saviour 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8f60221415cb3f9496b915d56999f2404784dba
-  data.tar.gz: 9de5a6f7f39a3df2c15e72486915a60cd1cf7231
+SHA256:
+  metadata.gz: 3759ef570763d52959c2939288131c3065fac5018e2abe0465b7098eb2572180
+  data.tar.gz: b5b51017fdc09079ad4c086340d9eba67e66e282ae86cc5d745cc4038ccc5c2f
 SHA512:
-  metadata.gz: c2995d015c6a1f6b66278a85a953230c76ceba7cddc4e5fc5ba8cd76bbfd4dd53f760023e735fa06723f738da4bbd18a28e32d10bc73dab9ae53e380b41b48ec
-  data.tar.gz: ab58fec40cdaac44bc69bf529336c7e07065e924fd49b15eab39268d129bfaa791c553c34614d090adbf76a7d72c8d2bdcf9d939b759b8f77b8a6de74132fbd0
+  metadata.gz: 56e95d8e497c5c1284fc0bc8e89fc182dcf8b044cc8d100e2925152816dacd4ce45ece02ef3253e75dd424c53d8afb73e44ceaa35f23f93d0c00ef9be7c242ef
+  data.tar.gz: 3477c312dd0f3d630ce43cbefc519f7db74c9b8b9d45c1f6f6b708ee0fb3038642fe8cc4ac220b198b3303d0f5dc55d6b9f3008ac357de2888cfd71ce6fa1295

data/lib/saviour/file.rb

@@ -12,7 +12,6 @@ module Saviour
 
     def set_path!(path)
       @persisted_path = path
-      @persisted_path_before_last_save = path
     end
 
     def exists?
@@ -25,6 +24,9 @@ module Saviour
 
     def delete
       persisted? && Config.storage.delete(@persisted_path)
+      @persisted_path = nil
+      @source_was = nil
+      @source = nil
     end
 
     def public_url
@@ -148,7 +150,6 @@ module Saviour
           end
 
           @persisted_path = path
-          @persisted_path_before_last_save = path
           path
         end
       end

data/lib/saviour/integrator.rb

@@ -49,6 +49,20 @@ module Saviour
           define_method("#{attach_as}_changed?") do
             send(attach_as).changed?
           end
+
+          define_method("remove_#{attach_as}!") do
+            work = proc do
+              send(attach_as).delete
+              layer = persistence_klass.new(self)
+              layer.write(attach_as, nil)
+            end
+
+            if ActiveRecord::Base.connection.current_transaction.open?
+              DbHelpers.run_after_commit &work
+            else
+              work.call
+            end
+          end
         end
 
         klass.include mod

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

data/spec/feature/crud_workflows_spec.rb

@@ -82,11 +82,7 @@ describe "saving a new file" do
       klass = Class.new(Test) do
         attr_accessor :fail_at_save
         before_save {
-          if ActiveRecord.version >= Gem::Version.new("5.0")
-            throw(:abort) if fail_at_save
-          else
-            !fail_at_save
-          end
+          throw(:abort) if fail_at_save
         }
         include Saviour::Model
       end

data/spec/feature/remove_attachment_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe "remove attachment" do
+  before { allow(Saviour::Config).to receive(:storage).and_return(Saviour::LocalStorage.new(local_prefix: @tmpdir, public_url_prefix: "http://domain.com")) }
+
+  let(:uploader) {
+    Class.new(Saviour::BaseUploader) {
+      store_dir { "/store/dir" }
+    }
+  }
+
+  let(:klass) {
+    a = Class.new(Test) { include Saviour::Model }
+    a.attach_file :file, uploader
+    a
+  }
+
+  context "without a transaction" do
+    it 'removes associated file and column when persisted' do
+      a = klass.create! file: Saviour::StringSource.new("Some contents", "filename.txt")
+
+      expect(a.file.read).to eq "Some contents"
+
+      a.remove_file!
+
+      expect(a.file.read).to be_falsey
+      expect(a[:file]).to be_nil
+    end
+
+    it 'removes associated file and column when file not persisted' do
+      a = klass.create!
+
+      a.file = Saviour::StringSource.new("Some contents", "filename.txt")
+
+      a.remove_file!
+
+      expect(a.file.read).to be_falsey
+      expect(a[:file]).to be_nil
+    end
+  end
+
+  context "within a transaction" do
+    it "does not remove file and column on rollback" do
+      a = klass.create! file: Saviour::StringSource.new("Some contents", "filename.txt")
+
+      expect(a.file.read).to eq "Some contents"
+
+      ActiveRecord::Base.transaction do
+        a.remove_file!
+        raise ActiveRecord::Rollback
+      end
+
+      expect(a.file.read).to eq "Some contents"
+      expect(a[:file]).to be_present
+    end
+
+    it "removes associated file and column on commit" do
+      a = klass.create! file: Saviour::StringSource.new("Some contents", "filename.txt")
+
+      expect(a.file.read).to eq "Some contents"
+
+      ActiveRecord::Base.transaction do
+        a.remove_file!
+        expect(a.file.read).to eq "Some contents"
+      end
+
+      expect(a.file.read).to be_falsey
+      expect(a[:file]).to be_nil
+    end
+
+    it "removes associated file and column on commit on non-persisted file" do
+      a = klass.create!
+      a.file = Saviour::StringSource.new("Some contents", "filename.txt")
+
+      ActiveRecord::Base.transaction do
+        a.remove_file!
+      end
+
+      expect(a.file.read).to be_falsey
+      expect(a[:file]).to be_nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -195,6 +195,7 @@ files:
 - spec/feature/persisted_path_spec.rb
 - spec/feature/processors_api_spec.rb
 - spec/feature/reload_model_spec.rb
+- spec/feature/remove_attachment_spec.rb
 - spec/feature/reopens_file_at_every_process_spec.rb
 - spec/feature/rewind_source_before_read_spec.rb
 - spec/feature/transactional_behavior_spec.rb
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: File storage handler following active record model lifecycle