sn-revisions 0.1.9 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0390856e64f4c09a2a0cfd392291462ff57e6f53
-  data.tar.gz: dba7dd937b46200b3eaa5ece18c0bc1e01caf270
+SHA256:
+  metadata.gz: 6ef6dde5ce7bff0360fb048f422bca949d38397153bbeb56156c31f2999e2be7
+  data.tar.gz: 1f1e88f5a87f06e160b12112604b507e27c5306120f6b06f6a481207d5f04afd
 SHA512:
-  metadata.gz: 80313e953ce4f4c4f9eebdfedbae92abc0842beaa21d2bfac9addcc330221df36ece60b02693bcf6f55218a41bebd25641aeadce08f28bbb9886524f8e1805b6
-  data.tar.gz: d03e874be2b56c6dc8d2dc0aedf2dd998302c07e77043f5a5441372f97e9808aee0928db2a41b69c235d4601ba47eae631d099b8eb58a522611e532d6fa85cf4
+  metadata.gz: f9ea13efaca49cf5dfcdbc8f122c0b53302dc94f6e5bd69d19de3f4d30840d08cf7bb7047019584073001c894462bb37eb419eb6e6f7d5e2873fbeea61737496
+  data.tar.gz: b07790d2b0f691dd4bf16d5d10430786a38305a2c6a0ce158cb04f9034294f1465fa9fac36755c2425309cb102592ef6f947087fbfed9020cdc9e917b172a30f

data/app/controllers/revisions/items_controller.rb

@@ -2,19 +2,21 @@ require_dependency "revisions/application_controller"
 
 module Revisions
   class ItemsController < ApplicationController
-
     def save
       items = params[:items]
+      auth_params = params[:auth_params]
+
       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"])
+        item.add_revision(item_hash["content"], item_hash["enc_item_key"], item_hash["auth_hash"], auth_params)
         if item.content_type == nil
           item.content_type = item_hash["content_type"]
           item.save
         end
       end
-    end
 
+      head :no_content
+    end
   end
 end

data/app/controllers/revisions/revisions_controller.rb

@@ -10,7 +10,19 @@ module Revisions
         return
       end
 
-      render :json => {:item => revision.as_json.merge({:uuid => revision.item.item_uuid, :content_type => revision.item.content_type})}
+      if revision.auth_params
+        # Handles issue where auth params were not previously properly serialized before being inserted
+        begin
+          auth_params = JSON.parse(revision.auth_params)
+        rescue
+          auth_params = JSON.parse(revision.auth_params.gsub('=>', ':'))
+        end
+      end
+
+      render :json => {
+        :item => revision.as_json.merge({:uuid => revision.item.item_uuid, :content_type => revision.item.content_type}),
+        :auth_params => auth_params
+      }
     end
 
   end

data/app/models/revisions/item.rb

@@ -3,21 +3,25 @@ module Revisions
 
     has_many :revisions, -> { order 'created_at desc' }
 
-    def add_revision(content, item_key, auth_hash)
+    def add_revision(content, item_key, auth_hash, auth_params)
       revision = self.revisions.new
       revision.content = content
       revision.enc_item_key = item_key
       revision.auth_hash = auth_hash
+      revision.auth_params = auth_params.to_json
       # revision.num = self.revisions.length > 0 && self.revisions.first.num ? (self.revisions.first.num + 1) : 0
       revision.save
     end
 
+    def prune_all_history
+      prune_history(400)
+    end
 
-    def prune_history
+    # prunes recent history
+    def prune_history(days = 30)
       # 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
       max_revs = 8
       min_revs = 4
       days.times do |days_from_today|

data/db/migrate/20180526182951_add_auth_params_to_revisions.rb

@@ -0,0 +1,5 @@
+class AddAuthParamsToRevisions < ActiveRecord::Migration[5.0]
+  def change
+    add_column :revisions_revisions, :auth_params, :text
+  end
+end

data/lib/revisions/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sn-revisions
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.4
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,6 +68,7 @@ files:
 - db/migrate/20170211000426_create_revisions_revisions.rb
 - db/migrate/20170211001350_create_revisions_users.rb
 - db/migrate/20170713154559_change_item_key_to_text.rb
+- db/migrate/20180526182951_add_auth_params_to_revisions.rb
 - lib/revisions.rb
 - lib/revisions/engine.rb
 - lib/revisions/version.rb
@@ -91,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Note History extension for Standard Notes allows you to track changes