card-mod-carrierwave 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9cccb0bf38f2b63fbae9b148388cb1744a0f9c09e9f707661c8337ff11b7b2
-  data.tar.gz: 7210e5767e0d36588635ff67dfd2c72a420d1e0f6ed83fcc52dbff49e4c88288
+  metadata.gz: 7898e373e4686e9f1d57f539c57122705c42f01878f47dec649cb8c64085e800
+  data.tar.gz: 47005c58bad47efb646dffacba2b1fb5bd6052c8a53ec8332f0a4f9dfe4042f3
 SHA512:
-  metadata.gz: 0b14c9478d50ac2c82b23f257f4814074c7956077c6a3ae8e4abe3ee6fc03458b9acd3674de91d6eae7ef45ccba708c2d0c24e5d563e2d337da8c785604ab83e
-  data.tar.gz: f0ad9f38f2f2cb891da667e5f80d0b7f78a0bc1e18a3f93c55d46e1dfcdca2550b01f7b454ec9143c69cad4bcf1f7d1cae21bb0838cdf8008c919de259f8f5b2
+  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

@@ -58,6 +58,7 @@ end
 
 # at some point uploaded files of canceled file card creation
 # should be deleted. We do this when ever an new file is created.
+# FIXME: move to cron job
 event :clear_draft_files, :integrate_with_delay, priority: 100, on: :create do
   Card.delete_tmp_files_of_cached_uploads
 end
@@ -85,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/abstract/attachment.rb

@@ -107,8 +107,6 @@ def duplicate?
     (old = attachment.file) &&
     (new = set_specific[attachment_name]) &&
     old.size == new.size
-  # rescue Card::Error
-  #   false
 end
 
 def delete_files_for_action action

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.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.0
+        version: 1.110.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.0
+        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.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        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.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 description: ''
 email:
 - info@decko.org
@@ -138,7 +138,6 @@ files:
 - data/files/logo.svg
 - data/files/logo/image-original.svg
 - data/files/mao2.jpg
-- data/files/mod_carrierwave/script/asset_output/file.js
 - data/files/rails.gif
 - data/real.yml
 - data/transform/20230130141025_move_favicon.rb
@@ -195,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: []

data/data/files/mod_carrierwave/script/asset_output/file.js

@@ -1,2 +0,0 @@
-// upload.js.coffee
-(function(){var e;decko.editors.init[".file-upload"]=function(){return decko.upload_file(this)},$.extend(decko,{upload_file:function(e){var t;return $(e).on("fileuploadsubmit",function(e,t){var r,i,a;return i=(r=$(this)).siblings(".attachment_card_name:first").attr("name"),a=r.siblings("#attachment_type_id").val(),t.formData={"card[type_id]":a,attachment_upload:i}}),t=$(e).closest("form").attr("action").indexOf("update")>-1?"card/update/"+$(e).siblings("#file_card_name").val():"card/create",$(e).fileupload({url:decko.path(t),dataType:"html",done:decko.doneFile,add:decko.chooseFile,progressall:decko.progressallFile})},chooseFile:function(e,t){var r;return t.form.find("button[type=submit]").attr("disabled",!0),r=$(this).closest(".card-editor"),$("#progress").show(),r.append('<input type="hidden" class="extra_upload_param" value="true" name="attachment_upload">'),r.append('<input type="hidden" class="extra_upload_param" value="preview_editor" name="view">'),t.submit(),r.find(".choose-file").hide(),r.find(".extra_upload_param").remove()},progressallFile:function(e,t){var r;return r=parseInt(t.loaded/t.total*100,10),$("#progress .progress-bar").css("width",r+"%")},doneFile:function(e,t){return $(this).closest(".card-editor").find(".chosen-file").replaceWith(t.result),t.form.find("button[type=submit]").attr("disabled",!1)}}),$(window).ready(function(){return $("body").on("click",".cancel-upload",function(){var e;return(e=$(this).closest(".card-editor")).find(".choose-file").show(),e.find(".chosen-file").empty(),e.find(".progress").show(),e.find("#progress .progress-bar").css("width","0%"),e.find("#progress").hide()}),$("body").on("submit","form",function(){return e(this,!0)}),$("body").on("ajax:complete","form",function(){return e(this,!1)})}),e=function(e,t){var r;if((r=$(e).find(".file-upload[type=file]"))[0])return r.prop("disabled",t)}}).call(this);