saviour 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299270bf4c0f5d46a9fd7a57d51062a5a86a1c9216187baf3d0d3a6258295811
-  data.tar.gz: a0ed19b72e62d0fc006698958bd057eaf0543c8595ae080e9279c07e33fddb95
+  metadata.gz: 43509e7e421eab9a8b45159d62c58513dbcb894b0ccecbd96a70cc0a29db74a6
+  data.tar.gz: 91b2eb4cf47dbac1b642c5ccc198ae0040ea0e81ef993c580e894065f1e58ecf
 SHA512:
-  metadata.gz: 90ac6353b42b4c3422bb3154b983422658837e9c0c307bb4871e2c3c0e50d7101286524984c036fcf68abb91b830d82aa39886f88d362490ddf86d459401c9a3
-  data.tar.gz: 82d6cdeab9db03a38a8819109c2cf24d4824a9ca1a9c77830bdb8d95efb98c50664ad1eeb8862224f795e9c334d8d36a9f071955e0f232ae14d2198b95124720
+  metadata.gz: e4a1fb654e3290d827236f115ebfd93e2f6d4994e57d022dd473f41436365de36182e689d20526cea2c9bb113dd6b558901da5deda945f526242ab2e78e7c633
+  data.tar.gz: 8f3f81305ceb56195d67eb2a6700a5f05bb3e4567c892a983fe845689c952864497e2bd29c47a4256a88a6f003527855952d2ed78e6edc7cff80d66adacca7b0

data/.travis.yml

@@ -2,14 +2,14 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - 2.5.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 
 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
 ```
@@ -817,11 +817,14 @@ as in the processor's case.
 
 ### Introspection
 
-Two methods are added to any class including `Saviour::Model` to give you information about what attachments
+Three methods are added to any class including `Saviour::Model` to give you information about what attachments
 have been defined in that class.
 
 `Model.attached_files` will give an array of symbols, representing all the attachments declared in that class.
 
+`Model.uploader_classes` will give you a hash with all the uploader classes being used in that model, key-ed by
+the name of each attachment.
+
 `Model.attached_followers_per_leader` will give a hash where the keys are attachments that have versions
 assigned, and the values being an array of symbols, representing the attachments that are following that attachment.
 
@@ -837,6 +840,7 @@ end
 
 Post.attached_files # => [:image, :image_thumb, :image_thumb_2, :cover]
 Post.attached_followers_per_leader # => { image: [:image_thumb, :image_thumb_2] }
+Post.uploader_classes # => { image: SomeUploader, image_thumb: SomeUploader, ... }
 ```
 
 
@@ -964,6 +968,38 @@ Any additional information the storage may require can be provided on instance c
 this is not used by Saviour.
 
 
+### Using `ReadOnlyFile`
+
+Sometimes you may find the need to have a saviour `File`-like object but you don't have the original model available.
+
+For example, if you're working directly fetching data from database, you have the `path` to an asset but you're not
+loading an ActiveRecord object.
+
+In such cases you can use the class `ReadOnlyFile`, like this:
+
+```ruby
+class Product
+  # ...
+  attach_file :image
+end
+
+my_cheap_products = ActiveRecord::Base.connection.select_all "select image, ... from products"
+
+# In this case, you have the path to the assets and want to convert it into an object so that the
+# rest of the application can work normally with it, you can do:
+ 
+storage = Product.uploader_classes[:image].storage
+file = Saviour::ReadOnlyFile.new(path, storage) 
+
+file.read # -> contents
+file.public_url # -> url
+# etc ...
+```
+
+You'll need to get the appropriate storage object from the same uploader that attachment is using, 
+and create a new `ReadOnlyFile` instance only with the asset's path and the storage.
+
+
 ### Bypassing Saviour
 
 The only reference to stored files Saviour holds and uses is the path persisted in the database. If you want to,
@@ -1096,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")
 ```
 
 
@@ -1136,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.rb

@@ -17,7 +17,8 @@ require 'saviour/db_helpers'
 
 require 'tempfile'
 require 'fileutils'
-require 'concurrent/future'
+require 'concurrent/edge/throttle'
+require 'concurrent/edge/lock_free_queue'
 
 require 'active_support/dependencies'
 

data/lib/saviour/base_uploader.rb

@@ -79,6 +79,8 @@ module Saviour
 
       def storage
         @storage ||= Config.storage
+
+        @storage.respond_to?(:call) ? @storage.call : @storage
       end
 
       def process(name = nil, opts = {}, type = :memory, &block)

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/file.rb

@@ -2,26 +2,26 @@ require 'securerandom'
 
 module Saviour
   class File
-    attr_reader :persisted_path
-    attr_reader :source
+    attr_reader :persisted_path, :source, :storage
 
     def initialize(uploader_klass, model, attached_as, persisted_path = nil)
       @uploader_klass, @model, @attached_as = uploader_klass, model, attached_as
       @source_was = @source = nil
       @persisted_path = persisted_path
+      @storage = @uploader_klass.storage
 
       if persisted_path
-        @model.instance_variable_set("@__uploader_#{@attached_as}_was", ReadOnlyFile.new(persisted_path, @uploader_klass))
+        @model.instance_variable_set("@__uploader_#{@attached_as}_was", ReadOnlyFile.new(persisted_path, @uploader_klass.storage))
       end
     end
 
     def exists?
-      persisted? && @uploader_klass.storage.exists?(@persisted_path)
+      persisted? && @storage.exists?(@persisted_path)
     end
 
     def read
       return nil unless persisted?
-      @uploader_klass.storage.read(@persisted_path)
+      @storage.read(@persisted_path)
     end
 
     def delete
@@ -32,7 +32,7 @@ module Saviour
 
     def public_url
       return nil unless persisted?
-      @uploader_klass.storage.public_url(@persisted_path)
+      @storage.public_url(@persisted_path)
     end
 
     def ==(another_file)
@@ -111,7 +111,7 @@ module Saviour
       temp_file.binmode
 
       begin
-        @uploader_klass.storage.read_to_file(@persisted_path, temp_file)
+        @storage.read_to_file(@persisted_path, temp_file)
 
         yield(temp_file)
       ensure
@@ -154,13 +154,13 @@ module Saviour
 
           case source_type
             when :stream
-              @uploader_klass.storage.write(contents, path)
+              @storage.write(contents, path)
             when :file
-              @uploader_klass.storage.write_from_file(contents, path)
+              @storage.write_from_file(contents, path)
           end
 
           @persisted_path = path
-          @model.instance_variable_set("@__uploader_#{@attached_as}_was", ReadOnlyFile.new(persisted_path, @uploader_klass))
+          @model.instance_variable_set("@__uploader_#{@attached_as}_was", ReadOnlyFile.new(persisted_path, @storage))
           path
         end
       end

data/lib/saviour/integrator.rb

@@ -12,6 +12,8 @@ module Saviour
       @klass.attached_files = []
       @klass.class_attribute :followers_per_leader_config
       @klass.followers_per_leader_config = {}
+      @klass.class_attribute :uploader_classes
+      @klass.uploader_classes = {}
 
       persistence_klass = @persistence_klass
 
@@ -36,10 +38,13 @@ module Saviour
           raise ConfigurationError, "you must provide either an UploaderClass or a block to define it."
         end
 
+        uploader_klass = Class.new(Saviour::BaseUploader, &block) if block
+
+        self.uploader_classes[attach_as] = uploader_klass
+
         mod = Module.new do
           define_method(attach_as) do
             instance_variable_get("@__uploader_#{attach_as}") || begin
-              uploader_klass = Class.new(Saviour::BaseUploader, &block) if block
               layer = persistence_klass.new(self)
               new_file = ::Saviour::File.new(uploader_klass, self, attach_as, layer.read(attach_as))
 
@@ -79,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/life_cycle.rb

@@ -1,5 +1,7 @@
 module Saviour
   class LifeCycle
+    SHOULD_USE_INTERLOCK = defined?(Rails)
+
     class FileCreator
       def initialize(current_path, file, column, connection)
         @file = file
@@ -49,7 +51,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
@@ -84,26 +86,19 @@ module Saviour
 
     def delete!
       DbHelpers.run_after_commit do
-        pool = Concurrent::FixedThreadPool.new(Saviour::Config.concurrent_workers)
+        pool = Concurrent::Throttle.new Saviour::Config.concurrent_workers
 
         futures = attached_files.map do |column|
-          Concurrent::Future.execute(executor: pool) {
-            file = @model.send(column)
+          pool.future(@model.send(column)) do |file|
             path = file.persisted_path
             file.uploader.storage.delete(path) if path
             file.delete
-          }
+          end
         end
 
         ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-          futures.each do |future|
-            future.value
-            raise(future.reason) if future.rejected?
-          end
+          futures.each(&:value!)
         end
-
-        pool.shutdown
-        pool.wait_for_termination
       end
     end
 
@@ -124,34 +119,32 @@ module Saviour
         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
 
-      pool = Concurrent::FixedThreadPool.new(Saviour::Config.concurrent_workers)
+      pool = Concurrent::Throttle.new Saviour::Config.concurrent_workers
+
       futures = uploaders.map { |uploader|
-        Concurrent::Future.execute(executor: pool) {
-          if defined?(Rails)
-            Rails.application.executor.wrap { uploader.upload }
+        pool.future(uploader) { |given_uploader|
+          if SHOULD_USE_INTERLOCK
+            Rails.application.executor.wrap { given_uploader.upload }
           else
-            uploader.upload
+            given_uploader.upload
           end
         }
       }
 
-      result = ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-        futures.map do |x|
-          x.value.tap do
-            raise(x.reason) if x.rejected?
-          end
-        end.compact
-      end
+      work = -> { futures.map(&:value!).compact }
 
-      pool.shutdown
-      pool.wait_for_termination
+      result = if SHOULD_USE_INTERLOCK
+                 ActiveSupport::Dependencies.interlock.permit_concurrent_loads(&work)
+               else
+                 work.call
+               end
 
       attrs = result.to_h
 

data/lib/saviour/read_only_file.rb

@@ -1,24 +1,24 @@
 module Saviour
   class ReadOnlyFile
-    attr_reader :persisted_path
+    attr_reader :persisted_path, :storage
 
-    def initialize(persisted_path, uploader_klass)
+    def initialize(persisted_path, storage)
       @persisted_path = persisted_path
-      @uploader_klass = uploader_klass
+      @storage = storage
     end
 
     def exists?
-      persisted? && Config.storage.exists?(@persisted_path)
+      persisted? && @storage.exists?(@persisted_path)
     end
 
     def read
       return nil unless persisted?
-      @uploader_klass.storage.read(@persisted_path)
+      @storage.read(@persisted_path)
     end
 
     def public_url
       return nil unless persisted?
-      @uploader_klass.storage.public_url(@persisted_path)
+      @storage.public_url(@persisted_path)
     end
     alias_method :url, :public_url
 

data/lib/saviour/s3_storage.rb

@@ -11,6 +11,7 @@ module Saviour
     def initialize(conf = {})
       @bucket = conf.delete(:bucket)
       @public_url_prefix = conf.delete(:public_url_prefix)
+      @extra_aws_client_options = conf.delete(:aws_client_opts)
       @conf = conf
       @create_options = conf.delete(:create_options) { {} }
       conf.fetch(:aws_access_key_id) { raise(ArgumentError, "aws_access_key_id is required") }
@@ -119,9 +120,11 @@ module Saviour
 
     def client
       @client ||= Aws::S3::Client.new(
-        access_key_id: @conf[:aws_access_key_id],
-        secret_access_key: @conf[:aws_secret_access_key],
-        region: @region
+        {
+          access_key_id: @conf[:aws_access_key_id],
+          secret_access_key: @conf[:aws_secret_access_key],
+          region: @region
+        }.merge(@extra_aws_client_options || {})
       )
     end
   end

data/lib/saviour/uploader/processors_runner.rb

@@ -58,7 +58,7 @@ module Saviour
           result = run_method_or_block(method_or_block, opts, file)
 
           self.file = result[0]
-          file.reopen(file.path)
+          file.reopen(file.path, "r+")
 
           self.filename = result[1]
         end

data/lib/saviour/version.rb

@@ -1,3 +1,3 @@
 module Saviour
-  VERSION = "0.6.2"
+  VERSION = "0.6.7"
 end

data/saviour.gemspec

@@ -13,17 +13,17 @@ 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"
   spec.add_dependency "concurrent-ruby", ">= 1.0.5"
+  spec.add_dependency "concurrent-ruby-edge", ">= 0.6.0"
 
   spec.add_development_dependency "bundler"
   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/read_only_file_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "direct usage of ReadOnlyFile" 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) do
+      store_dir { "/store/dir" }
+    end
+  }
+
+  let(:klass) {
+    klass = Class.new(Test) { include Saviour::Model }
+    klass.attach_file :file, uploader
+    klass
+  }
+
+  it "can be created" do
+    a = klass.create! file: Saviour::StringSource.new("contents", "file.txt")
+
+    path = a[:file]
+
+    read_only_file = Saviour::ReadOnlyFile.new(path, klass.uploader_classes[:file].storage)
+
+    expect(read_only_file.read).to eq "contents"
+    expect(read_only_file.public_url).to eq "http://domain.com/store/dir/file.txt"
+  end
+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/storages_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe "uploader declaration" do
+  let!(:default_storage) do
+    Saviour::LocalStorage.new(
+      local_prefix: @tmpdir,
+      public_url_prefix: "http://domain.com"
+    )
+  end
+
+  let!(:another_storage) do
+    Saviour::LocalStorage.new(
+      local_prefix: @tmpdir,
+      public_url_prefix: "http://custom-domain.com"
+    )
+  end
+
+  before { allow(Saviour::Config).to receive(:storage).and_return(default_storage) }
+
+  it "lets you override storage on attachment basis" do
+    klass = Class.new(Test) { include Saviour::Model }
+    custom_storage = another_storage
+
+    klass.attach_file(:file) do
+      store_dir { "/store/dir" }
+    end
+
+    klass.attach_file(:file_thumb) do
+      store_dir { "/store/dir" }
+      with_storage custom_storage
+    end
+
+    a = klass.create!(
+      file: Saviour::StringSource.new("content", "houhou.txt"),
+      file_thumb: Saviour::StringSource.new("content", "custom_houhou.txt")
+    )
+
+    expect(a.file.filename).to eq "houhou.txt"
+    expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
+
+    expect(a.file_thumb.filename).to eq "custom_houhou.txt"
+    expect(a.file_thumb.url).to eq 'http://custom-domain.com/store/dir/custom_houhou.txt'
+  end
+
+  context do
+    it "allows for lambda storages" do
+      allow(Saviour::Config).to receive(:storage).and_return(-> { default_storage })
+
+      klass = Class.new(Test) { include Saviour::Model }
+
+      klass.attach_file(:file) do
+        store_dir { "/store/dir" }
+      end
+
+      a = klass.create!(file: Saviour::StringSource.new("content", "houhou.txt"))
+
+      expect(a.file.filename).to eq "houhou.txt"
+      expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
+    end
+
+    it "allow to change storage on the fly" do
+      dynamic_storage = default_storage
+      allow(Saviour::Config).to receive(:storage).and_return(-> { dynamic_storage })
+
+      klass = Class.new(Test) { include Saviour::Model }
+
+      klass.attach_file(:file) do
+        store_dir { "/store/dir" }
+      end
+
+      a = klass.create!(
+        file: Saviour::StringSource.new("content", "houhou.txt"),
+        file_thumb: Saviour::StringSource.new("content", "custom_houhou.txt")
+      )
+
+      expect(a.file.filename).to eq "houhou.txt"
+      expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
+
+      dynamic_storage = another_storage  # Lambda will pick up the new storage.
+
+      a = klass.create!(file: Saviour::StringSource.new("content", "houhou.txt"))
+
+      expect(a.file.filename).to eq "houhou.txt"
+      expect(a.file.url).to eq 'http://custom-domain.com/store/dir/houhou.txt'
+    end
+  end
+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.2
+  version: 0.6.7
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: concurrent-ruby-edge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.6.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,13 +173,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
@@ -211,12 +211,13 @@ files:
 - spec/feature/original_assigned_file_is_not_modified_spec.rb
 - spec/feature/persisted_path_spec.rb
 - spec/feature/processors_api_spec.rb
+- spec/feature/read_only_file_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/stash_spec.rb
-- spec/feature/storage_overriding_spec.rb
+- spec/feature/storages_spec.rb
 - spec/feature/transactional_behavior_spec.rb
 - spec/feature/uploader_declaration_spec.rb
 - spec/feature/validations_spec.rb
@@ -247,15 +248,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: File storage handler following active record model lifecycle

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

data/spec/feature/storage_overriding_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe "uploader declaration" do
-  let!(:default_storage) do
-    Saviour::LocalStorage.new(
-      local_prefix: @tmpdir,
-      public_url_prefix: "http://domain.com"
-    )
-  end
-
-  let!(:custom_storage) do
-    Saviour::LocalStorage.new(
-      local_prefix: @tmpdir,
-      public_url_prefix: "http://custom-domain.com"
-    )
-  end
-
-  before { allow(Saviour::Config).to receive(:storage).and_return(default_storage) }
-
-  it "lets you override storage on attachment basis" do
-    klass = Class.new(Test) { include Saviour::Model }
-    kustom_storage = custom_storage
-
-    klass.attach_file(:file) do
-      store_dir { "/store/dir" }
-    end
-
-    klass.attach_file(:file_thumb) do
-      store_dir { "/store/dir" }
-      with_storage kustom_storage
-    end
-
-    a = klass.create!(
-      file: Saviour::StringSource.new("content", "houhou.txt"),
-      file_thumb: Saviour::StringSource.new("content", "custom_houhou.txt")
-    )
-
-    expect(a.file.filename).to eq "houhou.txt"
-    expect(a.file.url).to eq 'http://domain.com/store/dir/houhou.txt'
-
-    expect(a.file_thumb.filename).to eq "custom_houhou.txt"
-    expect(a.file_thumb.url).to eq 'http://custom-domain.com/store/dir/custom_houhou.txt'
-  end
-end