sn-revisions 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 54e2021f6695bc323ffbc7b370f88f8117fb538a
-  data.tar.gz: 41e8ed79ab6ede9130584e5f6cc92b1cc5d2b20a
+SHA256:
+  metadata.gz: e6fd8a7a570e4e2d838855b595302516522e9b210b40fac78da8ffe5cda37a6d
+  data.tar.gz: d65a449b84683914bf5d9a4dc6e20c38813b1f61df7a7cd7fcac06a98dae28ee
 SHA512:
-  metadata.gz: 9e4909e8f01bb411aff628aabd09371c63f291474f8945fdbf378521eabc02d6e6aed367fc2c123f23cb32c853932364f5a8b9c40ce6679431a054ae5a363da5
-  data.tar.gz: 7d7dfb7e2e9c41d3205db925f53b09558e31aec08feabb5a5b5cc4fb0a804cc337aa96b36a4213f1b9ff2f408b58a4188b5a54fb6ad9ab914da183277e3e0d07
+  metadata.gz: b01748ffda7142f8692d6d35ccb4f95b0583bf8643ac8a204199a46c64e98ce4aabe691752882455b5a18b3da032aefd29114c4f048c282791e433778924497a
+  data.tar.gz: a8eda9db60436e1a271e3f75c2b0920f89f69329f63f0eedff41073b6b15a493c346d2777658deaaaf68b067062590278717b6ebe3bee0192f9fc53c71890c18

data/app/controllers/revisions/application_controller.rb

@@ -7,7 +7,7 @@ module Revisions
 
     def authenticate_user
       user = Revisions::User.find(params[:uid])
-      if user.key != params[:key]
+      if !ActiveSupport::SecurityUtils.secure_compare(user.key, params[:key])
         render_unauthorized
         return
       end

data/app/controllers/revisions/extension_controller.rb

@@ -39,7 +39,12 @@ module Revisions
           end
         end
 
-        render :json => {:name => "Note History", :supported_types => [:Note], :actions => actions}
+        render :json => {
+          :name => "Note History",
+          :supported_types => [:Note],
+          :actions => actions,
+          deprecation: 'This extension will soon be replaced by Remote History, accessible via the History menu.'
+        }
     end
 
   end

data/app/controllers/revisions/items_controller.rb

@@ -1,33 +1,30 @@
-require_dependency "revisions/application_controller"
+require_dependency 'revisions/application_controller'
 
 module Revisions
   class ItemsController < ApplicationController
-
     def save
       items = params[:items]
       auth_params = params[:auth_params]
 
-      if items == nil || items.length == 0
-        # auth params migration
-        current_user.items.each do |item|
-          item.revisions.each do |revision|
-            revision.auth_params = auth_params
-            revision.save
-          end
-        end
-        return
-      end
-
       items.each do |item_hash|
-        item = current_user.items.find_or_create_by(:item_uuid => item_hash["uuid"])
+        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"], auth_params)
-        if item.content_type == nil
-          item.content_type = item_hash["content_type"]
+
+        item.add_revision(
+          items_key_id: item_hash['items_key_id'],
+          duplicate_of: item_hash['duplicate_of'],
+          content: item_hash['content'],
+          enc_item_key: item_hash['enc_item_key'],
+          auth_hash: item_hash['auth_hash'],
+          auth_params: 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,14 @@ module Revisions
         return
       end
 
-      auth_params = revision.auth_params ? JSON.parse(revision.auth_params) : nil
+      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}),

data/app/models/revisions/item.rb

@@ -3,13 +3,21 @@ module Revisions
 
     has_many :revisions, -> { order 'created_at desc' }
 
-    def add_revision(content, item_key, auth_hash, auth_params)
+    def add_revision(
+      items_key_id: nil,
+      duplicate_of: nil,
+      content: nil,
+      enc_item_key: nil,
+      auth_hash: nil,
+      auth_params: nil
+    )
       revision = self.revisions.new
+      revision.items_key_id = items_key_id
+      revision.duplicate_of = duplicate_of
       revision.content = content
-      revision.enc_item_key = item_key
+      revision.enc_item_key = enc_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
 
@@ -43,7 +51,9 @@ module Revisions
             end
           end
 
-          Revision.destroy(discard_ids)
+          Revision
+            .where(id: discard_ids)
+            .delete_all
         end
       end
     end

data/app/models/revisions/user.rb

@@ -1,6 +1,5 @@
 module Revisions
   class User < ApplicationRecord
     has_many :items
-
   end
 end

data/db/migrate/20200925151406_add_items_key_id.rb

@@ -0,0 +1,6 @@
+class AddItemsKeyId < ActiveRecord::Migration[5.2]
+  def change
+    add_column :revisions_revisions, :duplicate_of, :string, after: :id
+    add_column :revisions_revisions, :items_key_id, :string, after: :duplicate_of
+  end
+end

data/lib/revisions/version.rb

@@ -1,3 +1,3 @@
 module Revisions
-  VERSION = '0.2.2'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sn-revisions
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2020-10-13 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:
@@ -69,6 +75,7 @@ files:
 - 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
+- db/migrate/20200925151406_add_items_key_id.rb
 - lib/revisions.rb
 - lib/revisions/engine.rb
 - lib/revisions/version.rb
@@ -92,8 +99,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