card-mod-carrierwave 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29840e46e626a7121a84faa9b4b0f9889694ab7653031bd9cf97ccb896d46263
-  data.tar.gz: 503d37c6471c6fd8d0e6cba3c94c65097663ab0854fc24861673c80f913e1e86
+  metadata.gz: b3189d4e4979c66b05d69e7b09a602098410d5df3faa5cdd19a96b7b026a69bb
+  data.tar.gz: 774a0049c1c77d4373d5769a965734b797e916606f8ebd959ed97c39315f5646
 SHA512:
-  metadata.gz: 65f55c9a919ea38e364f5863030d35b5674569dab60454ee157c3e78c762afbc427b3e258246d8389714e00eb752bf8076b948e8a5c70b4d202a2dd63ff01695
-  data.tar.gz: 69c7e3184ca375b4342ad3a4f5dd2ae9f8654666e0e6cefded79f5b3c2823dfd8a074ad906acdb28b749f51413c49ebba315c7a790aa17907b1da063baf07791
+  metadata.gz: 2091526b0eb3da1d50ec833d7d990848a4bd6968b4595a235debccd6b5d802dcb5b32bf20a2abe6b2d0ba2679ad1d8564c755ea2d06f435563cdb08bf76e46e1
+  data.tar.gz: d10af461b8cc1ef9d0eaf8147274ab8e40f9a0106f87e8f153ccd2b4884ff73667fc53c6dfab8391f541dd3e80a552b06fc1d3eb03fd42d3174fdbd150653632

data/lib/carrier_wave/file_card_uploader.rb

@@ -1,40 +1,4 @@
 module CarrierWave
-  class << self
-    def tmp_path
-      @tmp_path ||= Card.paths["tmp"].existent.first
-    end
-  end
-
-  class SanitizedFile
-    def content_type
-      # the original content_type method doesn't seem to be very reliable
-      # It uses mime_magic_content_type  - which returns invalid/invalid for css files
-      # that start with a comment - as the second option.  (we switch the order and
-      # use it as the third option)
-      @content_type ||=
-        existing_content_type ||
-        mini_mime_content_type ||
-        mime_magic_content_type
-    end
-  end
-
-  module Uploader
-    # Implements a different name pattern for versions than CarrierWave's
-    # default: we expect the version name at the end of the filename separated
-    # by a dash
-    module Versions
-      private
-
-      # put version at the end of the filename
-      def full_filename for_file
-        name = super(for_file)
-        parts = name.split "."
-        basename = [parts.shift, version_name].compact.join("-")
-        "#{basename}.#{parts.join('.')}"
-      end
-    end
-  end
-
   # Takes care of the file upload for cards with attached files.
   # Most of the upload behaviour depends on the card itself.
   # (e.g. card type and storage option chosen for the card). So in contrary
@@ -161,15 +125,17 @@ module CarrierWave
   #
   class FileCardUploader < Uploader::Base
     attr_accessor :mod
+
     include Card::Env::Location
+    include Path
 
-    STORAGE_TYPES = [:cloud, :web, :coded, :local].freeze
-    CONFIG_OPTIONS = [:provider, :attributes, :directory, :public, :credentials,
-                      :authenticated_url_expiration, :use_ssl_for_aws].freeze
-    CONFIG_CREDENTIAL_OPTIONS = [
-      :provider,
-      :aws_access_key_id, :aws_secret_access_key, :region, :host, :endpoint,
-      :google_access_key_id, :google_secret_access_key
+    STORAGE_TYPES = %i[cloud web coded local].freeze
+    CONFIG_OPTIONS = %i[provider attributes directory public credentials
+                        authenticated_url_expiration use_ssl_for_aws].freeze
+    CONFIG_CREDENTIAL_OPTIONS = %i[
+      provider
+      aws_access_key_id aws_secret_access_key region host endpoint
+      google_access_key_id google_secret_access_key
     ].freeze
     delegate :store_dir, :retrieve_dir, :file_dir, :mod, :bucket, to: :model
 
@@ -205,6 +171,7 @@ module CarrierWave
       model.with_storage_options opts do
         return model.content if model.web?
         return "" unless file.present?
+
         "%s/%s" % [file_dir, url_filename]
       end
     end
@@ -230,57 +197,12 @@ module CarrierWave
       end
     end
 
-    def local_url opts={}
-      "%s/%s/%s" % [local_url_base(opts), file_dir, full_filename(url_filename(opts))]
-    end
-
-    def local_url_base opts={}
-      web_path = Card.config.files_web_path
-      opts.delete(:absolute) ? card_url(web_path) : card_path(web_path)
-    end
-
-    def public_path
-      File.join Cardio.paths["public"].existent.first, url
-    end
-
-    def cache_dir
-      @model.files_base_dir + "/cache"
-    end
-
-    # Carrierwave calls store_path without argument when it stores the file
-    # and with the identifier from the db when it retrieves the file.
-    # In our case the first part of our identifier is not part of the path
-    # but we can construct the filename from db data. So we don't need the
-    # identifier.
-    def store_path for_file=nil
-      if for_file
-        retrieve_path
-      else
-        File.join([store_dir, full_filename(filename)].compact)
-      end
-    end
-
-    def retrieve_path
-      File.join([retrieve_dir, full_filename(filename)].compact)
-    end
-
-    def tmp_path
-      Dir.mkdir model.tmp_upload_dir unless Dir.exist? model.tmp_upload_dir
-      File.join model.tmp_upload_dir, filename
-    end
-
     def create_versions? new_file
       model.create_versions? new_file
     end
 
-    # paperclip compatibility used in type/file.rb#core (base format)
-    def path version=nil
-      version ? versions[version].path : super()
-    end
-
     def original_filename
-      @original_filename ||= model.selected_action &&
-                             model.selected_action.comment
+      @original_filename ||= model.selected_action&.comment
     end
 
     def action_id
@@ -288,7 +210,7 @@ module CarrierWave
     end
 
     # delegate carrierwave's fog config methods to bucket configuration
-    ::CarrierWave::FileCardUploader::CONFIG_OPTIONS.each do |name|
+    CONFIG_OPTIONS.each do |name|
       define_method("fog_#{name}") { bucket_config name }
     end
 
@@ -311,9 +233,39 @@ module CarrierWave
     def storage
       case @model.storage_type
       when :cloud
-        ::CarrierWave::Storage::Fog.new(self)
+        Storage::Fog.new self
       else
-        ::CarrierWave::Storage::File.new(self)
+        Storage::File.new self
+      end
+    end
+  end
+
+  class SanitizedFile
+    def content_type
+      # the original content_type method doesn't seem to be very reliable
+      # It uses mime_magic_content_type  - which returns invalid/invalid for css files
+      # that start with a comment - as the second option.  (we switch the order and
+      # use it as the third option)
+      @content_type ||=
+        existing_content_type ||
+        mini_mime_content_type ||
+        mime_magic_content_type
+    end
+  end
+
+  module Uploader
+    # Implements a different name pattern for versions than CarrierWave's
+    # default: we expect the version name at the end of the filename separated
+    # by a dash
+    module Versions
+      private
+
+      # put version at the end of the filename
+      def full_filename for_file
+        name = super(for_file)
+        parts = name.split "."
+        basename = [parts.shift, version_name].compact.join("-")
+        "#{basename}.#{parts.join('.')}"
       end
     end
   end

data/lib/carrier_wave/file_card_uploader/path.rb

@@ -0,0 +1,54 @@
+module CarrierWave
+  def self.tmp_path
+    @tmp_path ||= Card.paths["tmp"].existent.first
+  end
+
+  class FileCardUploader
+    # path-related methods for uploader
+    module Path
+      def local_url opts={}
+        "%s/%s/%s" % [local_url_base(opts), file_dir, full_filename(url_filename(opts))]
+      end
+
+      def local_url_base opts={}
+        web_path = Card.config.files_web_path
+        opts.delete(:absolute) ? card_url(web_path) : card_path(web_path)
+      end
+
+      def public_path
+        File.join Cardio.paths["public"].existent.first, url
+      end
+
+      def cache_dir
+        "#{@model.files_base_dir}/cache"
+      end
+
+      # Carrierwave calls store_path without argument when it stores the file
+      # and with the identifier from the db when it retrieves the file.
+      # In our case the first part of our identifier is not part of the path
+      # but we can construct the filename from db data. So we don't need the
+      # identifier.
+      def store_path for_file=nil
+        if for_file
+          retrieve_path
+        else
+          File.join([store_dir, full_filename(filename)].compact)
+        end
+      end
+
+      def retrieve_path
+        File.join([retrieve_dir, full_filename(filename)].compact)
+      end
+
+      def tmp_path
+        Dir.mkdir model.tmp_upload_dir unless Dir.exist? model.tmp_upload_dir
+        File.join model.tmp_upload_dir, filename
+      end
+
+      # paperclip compatibility used in type/file.rb#core (base format)
+      def path version=nil
+        version ? versions[version].path : super()
+      end
+    end
+  end
+end

data/lib/carrier_wave/image_card_uploader.rb

@@ -10,7 +10,7 @@ module CarrierWave
     include CarrierWave::MiniMagick
 
     def path version=nil
-      (version && version != :original) ? versions[version].path : super()
+      version && version != :original ? versions[version].path : super()
     end
 
     version :icon, if: :create_versions?, from_version: :small do

data/set/abstract/attachment.rb

@@ -17,11 +17,13 @@ end
 
 event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_to_save? do
   return unless @current_action
+
   @current_action.update! comment: original_filename
 end
 
 event :validate_file_exist, :validate, on: :create do
   return if empty_ok?
+
   if will_be_stored_as == :web
     errors.add "url is missing" if content.blank?
   elsif !attachment.file.present?
@@ -40,12 +42,14 @@ def file_ready_to_save?
     attachment_is_changing?
 end
 
-def item_names _args={} # needed for flexmail attachments.  hacky.
+# needed for flexmail attachments.  hacky.
+def item_names _args={}
   [name]
 end
 
 def original_filename
   return content.split("/").last if web?
+
   attachment.original_filename
 end
 
@@ -75,7 +79,7 @@ end
 
 def assign_set_specific_attributes
   # reset content if we really have something to upload
-  self.content = nil if set_specific[attachment_name.to_s].present?
+  self.content = nil if set_specific[attachment_name].present?
   super
 end
 
@@ -90,23 +94,42 @@ end
 
 def revision action, before_action=false
   return unless (result = super)
+
   result[:empty_ok] = true
   result
 end
 
 def attachment_format ext
-  if ext.present? && attachment && (original_ext = attachment.extension.sub(/^\./, ""))
-    if ["file", original_ext].member? ext
-      original_ext
-    elsif (exts = Mime::Types[attachment.content_type])
-      if exts.find { |mt| mt.extensions.member? ext }
-        ext
-      else
-        exts[0].extensions[0]
-      end
-    end
+  rescuing_extension_issues do
+    return unless ext.present? && original_extension
+
+    confirm_original_extension(ext) || detect_extension(ext)
   end
-rescue => e
+end
+
+def rescuing_extension_issues
+  yield
+rescue StandardError => e
   Rails.logger.info "attachment_format issue: #{e.message}"
   nil
 end
+
+def detect_extension ext
+  return unless (mime_types = MIME::Types[attachment.content_type])
+
+  recognized_extension?(mime_types, ext) ? ext : mime_types[0].extensions[0]
+end
+
+def recognized_extension? mime_types, ext
+  mime_types.find { |mt| mt.extensions.member? ext }
+end
+
+def confirm_original_extension ext
+  return unless ["file", original_extension].member? ext
+
+  original_extension
+end
+
+def original_extension
+  @original_extension ||= attachment&.extension&.sub(/^\./, "")
+end

data/set/abstract/attachment/cloud.rb

@@ -11,7 +11,7 @@ event :validate_storage_type_update, :validate, on: :update, when: :cloud? do
   #        `update storage_type: :local, file: [file handle]` is ok
   return unless storage_type_changed? && !attachment_is_changing?
 
-  errors.add :storage_type, tr(:moving_files_is_not_supported)
+  errors.add :storage_type, t(:carrierwave_moving_files_is_not_supported)
 end
 
 def bucket
@@ -20,6 +20,7 @@ end
 
 def new_card_bucket
   return unless new_card?
+
   # If the file is assigned before the bucket option we have to
   # check if there is a bucket options in set_specific.
   # That happens for exmaple when the file appears before the bucket in the
@@ -34,6 +35,7 @@ end
 
 def load_bucket_config
   return {} unless bucket
+
   bucket_config = Cardio.config.file_buckets&.dig(bucket.to_sym) || {}
   bucket_config.symbolize_keys!
   bucket_config[:credentials]&.symbolize_keys!
@@ -96,6 +98,7 @@ def each_credential_from_env
   regexp = credential_from_env_regexp
   ENV.each_key do |env_key|
     next unless (m = regexp.match env_key)
+
     yield m[:option].downcase.to_sym
   end
 end
@@ -112,6 +115,7 @@ end
 
 def bucket_from_content
   return unless content
+
   content.match(/^\((?<bucket>[^)]+)\)/) { |m| m[:bucket] }
 end
 

data/set/abstract/attachment/coded.rb

@@ -1,12 +1,17 @@
 event :lose_coded_status_on_update, :initialize, on: :update, when: :coded? do
   # unless explicit
   return if @new_mod
+
   @new_storage_type ||= storage_type_from_config
 end
 
 event :validate_coded_storage_type, :validate, on: :save, when: :will_become_coded? do
-  errors.add :storage_type, tr(:mod_argument_needed_to_save) unless mod || @new_mod
-  errors.add :storage_type, tr(:codename_needed_for_storage) if codename.blank?
+  storage_type_error :mod_argument_needed_to_save unless mod || @new_mod
+  storage_type_error :codename_needed_for_storage if codename.blank?
+end
+
+def storage_type_error error_name
+  errors.add :storage_type, t("carrierwave_#{error_name}")
 end
 
 def will_become_coded?

data/set/abstract/attachment/local.rb

@@ -1,4 +1,3 @@
-
 event :update_public_link_on_create, :integrate, on: :create, when: :local? do
   update_public_link
 end
@@ -9,6 +8,7 @@ end
 
 event :update_public_link, after: :update_read_rule, when: :local? do
   return if content.blank?
+
   if who_can(:read).include? Card::AnyoneID
     create_public_links
   else
@@ -21,6 +21,7 @@ private
 def create_public_links
   path = attachment.public_path
   return if File.exist? path
+
   FileUtils.mkdir_p File.dirname(path)
   File.symlink attachment.path, path unless File.symlink? path
   create_versions_public_links
@@ -29,6 +30,7 @@ end
 def create_versions_public_links
   attachment.versions.each_value do |version|
     next if File.symlink? version.public_path
+
     File.symlink version.path, version.public_path
   end
 end
@@ -36,5 +38,6 @@ end
 def remove_public_links
   symlink_dir = File.dirname attachment.public_path
   return unless Dir.exist? symlink_dir
+
   FileUtils.rm_rf symlink_dir
 end

data/set/abstract/attachment/paths.rb

@@ -25,6 +25,7 @@ def mod_dir new_mod=nil
   dir = Cardio::Mod.dirs.path(mod_name) || (mod_name.to_sym == :test && "test")
 
   raise Error, "can't find mod \"#{mod_name}\"" unless dir
+
   dir
 end
 

data/set/abstract/attachment/storage_type.rb

@@ -14,12 +14,9 @@ event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
 end
 
 event :validate_storage_type, :validate, on: :save do
-  unless known_storage_type? will_be_stored_as
-    errors.add :storage_type, tr(
-      :unknown_storage_type,
-      new_storage_type: @new_storage_type
-    )
-  end
+  return if known_storage_type? will_be_stored_as
+
+  errors.add :storage_type, unknown_storage_type(@new_storage_type)
 end
 
 def will_be_stored_as
@@ -64,8 +61,8 @@ def mod
 end
 
 def mod_from_content
-  if content =~ %r{^:[^/]+/([^.]+)}
-    Regexp.last_match(1) # current mod_file format
+  if (m = content.match %r{^:[^/]+/([^.]+)})
+    m[1] # current mod_file format
   else
     mod_from_deprecated_content
   end
@@ -73,8 +70,9 @@ end
 
 # old format is still used in card_changes
 def mod_from_deprecated_content
-  return if content =~ /^\~/
+  return if content.match?(/^~/)
   return unless (lines = content.split("\n")) && lines.size == 4
+
   lines.last
 end
 
@@ -93,15 +91,15 @@ def valid_storage_type_list
 end
 
 def invalid_storage_type! type
-  raise Card::Error, tr(:error_invalid_storage_type, type: type)
+  raise Card::Error, t(:carrierwave_error_invalid_storage_type, type: type)
 end
 
 def storage_type_from_content
   case content
-  when /^\(/           then :cloud
-  when %r{/^https?\:/} then :web
-  when /^~/            then :local
-  when /^\:/           then :coded
+  when /^\(/          then :cloud
+  when %r{/^https?:/} then :web
+  when /^~/           then :local
+  when /^:/           then :coded
   else
     if deprecated_mod_file?
       :coded
@@ -123,7 +121,7 @@ end
 
 def storage_type= value
   known_storage_type? value
-  if @action == :update #&& storage_type != value
+  if @action == :update # && storage_type != value
     # we cant update the storage type directly here
     # if we do then the uploader doesn't find the file we want to update
     @new_storage_type = value
@@ -133,19 +131,22 @@ def storage_type= value
 end
 
 def with_storage_options opts={}
-  old_values = {}
+  old_values = stash_and_set_storage_options opts
   validate_temporary_storage_type_change opts[:storage_type]
-  %i[storage_type mod bucket].each do |opt_name|
-    next unless opts[opt_name]
-    old_values[opt_name] = instance_variable_get "@#{opt_name}"
-    instance_variable_set "@#{opt_name}", opts[opt_name]
-    @temp_storage_type = true
-  end
+  @temp_storage_type = true
   yield
 ensure
   @temp_storage_type = false
-  old_values.each do |key, val|
-    instance_variable_set "@#{key}", val
+  old_values.each { |key, val| instance_variable_set "@#{key}", val }
+end
+
+def stash_and_set_storage_options opts
+  %i[storage_type mod bucket].each_with_object({}) do |opt_name, old_values|
+    next unless opts[opt_name]
+
+    old_values[opt_name] = instance_variable_get "@#{opt_name}"
+    instance_variable_set "@#{opt_name}", opts[opt_name]
+    old_values
   end
 end
 
@@ -153,14 +154,10 @@ def temporary_storage_type_change?
   @temp_storage_type
 end
 
-def validate_temporary_storage_type_change new_storage_type=nil
-  new_storage_type ||= @new_storage_type
-  return unless new_storage_type
-  unless known_storage_type? new_storage_type
-    raise Error, tr(:unknown_storage_type, new_storage_type: new_storage_type)
-  end
-
-  if new_storage_type == :coded && codename.blank?
+def validate_temporary_storage_type_change type=nil
+  return unless type ||= @new_storage_type
+  raise Error, unknown_storage_type(type) unless known_storage_type? type
+  if type == :coded && codename.blank?
     raise Error, "codename needed for storage type :coded"
   end
 end
@@ -168,3 +165,7 @@ end
 def known_storage_type? type=storage_type
   type.in? CarrierWave::FileCardUploader::STORAGE_TYPES
 end
+
+def unknown_storage_type type
+  t :carrierwave_unknown_storage_type, new_storage_type: type
+end

data/set/abstract/attachment/upload_cache.rb

@@ -27,6 +27,7 @@ end
 event :assign_attachment_on_create, :initialize,
       after: :assign_action, on: :create, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   upload_cache_card.selected_action_id = action.id
   upload_cache_card.select_file_revision
   assign_attachment upload_cache_card.attachment.file, action.comment
@@ -35,6 +36,7 @@ end
 event :assign_attachment_on_update, :initialize,
       after: :assign_action, on: :update, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   uploaded_file = with_selected_action_id(action.id) { attachment.file }
   assign_attachment uploaded_file, action.comment
 end
@@ -48,6 +50,7 @@ end
 event :delete_cached_upload_file_on_create, :integrate,
       on: :create, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   upload_cache_card.delete_files_for_action action
   action.delete
 end
@@ -61,6 +64,7 @@ end
 event :delete_cached_upload_file_on_update, :integrate,
       on: :update, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   delete_files_for_action action
   action.delete
 end

data/set/self/favicon.rb

@@ -6,6 +6,7 @@ format :html do
 
   view :link_tag, perms: :none do
     return unless (source = render :source, size: :small)
+
     tag :link, rel: "shortcut icon", href: source
   end
 

data/set/type/file.rb

@@ -9,8 +9,9 @@ module SelectedAction
 
   def last_content_action_id
     return super if temporary_storage_type_change?
+
     # find action id from content (saves lookups)
-    db_content.to_s.split(%r{[/\.]})[-2]
+    db_content.to_s.split(%r{[/.]})[-2]
   end
 end
 include SelectedAction
@@ -19,6 +20,7 @@ format do
   view :source do
     file = card.attachment
     return "" unless file.valid?
+
     contextualize_path file.url
   end
 
@@ -33,17 +35,26 @@ format do
   end
 
   def handle_source
-    source = _render_source
-    return "" if source.blank?
-    block_given? ? yield(source) : source
-  rescue => e
-    Rails.logger.info "Error with file source: #{e.message}"
-    tr :file_error
+    rescuing_file_source_error do
+      source = _render_source
+      return "" if source.blank?
+
+      block_given? ? yield(source) : source
+    end
   end
 
   def selected_version
     card.attachment
   end
+
+  private
+
+  def rescuing_file_source_error
+    yield
+  rescue StandardError => e
+    Rails.logger.info "Error with file source: #{e.message}"
+    t :carrierwave_file_error
+  end
 end
 
 format :file do
@@ -53,6 +64,7 @@ format :file do
     attachment_format = card.attachment_format(params[:format])
     return _render_not_found unless attachment_format
     return card.format(:html).render_core if card.remote_storage?
+
     set_response_headers
     args_for_send_file
   end
@@ -60,13 +72,14 @@ format :file do
   def args_for_send_file
     file = selected_version
     [file.path, { type: file.content_type,
-                  filename:  "#{card.name.safe_key}#{file.extension}",
+                  filename: "#{card.name.safe_key}#{file.extension}",
                   x_sendfile: true,
                   disposition: (params[:format] == "file" ? "attachment" : "inline") }]
   end
 
   def set_response_headers
     return unless params[:explicit_file] && (response = controller&.response)
+
     response.headers["Expires"] = 1.year.from_now.httpdate
     # currently using default "private", because proxy servers could block
     # needed permission checks
@@ -74,10 +87,14 @@ format :file do
   end
 end
 
+format :json do
+  view(:content) { render_core }
+end
+
 format :html do
   view :core do
     handle_source do |source|
-      "<a href=\"#{source}\">#{tr :download, title: title_in_context(voo.title)}</a>"
+      haml :core, source: source
     end
   end
 
@@ -111,6 +128,6 @@ format :html do
   end
 
   def preview_editor_delete_text
-    tr :delete
+    t :carrierwave_delete
   end
 end

data/set/type/file/core.haml

@@ -0,0 +1,2 @@
+%a{ href: source }<
+  = t :carrierwave_download, title: title_in_context(voo.title)

data/set/type/image.rb

@@ -23,8 +23,10 @@ format do
 
   view :source do
     return card.content if card.web?
+
     image = selected_version
     return "" unless image.valid?
+
     contextualize_path image.url
   end
 
@@ -37,10 +39,6 @@ format do
     end
   end
 
-  def handle_source
-    super
-  end
-
   def closed_size
     :icon
   end
@@ -70,11 +68,16 @@ format do
   end
 end
 
+format :json do
+  include File::JsonFormat
+end
+
 format :email_html do
   view :inline, cache: :never do
     handle_source do |source|
       return source unless (mail = inherit :active_mail) &&
                            ::File.exist?(path = selected_version.path)
+
       url = attach_image mail, path
       image_tag url
     end

data/set/type/image/html_views.rb

@@ -4,6 +4,7 @@ format :html do
   # core HTML image view.
   view :core do
     return card.attachment.read if card.svg?
+
     with_valid_source do |source|
       image_tag source, alt: card.name
     end
@@ -34,6 +35,7 @@ format :html do
 
   def preview
     return if card.new_card? && !card.preliminary_upload?
+
     wrap_with :div, class: "attachment-preview",
                     id: "#{card.attachment.filename}-preview" do
       _render_core size: :medium
@@ -55,12 +57,20 @@ format :html do
 
   def old_image action, hide_diff
     return if hide_diff || !action
-    return unless (last_change = card.last_change_on(:db_content, before: action))
-    card.with_selected_action_id last_change.card_action_id do
-      Card::Content::Diff.render_deleted_chunk _render_core
+
+    old_image_change action do |old_action_id|
+      card.with_selected_action_id old_action_id do
+        Card::Content::Diff.render_deleted_chunk _render_core
+      end
     end
   end
 
+  def old_image_change action
+    return unless (change = card.last_change_on(:db_content, before: action))
+
+    yield change.card_action_id
+  end
+
   def new_image action
     card.with_selected_action_id action.id do
       Card::Content::Diff.render_added_chunk _render_core

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.5
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 description: ''
 email:
 - info@decko.org
@@ -92,6 +92,7 @@ files:
 - config/core_initializers/carrierwave.rb
 - lib/carrier_wave/card_mount.rb
 - lib/carrier_wave/file_card_uploader.rb
+- lib/carrier_wave/file_card_uploader/path.rb
 - lib/carrier_wave/image_card_uploader.rb
 - set/abstract/attachment.rb
 - set/abstract/attachment/cloud.rb
@@ -107,14 +108,20 @@ files:
 - set/self/new_file.rb
 - set/self/new_image.rb
 - set/type/file.rb
+- set/type/file/core.haml
 - set/type/file/file_chooser.haml
 - set/type/file/preview_editor.haml
 - set/type/image.rb
 - set/type/image/html_views.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: carrierwave
 post_install_message:
 rdoc_options: []
@@ -131,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: File and Image handling