sn-revisions 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c332396cc54a84421da58db8b83aec7dd2eb6b39
4
- data.tar.gz: a997680a0c289a748e258fbbb1163ebb049e6dc5
3
+ metadata.gz: f52e5c5fae95cc3fcf56e4b95fd38749587fee24
4
+ data.tar.gz: 79e7023c98ebf7ea47cacaa760e4ae0f2e3f8df0
5
5
  SHA512:
6
- metadata.gz: 4ce3bebb7bf5b4bb09cfc312f184704efaba857ef76444ee256e486cbfc3c4c08a53e5cf8768d60e6ae6eea26a585daa0f1099b16b99cacbbb6254e39111d46b
7
- data.tar.gz: 440318cdf88b3aa689181d06e17254e4d08e2bcb6b7338062846375d649f96fbdd75070f3577dabdd92a878a976cd1ac654b7bdb4e3ae6bc53049eaf1f99e947
6
+ metadata.gz: ed07b4da09a421408e04b3b94819e3ade81d6f20989748534ab34cdc32186f9e6503963ed9402f5ea6ec27a3486899481a5cd005e0219cf26925b2bce4388cf7
7
+ data.tar.gz: 5ab19716e4e1ea4c709753155d3a0df3aba5177ffde223b749d81fc737da0983b0b375beb61927cdc68b6ff777a695bafa26b23930e66451782b40ee73168d6f
@@ -5,10 +5,11 @@ module Revisions
5
5
 
6
6
  def save
7
7
  items = params[:items]
8
+ auth_params = params[:auth_params]
8
9
  items.each do |item_hash|
9
10
  item = current_user.items.find_or_create_by(:item_uuid => item_hash["uuid"])
10
11
  item.prune_history
11
- item.add_revision(item_hash["content"], item_hash["enc_item_key"], item_hash["auth_hash"])
12
+ item.add_revision(item_hash["content"], item_hash["enc_item_key"], item_hash["auth_hash"], auth_params)
12
13
  if item.content_type == nil
13
14
  item.content_type = item_hash["content_type"]
14
15
  item.save
@@ -10,7 +10,12 @@ module Revisions
10
10
  return
11
11
  end
12
12
 
13
- render :json => {:item => revision.as_json.merge({:uuid => revision.item.item_uuid, :content_type => revision.item.content_type})}
13
+ auth_params = revision.auth_params ? JSON.parse(revision.auth_params) : nil
14
+
15
+ render :json => {
16
+ :item => revision.as_json.merge({:uuid => revision.item.item_uuid, :content_type => revision.item.content_type}),
17
+ :auth_params => auth_params
18
+ }
14
19
  end
15
20
 
16
21
  end
@@ -3,11 +3,12 @@ module Revisions
3
3
 
4
4
  has_many :revisions, -> { order 'created_at desc' }
5
5
 
6
- def add_revision(content, item_key, auth_hash)
6
+ def add_revision(content, item_key, auth_hash, auth_params)
7
7
  revision = self.revisions.new
8
8
  revision.content = content
9
9
  revision.enc_item_key = item_key
10
10
  revision.auth_hash = auth_hash
11
+ revision.auth_params = auth_params.to_json
11
12
  # revision.num = self.revisions.length > 0 && self.revisions.first.num ? (self.revisions.first.num + 1) : 0
12
13
  revision.save
13
14
  end
@@ -0,0 +1,5 @@
1
+ class AddAuthParamsToRevisions < ActiveRecord::Migration[5.0]
2
+ def change
3
+ add_column :revisions_revisions, :auth_params, :text
4
+ end
5
+ end
@@ -1,3 +1,3 @@
1
1
  module Revisions
2
- VERSION = '0.2.0'
2
+ VERSION = '0.2.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sn-revisions
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Standard Notes
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-26 00:00:00.000000000 Z
11
+ date: 2018-05-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -68,6 +68,7 @@ files:
68
68
  - db/migrate/20170211000426_create_revisions_revisions.rb
69
69
  - db/migrate/20170211001350_create_revisions_users.rb
70
70
  - db/migrate/20170713154559_change_item_key_to_text.rb
71
+ - db/migrate/20180526182951_add_auth_params_to_revisions.rb
71
72
  - lib/revisions.rb
72
73
  - lib/revisions/engine.rb
73
74
  - lib/revisions/version.rb