saviour 0.5.10 → 0.5.11

data/spec/feature/remove_attachment_spec.rb

@@ -23,6 +23,7 @@ describe "remove attachment" do
 
       a.remove_file!
 
+      expect(a.file.persisted?).to be_falsey
       expect(a.file.read).to be_falsey
       expect(a[:file]).to be_nil
     end
@@ -44,24 +45,49 @@ describe "remove attachment" do
       a = klass.create! file: Saviour::StringSource.new("Some contents", "filename.txt")
 
       expect(a.file.read).to eq "Some contents"
+      path = a[:file]
 
       ActiveRecord::Base.transaction do
         a.remove_file!
         raise ActiveRecord::Rollback
       end
 
+      # Changes only propagate once the model is manually reloaded, same as any
+      # other AR attribute
+      expect(a.file.persisted?).to be_falsey
+
+      a.reload
+
+      expect(a.file.persisted?).to be_truthy
       expect(a.file.read).to eq "Some contents"
-      expect(a[:file]).to be_present
+      expect(Saviour::Config.storage.exists?(path)).to be_truthy
+    end
+
+    it "removes associated file and column after commit" do
+      a = klass.create! file: Saviour::StringSource.new("Some contents", "filename.txt")
+
+      expect(a.file.read).to eq "Some contents"
+      path = a[:file]
+
+      ActiveRecord::Base.transaction do
+        a.remove_file!
+        expect(Saviour::Config.storage.exists?(path)).to be_truthy
+      end
+
+      expect(Saviour::Config.storage.exists?(path)).to be_falsey
+      expect(a.file.read).to be_falsey
+      expect(a[:file]).to be_nil
     end
 
-    it "removes associated file and column on commit" do
+    it "attachment appears as nil after deletion and before 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"
+        expect(a.file.persisted?).to be_falsey
+        expect(a[:file]).to be_nil
       end
 
       expect(a.file.read).to be_falsey
@@ -79,6 +105,27 @@ describe "remove attachment" do
       expect(a.file.read).to be_falsey
       expect(a[:file]).to be_nil
     end
+
+    it "allows for the same file path to be deleted and later updated" do
+      a = klass.create! file: Saviour::StringSource.new("Some contents", "filename.txt")
+      path = a[:file]
+
+      ActiveRecord::Base.transaction do
+        a.remove_file!
+        expect(a.file.persisted?).to be_falsey
+        expect(Saviour::Config.storage.exists?(path)).to be_truthy
+        expect(Saviour::Config.storage.read(path)).to eq "Some contents"
+
+        a.update_attributes!(file: Saviour::StringSource.new("Other contents", "filename.txt"))
+        expect(a.file.persisted?).to be_truthy
+        expect(a.file.read).to eq "Other contents"
+        expect(Saviour::Config.storage.exists?(path)).to be_truthy
+      end
+
+      # Deletion has not occurred
+      expect(Saviour::Config.storage.exists?(path)).to be_truthy
+      expect(Saviour::Config.storage.read(path)).to eq "Other contents"
+    end
   end
 
   context "with followers" do

data/spec/feature/stash_spec.rb

@@ -72,10 +72,9 @@ describe "stash data on process" do
 
     a = klass.create!
 
-    # - 1 initial empty query
     # - 2 queries to update size
     # - 1 query to assign stored paths
-    expect_to_yield_queries(count: 4) do
+    expect_to_yield_queries(count: 3) do
       a.update_attributes! file: Saviour::StringSource.new("a" * 74, "file.txt"),
                            file_thumb: Saviour::StringSource.new("a" * 31, "file_2.txt")
     end

data/spec/models/file_spec.rb

@@ -131,8 +131,7 @@ describe Saviour::File do
 
   describe "#filename" do
     it "returns the filename of the persisted file" do
-      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      file.set_path! "/mocked/path/file.rar"
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file, "/mocked/path/file.rar")
       expect(file.filename).to eq "file.rar"
     end
 
@@ -149,8 +148,7 @@ describe Saviour::File do
     end
 
     it "it's false when not yet assigned but persisted" do
-      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      file.set_path! "/path/dummy.jpg"
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file, "/path/dummy.jpg")
       expect(file).not_to be_blank
     end
 
@@ -161,16 +159,14 @@ describe Saviour::File do
     end
 
     it "it's false when persisted and assigned" do
-      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      file.set_path! "/path/dummy.jpg"
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file, "/path/dummy.jpg")
       expect(file).not_to be_blank
     end
   end
 
   describe "#clone" do
     it "returns a cloned instance pointing to the same stored file" do
-      file = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      file.set_path! "/path/dummy.jpg"
+      file = Saviour::File.new(uploader_klass, dummy_class.new, :file, "/path/dummy.jpg")
 
       new_file = file.clone
       expect(new_file.persisted_path).to eq "/path/dummy.jpg"
@@ -179,16 +175,10 @@ describe Saviour::File do
 
   describe "#==" do
     it "compares by object persisted path if persisted" do
-      a = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      a.set_path! "/path/dummy.jpg"
-
-      b = Saviour::File.new(uploader_klass, dummy_class.new, :file)
-      b.set_path! "/path/dummy.jpg"
+      a = Saviour::File.new(uploader_klass, dummy_class.new, :file, "/path/dummy.jpg")
+      b = Saviour::File.new(uploader_klass, dummy_class.new, :file, "/path/dummy.jpg")
 
       expect(a).to eq b
-
-      b.set_path! "/path/dummy2.jpg"
-      expect(a).to_not eq b
     end
 
     it "compares by content if not persisted" do

data/spec/support/active_record_asserts.rb

@@ -30,6 +30,15 @@ RSpec.configure do |config|
 end
 
 ActiveSupport::Notifications.subscribe "sql.active_record" do |name, started, finished, unique_id, data|
-  AssertionsTracker.data.push(data[:sql]) if data[:name] == "SQL"
+  if ActiveRecord.gem_version >= Gem::Version.new("5.2.0")
+    if data[:name] =~ /(Create|Update|Destroy)/
+      sql = data[:sql]
+      sql = sql.gsub("?").with_index { |_, i| ActiveRecord::Base.connection.quote(data[:type_casted_binds][i]) }
+
+      AssertionsTracker.data.push(sql)
+    end
+  else
+    AssertionsTracker.data.push(data[:sql]) if data[:name] == "SQL"
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -184,8 +178,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - lib/saviour.rb
 - lib/saviour/base_uploader.rb
 - lib/saviour/config.rb
@@ -196,6 +190,7 @@ files:
 - lib/saviour/local_storage.rb
 - lib/saviour/model.rb
 - lib/saviour/persistence_layer.rb
+- lib/saviour/read_only_file.rb
 - lib/saviour/s3_storage.rb
 - lib/saviour/source_filename_extractor.rb
 - lib/saviour/string_source.rb
@@ -206,7 +201,7 @@ files:
 - lib/saviour/version.rb
 - saviour.gemspec
 - spec/feature/allow_overriding_attached_as_method_spec.rb
-- spec/feature/concurrent_processors_spec.rb
+- spec/feature/concurrency_spec.rb
 - spec/feature/crud_workflows_spec.rb
 - spec/feature/dirty_spec.rb
 - spec/feature/follow_file_spec.rb