kotovalexarian-likes-github
/
paper-trail-gem--paper_trail
mirror of https://github.com/paper-trail-gem/paper_trail.git
1
0
Fork 0
Code Releases Activity

Default order by timestamp to ensure early versions are cleaned

This commit is contained in:
Owen Rodda 2016-01-16 21:48:48 -05:00
parent a80c23f8ed
commit c4e7b3c744
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -19,7 +19,10 @@ None
### Fixed ### Fixed
None - [#701](https://github.com/airblade/paper_trail/pull/701) /
[#699](https://github.com/airblade/paper_trail/issues/699) -
Cleaning old versions explicitly preserves the most recent
versions instead of relying on database result ordering.
## 4.1.0 (Unreleased) ## 4.1.0 (Unreleased)

7
lib/paper_trail/cleaner.rb
View File

@ -6,7 +6,8 @@ module PaperTrail
# Options: # Options:
# #
# - :keeping - An `integer` indicating the number of versions to be kept for # - :keeping - An `integer` indicating the number of versions to be kept for
# each item per date. Defaults to `1`. # each item per date. Defaults to `1`. The most recent matching versions
# are kept.
# - :date - Should either be a `Date` object specifying which date to # - :date - Should either be a `Date` object specifying which date to
# destroy versions for or `:all`, which will specify that all dates # destroy versions for or `:all`, which will specify that all dates
# should be cleaned. Defaults to `:all`. # should be cleaned. Defaults to `:all`.
@ -30,12 +31,14 @@ module PaperTrail
# Returns a hash of versions grouped by the `item_id` attribute formatted # Returns a hash of versions grouped by the `item_id` attribute formatted
# like this: {:item_id => PaperTrail::Version}. If `item_id` or `date` is # like this: {:item_id => PaperTrail::Version}. If `item_id` or `date` is
# set, versions will be narrowed to those pointing at items with those ids # set, versions will be narrowed to those pointing at items with those ids
# that were created on specified date. # that were created on specified date. Versions are returned in
# chronological order.
def gather_versions(item_id = nil, date = :all) def gather_versions(item_id = nil, date = :all)
unless date == :all || date.respond_to?(:to_date) unless date == :all || date.respond_to?(:to_date)
raise ArgumentError.new("`date` argument must receive a Timestamp or `:all`") raise ArgumentError.new("`date` argument must receive a Timestamp or `:all`")
end end
versions = item_id ? PaperTrail::Version.where(:item_id => item_id) : PaperTrail::Version versions = item_id ? PaperTrail::Version.where(:item_id => item_id) : PaperTrail::Version
versions = versions.order(PaperTrail.timestamp_field, :id)
versions = versions.between(date.to_date, date.to_date + 1.day) unless date == :all versions = versions.between(date.to_date, date.to_date + 1.day) unless date == :all
# If `versions` has not been converted to an ActiveRecord::Relation yet, # If `versions` has not been converted to an ActiveRecord::Relation yet,