saviour 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30fa955590994c40acee59df17db7840c20d772afd8532e772813f53cdf9588
-  data.tar.gz: 37f60dce478723b85d08ba25e971497b9a20829fab51c0d6f46e2422661cfa5e
+  metadata.gz: e1da8130c0e682e7d8c0d86a936a498a8d70d85f5feb8b94d287217062bbb69c
+  data.tar.gz: ce046b7ff42417a32229f5ba4ee717ecf4a49c1d07ab0923aae3b96152d998ec
 SHA512:
-  metadata.gz: 0055e48b2d02bc40270c32ddf797089c0ef4c7fcfc1d29ecae04b2abd6a72ce952b2faf319bed50619b5497eab337001e950edb2c4b0a06a478dce7fefbc8941
-  data.tar.gz: bb9bd3648caaa9fc1c379f374f7c97f5e131916ba3ffa600f691db28ae90853afed59432b86f359b0f1d93064d3efb683f2fe4c7f0f58dc8d118992569d764c6
+  metadata.gz: 5b532b295d640352549307de69ac0bf4d4ca63cb1f8312d4e43f97f98d28a122b4249e31e44dc4ee5d99e24a811d31e63f1dfb22d4cda280f20ba634a077f571
+  data.tar.gz: da792dd8c19baa075f43ba22062f7f8bc920e985f465c5b09660e31e762f5b8c13e93ef3847c9d7fdefe673bbba3dac60c58a920240f76cb91d3611536399741

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.2.8
   - 2.3.5
   - 2.4.2
+  - 2.5.0
 
 gemfile:
   - gemfiles/5.0.gemfile

data/lib/saviour/base_uploader.rb

@@ -53,7 +53,7 @@ module Saviour
     end
 
     def stash(hash)
-      @stash.merge!(hash)
+      @stash.deep_merge!(hash)
     end
 
     def stashed

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/feature/stash_spec.rb

@@ -83,4 +83,64 @@ describe "stash data on process" do
     expect(a.size_file).to eq 74
     expect(a.size_file_thumb).to eq 31
   end
+
+  it 'stash deep merges' do
+    uploader = Class.new(Saviour::BaseUploader) {
+      store_dir { "/store/dir" }
+
+      process_with_file do |file, filename|
+        stash(model: { file_size: File.size(file.path) })
+
+        [file, filename]
+      end
+
+      process_with_file do |file, filename|
+        stash(model: { name: "Foo" })
+
+        [file, filename]
+      end
+
+      after_upload do |stash|
+        model.update_attributes!(stash[:model])
+      end
+    }
+
+    klass = Class.new(Test) { include Saviour::Model }
+    klass.attach_file :file, uploader
+
+    a = klass.create! file: Saviour::StringSource.new("a" * 74, "file.txt")
+
+    expect(a.file_size).to eq 74
+    expect(a.name).to eq 'Foo'
+  end
+
+  it 'after_upload can be declared multiple times' do
+    uploader = Class.new(Saviour::BaseUploader) {
+      store_dir { "/store/dir" }
+
+      process_with_file do |file, filename|
+        stash(file_size: File.size(file.path), name: "Foo")
+
+        [file, filename]
+      end
+
+      after_upload do |stash|
+        model.update_attributes!(file_size: stash[:file_size])
+      end
+
+      after_upload do |stash|
+        model.update_attributes!(name: stash[:name])
+      end
+    }
+
+    klass = Class.new(Test) { include Saviour::Model }
+    klass.attach_file :file, uploader
+
+    # 1- insert, 2- set file path 3+4- two after_upload' updates
+    expect_to_yield_queries(count: 4) do
+      a = klass.create! file: Saviour::StringSource.new("a" * 74, "file.txt")
+      expect(a.file_size).to eq 74
+      expect(a.name).to eq 'Foo'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord