card-mod-carrierwave 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c72b8dff10b57cf9069cf660f32d736cf67df866ea979c6518c46b1285afcb
-  data.tar.gz: f4442c5099e32a4fbfae63a44fe9e9a172ae11b26509f7d0a56a21a5f1f44a42
+  metadata.gz: 4ac2c925e781cea75ee15877146a557b3f2a8ea1fdd620ed6af05b0fe076ee36
+  data.tar.gz: 91e44c37320cb9b5e9111a7dfe6fc4fb62aa626fb03ffcd77ae3d6cc9e1f6080
 SHA512:
-  metadata.gz: 38e990a4f6232af77d5204a1f4799b08f67e7d0948b5c64211a0eeaeb6900c1b431abac5e519f8d5e567f98c1c7dda174fddc037c6b67eb683f57708eaa541cd
-  data.tar.gz: b4064e332a60251c6bcce1d39a7cbbde7152f7e4109de401fbe643cfcbff4bff0561dcaa53da6c30356299a56b73eccaa071fcdfb6fd40e980a212a0e6be5b4d
+  metadata.gz: 71e94c5ddadbbfde27a7d6cd4b275ec5efcdae771efec9a55b02a5242f965e5c6a5c6bd3770cef9da6f7f8fd1b748ac750a27f5126bc38e6fba2a15b891416f4
+  data.tar.gz: e98f8c34631c7405af3a499844ddb8c8d9d294dddc8a8d66f0eefea839ec599280ee39bcd23f5260c79c644b7bd7d4837d7eb9d90cc1fc85aa67768defcbe8af

data/init/early/mini_magick.rb

@@ -0,0 +1,4 @@
+require "mini_magick"
+
+# This call fails if ImageMagick isn't installed (common installation problem)
+MiniMagick.cli

data/lib/carrier_wave/card_mount.rb

@@ -29,8 +29,7 @@ module CarrierWave
           remove_#{column}!
         end
 
-        event :mark_remove_#{column}_false_event, :finalize,
-              on: :update do
+        event :mark_remove_#{column}_false_event, :finalize, on: :update do
           mark_remove_#{column}_false
         end
 
@@ -116,21 +115,17 @@ module CarrierWave
           @#{column}_changed
         end
 
-        def serializable_hash(options=nil)
-          hash = {}
+        def serializable_hash(opts=nil)
+          except = opts&.dig(:except) && Array.wrap(opts[:except]).map(&:to_s)
+          only = opts&.dig(:only) && Array.wrap(opts[:only]).map(&:to_s)
 
-          except = options && options[:except] &&
-                   Array.wrap(options[:except]).map(&:to_s)
-          only   = options && options[:only]   &&
-                   Array.wrap(options[:only]).map(&:to_s)
-
-          self.class.uploaders.each do |column, uploader|
-            if (!only && !except) || (only && only.include?(column.to_s)) ||
+          self.class.uploaders.each_with_object(super(opts)) do |(column, uploader), hash|
+            if (!only && !except) ||
+               (only && only.include?(column.to_s)) ||
                (!only && except && !except.include?(column.to_s))
               hash[column.to_s] = _mounter(column).uploader.serializable_hash
             end
           end
-          super(options).merge(hash)
         end
       RUBY
     end

data/set/self/admin.rb

@@ -1,23 +1,22 @@
-add_to_basket(
-  :tasks,
-  name: :update_file_storage_locations,
-  execute_policy: -> { Card.update_all_storage_locations },
-  stats: {
-    title: "cards with attachment",
-    count: -> { Card.count_cards_with_attachment }
-    # link_text: "update storage locations",
-    # task: "update_file_storage_locations"
+basket[:tasks] += [
+  {
+    name: :update_file_storage_locations,
+    execute_policy: -> { Card.update_all_storage_locations },
+    stats: {
+      title: "cards with attachment",
+      count: -> { Card.count_cards_with_attachment }
+      # link_text: "update storage locations",
+      # task: "update_file_storage_locations"
+    }
+  },
+  {
+    name: :delete_upload_tmp_files,
+    execute_policy: -> { Card.delete_tmp_files_of_cached_uploads },
+    stats: {
+      title: "tmp files of canceled uploads",
+      count: -> { ::Card.draft_actions_with_attachment },
+      link_text: "delete tmp files",
+      task: "delete_tmp_files_of_cached_uploads"
+    }
   }
-)
-
-add_to_basket(
-  :tasks,
-  name: :delete_upload_tmp_files,
-  execute_policy: -> { Card.delete_tmp_files_of_cached_uploads },
-  stats: {
-    title: "tmp files of canceled uploads",
-    count: -> { ::Card.draft_actions_with_attachment },
-    link_text: "delete tmp files",
-    task: "delete_tmp_files_of_cached_uploads"
-  }
-)
+]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.103.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.103.3
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 description: ''
 email:
 - info@decko.org
@@ -90,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - init/early/carrierwave.rb
+- init/early/mini_magick.rb
 - lib/carrier_wave/card_mount.rb
 - lib/carrier_wave/file_card_uploader.rb
 - lib/carrier_wave/file_card_uploader/path.rb