sn-revisions 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adab82c07e5663ee93287087e7724e40d6b9824d
-  data.tar.gz: bdd9d0582b9fb0ef59a1ebd9179a881a716578c4
+  metadata.gz: 008b8602beb04a57882d9e7f3e821fc13071b5b7
+  data.tar.gz: 0362024a93034631d5f8d5d33a9a1f93969bda5e
 SHA512:
-  metadata.gz: 1da0a860f88c5043660172d13818c22a8ff4a662620d74b39d1a25572f61d29d28e3d7458d8abfc4781904eda3779a36d798b345ceb15510a0b6b9ef573dd41b
-  data.tar.gz: 79616569158fb07c21bfe0df8cc5f49191e9f73e89c12b56e183bffa6d54cbf559a93f5edf4bfbac776c1041e746e3a506c3b932fcb7b4492dbdd4b20e7c0349
+  metadata.gz: f8e9647c44c9ee6e38d6ba21a8d94624f048d10dc2ed6d9949dc845324ee926702a5ff950054c57c64a2b83f0ee30c3dcab6f90367509f2bbf750dc7f13cb580
+  data.tar.gz: 11ea6a08385908d96cc419bcbc04ae918897a37014e4d1dbabf7efa75ae11b9dbdb377fdbb00b01e7665ff5b7f4a40c20d81e010143b4d3450b2750f75b1a7ee

data/app/controllers/revisions/extension_controller.rb

@@ -13,6 +13,7 @@ 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

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

data/app/models/revisions/item.rb

@@ -8,27 +8,37 @@ module Revisions
       revision.content = content
       revision.enc_item_key = item_key
       revision.auth_hash = auth_hash
+      # revision.num = self.revisions.length > 0 && self.revisions.first.num ? (self.revisions.first.num + 1) : 0
       revision.save
     end
 
 
-    def condense_history
-      # revisions past 30 days are limited to 1 revision per day
+    def prune_history
+      # revisions past 30 days are limited to min_revs revision per day
       # 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
-      min_revs = 3
+      min_revs = 4
       days.times do |days_from_today|
         date = Time.now.utc.to_date - days_from_today
-        num_revs_allowed = days - days_from_today + min_revs
+        num_revs_target = days - days_from_today + min_revs # 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_allowed
-          num_to_remove = revs.length - num_revs_allowed
-          num_to_remove.times do |time|
-            index = revs.length/2 - 1
-            Revision.destroy(revs[index])
-            revs.delete_at(index)
+        if revs.length > num_revs_target
+          keep_every_nth = (revs.length.to_f / (num_revs_target)).ceil
+          keep = [revs.length - 1]
+
+          (0..revs.length - keep_every_nth).step(keep_every_nth) do |n|
+            keep.push(n)
+          end
+
+          discard_ids = []
+          revs.length.times do |index|
+            if keep.include?(index) == false
+              discard_ids.push(revs[index])
+            end
           end
+
+          Revision.destroy(discard_ids)
         end
       end
     end

data/lib/revisions/version.rb

@@ -1,3 +1,3 @@
 module Revisions
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

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