shrine 3.3.0 → 3.5.0

data/doc/testing.md

@@ -2,6 +2,9 @@
 title: Testing with Shrine
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 The goal of this guide is to provide some useful tips for testing file
 attachments implemented with Shrine in your application.
 
@@ -137,19 +140,26 @@ module TestData
   end
 end
 ```
-<!--DOCUSAURUS_CODE_TABS-->
-<!--FactoryBot-->
+
+<Tabs>
+<TabItem value="factory_bot" label="FactoryBot">
+
 ```rb
 factory :photo do
   image_data { TestData.image_data }
 end
 ```
-<!--Rails YAML fixtures-->
+
+</TabItem>
+<TabItem value="fixtures" label="Rails YAML fixtures">
+
 ```erb
 photo:
   image_data: <%= TestData.image_data %>
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 ## Unit tests
 
@@ -182,24 +192,33 @@ end
 In acceptance tests you're testing your app end-to-end, and you likely want to
 also test file attachments here. Here are examples for some common use cases:
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Capybara-->
+<Tabs>
+<TabItem value="capybara" label="Capybara">
+
 ```rb
 attach_file("#image-field", "test/files/image.jpg")
 ```
-<!--Rack::Test-->
+
+</TabItem>
+<TabItem value="rack-test" label="rack-test">
+
 ```rb
 post "/photos", photo: {
   image: Rack::Test::UploadedFile.new("test/files/image.jpg", "image/jpeg")
 }
 ```
-<!--Rack::TestApp-->
+
+</TabItem>
+</Tabs>
+
+If you want to test requests with cached attachment data, you can do so as
+follows:
+
 ```rb
-app.post "/photos", multipart: {
-  "photo[image]" => File.open("test/files/image.jpg")
-}
+cached_file = Shrine.upload(file, :cache)
+
+post "/photos", photo: { image: cached_file.to_json }
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
 
 ## Background jobs
 
@@ -207,21 +226,30 @@ If you're using background jobs with Shrine, you probably want to make them
 synchronous in tests. See your backgrounding library docs for how to make jobs
 synchronous.
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--ActiveJob-->
+<Tabs>
+<TabItem value="activejob" label="Active Job">
+
 ```rb
 ActiveJob::Base.queue_adapter = :inline
 ```
-<!--Sidekiq-->
+
+</TabItem>
+<TabItem value="sidekiq" label="Sidekiq">
+
 ```rb
 require "sidekiq/testing"
 Sidekiq::Testing.inline!
 ```
-<!--SuckerPunch-->
+
+</TabItem>
+<TabItem value="sucker_punch" label="SuckerPunch">
+
 ```rb
 require "sucker_punch/testing/inline"
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 ## Processing
 
@@ -251,6 +279,16 @@ TestMode.disable_processing(Photo.image_attacher) do
 end
 ```
 
+## Testing direct upload
+
+If you'd like to unit-test direct upload on the server side, you can
+emulate it by uploading a file to `cache` and then assigning it to the record.
+
+```rb
+cached_file = Shrine.upload(some_file, :cache)
+record.attachment = cached_file.to_json
+```
+
 [DatabaseCleaner]: https://github.com/DatabaseCleaner/database_cleaner
 [`#attach_file`]: http://www.rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Actions#attach_file-instance_method
 [aws-sdk-ruby stubs]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ClientStubs.html

data/doc/upgrading_to_3.md

@@ -7,9 +7,6 @@ This guide provides instructions for upgrading Shrine in your apps to version
 3.x. If you're looking for a full list of changes, see the **[3.0 release
 notes]**.
 
-If you would like assistance with the upgrade, I'm available for consultation,
-you can email me at <janko.marohnic@gmail.com>.
-
 ## Attacher
 
 The `Shrine::Attacher` class has been rewritten in Shrine 3.0, though much of
@@ -237,7 +234,7 @@ class PromoteJob
   rescue Shrine::AttachmentChanged, ActiveRecord::RecordNotFound
     # attachment has changed or record has been deleted, nothing to do
   end
-and
+end
 ```
 ```rb
 class DestroyJob
@@ -258,7 +255,7 @@ class DestroyJob
     attacher = attacher_class.from_data(data)
     attacher.destroy
   end
-and
+end
 ```
 
 ### Attacher backgrounding
@@ -439,7 +436,7 @@ creation in the `PromoteJob` instead of the controller:
 class PromoteJob
   include Sidekiq::Worker
 
-  def perform(attacher_class, record_class, record.id, name, file_data)
+  def perform(attacher_class, record_class, record_id, name, file_data)
     attacher_class = Object.const_get(attacher_class)
     record         = Object.const_get(record_class).find(record_id) # if using Active Record
 
@@ -447,7 +444,7 @@ class PromoteJob
     attacher.create_derivatives # call derivatives processor
     attacher.atomic_promote
   rescue Shrine::AttachmentChanged, ActiveRecord::RecordNotFound
-    # attachment has changed or record has beeen deleted, nothing to do
+    # attachment has changed or record has been deleted, nothing to do
   end
 end
 ```
@@ -649,7 +646,8 @@ attacher.copy(other_attacher)
 with
 
 ```rb
-attacher.set attacher.upload(other_attacher.file)
+attacher.set nil # clear original attachment
+attacher.attach other_attacher.file, storage: other_attacher.file.storage_key
 attacher.add_derivatives other_attacher.derivatives # if using derivatives
 ```
 

data/lib/shrine/plugins/activerecord.rb

@@ -55,7 +55,7 @@ class Shrine
           # reload the attacher on record reload
           define_method :reload do |*args|
             result = super(*args)
-            send(:"#{name}_attacher").reload
+            send(:"#{name}_attacher").reload if instance_variable_defined?(:"@#{name}_attacher")
             result
           end
         end
@@ -75,8 +75,8 @@ class Shrine
         def activerecord_validate
           return unless respond_to?(:errors)
 
-          errors.each do |message|
-            record.errors.add(name, *message)
+          errors.each do |(type, options)|
+            record.errors.add(name, type, **options.to_h)
           end
         end
 

data/lib/shrine/plugins/derivation_endpoint.rb

@@ -28,8 +28,8 @@ class Shrine
         uploader.opts[:derivation_endpoint] ||= { options: {}, derivations: {} }
         uploader.opts[:derivation_endpoint][:options].merge!(opts)
 
-        unless uploader.opts[:derivation_endpoint][:options][:secret_key]
-          fail Error, "must provide :secret_key option to derivation_endpoint plugin"
+        if !uploader.opts[:derivation_endpoint][:options][:secret_key] && !uploader.opts[:derivation_endpoint][:options][:signer]
+          fail Error, "must provide :secret_key option to derivation_endpoint plugin when no custom signer is set"
         end
 
         # instrumentation plugin integration
@@ -197,6 +197,7 @@ class Shrine
     option :metadata,                    default: -> { [] }
     option :prefix
     option :secret_key
+    option :signer
     option :type
     option :upload,                      default: -> { false }
     option :upload_location,             default: -> { default_upload_location }, result: -> (o) { upload_location(o) }
@@ -216,7 +217,7 @@ class Shrine
       option_definition = self.class.options.fetch(name)
 
       value = options.fetch(name) { shrine_class.derivation_options[name] }
-      value = instance_exec(&value) if value.is_a?(Proc)
+      value = instance_exec(&value) if value.is_a?(Proc) && value.arity == 0
 
       if value.nil?
         default = option_definition[:default]
@@ -300,20 +301,36 @@ class Shrine
   end
 
   class Derivation::Url < Derivation::Command
-    delegate :name, :args, :source, :secret_key
+    delegate :name, :args, :source, :secret_key, :signer
 
     def call(host: nil, prefix: nil, **options)
-      [host, *prefix, identifier(**options)].join("/")
+      base_url = [host, *prefix].join("/")
+      path = path_identifier(metadata: options.delete(:metadata))
+
+      if signer
+        url = [base_url, path].join("/")
+        signer.call(url, **options)
+      else
+        signed_part = signed_url("#{path}?#{query(**options)}")
+        [base_url, signed_part].join("/")
+      end
     end
 
     private
 
-    def identifier(expires_in: nil,
-                   version: nil,
-                   type: nil,
-                   filename: nil,
-                   disposition: nil,
-                   metadata: [])
+    def path_identifier(metadata: [])
+      [
+        name,
+        *args,
+        source.urlsafe_dump(metadata: metadata)
+      ].map{|component| Rack::Utils.escape_path(component.to_s)}.join('/')
+    end
+
+    def query(expires_in: nil,
+              type: nil,
+              filename: nil,
+              disposition: nil,
+              version: nil)
 
       params = {}
       params[:expires_at]  = (Time.now + expires_in).to_i if expires_in
@@ -322,23 +339,7 @@ class Shrine
       params[:filename]    = filename if filename
       params[:disposition] = disposition if disposition
 
-      # serializes the source uploaded file into an URL-safe format
-      source_component = source.urlsafe_dump(metadata: metadata)
-
-      # generate plain URL
-      url = plain_url(name, *args, source_component, params)
-
-      # generate signed URL
-      signed_url(url)
-    end
-
-    def plain_url(*components, params)
-      # When using Rack < 2, Rack::Utils#escape_path will escape '/'.
-      # Escape each component and then join them together.
-      path  = components.map{|component| Rack::Utils.escape_path(component.to_s)}.join('/')
-      query = Rack::Utils.build_query(params)
-
-      "#{path}?#{query}"
+      Rack::Utils.build_query(params)
     end
 
     def signed_url(url)
@@ -379,7 +380,7 @@ class Shrine
     # Returns "404 Not Found" if derivation block is not defined, or if source
     # file was not found on the storage.
     def handle_request(request)
-      verify_signature!(request)
+      verify_signature!(request) if secret_key
       check_expiry!(request)
 
       name, *args, serialized_file = request.path_info.split("/")[1..-1]
@@ -603,7 +604,7 @@ class Shrine
     def instrument_derivation(&block)
       return yield unless shrine_class.respond_to?(:instrument)
 
-      shrine_class.instrument(:derivation, derivation: derivation, &block)
+      shrine_class.instrument(:derivation, { derivation: derivation }, &block)
     end
 
     # Massages the derivation result, ensuring it's opened in binary mode,

data/lib/shrine/plugins/derivatives.rb

@@ -12,18 +12,18 @@ class Shrine
         }.inspect}"
       end
 
-      def self.load_dependencies(uploader, versions_compatibility: false, **)
+      def self.load_dependencies(uploader, **)
         uploader.plugin :default_url
-
-        AttacherMethods.prepend(VersionsCompatibility) if versions_compatibility
       end
 
-      def self.configure(uploader, log_subscriber: LOG_SUBSCRIBER, **opts)
-        uploader.opts[:derivatives] ||= { processors: {}, processor_settings: {}, storage: proc { store_key } }
+      def self.configure(uploader, log_subscriber: LOG_SUBSCRIBER, versions_compatibility: false, **opts)
+        uploader.opts[:derivatives] ||= { processors: {}, processor_settings: {}, storage: proc { store_key }, mutex: true }
         uploader.opts[:derivatives].merge!(opts)
 
         # instrumentation plugin integration
         uploader.subscribe(:derivatives, &log_subscriber) if uploader.respond_to?(:subscribe)
+
+        uploader::Attacher.include(VersionsCompatibility) if versions_compatibility
       end
 
       module AttachmentMethods
@@ -109,7 +109,7 @@ class Shrine
           super(**options)
 
           @derivatives       = derivatives
-          @derivatives_mutex = Mutex.new
+          @derivatives_mutex = Mutex.new if shrine_class.derivatives_options[:mutex]
         end
 
         # Convenience method for accessing derivatives.
@@ -139,7 +139,7 @@ class Shrine
         # Allows generating a URL to the derivative by passing the derivative
         # name.
         #
-        #     attacher.add_derivatives(thumb: thumb)
+        #     attacher.add_derivatives({ thumb: thumb })
         #     attacher.url(:thumb) #=> "https://example.org/thumb.jpg"
         def url(*path, **options)
           return super if path.empty?
@@ -180,7 +180,7 @@ class Shrine
 
         # In addition to deleting the main file it also deletes any derivatives.
         #
-        #     attacher.add_derivatives(thumb: thumb)
+        #     attacher.add_derivatives({ thumb: thumb })
         #     attacher.derivatives[:thumb].exists? #=> true
         #     attacher.destroy
         #     attacher.derivatives[:thumb].exists? #=> false
@@ -208,7 +208,7 @@ class Shrine
         #     # {
         #     #   thumb: #<Shrine::UploadedFile>,
         #     # }
-        #     attacher.add_derivatives(cropped: cropped)
+        #     attacher.add_derivatives({ cropped: cropped })
         #     attacher.derivatives #=>
         #     # {
         #     #   thumb: #<Shrine::UploadedFile>,
@@ -239,7 +239,7 @@ class Shrine
 
         # Uploads given hash of files.
         #
-        #     hash = attacher.upload_derivatives(thumb: thumb)
+        #     hash = attacher.upload_derivatives({ thumb: thumb })
         #     hash[:thumb] #=> #<Shrine::UploadedFile>
         def upload_derivatives(files, **options)
           map_derivative(files) do |path, file|
@@ -298,10 +298,10 @@ class Shrine
         # Deep merges given uploaded derivatives with current derivatives.
         #
         #     attacher.derivatives #=> { one: #<Shrine::UploadedFile> }
-        #     attacher.merge_derivatives(two: uploaded_file)
+        #     attacher.merge_derivatives({ two: uploaded_file })
         #     attacher.derivatives #=> { one: #<Shrine::UploadedFile>, two: #<Shrine::UploadedFile> }
         def merge_derivatives(new_derivatives)
-          @derivatives_mutex.synchronize do
+          derivatives_synchronize do
             merged_derivatives = deep_merge_derivatives(derivatives, new_derivatives)
             set_derivatives(merged_derivatives)
           end
@@ -379,7 +379,7 @@ class Shrine
 
         # Deletes given hash of uploaded files.
         #
-        #     attacher.delete_derivatives(thumb: uploaded_file)
+        #     attacher.delete_derivatives({ thumb: uploaded_file })
         #     uploaded_file.exists? #=> false
         def delete_derivatives(derivatives = self.derivatives)
           map_derivative(derivatives) { |_, derivative| derivative.delete }
@@ -387,7 +387,7 @@ class Shrine
 
         # Sets the given hash of uploaded files as derivatives.
         #
-        #     attacher.set_derivatives(thumb: uploaded_file)
+        #     attacher.set_derivatives({ thumb: uploaded_file })
         #     attacher.derivatives #=> { thumb: #<Shrine::UploadedFile> }
         def set_derivatives(derivatives)
           self.derivatives = derivatives
@@ -398,7 +398,7 @@ class Shrine
         # Adds derivative data into the hash.
         #
         #     attacher.attach(io)
-        #     attacher.add_derivatives(thumb: thumb)
+        #     attacher.add_derivatives({ thumb: thumb })
         #     attacher.data
         #     #=>
         #     # {
@@ -507,14 +507,12 @@ class Shrine
         def instrument_derivatives(processor_name, source, processor_options, &block)
           return yield unless shrine_class.respond_to?(:instrument)
 
-          shrine_class.instrument(
-            :derivatives,
+          shrine_class.instrument(:derivatives, {
             processor:         processor_name,
             processor_options: processor_options,
             io:                source,
             attacher:          self,
-            &block
-          )
+          }, &block)
         end
 
         # Returns symbolized array or single key.
@@ -546,6 +544,14 @@ class Shrine
         def create_derivatives_on_promote?
           shrine_class.derivatives_options[:create_on_promote]
         end
+
+        def derivatives_synchronize
+          if @derivatives_mutex
+            @derivatives_mutex.synchronize { yield }
+          else
+            yield
+          end
+        end
       end
 
       module ClassMethods

data/lib/shrine/plugins/determine_mime_type.rb

@@ -124,6 +124,8 @@ class Shrine
           require "fastimage"
 
           type = FastImage.type(io)
+          return 'image/svg+xml' if type == :svg
+
           "image/#{type}" if type
         end
 

data/lib/shrine/plugins/download_endpoint.rb

@@ -182,12 +182,19 @@ class Shrine
       @shrine_class::UploadedFile.urlsafe_load(serialized)
     rescue Shrine::Error # storage not found
       not_found!
+    rescue JSON::ParserError, ArgumentError => error # invalid serialized component
+      raise if error.is_a?(ArgumentError) && error.message != "invalid base64"
+      bad_request!("Invalid serialized file")
     end
 
     def not_found!
       error!(404, "File Not Found")
     end
 
+    def bad_request!(message)
+      error!(400, message)
+    end
+
     # Halts the request with the error message.
     def error!(status, message)
       throw :halt, [status, { "Content-Type" => "text/plain" }, [message]]

data/lib/shrine/plugins/entity.rb

@@ -36,8 +36,14 @@ class Shrine
           attachment = self
 
           # Returns the attached file.
-          define_method :"#{name}" do |*args|
-            send(:"#{name}_attacher").get(*args)
+          if shrine_class::Attacher.instance_method(:get).arity == 0
+            define_method :"#{name}" do
+              send(:"#{name}_attacher").get
+            end
+          else # derivatives
+            define_method :"#{name}" do |*args|
+              send(:"#{name}_attacher").get(*args)
+            end
           end
 
           # Returns the URL to the attached file.
@@ -112,9 +118,15 @@ class Shrine
         #     attacher.file #=> #<Shrine::UploadedFile>
         def reload
           read
+          @previous = nil
           self
         end
 
+        # Loads attachment from the entity attribute.
+        def read
+          load_column(read_attribute)
+        end
+
         # Returns a hash with entity attribute name and column data.
         #
         #     attacher.column_values
@@ -134,11 +146,6 @@ class Shrine
 
         private
 
-        # Loads attachment from the entity attribute.
-        def read
-          load_column(read_attribute)
-        end
-
         # Reads value from the entity attribute.
         def read_attribute
           record.public_send(attribute)

data/lib/shrine/plugins/infer_extension.rb

@@ -51,6 +51,10 @@ class Shrine
       end
 
       module InstanceMethods
+        def infer_extension(mime_type)
+          self.class.infer_extension(mime_type)
+        end
+
         private
 
         def basic_location(io, metadata:)

data/lib/shrine/plugins/instrumentation.rb

@@ -12,7 +12,11 @@ class Shrine
       def self.configure(uploader, log_subscriber: LOG_SUBSCRIBER, **opts)
         uploader.opts[:instrumentation] ||= { log_events: EVENTS, subscribers: {} }
         uploader.opts[:instrumentation].merge!(opts)
-        uploader.opts[:instrumentation][:notifications] ||= ::ActiveSupport::Notifications
+        begin
+          uploader.opts[:instrumentation][:notifications] ||= ::ActiveSupport::Notifications
+        rescue NameError
+          fail Error, "default notifications library is ActiveSupport::Notifications, but activesupport gem is not installed"
+        end
 
         uploader.opts[:instrumentation][:log_events].each do |event_name|
           uploader.subscribe(event_name, &log_subscriber)
@@ -69,27 +73,25 @@ class Shrine
 
         # Sends a `upload.shrine` event.
         def _upload(io, location:, metadata:, upload_options: {}, **options)
-          self.class.instrument(
-            :upload,
+          self.class.instrument(:upload, {
             storage: storage_key,
             location: location,
             io: io,
             upload_options: upload_options,
             metadata: metadata,
             options: options,
-          ) { super }
+          }) { super }
         end
 
         # Sends a `metadata.shrine` event.
         def get_metadata(io, metadata: nil, **options)
           return super if io.is_a?(UploadedFile) && metadata != true || metadata == false
 
-          self.class.instrument(
-            :metadata,
+          self.class.instrument(:metadata, {
             storage: storage_key,
             io: io,
             options: options,
-          ) { super }
+          }) { super }
         end
       end
 
@@ -98,30 +100,27 @@ class Shrine
         def stream(destination, **options)
           return super if opened?
 
-          shrine_class.instrument(
-            :download,
+          shrine_class.instrument(:download, {
             storage: storage_key,
             location: id,
             download_options: options,
-          ) { super(destination, **options, instrument: false) }
+          }) { super(destination, **options, instrument: false) }
         end
 
         # Sends a `exists.shrine` event.
         def exists?
-          shrine_class.instrument(
-            :exists,
+          shrine_class.instrument(:exists, {
             storage: storage_key,
             location: id,
-          ) { super }
+          }) { super }
         end
 
         # Sends a `delete.shrine` event.
         def delete
-          shrine_class.instrument(
-            :delete,
+          shrine_class.instrument(:delete, {
             storage: storage_key,
             location: id,
-          ) { super }
+          }) { super }
         end
 
         private
@@ -130,12 +129,11 @@ class Shrine
         def _open(instrument: true, **options)
           return super(**options) unless instrument
 
-          shrine_class.instrument(
-            :open,
+          shrine_class.instrument(:open, {
             storage: storage_key,
             location: id,
             download_options: options,
-          ) { super(**options) }
+          }) { super(**options) }
         end
       end
 

data/lib/shrine/plugins/model.rb

@@ -48,7 +48,9 @@ class Shrine
           # The copy constructor that's called on #dup and #clone.
           define_method :initialize_copy do |other|
             super(other)
-            instance_variable_set(:"@#{name}_attacher", instance_variable_get(:"@#{name}_attacher")&.dup)
+            attacher_copy = instance_variable_get(:"@#{name}_attacher")&.dup
+            attacher_copy.set_entity(self, name) if attacher_copy
+            instance_variable_set(:"@#{name}_attacher", attacher_copy)
             self
           end
           private :initialize_copy

data/lib/shrine/plugins/remove_attachment.rb

@@ -39,6 +39,8 @@ class Shrine
 
         # Rails sends "0" or "false" if the checkbox hasn't been ticked.
         def remove?
+          return remove if [true, false].include?(remove)
+
           remove && remove != "" && remove !~ /\A(0|false)\z/
         end
       end

data/lib/shrine/plugins/sequel.rb

@@ -62,7 +62,7 @@ class Shrine
           # reload the attacher on record reload
           define_method :_refresh do |*args|
             result = super(*args)
-            send(:"#{name}_attacher").reload
+            send(:"#{name}_attacher").reload if instance_variable_defined?(:"@#{name}_attacher")
             result
           end
           private :_refresh