sn-revisions 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c332396cc54a84421da58db8b83aec7dd2eb6b39
-  data.tar.gz: a997680a0c289a748e258fbbb1163ebb049e6dc5
+SHA256:
+  metadata.gz: edbf1ef739e32f8ac0d20f3c717193b28465d11c219284061d5305b6a6b0dfd1
+  data.tar.gz: af6623b32de817b40d83806e1ae286a1481fe039e276b907147c9b03712971ce
 SHA512:
-  metadata.gz: 4ce3bebb7bf5b4bb09cfc312f184704efaba857ef76444ee256e486cbfc3c4c08a53e5cf8768d60e6ae6eea26a585daa0f1099b16b99cacbbb6254e39111d46b
-  data.tar.gz: 440318cdf88b3aa689181d06e17254e4d08e2bcb6b7338062846375d649f96fbdd75070f3577dabdd92a878a976cd1ac654b7bdb4e3ae6bc53049eaf1f99e947
+  metadata.gz: a4864c8780a6f346c2638b9d05ba4cb599873db0fc0e7e7778f1ceee7663fffc31c3e8095246578d60c10825ca93d5519b01b358c22a7d7146416e8db22ab767
+  data.tar.gz: 25db854727398ffe4275e8fb2be3b09beebd75618a5fb63442b5448226d5a8964733aacf540794b3c099336fdd3f712b1f09169f3794589bc0878103956c2ff2

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,11 +3,12 @@ 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

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.2.0'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sn-revisions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: The Note History extension for Standard Notes allows you to track changes
   to your notes, and restore them to previous versions.
 email:
@@ -68,6 +74,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 +98,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