sn-revisions 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445c6625627b8a716cfb409e90a5e305a89da815
-  data.tar.gz: 331efe387b0062c7a44f524ffa0f3d2d6be8aaff
+  metadata.gz: 0390856e64f4c09a2a0cfd392291462ff57e6f53
+  data.tar.gz: dba7dd937b46200b3eaa5ece18c0bc1e01caf270
 SHA512:
-  metadata.gz: 16b20e8fd255e43bab312a11700753a12d4a9dc2b17d7bd07be5f24bcdb7a2581f91c0cb020092709477c915d4b38e1ad6d34c0351eeed140411db64d35faa4f
-  data.tar.gz: 17c63934f08a39d84903dd55aef3af880a50c8fc05029143dfca7748a04bb319321340b5f1c6fa2eefdb3ed2d5169c3563536b9db4b47956095ef66ef5fc70b7
+  metadata.gz: 80313e953ce4f4c4f9eebdfedbae92abc0842beaa21d2bfac9addcc330221df36ece60b02693bcf6f55218a41bebd25641aeadce08f28bbb9886524f8e1805b6
+  data.tar.gz: d03e874be2b56c6dc8d2dc0aedf2dd998302c07e77043f5a5441372f97e9808aee0928db2a41b69c235d4601ba47eae631d099b8eb58a522611e532d6fa85cf4

data/app/controllers/revisions/extension_controller.rb

@@ -13,7 +13,6 @@ module Revisions
       end
 
       if item
-        item.prune_history
         item.revisions.each_with_index do |rev, index|
             action = {
               :label => "#{rev.created_at.strftime('%a %b %d, %Y at %I:%M%p %Z')}" + (index == 0 ? " (current)" : ""),

data/app/controllers/revisions/items_controller.rb

@@ -7,6 +7,7 @@ module Revisions
       items = params[:items]
       items.each do |item_hash|
         item = current_user.items.find_or_create_by(:item_uuid => item_hash["uuid"])
+        item.prune_history
         item.add_revision(item_hash["content"], item_hash["enc_item_key"], item_hash["auth_hash"])
         if item.content_type == nil
           item.content_type = item_hash["content_type"]

data/app/models/revisions/item.rb

@@ -18,10 +18,11 @@ module Revisions
       # any revision within 30 days is capped to 30-days_from_today revisions per day
       # so if there are 50 revisions from 5 days ago, 50 - (30-5) = 25 revisions are allowed
       days = 30
+      max_revs = 8
       min_revs = 4
       days.times do |days_from_today|
         date = Time.now.utc.to_date - days_from_today
-        num_revs_target = days - days_from_today + min_revs # actual number kept may be a little more or less
+        num_revs_target = [days - days_from_today + min_revs, max_revs].min # actual number kept may be a little more or less
         revs = self.revisions.where(:created_at => date.midnight..date.end_of_day).pluck(:id)
         if revs.length > num_revs_target
           keep_every_nth = (revs.length.to_f / (num_revs_target)).ceil

data/lib/revisions/version.rb

@@ -1,3 +1,3 @@
 module Revisions
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sn-revisions
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails