card-mod-carrierwave 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29840e46e626a7121a84faa9b4b0f9889694ab7653031bd9cf97ccb896d46263
-  data.tar.gz: 503d37c6471c6fd8d0e6cba3c94c65097663ab0854fc24861673c80f913e1e86
+  metadata.gz: 34b28c82c148d656ea2b868af80d713a79b0ae318cc3594daaeb0b174f9ad476
+  data.tar.gz: a8dea9684fae1880d58d26fb3a2731c3afa0a8ed5b40b115bac844d887ac22a4
 SHA512:
-  metadata.gz: 65f55c9a919ea38e364f5863030d35b5674569dab60454ee157c3e78c762afbc427b3e258246d8389714e00eb752bf8076b948e8a5c70b4d202a2dd63ff01695
-  data.tar.gz: 69c7e3184ca375b4342ad3a4f5dd2ae9f8654666e0e6cefded79f5b3c2823dfd8a074ad906acdb28b749f51413c49ebba315c7a790aa17907b1da063baf07791
+  metadata.gz: 0ac6214d839224cb946be3f23c12fa0a5291f9338b4124f31c8106dae432f3f1edd2cb02de9e4a405735e3c69181fd15dd4e872bc289a9c93d4321c2d86fc780
+  data.tar.gz: 0a0e99bfb0a5a9be113ce186683166ae880031fd15c2723ed00cce9f13eb8cea191ceead6155d3258fee5d3de171a71fdf41d6092248c15e1c3249a97e36dd23

data/lib/carrier_wave/file_card_uploader.rb

@@ -279,8 +279,7 @@ module CarrierWave
     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 +287,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 +310,9 @@ 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

data/set/abstract/attachment.rb

@@ -75,7 +75,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
 
@@ -95,18 +95,36 @@ def revision action, before_action=false
 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/type/image/html_views.rb

@@ -55,12 +55,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.1
 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-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 description: ''
 email:
 - info@decko.org