card-mod-carrierwave 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41e00279cb3fb0dfffc3135050fe876cfa14488a82b772574540826c75334b76
-  data.tar.gz: 6946ea1509d63ad54e59aa385a4ce8119b523a50ebe7faf4074ec8677f186608
+  metadata.gz: 7898e373e4686e9f1d57f539c57122705c42f01878f47dec649cb8c64085e800
+  data.tar.gz: 47005c58bad47efb646dffacba2b1fb5bd6052c8a53ec8332f0a4f9dfe4042f3
 SHA512:
-  metadata.gz: ed8168b06078138a17aa2a085c374154849d7f2935e89300d520ab63772ebe6c91f3420ad06a692f6d14ff445aa25c1b8d1fa691c1256244b70acb103d19a5fb
-  data.tar.gz: f28efee9f686a1d84f21ce6b372514f53d834fdf29dbdda6a3b2d9693dd1e3022ddd05d1eeaced8f5a2c8a9b09280d89212c415a83d7ce0b3a22d56a6cf5324e
+  metadata.gz: 40222995ad5c758838effcce2639418fe1f751fca3fb0f1eeb7a764b4c6c2e4bf0b2461a698bb110436c30ef3bb248cdc6d24232e834b41d6c52408397a7fe5d
+  data.tar.gz: d32368f0966002e2eead792e1f14082c7ff9c3f5b97fe01330e49bb22717e588c32e485e702293ae26b10268c4445a0f654173c192ef28b5c7afde8673bdfd99

data/lib/carrier_wave/card_mount/helper.rb

@@ -2,12 +2,12 @@ module CarrierWave
   module CardMount
     # helper methods for mounted cards
     module Helper
-      def read_uploader *args
-        read_attribute(*args)
+      def read_uploader(*)
+        read_attribute(*)
       end
 
-      def write_uploader *args
-        write_attribute(*args)
+      def write_uploader(*)
+        write_attribute(*)
       end
 
       def reload *_args
@@ -19,7 +19,7 @@ module CarrierWave
         except = serializable_hash_config opts, :except
         only = serializable_hash_config opts, :only
 
-        self.class.uploaders.each_with_object(super(opts)) do |(column, _uploader), hash|
+        self.class.uploaders.each_with_object(super) do |(column, _uploader), hash|
           if add_column_to_serializable_hash? column.to_s, only, except
             hash[column.to_s] = _mounter(column).uploader.serializable_hash
           end

data/lib/carrier_wave/card_mount.rb

@@ -7,6 +7,7 @@ module CarrierWave
   # to card events.
   module CardMount
     include CarrierWave::Mount
+
     # Helper # load helper module so it's available to mounted cards
 
     def uploaders
@@ -17,7 +18,7 @@ module CarrierWave
       Card.uploader_options ||= {}
     end
 
-    def mount_uploader column, uploader=nil, options={}, &block
+    def mount_uploader(column, uploader=nil, options={}, &)
       options[:mount_on] ||= :db_content
       super
 

data/lib/carrier_wave/file_card_uploader/path.rb

@@ -22,7 +22,7 @@ module CarrierWave
       end
 
       def cache_dir
-        "#{@model.files_base_dir 'tmp'}/cache"
+        "#{@model.files_base_dir 'tmp'}/files"
       end
 
       # Carrierwave calls store_path without argument when it stores the file

data/set/abstract/attachment/00_upload_cache.rb

@@ -86,6 +86,6 @@ def save_preliminary_upload?
 end
 
 # place for files if card doesn't have an id yet
-def tmp_upload_dir _action_id=nil
-  "#{files_base_dir 'tmp'}/#{upload_cache_card.id}"
+def tmp_upload_dir
+  "#{files_base_dir 'tmp'}/files/#{upload_cache_card.id}"
 end

data/set/abstract/attachment/cloud.rb

@@ -100,7 +100,7 @@ end
 
 def replace_with_env_variable config, option, prefix=nil
   env_key = [prefix, option].compact.join("_").upcase
-  new_value = ENV["#{bucket.to_s.upcase}_#{env_key}"] || ENV[env_key]
+  new_value = ENV["#{bucket.to_s.upcase}_#{env_key}"] || ENV.fetch(env_key, nil)
   config[option] = new_value if new_value
 end
 

data/set/self/new_file.rb

@@ -1,3 +1,7 @@
+def upload_dir
+  tmp_upload_dir
+end
+
 format :html do
   view :source, cache: :never do
     super()

data/set/self/new_image.rb

@@ -1,3 +1,7 @@
+def upload_dir
+  tmp_upload_dir
+end
+
 format :html do
   view :source, cache: :never do
     super()

data/set/type/image.rb

@@ -12,6 +12,7 @@ end
 
 format do
   include File::Format
+
   delegate :svg?, to: :card
 
   view :one_line_content do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.1
+        version: 1.110.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.1
+        version: 1.110.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -87,28 +87,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 description: ''
 email:
 - info@decko.org
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.7.2
 specification_version: 4
 summary: File and Image handling
 test_files: []