saviour 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9031d0f7f9624571c39792d2953c5eb11f50f7edd7f4c7117bf7951166c43b8
-  data.tar.gz: 3ef5fac874948c7b1a330b756c25c88c357108e08237ab940f4e0cb0d71ff55e
+  metadata.gz: 0121fbeb0549f71c53b630c648c3791c3b47c48accb0839c2d887490ade48868
+  data.tar.gz: 1494bc8c02a203fc199117210e43d0a5e694b6766774799d85a8cd34049f0c87
 SHA512:
-  metadata.gz: aa7d00ae67fe68da25c4eb9652813b9a6f0d751a0ddf9729efe43c6dcfd5af2ffa8b7db14e9bb9dcc06b8c5a4cf8bcea503c3394abf2d5e82e8213b6d0f3589f
-  data.tar.gz: 348f05edc2b3f0d5185412f741e5d9aedecfdff44430833aaed0ab7221a70fc6c834d4489d0ff8c1bd01c06c20fb1bd56a3b996b6d3c75cdd15471c911159636
+  metadata.gz: b8a223b8b404728287418c24391db7320332ed09a931fffb550a024948d12a335187df393f85defa26fbd3e943dc18c2f49cf6467d743d066c42a21b57212211
+  data.tar.gz: d8c1ab1f0b7f72e2d376391c62fd166b708182bb2733a13ffef2310fdc6c1b8d5152b5364ca5837b2b7da09d46e770d276b42dc65fc234f00d0bc0d1748f02be

data/lib/saviour/life_cycle.rb

@@ -49,7 +49,7 @@ module Saviour
         end
 
         @new_path = @file.write(
-          before_write: ->(path) { dup_file.call if @current_path == path }
+            before_write: ->(path) { dup_file.call if @current_path == path }
         )
 
         return unless @new_path
@@ -112,22 +112,22 @@ module Saviour
     end
 
     def update!
-      process_upload(FileUpdater)
+      process_upload(FileUpdater, touch: true)
     end
 
     private
 
-    def process_upload(klass)
+    def process_upload(klass, touch: false)
       persistence_layer = @persistence_klass.new(@model)
 
       uploaders = attached_files.map do |column|
         next unless @model.send(column).changed?
 
         klass.new(
-          persistence_layer.read(column),
-          @model.send(column),
-          column,
-          ActiveRecord::Base.connection
+            persistence_layer.read(column),
+            @model.send(column),
+            column,
+            ActiveRecord::Base.connection
         )
       end.compact
 
@@ -161,6 +161,11 @@ module Saviour
         end
       end
 
+      if attrs.length > 0 && touch && @model.class.record_timestamps
+        touches = @model.class.send(:timestamp_attributes_for_update_in_model).map { |x| [x, Time.current] }.to_h
+        attrs.merge!(touches)
+      end
+
       persistence_layer.write_attrs(attrs) if attrs.length > 0
     end
 

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/feature/crud_workflows_spec.rb

@@ -117,8 +117,8 @@ describe "CRUD" do
         expected_query = %Q{UPDATE "tests" SET "file" = '/store/dir/file.txt', "file_thumb" = '/store/dir/file.txt'}
         expect_to_yield_queries(count: 2, including: [expected_query]) do
           klass.create!(
-            file: Saviour::StringSource.new("foo", "file.txt"),
-            file_thumb: Saviour::StringSource.new("foo", "file.txt")
+              file: Saviour::StringSource.new("foo", "file.txt"),
+              file_thumb: Saviour::StringSource.new("foo", "file.txt")
           )
         end
       end
@@ -188,6 +188,31 @@ describe "CRUD" do
       end
     end
 
+    describe "touch updated_at" do
+      it "touches updated_at if the model has it" do
+        time = Time.now - 4.years
+        a = klass.create! updated_at: time
+        a.update_attributes! file: Saviour::StringSource.new("foo", "file.txt")
+
+        expect(a.updated_at).to be > time + 2.years
+      end
+
+      context do
+        let(:klass) {
+          a = Class.new(TestNoTimestamp) { include Saviour::Model }
+          a.attach_file :file, uploader
+          a
+        }
+
+        it "works with models that do not have updated_at" do
+          a = klass.create!
+          expect(a).not_to respond_to(:updated_at)
+          a.update_attributes! file: Saviour::StringSource.new("foo", "file.txt")
+          expect(a.file.read).to eq "foo"
+        end
+      end
+    end
+
     context do
       let(:klass) {
         a = Class.new(Test) { include Saviour::Model }
@@ -202,8 +227,8 @@ describe "CRUD" do
         expected_query = %Q{UPDATE "tests" SET "file" = '/store/dir/file.txt', "file_thumb" = '/store/dir/file.txt'}
         expect_to_yield_queries(count: 1, including: [expected_query]) do
           a.update_attributes!(
-            file: Saviour::StringSource.new("foo", "file.txt"),
-            file_thumb: Saviour::StringSource.new("foo", "file.txt")
+              file: Saviour::StringSource.new("foo", "file.txt"),
+              file_thumb: Saviour::StringSource.new("foo", "file.txt")
           )
         end
       end

data/spec/feature/stash_spec.rb

@@ -55,7 +55,6 @@ describe "stash data on process" do
       store_dir { "/store/dir" }
 
       process_with_file do |file, filename|
-        # same ':size' key in the stash
         stash(size: File.size(file.path))
 
         [file, filename]

data/spec/support/models.rb

@@ -2,6 +2,10 @@ class Test < ActiveRecord::Base
 
 end
 
+class TestNoTimestamp < ActiveRecord::Base
+
+end
+
 # Constant lookup in ruby works by lexical scope, so we can't create classes dynamically to test this.
 class TestForSaviourFileResolution < Test
   include Saviour::Model

data/spec/support/schema.rb

@@ -10,4 +10,9 @@ ActiveRecord::Schema.define do
     t.integer :size_file_thumb
     t.timestamps null: false
   end
+
+  create_table :test_no_timestamps do |t|
+    t.string :file
+    t.string :name
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord