paper_trail 2.6.1 → 2.6.2

data/.gitignore

@@ -1,3 +1,4 @@
+NOTES
 test/debug.log
 test/paper_trail_plugin.sqlite3.db
 test/dummy/db/*.sqlite3

data/README.md

@@ -717,6 +717,8 @@ Many thanks to:
 * [Nikita Cernovs](https://github.com/nikitachernov)
 * [Jason Noble](https://github.com/jasonnoble)
 * [Jared Mehle](https://github.com/jrmehle)
+* [Eric Schwartz](https://github.com/emschwar)
+
 
 
 ## Inspirations

data/lib/paper_trail/has_paper_trail.rb

@@ -108,6 +108,12 @@ module PaperTrail
         v ? v.reify(reify_options) : self
       end
 
+      # Returns the objects (not Versions) as they were between the given times.
+      def versions_between(start_time, end_time, reify_options={})
+        versions = send(self.class.versions_association_name).between(start_time, end_time)
+        versions.collect { |version| version_at(version.send PaperTrail.timestamp_field) }
+      end
+
       # Returns the object (not a Version) as it was most recently.
       def previous_version
         preceding_version = source_version ? source_version.previous : send(self.class.versions_association_name).last

data/lib/paper_trail/version.rb

@@ -17,7 +17,13 @@ class Version < ActiveRecord::Base
 
   scope :following, lambda { |timestamp|
     # TODO: is this :order necessary, considering its presence on the has_many :versions association?
-    where(["#{PaperTrail.timestamp_field} > ?", timestamp]).order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
+    where(["#{PaperTrail.timestamp_field} > ?", timestamp]).
+      order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
+  }
+
+  scope :between, lambda { |start_time, end_time|
+    where(["#{PaperTrail.timestamp_field} > ? AND #{PaperTrail.timestamp_field} < ?", start_time, end_time ]).
+      order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
   }
 
   # Restore the item from this version.

data/lib/paper_trail/version_number.rb

@@ -1,3 +1,3 @@
 module PaperTrail
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end

data/test/unit/model_test.rb

@@ -576,6 +576,24 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
     end
 
+    context '.versions_between' do
+      setup do
+        @created       = 30.days.ago
+        @first_update  = 15.days.ago
+        @second_update = 1.day.ago
+        @widget.versions[0].update_attributes :created_at => @created
+        @widget.versions[1].update_attributes :created_at => @first_update
+        @widget.versions[2].update_attributes :created_at => @second_update
+        @widget.update_attribute :updated_at, @second_update
+      end
+
+      should 'return versions in the time period' do
+        assert_equal ['Fidget'], @widget.versions_between(20.days.ago, 10.days.ago).map(&:name)
+        assert_equal ['Widget', 'Fidget'], @widget.versions_between(45.days.ago, 10.days.ago).map(&:name)
+        assert_equal ['Fidget', 'Digit'], @widget.versions_between(16.days.ago, 1.minute.ago).map(&:name)
+        assert_equal [], @widget.versions_between(60.days.ago, 45.days.ago).map(&:name)
+      end
+    end
 
     context 'on the first version' do
       setup { @version = @widget.versions.first }

data/test/unit/timestamp_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TimestampTest < ActiveSupport::TestCase
 
   setup do
-    PaperTrail.config.timestamp_field = :custom_created_at
+    PaperTrail.timestamp_field = :custom_created_at
     change_schema
     Version.reset_column_information
 
@@ -16,6 +16,10 @@ class TimestampTest < ActiveSupport::TestCase
     @fluxor.update_attributes :name => 'Even more text.'
   end
 
+  teardown do
+    PaperTrail.timestamp_field = :created_at
+  end
+
   test 'versions works with custom timestamp field' do
     # Normal behaviour
     assert_equal 3, @fluxor.versions.length

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paper_trail
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 2
   - 6
-  - 1
-  version: 2.6.1
+  - 2
+  version: 2.6.2
 platform: ruby
 authors: 
 - Andy Stewart