mongoid-scroll 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73c44f9f9dcdc554e3f0ab2701cb4c87822bdf905bd7212e6bb59ea66e6a454d
-  data.tar.gz: 6e2abaa7d08e7bf0dfb914fc26b51b1d835526c8d0b1bc75fb0577adf06edb8d
+  metadata.gz: 26aa74f5571582e25321e096612b63056c8ac9839299434ee2007ba778042421
+  data.tar.gz: 95b7d7739e45b8a38b15ff74af68be5f25bc8c346dd291c0f062d14c46439c71
 SHA512:
-  metadata.gz: ea72567b1edb2d8df27dc309d685804a8f199ff060ad93cb64ef01b6fd098a4ae7f677242375a89875bbdb8f8104f238cb6d79fb667799b5e90c297ce96d0e6f
-  data.tar.gz: ab22160efc873bf42430292047661de3b532a0629326dbfdc93a2ef49bc64207725b405472410171e96e6f997e5a23fc5914698b488a4fd1cacb29021bd70261
+  metadata.gz: 886b6450b7aa4d0d0ee768ba59752464ba8e3743649990e99349bc03540c1715ba10ecbe845cfaa9a27a9e7082d3d205e99ae1d6651bd8f3a403ba02615bbee7
+  data.tar.gz: f16fad09019d31f73d436352efd83fb7278a716d61d25c055ceae678c8cd3bfec2815e408861ff578039c6f20fcba230a0e1695522bcf523acf06d269317ddb8

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-07 08:58:13 -0500 using RuboCop version 0.49.1.
+# on 2023-03-09 01:14:57 +0100 using RuboCop version 0.49.1.
 # 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
@@ -20,7 +20,7 @@ Metrics/AbcSize:
 # Offense count: 18
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 258
+  Max: 274
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -31,7 +31,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 146
+# Offense count: 153
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.1 (2023/03/15)
+
+* [#36](https://github.com/mongoid/mongoid-scroll/pull/36): Keep millisecond precision on time fields - [@FabienChaynes](https://github.com/FabienChaynes).
+
 ### 1.0.0 (2023/03/08)
 
 * [#25](https://github.com/mongoid/mongoid-scroll/pull/25): Compatibility with Ruby 3 - [@leamotta](https://github.com/leamotta).

data/lib/mongoid/scroll/base_cursor.rb

@@ -55,8 +55,8 @@ module Mongoid
         case field_type.to_s
         when 'BSON::ObjectId' then BSON::ObjectId.from_string(value)
         when 'String' then value.to_s == '' ? nil : value.to_s
-        when 'DateTime' then value.is_a?(DateTime) ? value : Time.at(value.to_i).to_datetime
-        when 'Time' then value.is_a?(Time) ? value : Time.at(value.to_i)
+        when 'DateTime' then value.is_a?(DateTime) ? value : Time.at(value.to_f).to_datetime
+        when 'Time' then value.is_a?(Time) ? value : Time.at(value.to_f)
         when 'Date' then value.is_a?(Date) ? value : Time.at(value.to_i).utc.to_date
         when 'Float' then value.to_f
         when 'Integer' then value.to_i
@@ -72,7 +72,7 @@ module Mongoid
         when 'BSON::ObjectId' then value.to_s
         when 'String' then value.to_s
         when 'Date' then Time.utc(value.year, value.month, value.day).to_i
-        when 'DateTime', 'Time' then value.utc.to_i
+        when 'DateTime', 'Time' then value.utc.to_f.round(3)
         when 'Float' then value.to_f
         when 'Integer' then value.to_i
         else

data/lib/mongoid/scroll/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Scroll
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/spec/mongoid/base64_encoded_cursor_spec.rb

@@ -77,7 +77,7 @@ describe Mongoid::Scroll::Base64EncodedCursor do
       its(:to_s) { should eq(base64_string) }
     end
     context 'a date/time field cursor' do
-      let(:base64_string) { 'eyJ2YWx1ZSI6MTM4NzU5MDEyMywiZmllbGRfdHlwZSI6IkRhdGVUaW1lIiwiZmllbGRfbmFtZSI6ImFfZGF0ZXRpbWUiLCJkaXJlY3Rpb24iOjEsImluY2x1ZGVfY3VycmVudCI6ZmFsc2UsInRpZWJyZWFrX2lkIjoiNjQwNjQzYTcwOTQ0MzQyMzlmMmRiZjg2In0=' }
+      let(:base64_string) { 'eyJ2YWx1ZSI6MTM4NzU5MDEyMy4wLCJmaWVsZF90eXBlIjoiRGF0ZVRpbWUiLCJmaWVsZF9uYW1lIjoiYV9kYXRldGltZSIsImRpcmVjdGlvbiI6MSwiaW5jbHVkZV9jdXJyZW50IjpmYWxzZSwidGllYnJlYWtfaWQiOiI2NDA2NDNhNzA5NDQzNDIzOWYyZGJmODYifQ==' }
       let(:a_value) { DateTime.new(2013, 12, 21, 1, 42, 3, 'UTC') }
       let(:tiebreak_id) { BSON::ObjectId('640643a7094434239f2dbf86') }
       let(:criteria) do
@@ -117,7 +117,7 @@ describe Mongoid::Scroll::Base64EncodedCursor do
       its(:to_s) { should eq(base64_string) }
     end
     context 'a time field cursor' do
-      let(:base64_string) { 'eyJ2YWx1ZSI6MTM4NzYwNTcyMywiZmllbGRfdHlwZSI6IlRpbWUiLCJmaWVsZF9uYW1lIjoiYV90aW1lIiwiZGlyZWN0aW9uIjoxLCJpbmNsdWRlX2N1cnJlbnQiOmZhbHNlLCJ0aWVicmVha19pZCI6IjY0MDYzZDRhMDk0NDM0MTY2YmQwNTNlZCJ9' }
+      let(:base64_string) { 'eyJ2YWx1ZSI6MTM4NzYwNTcyMy4wLCJmaWVsZF90eXBlIjoiVGltZSIsImZpZWxkX25hbWUiOiJhX3RpbWUiLCJkaXJlY3Rpb24iOjEsImluY2x1ZGVfY3VycmVudCI6ZmFsc2UsInRpZWJyZWFrX2lkIjoiNjQwNjNkNGEwOTQ0MzQxNjZiZDA1M2VkIn0=' }
       let(:item_id) { BSON::ObjectId('640636f209443407333b46d4') }
       let(:a_value) { Time.new(2013, 12, 21, 6, 2, 3, '+00:00').utc }
       let(:tiebreak_id) { BSON::ObjectId('64063d4a094434166bd053ed') }

data/spec/mongoid/criteria_spec.rb

@@ -260,6 +260,23 @@ describe Mongoid::Criteria do
           expect(items).to eq([second_item, third_item])
         end
       end
+      context 'with DateTime with a milisecond precision' do
+        let!(:item_1) { Feed::Item.create!(a_datetime: DateTime.new(2013, 1, 21, 1, 42, 3.1, 'UTC')) }
+        let!(:item_2) { Feed::Item.create!(a_datetime: DateTime.new(2013, 1, 21, 1, 42, 3.2, 'UTC')) }
+        let!(:item_3) { Feed::Item.create!(a_datetime: DateTime.new(2013, 1, 21, 1, 42, 3.3, 'UTC')) }
+
+        it 'doesn\'t lose the precision when rebuilding the cursor' do
+          records = []
+          cursor = nil
+          Feed::Item.order_by(a_datetime: 1).limit(2).scroll(cursor_type) do |record, next_cursor|
+            records << record
+            cursor = next_cursor
+          end
+          expect(records).to eq [item_1, item_2]
+          cursor = cursor_type.new(cursor.to_s, field: Feed::Item.fields['a_datetime'])
+          expect(Feed::Item.order_by(a_datetime: 1).limit(2).scroll(cursor).to_a).to eq([item_3])
+        end
+      end
     end
   end
 end

data/spec/mongoid/cursor_spec.rb

@@ -59,11 +59,11 @@ describe Mongoid::Scroll::Cursor do
   context 'a date/time field cursor' do
     let(:feed_item) { Feed::Item.create!(a_datetime: DateTime.new(2013, 12, 21, 1, 42, 3, 'UTC')) }
     subject do
-      Mongoid::Scroll::Cursor.new "#{feed_item.a_datetime.utc.to_i}:#{feed_item.id}", field_name: 'a_datetime', field_type: DateTime
+      Mongoid::Scroll::Cursor.new "#{feed_item.a_datetime.utc.to_f.round(3)}:#{feed_item.id}", field_name: 'a_datetime', field_type: DateTime
     end
     its(:value) { should eq feed_item.a_datetime }
     its(:tiebreak_id) { should eq feed_item.id }
-    its(:to_s) { should eq "#{feed_item.a_datetime.utc.to_i}:#{feed_item.id}" }
+    its(:to_s) { should eq "#{feed_item.a_datetime.utc.to_f.round(3)}:#{feed_item.id}" }
     its(:criteria) do
       should eq('$or' => [
                   { 'a_datetime' => { '$gt' => feed_item.a_datetime } },
@@ -89,11 +89,11 @@ describe Mongoid::Scroll::Cursor do
   context 'a time field cursor' do
     let(:feed_item) { Feed::Item.create!(a_time: Time.new(2013, 12, 21, 1, 2, 3)) }
     subject do
-      Mongoid::Scroll::Cursor.new "#{feed_item.a_time.to_i}:#{feed_item.id}", field_name: 'a_time', field_type: Time
+      Mongoid::Scroll::Cursor.new "#{feed_item.a_time.to_f.round(3)}:#{feed_item.id}", field_name: 'a_time', field_type: Time
     end
     its(:value) { should eq feed_item.a_time }
     its(:tiebreak_id) { should eq feed_item.id }
-    its(:to_s) { should eq "#{feed_item.a_time.to_i}:#{feed_item.id}" }
+    its(:to_s) { should eq "#{feed_item.a_time.to_f.round(3)}:#{feed_item.id}" }
     its(:criteria) do
       should eq('$or' => [
                   { 'a_time' => { '$gt' => feed_item.a_time } },
@@ -104,11 +104,11 @@ describe Mongoid::Scroll::Cursor do
   context 'a time field cursor with a field option' do
     let(:feed_item) { Feed::Item.create!(a_time: Time.new(2013, 12, 21, 1, 2, 3)) }
     subject do
-      Mongoid::Scroll::Cursor.new "#{feed_item.a_time.to_i}:#{feed_item.id}", field: Feed::Item.fields['a_time']
+      Mongoid::Scroll::Cursor.new "#{feed_item.a_time.to_f.round(3)}:#{feed_item.id}", field: Feed::Item.fields['a_time']
     end
     its(:value) { should eq feed_item.a_time }
     its(:tiebreak_id) { should eq feed_item.id }
-    its(:to_s) { should eq "#{feed_item.a_time.to_i}:#{feed_item.id}" }
+    its(:to_s) { should eq "#{feed_item.a_time.to_f.round(3)}:#{feed_item.id}" }
     its(:criteria) do
       should eq('$or' => [
                   { 'a_time' => { '$gt' => feed_item.a_time } },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-scroll
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid