saviour 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482a04ef6b634ab6764da860557971b844fa1100c86f27eca3abf87eee26c9fa
-  data.tar.gz: 4ec9ed3937d113c39e0a8258a40771985258ca791e817cc9b84aaf39a4a2fbcb
+  metadata.gz: 8bca4d3cff0e6279633cfffc29a4d773766027a10cdf78476779184d9f280d00
+  data.tar.gz: d386ff08897ea1241edad2f320e9c37e6384150a0f784cad9094156393f8722c
 SHA512:
-  metadata.gz: c9ca2eb4c9ac709ac1ec724476663217eede8c9a3081f7a4caeaf56891da2d458142d184310c3b4b38554dcda3c5e297de2cdadc4ecbbb0dbfe881985f27bd80
-  data.tar.gz: fa501dce7fa4030e4a7ba93f865e276d56aca9eebabaebf0152e44dc25e757a969b396291c7c56b28272d70846106c4f2a0edc314250ec9b75c1956bc777f6ec
+  metadata.gz: d1488dfc1fc68bc7039d8bc37157002e0fb55e1f5acac50cdfa0f3f3c4abd02b56b06fd0688e1c7c686e949929a1c86878742698dc27c3dc4925d37aa3c37a83
+  data.tar.gz: 79612867403b5856c642fdd69297f31e13006b08d9f998480b8f006e64d36f7555b699f44baaf0fc360fb811ff507157b08ca6ae2644c0b7571a2c92fafa442e

data/.travis.yml

@@ -2,15 +2,13 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
   - 2.5.0
   - 2.6.0
 
 gemfile:
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 
 addons:
   code_climate:

data/README.md

@@ -593,7 +593,7 @@ Now, both attachments are independent:
 
 ```ruby
 # `image_thumb` can be changed independently
-a.update_attributes! image_thumb: File.open("/path/another_file.png")
+a.update! image_thumb: File.open("/path/another_file.png")
 
 # or removed
 a.remove_file_thumb!
@@ -714,7 +714,7 @@ class ImageUploader < Saviour::BaseUploader
   end
 
   after_upload do |stash|
-    model.update_attributes!(size: stash[:size], width: stash[:width], height: stash[:height])
+    model.update!(size: stash[:size], width: stash[:width], height: stash[:height])
   end
 end
 ```
@@ -1132,7 +1132,7 @@ Then it can be used as:
 a = Post.find(42)
 
 # Params received from a form
-a.update_attributes(remove_image: "t")
+a.update(remove_image: "t")
 ```
 
 
@@ -1172,7 +1172,7 @@ The job then should take the model and the attachment to process and run the pro
 a = Post.find(42)
 a.image.with_copy do |f|
   # manipulate f as desired
-  a.update_attributes! image: f
+  a.update! image: f
 end
 ```
 

data/gemfiles/5.1.gemfile

@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "codeclimate-test-reporter", :group => :test, :require => nil

data/gemfiles/5.2.gemfile

@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "codeclimate-test-reporter", :group => :test, :require => nil

data/gemfiles/6.0.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "activesupport", "~> 6.0.0"
+gem "activerecord", "~> 6.0.0"
+
+gemspec :path => "../"

data/lib/saviour/db_helpers.rb

@@ -22,6 +22,9 @@ module Saviour
       def committed!(*)
         @block.call
       end
+
+      def trigger_transactional_callbacks?(*)
+      end
     end
 
     class RollbackDummy
@@ -42,6 +45,9 @@ module Saviour
 
       def committed!(*)
       end
+
+      def trigger_transactional_callbacks?(*)
+      end
     end
 
 

data/lib/saviour/integrator.rb

@@ -84,6 +84,22 @@ module Saviour
             end
           end
 
+          define_method(:changed) do
+            if ActiveRecord::VERSION::MAJOR == 6 && send("#{attach_as}_changed?")
+              super() + [attach_as.to_s]
+            else
+              super()
+            end
+          end
+
+          define_method(:changed?) do
+            if ActiveRecord::VERSION::MAJOR == 6
+              send("#{attach_as}_changed?") || super()
+            else
+              super()
+            end
+          end
+
           define_method("#{attach_as}_change") do
             [send("#{attach_as}_was"), send(attach_as)]
           end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/saviour.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.2.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_dependency "activerecord", ">= 5.1"
   spec.add_dependency "activesupport", ">= 5.1"
@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "aws-sdk-s3"
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "get_process_mem"

data/spec/feature/concurrency_spec.rb

@@ -52,7 +52,7 @@ describe "concurrency on operations" do
 
       Saviour::Config.concurrent_workers = 4
 
-      a.update_attributes! file: Saviour::StringSource.new("contents", "file.txt"),
+      a.update! file: Saviour::StringSource.new("contents", "file.txt"),
                            file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
                            file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
                            file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
@@ -66,7 +66,7 @@ describe "concurrency on operations" do
 
       Saviour::Config.concurrent_workers = 1
 
-      a.update_attributes! file: Saviour::StringSource.new("contents", "file.txt"),
+      a.update! file: Saviour::StringSource.new("contents", "file.txt"),
                            file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
                            file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
                            file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")
@@ -80,7 +80,7 @@ describe "concurrency on operations" do
 
       Saviour::Config.concurrent_workers = 2
 
-      a.update_attributes! file: Saviour::StringSource.new("contents", "file.txt"),
+      a.update! file: Saviour::StringSource.new("contents", "file.txt"),
                            file_thumb: Saviour::StringSource.new("contents", "file_2.txt"),
                            file_thumb_2: Saviour::StringSource.new("contents", "file_3.txt"),
                            file_thumb_3: Saviour::StringSource.new("contents", "file_4.txt")

data/spec/feature/crud_workflows_spec.rb

@@ -19,14 +19,14 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example|
         a = klass.create!
-        expect(a.update_attributes(file: example)).to be_truthy
+        expect(a.update(file: example)).to be_truthy
       end
     end
 
     it do
       with_test_file("example.xml") do |example|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
 
         expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
       end
@@ -35,7 +35,7 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example, real_filename|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
         expect(a[:file]).to eq "/store/dir/#{real_filename}"
       end
     end
@@ -43,7 +43,7 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
 
         example.rewind
         expect(a.file.read).to eq example.read
@@ -53,7 +53,7 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
 
         expect(a.file.exists?).to be_truthy
       end
@@ -62,7 +62,7 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example, real_filename|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
 
         expect(a.file.filename).to eq real_filename
       end
@@ -71,7 +71,7 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example, real_filename|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
 
         expect(a.file.url).to eq "http://domain.com/store/dir/#{real_filename}"
         expect(a.file.public_url).to eq a.file.url
@@ -137,7 +137,7 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
         expect(a.file.exists?).to be_truthy
         expect(a.destroy).to be_truthy
 
@@ -150,13 +150,13 @@ describe "CRUD" do
     it do
       with_test_file("example.xml") do |example|
         a = klass.create!
-        a.update_attributes(file: example)
+        a.update(file: example)
 
         expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
         previous_location = a[:file]
 
         with_test_file("camaloon.jpg") do |example_2|
-          a.update_attributes(file: example_2)
+          a.update(file: example_2)
           expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
 
           expect(Saviour::Config.storage.exists?(previous_location)).to be_falsey
@@ -167,7 +167,7 @@ describe "CRUD" do
     it "does allow to update the same file to another contents in the same path" do
       a = klass.create! file: Saviour::StringSource.new("contents", "file.txt")
 
-      a.update_attributes! file: Saviour::StringSource.new("foo", "file.txt")
+      a.update! file: Saviour::StringSource.new("foo", "file.txt")
       expect(Saviour::Config.storage.read(a[:file])).to eq "foo"
     end
 
@@ -175,7 +175,7 @@ describe "CRUD" do
       a = klass.create!
 
       expect_to_yield_queries(count: 1) do
-        a.update_attributes! file: Saviour::StringSource.new("foo", "file.txt")
+        a.update! file: Saviour::StringSource.new("foo", "file.txt")
       end
     end
 
@@ -183,7 +183,7 @@ describe "CRUD" do
       a = klass.create!
 
       expect_to_yield_queries(count: 2) do
-        a.update_attributes! name: "Text",
+        a.update! name: "Text",
                              file: Saviour::StringSource.new("foo", "file.txt")
       end
     end
@@ -192,7 +192,7 @@ describe "CRUD" 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")
+        a.update! file: Saviour::StringSource.new("foo", "file.txt")
 
         expect(a.updated_at).to be > time + 2.years
       end
@@ -207,7 +207,7 @@ describe "CRUD" do
         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")
+          a.update! file: Saviour::StringSource.new("foo", "file.txt")
           expect(a.file.read).to eq "foo"
         end
       end
@@ -226,7 +226,7 @@ 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!(
+          a.update!(
               file: Saviour::StringSource.new("foo", "file.txt"),
               file_thumb: Saviour::StringSource.new("foo", "file.txt")
           )

data/spec/feature/dirty_spec.rb

@@ -14,7 +14,7 @@ describe "dirty model" do
 
     with_test_file("example.xml") do |xml_file|
       with_test_file("camaloon.jpg") do |jpg_file|
-        a.update_attributes! file: xml_file
+        a.update! file: xml_file
 
         expect(a.changed_attributes).to eq({})
 

data/spec/feature/halt_processor_spec.rb

@@ -23,7 +23,7 @@ describe "halt processor behavior" do
 
     expect(Saviour::Config.storage).to_not receive(:write)
 
-    a.update_attributes! file: StringIO.new("contents")
+    a.update! file: StringIO.new("contents")
     expect(a.reload.read_attribute(:file)).to be_nil
   end
 

data/spec/feature/memory_usage_spec.rb

@@ -9,8 +9,6 @@ describe "memory usage" do
     a
   }
 
-  CHUNK = ("A" * 1024).freeze
-
   let(:size_to_test) { 10 } # Test with 10Mb files
 
   def with_tempfile
@@ -18,7 +16,7 @@ describe "memory usage" do
 
     size_to_test.times do
       1024.times do
-        f.write CHUNK
+        f.write SecureRandom.hex(512)
       end
     end
     f.flush
@@ -56,7 +54,7 @@ describe "memory usage" do
         with_no_gc do
           base_line = GetProcessMem.new.mb
 
-          a.update_attributes! file: f
+          a.update! file: f
 
           # Expect memory usage to grow below 10% of the file size
           expect(GetProcessMem.new.mb - base_line).to be < size_to_test / 10
@@ -72,22 +70,22 @@ describe "memory usage" do
 
         process do |contents, filename|
           digest = Digest::MD5.hexdigest(contents)
+
           [contents, "#{digest}-#{filename}"]
         end
       }
     }
 
     it do
-      a = base_klass.create!
-
       with_tempfile do |f|
         with_no_gc do
-          base_line = GetProcessMem.new.mb
+          a = base_klass.create!
 
-          a.update_attributes! file: f
+          base_line = GetProcessMem.new.mb
 
-          # Expect memory usage to grow at least the size of the file
-          expect(GetProcessMem.new.mb - base_line).to be > size_to_test
+          a.update! file: f
+          # Expect memory usage to grow at least half the file size
+          expect(GetProcessMem.new.mb - base_line).to be >= size_to_test / 2
         end
       end
     end

data/spec/feature/persisted_path_spec.rb

@@ -11,7 +11,7 @@ describe "persisted path" do
 
       with_test_file("example.xml") do |example|
         a = klass.create!
-        expect(a.update_attributes(file: example)).to be_truthy
+        expect(a.update(file: example)).to be_truthy
         expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
         expect(File.dirname(a[:file])).to eq "/store/dir"
 
@@ -20,7 +20,7 @@ describe "persisted path" do
 
         with_test_file("camaloon.jpg") do |example_2|
           b = klass.create!
-          expect(b.update_attributes(file: example_2)).to be_truthy
+          expect(b.update(file: example_2)).to be_truthy
 
           expect(Saviour::Config.storage.exists?(b[:file])).to be_truthy
           expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy

data/spec/feature/processors_api_spec.rb

@@ -88,7 +88,7 @@ describe "processor's API" do
       a = klass.create!
 
       expect {
-        a.update_attributes! file: Saviour::StringSource.new("contents", "filename.txt")
+        a.update! file: Saviour::StringSource.new("contents", "filename.txt")
       }.to raise_error.with_message("custom problem!")
     end
 

data/spec/feature/reload_model_spec.rb

@@ -12,7 +12,7 @@ describe "reload" do
       b = klass.find(a.id)
 
       with_test_file("example.xml") do |example|
-        a.update_attributes! file: example
+        a.update! file: example
         expect(a.file.exists?).to be_truthy
         expect(b.file.exists?).to be_falsey
 

data/spec/feature/remove_attachment_spec.rb

@@ -116,7 +116,7 @@ describe "remove attachment" do
         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"))
+        a.update!(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

data/spec/feature/stash_spec.rb

@@ -14,7 +14,7 @@ describe "stash data on process" do
       end
 
       after_upload do |stash|
-        model.update_attributes!(file_size: stash[:file_size])
+        model.update!(file_size: stash[:file_size])
       end
     }
 
@@ -23,7 +23,7 @@ describe "stash data on process" do
 
     a = klass.create!
 
-    a.update_attributes! file: Saviour::StringSource.new("a" * 74, "file.txt")
+    a.update! file: Saviour::StringSource.new("a" * 74, "file.txt")
     expect(a.file_size).to eq 74
   end
 
@@ -38,7 +38,7 @@ describe "stash data on process" do
       end
 
       after_upload do |stash|
-        model.update_attributes!(file_size: stash[:file_size])
+        model.update!(file_size: stash[:file_size])
       end
     }
 
@@ -61,7 +61,7 @@ describe "stash data on process" do
       end
 
       after_upload do |stash|
-        model.update_attributes!("size_#{attached_as}" => stash[:size])
+        model.update!("size_#{attached_as}" => stash[:size])
       end
     }
 
@@ -74,7 +74,7 @@ describe "stash data on process" do
     # - 2 queries to update size
     # - 1 query to assign stored paths
     expect_to_yield_queries(count: 3) do
-      a.update_attributes! file: Saviour::StringSource.new("a" * 74, "file.txt"),
+      a.update! file: Saviour::StringSource.new("a" * 74, "file.txt"),
                            file_thumb: Saviour::StringSource.new("a" * 31, "file_2.txt")
     end
 
@@ -99,7 +99,7 @@ describe "stash data on process" do
       end
 
       after_upload do |stash|
-        model.update_attributes!(stash[:model])
+        model.update!(stash[:model])
       end
     }
 
@@ -123,11 +123,11 @@ describe "stash data on process" do
       end
 
       after_upload do |stash|
-        model.update_attributes!(file_size: stash[:file_size])
+        model.update!(file_size: stash[:file_size])
       end
 
       after_upload do |stash|
-        model.update_attributes!(name: stash[:name])
+        model.update!(name: stash[:name])
       end
     }
 

data/spec/feature/transactional_behavior_spec.rb

@@ -87,7 +87,7 @@ describe "transactional behavior" do
 
         with_test_file("camaloon.jpg") do |file2|
           ActiveRecord::Base.transaction do
-            a.update_attributes! file: file2
+            a.update! file: file2
 
             expect(Saviour::Config.storage.exists?(path1)).to be_truthy
             expect(Saviour::Config.storage.exists?(a[:file])).to be_truthy
@@ -107,7 +107,7 @@ describe "transactional behavior" do
 
         with_test_file("camaloon.jpg") do |file2|
           ActiveRecord::Base.transaction do
-            a.update_attributes! file: file2
+            a.update! file: file2
             path2 = a[:file]
 
             expect(Saviour::Config.storage.exists?(path1)).to be_truthy
@@ -135,7 +135,7 @@ describe "transactional behavior" do
       expect(Saviour::Config.storage.read(a[:file])).to eq "original content"
 
       ActiveRecord::Base.transaction do
-        a.update_attributes! file: Saviour::StringSource.new("new content", "file.txt")
+        a.update! file: Saviour::StringSource.new("new content", "file.txt")
         expect(Saviour::Config.storage.read(a[:file])).to eq "new content"
         raise ActiveRecord::Rollback
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saviour
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -173,13 +159,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
 - lib/saviour.rb
 - lib/saviour/base_uploader.rb
 - lib/saviour/config.rb
@@ -248,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Appraisals

@@ -1,19 +0,0 @@
-appraise "4.0" do
-  gem "activesupport", "~> 4.0.0"
-  gem "activerecord", "~> 4.0.0"
-end
-
-appraise "4.1" do
-  gem "activesupport", "~> 4.1.0"
-  gem "activerecord", "~> 4.1.0"
-end
-
-appraise "4.2" do
-  gem "activesupport", "~> 4.2.0"
-  gem "activerecord", "~> 4.2.0"
-end
-
-appraise "5.0" do
-  gem "activesupport", "~> 5.0.0"
-  gem "activerecord", "~> 5.0.0"
-end