mongoid-scroll 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b18caa6adcba10267216ab4c06890232de3ec0cd
-  data.tar.gz: b05d520e679bb1d49806470546a546624f0574bf
+  metadata.gz: 49f6957fe1cfab726fa346c141eb979487590912
+  data.tar.gz: e791fd49a8bf4aa187aaccb5222ada9f1e0dcf89
 SHA512:
-  metadata.gz: 7c4c3bbe7deeb838e893f3c19de0160b64b9e4ee66d7c12dbca872181e56c51416c0355d87acb3dd5a33db0d504b11f396c4a59559c2592bf78c74437e9fba66
-  data.tar.gz: b5a55c6f00c90ae8eed3f3ee3153d07b17159d8c7129b4e5dab3d4719a9d6147804ba20cd00e2c6b8825638f3d77102dafd3556557b6deb92664c79cd4002911
+  metadata.gz: 5cdf23a3ee65c76874d71ff8d78cb948c478e8f75b53cc930717493d2bc7ebc13b3787c06c4527eec197bd241b7b7ac4f62ca4ce5eb01cf67f56e54b2438a17b
+  data.tar.gz: 9606b19764c8aa3a578e1f7b7f278d9cc4f1ce1849aaa5de5804024dd9a7399b9a4d337febe88dea7f415692268ea1c171091ca6eff0bcc467f15f3f1799d7e3

data/.rubocop_todo.yml

@@ -1,11 +1,12 @@
-# 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
 
@@ -13,7 +14,7 @@ Metrics/AbcSize:
 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.

data/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).

data/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

data/examples/moped_scroll_feed.rb

@@ -28,7 +28,7 @@ next_cursor = nil
 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

data/lib/mongoid/scroll/cursor.rb

@@ -14,7 +14,9 @@ module Mongoid
         compare_direction = direction == 1 ? '$gt' : '$lt'
         cursor_criteria = { field_name => { compare_direction => mongo_value } } if mongo_value
         tiebreak_criteria = { field_name => mongo_value, :_id => { compare_direction => tiebreak_id } } if mongo_value && tiebreak_id
-        cursor_criteria || tiebreak_criteria ? { '$or' => [cursor_criteria, tiebreak_criteria].compact } : {}
+        cursor_selector = Origin::Selector.new
+        cursor_selector.merge!('$or' => [cursor_criteria, tiebreak_criteria].compact) if cursor_criteria || tiebreak_criteria
+        cursor_selector.__evolve_object_id__
       end
 
       class << self

data/lib/mongoid/scroll/version.rb

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

data/spec/mongoid/criteria_spec.rb

@@ -130,6 +130,20 @@ describe Mongoid::Criteria do
       expect(records.size).to eq 1
       expect(records.map(&:name)).to eq ['Feed Item 2']
     end
+    it 'merges cursor criteria when no sort field is given' do
+      criteria = Feed::Item.where(:a_time.gt => Time.new(2013, 7, 22, 1, 2, 3))
+      feed_item_1 = Feed::Item.where(name: 'Feed Item 1').first
+      cursor_input = "#{feed_item_1.id}:#{feed_item_1.id}"
+      field_type = Mongoid::Scroll.mongoid3? ? Moped::BSON::ObjectId : BSON::ObjectId
+      cursor_options = { field_type: field_type, field_name: '_id', direction: 1 }
+      cursor = Mongoid::Scroll::Cursor.new(cursor_input, cursor_options)
+      records = []
+      criteria.limit(2).scroll(cursor) do |record, next_cursor|
+        records << record
+        cursor = next_cursor
+      end
+      expect(records.size).to eq 2
+    end
   end
   context 'with embeddable objects' do
     before do

data/spec/mongoid/scroll_cursor_spec.rb

@@ -15,6 +15,26 @@ describe Mongoid::Scroll::Cursor do
                                                                                                                   /The cursor supplied is invalid: invalid./
     end
   end
+  context 'an id field cursor' do
+    let(:feed_item) { Feed::Item.create!(a_string: 'astring') }
+    field_type = Mongoid::Scroll.mongoid3? ? Moped::BSON::ObjectId : BSON::ObjectId
+    subject do
+      Mongoid::Scroll::Cursor.new "#{feed_item.id}:#{feed_item.id}", field_name: '_id', field_type: field_type, direction: 1
+    end
+    its(:value) { should eq feed_item.id.to_s }
+    its(:tiebreak_id) { should eq feed_item.id }
+    its(:criteria) do
+      if Mongoid::Scroll.mongoid3?
+        should eq('$or' => [
+          { '_id' => { '$gt' => Moped::BSON::ObjectId("#{feed_item.id}") } }
+        ])
+      else
+        should eq('$or' => [
+          { '_id' => { '$gt' => BSON::ObjectId("#{feed_item.id}") } }
+        ])
+      end
+    end
+  end
   context 'a string field cursor' do
     let(:feed_item) { Feed::Item.create!(a_string: 'astring') }
     subject do
@@ -25,7 +45,7 @@ describe Mongoid::Scroll::Cursor do
     its(:criteria) do
       should eq('$or' => [
         { 'a_string' => { '$gt' => feed_item.a_string } },
-        { 'a_string' => feed_item.a_string, :_id => { '$gt' => feed_item.id } }
+        { 'a_string' => feed_item.a_string, '_id' => { '$gt' => feed_item.id } }
       ])
     end
   end
@@ -39,7 +59,7 @@ describe Mongoid::Scroll::Cursor do
     its(:criteria) do
       should eq('$or' => [
         { 'a_integer' => { '$gt' => feed_item.a_integer } },
-        { 'a_integer' => feed_item.a_integer, :_id => { '$gt' => feed_item.id } }
+        { 'a_integer' => feed_item.a_integer, '_id' => { '$gt' => feed_item.id } }
       ])
     end
   end
@@ -54,7 +74,7 @@ describe Mongoid::Scroll::Cursor do
     its(:criteria) do
       should eq('$or' => [
         { 'a_datetime' => { '$gt' => feed_item.a_datetime } },
-        { 'a_datetime' => feed_item.a_datetime, :_id => { '$gt' => feed_item.id } }
+        { 'a_datetime' => feed_item.a_datetime, '_id' => { '$gt' => feed_item.id } }
       ])
     end
   end
@@ -69,7 +89,7 @@ describe Mongoid::Scroll::Cursor do
     its(:criteria) do
       should eq('$or' => [
         { 'a_date' => { '$gt' => feed_item.a_date.to_datetime } },
-        { 'a_date' => feed_item.a_date.to_datetime, :_id => { '$gt' => feed_item.id } }
+        { 'a_date' => feed_item.a_date.to_datetime, '_id' => { '$gt' => feed_item.id } }
       ])
     end
   end
@@ -84,7 +104,7 @@ describe Mongoid::Scroll::Cursor do
     its(:criteria) do
       should eq('$or' => [
         { 'a_time' => { '$gt' => feed_item.a_time } },
-        { 'a_time' => feed_item.a_time, :_id => { '$gt' => feed_item.id } }
+        { 'a_time' => feed_item.a_time, '_id' => { '$gt' => feed_item.id } }
       ])
     end
   end
@@ -99,7 +119,7 @@ describe Mongoid::Scroll::Cursor do
     its(:criteria) do
       should eq('$or' => [
         { 'a_time' => { '$gt' => feed_item.a_time } },
-        { 'a_time' => feed_item.a_time, :_id => { '$gt' => feed_item.id } }
+        { 'a_time' => feed_item.a_time, '_id' => { '$gt' => feed_item.id } }
       ])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-scroll
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Daniel Doubrovkine
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -45,11 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -89,12 +89,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []