sn-revisions 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef6dde5ce7bff0360fb048f422bca949d38397153bbeb56156c31f2999e2be7
-  data.tar.gz: 1f1e88f5a87f06e160b12112604b507e27c5306120f6b06f6a481207d5f04afd
+  metadata.gz: 3a9d224739a0b4226619d30a6a807159782e6308a6c25b6d19b3cb8d27d93ef2
+  data.tar.gz: 7f830a9a38b1d3f5752cd43f2688c1b5ae355e0abd6d31482b99e395a8233539
 SHA512:
-  metadata.gz: f9ea13efaca49cf5dfcdbc8f122c0b53302dc94f6e5bd69d19de3f4d30840d08cf7bb7047019584073001c894462bb37eb419eb6e6f7d5e2873fbeea61737496
-  data.tar.gz: b07790d2b0f691dd4bf16d5d10430786a38305a2c6a0ce158cb04f9034294f1465fa9fac36755c2425309cb102592ef6f947087fbfed9020cdc9e917b172a30f
+  metadata.gz: 9a5ea644c900275e06150e26c35f203f1e26b94773e083bd5532be09d7a4c60328da4f6f894e53d6f6b5c45faa583452de5d933a0efdbca2e125512d20680c72
+  data.tar.gz: 701820bd4b88de3d0e2a3d091f948162e2adda612bd08128c1ed78ed04383d72a8d7180b2e53bc9dda0193142344986733bca7dd778cc6882ffaae0aea1360b6

data/app/controllers/revisions/application_controller.rb

@@ -6,8 +6,8 @@ module Revisions
     before_action :authenticate_user
 
     def authenticate_user
-      user = Revisions::User.find(params[:uid])
-      if user.key != params[:key]
+      user = Revisions::User.find_by_id(params[:uid])
+      if !user || !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,17 +1,39 @@
-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]
+      directive = params[:directive]
+
+      if directive == 'delete-account'
+        current_user.destroy
+        head :no_content
+        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'])
+
+        if item_hash['deleted'] == true
+          item.destroy
+          head :no_content
+          next
+        end
+
         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

data/app/models/revisions/item.rb

@@ -1,15 +1,23 @@
 module Revisions
   class Item < ApplicationRecord
 
-    has_many :revisions, -> { order 'created_at desc' }
-
-    def add_revision(content, item_key, auth_hash, auth_params)
+    has_many :revisions, -> { order 'created_at desc' }, dependent: :destroy
+
+    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
-
+    has_many :items, dependent: :destroy
   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.4'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sn-revisions
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-02-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:
@@ -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