Preparing for release, 0.3.2.

.rubocop_todo.yml

@@ -1,19 +1,20 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-07 10:17:35 -0400 using RuboCop version 0.32.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-08 11:38:01 -0400 using RuboCop version 0.33.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
+# Offense count: 5
 Metrics/AbcSize:
   Max: 70
 
 # Offense count: 5
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 78
+# Offense count: 83
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 170
@@ -27,14 +28,28 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 12
 
-# Offense count: 12
+# Offense count: 13
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'examples/mongoid_scroll_feed.rb'
+    - 'lib/mongoid/criterion/scrollable.rb'
+    - 'lib/mongoid/scroll/cursor.rb'
+    - 'lib/mongoid/scroll/errors/base.rb'
+    - 'lib/mongoid/scroll/errors/invalid_cursor_error.rb'
+    - 'lib/mongoid/scroll/errors/multiple_sort_fields_error.rb'
+    - 'lib/mongoid/scroll/errors/no_such_field_error.rb'
+    - 'lib/mongoid/scroll/errors/unsupported_field_type_error.rb'
+    - 'lib/mongoid/scroll/mongoid.rb'
+    - 'lib/mongoid/scroll/version.rb'
+    - 'lib/moped/scrollable.rb'
+    - 'spec/support/feed/embedded_item.rb'
+    - 'spec/support/feed/item.rb'
 
 # Offense count: 1
 # Configuration parameters: Exclude.
 Style/FileName:
-  Enabled: false
+  Exclude:
+    - 'lib/mongoid-scroll.rb'
 
 # Offense count: 6
 # Configuration parameters: SupportedStyles.

CHANGELOG.md

@@ -1,5 +1,10 @@
+0.3.2 (8/8/2015)
+----------------
+
+* [#7](https://github.com/dblock/mongoid-scroll/pull/7): Fix: pre-merge cursor criteria fields - [@sweir27](https://github.com/sweir27).
+
 0.3.1 (7/27/2015)
-------------
+-----------------
 
 * Compatibility with Mongoid 5.x beta - [@dblock](https://github.com/dblock).
 * [#4](https://github.com/dblock/mongoid-scroll/pull/4): Fix: support chaining `$or` criteria - [@sweir27](https://github.com/sweir27).

Gemfile

@@ -17,5 +17,5 @@ group :development, :test do
   gem 'rspec', '~> 3.0'
   gem 'rspec-its'
   gem 'faker'
-  gem 'rubocop', '0.32.1'
+  gem 'rubocop', '0.33.0'
 end

examples/moped_scroll_feed.rb

@@ -28,7 +28,7 @@
 loop do
   current_cursor = next_cursor
   next_cursor = nil
-  Mongoid.default_session['feed_items'].find.limit(scroll_by).sort(position: 1).scroll(current_cursor,  field_type: Integer, field_name: 'position') do |item, cursor|
+  Mongoid.default_session['feed_items'].find.limit(scroll_by).sort(position: 1).scroll(current_cursor, field_type: Integer, field_name: 'position') do |item, cursor|
     puts "#{item['position']}: #{item['title']}"
     next_cursor = cursor
     total_shown += 1

lib/mongoid/scroll/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Scroll
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end