shrine 3.1.0 → 3.4.0

data/doc/testing.md

@@ -119,7 +119,7 @@ module TestData
       small:  uploaded_image,
     )
 
-    attacher.column_data
+    attacher.column_data # or attacher.data in case of postgres jsonb column
   end
 
   def uploaded_image
@@ -128,7 +128,7 @@ module TestData
     # for performance we skip metadata extraction and assign test metadata
     uploaded_file = Shrine.upload(file, :store, metadata: false)
     uploaded_file.metadata.merge!(
-      "size"      => file.size,
+      "size"      => File.size(file.path),
       "mime_type" => "image/jpeg",
       "filename"  => "test.jpg",
     )
@@ -251,6 +251,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

@@ -237,7 +237,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 +258,7 @@ class DestroyJob
     attacher = attacher_class.from_data(data)
     attacher.destroy
   end
-and
+end
 ```
 
 ### Attacher backgrounding
@@ -283,8 +283,9 @@ attacher.destroy_background # calls destroy block
 ## Versions
 
 The `versions`, `processing`, `recache`, and `delete_raw` plugins have been
-deprecated in favour of the new **[`derivatives`][derivatives]** plugin. Let's
-assume you have the following `versions` code:
+deprecated in favour of the new **[`derivatives`][derivatives]** plugin.
+
+Let's assume you have the following `versions` configuration:
 
 ```rb
 class ImageUploader < Shrine
@@ -307,26 +308,32 @@ class ImageUploader < Shrine
   end
 end
 ```
+
+When an attached file is promoted to permanent storage, the versions would
+automatically get generated:
+
 ```rb
 photo = Photo.new(photo_params)
 
 if photo.valid?
-  photo.save # automatically calls processing block
+  photo.save # generates versions on promotion
   # ...
 else
   # ...
 end
 ```
 
-With `derivatives`, the original file is automatically downloaded and retained,
-so the code is now much simpler:
+With `derivatives`, the original file is automatically downloaded and retained
+during processing, so the setup is simpler:
 
 ```rb
-Shrine.plugin :derivatives, versions_compatibility: true # handle versions column format
+Shrine.plugin :derivatives,
+  create_on_promote:      true, # automatically create derivatives on promotion
+  versions_compatibility: true  # handle versions column format
 ```
 ```rb
 class ImageUploader < Shrine
-  Attacher.derivatives_processor do |original|
+  Attacher.derivatives do |original|
     magick = ImageProcessing::MiniMagick.source(original)
 
     # the :original file should NOT be included anymore
@@ -342,28 +349,13 @@ end
 photo = Photo.new(photo_params)
 
 if photo.valid?
-  photo.image_derivatives! if photo.image_changed? # create derivatives
-  photo.save # automatically calls processing block
+  photo.save # creates derivatives on promotion
   # ...
 else
   # ...
 end
 ```
 
-If you have multiple places where you need to generate derivatives, and want it
-to happen automatically like it did with the `versions` plugin, you can
-override `Attacher#promote` to call `Attacher#create_derivatives` before
-promotion:
-
-```rb
-class Shrine::Attacher
-  def promote(*)
-    create_derivatives
-    super
-  end
-end
-```
-
 ### Accessing derivatives
 
 The derivative URLs are accessed in the same way as versions:
@@ -372,7 +364,7 @@ The derivative URLs are accessed in the same way as versions:
 photo.image_url(:small)
 ```
 
-But the derivatives themselves are accessed differently:
+But the files themselves are accessed differently:
 
 ```rb
 # versions
@@ -426,8 +418,8 @@ database column in different formats:
 
 The `:versions_compatibility` flag to the `derivatives` plugin enables it to
 read the `versions` format, which aids in transition. Once the `derivatives`
-plugin has been deployed to production, you can switch existing records to the
-new column format:
+plugin has been deployed to production, you can update existing records with
+the new column format:
 
 ```rb
 Photo.find_each do |photo|
@@ -447,7 +439,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
 
@@ -467,11 +459,11 @@ creating another derivatives processor that you will trigger in the controller:
 
 ```rb
 class ImageUploader < Shrine
-  Attacher.derivatives_processor do |original|
+  Attacher.derivatives do |original|
     # this will be triggered in the background job
   end
 
-  Attacher.derivatives_processor :foreground do |original|
+  Attacher.derivatives :foreground do |original|
     # this will be triggered in the controller
   end
 end
@@ -488,48 +480,77 @@ else
 end
 ```
 
-#### Parallelize
+### Default URL
 
-The `parallelize` plugin has been removed. The `derivatives` plugin is
-thread-safe, so you can parallelize uploading processed files manually:
+If you were using the `default_url` plugin, the `Attacher.default_url` now
+receives a `:derivative` option:
 
 ```rb
-# Gemfile
-gem "concurrent-ruby"
+Attacher.default_url do |derivative: nil, **|
+  "https://my-app.com/fallbacks/#{derivative}.jpg" if derivative
+end
 ```
-```rb
-require "concurrent"
 
-derivatives = attacher.process_derivatives
+#### Fallback to original
 
-tasks = derivatives.map do |name, file|
-  Concurrent::Promises.future(name, file) do |name, file|
-    attacher.add_derivative(name, file)
-  end
-end
+With the `versions` plugin, a missing version URL would automatically fall back
+to the original file. The `derivatives` plugin has no such fallback, but you
+can configure it manually:
 
-Concurrent::Promises.zip(*tasks).wait!
+```rb
+Attacher.default_url do |derivative: nil, **|
+  file&.url if derivative
+end
 ```
 
-#### Default URL
+#### Fallback to version
 
-The `derivatives` plugin integrates with the `default_url` plugin:
+The `versions` plugin had the ability to fall back missing version URL to
+another version that already exists. The `derivatives` plugin doesn't have this
+built in, but you can implement it as follows:
 
 ```rb
+DERIVATIVE_FALLBACKS = { foo: :bar, ... }
+
 Attacher.default_url do |derivative: nil, **|
-  "https://my-app.com/fallbacks/#{derivative}.jpg" if derivative
+  derivatives[DERIVATIVE_FALLBACKS[derivative]]&.url if derivative
 end
 ```
 
-However, it doesn't implement any other URL fallbacks that the `versions`
-plugin has for missing derivatives.
+### Location
+
+The `Shrine#generate_location` method will now receive a `:derivative`
+parameter instead of `:version`:
+
+```rb
+class MyUploader < Shrine
+  def generate_location(io, derivative: nil, **)
+    derivative #=> :large, :medium, :small, ...
+    # ...
+  end
+end
+```
+
+### Overwriting original
+
+With the `derivatives` plugin, saving processed files separately from the
+original file, so the original file is automatically kept. This means it's not
+possible anymore to overwrite the original file as part of processing.
+
+However, **it's highly recommended to always keep the original file**, even if
+you don't plan to use it. That way, if there is ever a need to reprocess
+derivatives, you have the original file to use as a base.
+
+That being said, if you still want to overwrite the original file, [this
+thread][overwriting original] has some tips.
 
 ## Other
 
 ### Processing
 
 The `processing` plugin has been deprecated over the new
-[`derivatives`][derivatives] plugin. If you were modifying the original file:
+[`derivatives`][derivatives] plugin. If you were previously replacing the
+original file:
 
 ```rb
 class MyUploader < Shrine
@@ -549,7 +570,7 @@ you should now add the processed file as a derivative:
 class MyUploader < Shrine
   plugin :derivatives
 
-  Attacher.derivatives_processor do |original|
+  Attacher.derivatives do |original|
     magick = ImageProcessing::MiniMagick.source(original)
 
     { normalized: magick.resize_to_limit!(1600, 1600) }
@@ -557,6 +578,30 @@ class MyUploader < Shrine
 end
 ```
 
+### Parallelize
+
+The `parallelize` plugin has been removed. With `derivatives` plugin you can
+parallelize uploading processed files manually:
+
+```rb
+# Gemfile
+gem "concurrent-ruby"
+```
+```rb
+require "concurrent"
+
+attacher    = photo.image_attacher
+derivatives = attacher.process_derivatives
+
+tasks = derivatives.map do |name, file|
+  Concurrent::Promises.future(name, file) do |name, file|
+    attacher.add_derivative(name, file)
+  end
+end
+
+Concurrent::Promises.zip(*tasks).wait!
+```
+
 ### Logging
 
 The `logging` plugin has been removed in favour of the
@@ -604,7 +649,7 @@ attacher.copy(other_attacher)
 with
 
 ```rb
-attacher.attach other_attacher.file
+attacher.set attacher.upload(other_attacher.file)
 attacher.add_derivatives other_attacher.derivatives # if using derivatives
 ```
 
@@ -662,3 +707,4 @@ end
 [derivatives]: https://shrinerb.com/docs/plugins/derivatives
 [instrumentation]: https://shrinerb.com/docs/plugins/instrumentation
 [mirroring]: https://shrinerb.com/docs/plugins/mirroring
+[overwriting original]: https://discourse.shrinerb.com/t/keep-original-file-after-processing/50/4

data/lib/shrine.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "shrine/version"
 require "shrine/uploaded_file"
 require "shrine/attacher"
 require "shrine/attachment"
 require "shrine/plugins"
+require "shrine/version"
 
 require "securerandom"
 require "json"
@@ -14,7 +14,8 @@ require "logger"
 # Core class that handles uploading files to specified storage.
 class Shrine
   # A generic exception used by Shrine.
-  class Error < StandardError; end
+  class Error < StandardError
+  end
 
   # Raised when a file is not a valid IO.
   class InvalidFile < Error
@@ -67,9 +68,9 @@ class Shrine
     #
     #     Shrine.plugin MyPlugin
     #     Shrine.plugin :my_plugin
-    def plugin(plugin, *args, &block)
+    def plugin(plugin, *args, **kwargs, &block)
       plugin = Plugins.load_plugin(plugin) if plugin.is_a?(Symbol)
-      plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
+      Plugins.load_dependencies(plugin, self, *args, **kwargs, &block)
       self.include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
       self.extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
       self::UploadedFile.include(plugin::FileMethods) if defined?(plugin::FileMethods)
@@ -78,7 +79,7 @@ class Shrine
       self::Attachment.extend(plugin::AttachmentClassMethods) if defined?(plugin::AttachmentClassMethods)
       self::Attacher.include(plugin::AttacherMethods) if defined?(plugin::AttacherMethods)
       self::Attacher.extend(plugin::AttacherClassMethods) if defined?(plugin::AttacherClassMethods)
-      plugin.configure(self, *args, &block) if plugin.respond_to?(:configure)
+      Plugins.configure(plugin, self, *args, **kwargs, &block)
       plugin
     end
 
@@ -94,8 +95,8 @@ class Shrine
     #     class Photo
     #       include Shrine::Attachment(:image) # creates a Shrine::Attachment object
     #     end
-    def Attachment(name, *args)
-      self::Attachment.new(name, *args)
+    def Attachment(name, **args)
+      self::Attachment.new(name, **args)
     end
     alias attachment Attachment
     alias [] Attachment
@@ -296,7 +297,7 @@ class Shrine
     # Retrieves the location for the given IO and context. First it looks
     # for the `:location` option, otherwise it calls #generate_location.
     def get_location(io, location: nil, **options)
-      location ||= generate_location(io, options)
+      location ||= generate_location(io, **options)
       location or fail Error, "location generated for #{io.inspect} was nil"
     end
 

data/lib/shrine/attacher.rb

@@ -39,10 +39,11 @@ class Shrine
 
       # Initializes the attached file, temporary and permanent storage.
       def initialize(file: nil, cache: :cache, store: :store)
-        @file    = file
-        @cache   = cache
-        @store   = store
-        @context = {}
+        @file     = file
+        @cache    = cache
+        @store    = store
+        @context  = {}
+        @previous = nil
       end
 
       # Returns the temporary storage identifier.
@@ -69,6 +70,10 @@ class Shrine
       def assign(value, **options)
         return if value == "" # skip empty hidden field
 
+        if value.is_a?(Hash) || value.is_a?(String)
+          return if uploaded_file(value) == file # skip assignment for current file
+        end
+
         attach_cached(value, **options)
       end
 
@@ -89,7 +94,7 @@ class Shrine
       #     attacher.attach_cached({ "id" => "...", "storage" => "cache", "metadata" => {} })
       def attach_cached(value, **options)
         if value.is_a?(String) || value.is_a?(Hash)
-          change(cached(value, **options), **options)
+          change(cached(value, **options))
         else
           attach(value, storage: cache_key, action: :cache, **options)
         end
@@ -111,7 +116,7 @@ class Shrine
       def attach(io, storage: store_key, **options)
         file = upload(io, storage, **options) if io
 
-        change(file, **options)
+        change(file)
       end
 
       # Deletes any previous file and promotes newly attached cached file.
@@ -138,7 +143,7 @@ class Shrine
       def finalize
         destroy_previous
         promote_cached
-        remove_instance_variable(:@previous) if changed?
+        @previous = nil
       end
 
       # Plugins can override this if they want something to be done in a
@@ -211,8 +216,8 @@ class Shrine
       #     attacher.change(uploaded_file)
       #     attacher.file #=> #<Shrine::UploadedFile>
       #     attacher.changed? #=> true
-      def change(file, **)
-        @previous = dup unless @file == file
+      def change(file)
+        @previous = dup if change?(file)
         set(file)
       end
 
@@ -254,7 +259,7 @@ class Shrine
       #     attacher.attach(file)
       #     attacher.changed? #=> true
       def changed?
-        instance_variable_defined?(:@previous)
+        !!@previous
       end
 
       # Returns whether a file is attached.
@@ -368,6 +373,11 @@ class Shrine
         attached? && !cached?
       end
 
+      # Whether assigning the given file is considered a change.
+      def change?(file)
+        @file != file
+      end
+
       # Returns whether the file is uploaded to specified storage.
       def uploaded?(file, storage_key)
         file&.storage_key == storage_key