card-mod-carrierwave 0.12.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6f61fadc7f61e0ae8eff9484b223c266af78bd06c8d2d54edbcd4bbb337b43
-  data.tar.gz: 818a78abc7e061f4bd859f4f011a74c5934a55acf81795b83b893b0885192d33
+  metadata.gz: 4ac2c925e781cea75ee15877146a557b3f2a8ea1fdd620ed6af05b0fe076ee36
+  data.tar.gz: 91e44c37320cb9b5e9111a7dfe6fc4fb62aa626fb03ffcd77ae3d6cc9e1f6080
 SHA512:
-  metadata.gz: 9049446ded4dc6b6f24c7b52675b41ffd1f3ca83c9d5f9c5eb7b0fbee2c8171f03971d2a80369c238ebf6023a1688421e35cb976690463706c36dd044439b4cb
-  data.tar.gz: e9d38774361ce5f10eeaed09d2973c660afe27defb196fc31e08e610fac62048994e39414f2b256bca3e83c217aee6679d7ca37d44c2ff52f75df19d9524ae1d
+  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/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  carrierwave_add_item: Add %{attachment_name}...
+  carrierwave_codename_needed_for_storage: codename needed for storage type coded
+  carrierwave_delete: Delete
+  carrierwave_download: Download %{title}
+  carrierwave_error_invalid_storage_type: "%{type} is not a valid file storage option"
+  carrierwave_file_error: File Error
+  carrierwave_is_missing: is missing
+  carrierwave_mod_argument_needed_to_save: mod argument needed to save card as coded
+  carrierwave_moving_files_is_not_supported: moving files from cloud elsewhere is not supported
+  carrierwave_replace_item: Replace %{attachment_name}...
+  carrierwave_unknown_storage_type: unknown storage type %{new_storage_type}
+  carrierwave_url_is_missing: url is missing

data/set/abstract/attachment/paths.rb

@@ -39,7 +39,7 @@ def files_base_dir_configuration_error
         "missing directory for file cache (default is `files` in deck root)"
 end
 
-# used in the indentifier
+# used in the identifier
 def file_dir
   if coded?
     ":#{codename}"

data/set/abstract/attachment/storage_type.rb

@@ -1,4 +1,4 @@
-attr_writer :bucket, :storage_type
+attr_writer :bucket, :new_storage_type
 
 event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
   # carrierwave stores file if @cache_id is not nil

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.12.0
+  version: 0.13.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 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.102.0
+        version: 1.103.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        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.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 description: ''
 email:
 - info@decko.org
@@ -89,11 +89,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- config/core_initializers/carrierwave.rb
+- 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
 - lib/carrier_wave/image_card_uploader.rb
+- locales/en.yml
 - set/abstract/attachment.rb
 - set/abstract/attachment/cloud.rb
 - set/abstract/attachment/coded.rb
@@ -138,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: File and Image handling