card-mod-carrierwave 0.18.1 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73304194a2bb94ad8c34b94efbe6eb25fbc1be4980d47aaec3cb4754f38372b1
-  data.tar.gz: 94fc1681758c94e3d81342d64c788571ebfa3115efdd1b930fa96c50d41de7a3
+  metadata.gz: 41e00279cb3fb0dfffc3135050fe876cfa14488a82b772574540826c75334b76
+  data.tar.gz: 6946ea1509d63ad54e59aa385a4ce8119b523a50ebe7faf4074ec8677f186608
 SHA512:
-  metadata.gz: 164d1d2db881114ae6b29fe0aa85db12b4ebf1e1a0bac5eb12c7b5eee11f7e8727baea166cc7d856d894b333d16291dcff9d774e9e50e19152679878ca31cdeb
-  data.tar.gz: ace22385ed01cb5d8306d66bd26a3e78d1305d930814f2ce9da0d040935be57f73f95312d516789f988f796398e61b65e13ceb6261a9acba9418feaa7dba9bdd
+  metadata.gz: ed8168b06078138a17aa2a085c374154849d7f2935e89300d520ab63772ebe6c91f3420ad06a692f6d14ff445aa25c1b8d1fa691c1256244b70acb103d19a5fb
+  data.tar.gz: f28efee9f686a1d84f21ce6b372514f53d834fdf29dbdda6a3b2d9693dd1e3022ddd05d1eeaced8f5a2c8a9b09280d89212c415a83d7ce0b3a22d56a6cf5324e

data/data/transform/20250204175412_fix_compound_self_sets.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+
+class FixCompoundSelfSets < Cardio::Migration::Transform
+  def up
+    Card.where("codename is not null and name is null").each do |card|
+      card.include_set_modules
+      card.update_column :codename, nil
+      next unless card.respond_to? :attachment
+
+      card.update_column :db_content, card.attachment.db_content
+    end
+  end
+end

data/lib/carrier_wave/card_mount/helper.rb

@@ -0,0 +1,44 @@
+module CarrierWave
+  module CardMount
+    # helper methods for mounted cards
+    module Helper
+      def read_uploader *args
+        read_attribute(*args)
+      end
+
+      def write_uploader *args
+        write_attribute(*args)
+      end
+
+      def reload *_args
+        @_mounters = nil
+        super
+      end
+
+      def serializable_hash opts=nil
+        except = serializable_hash_config opts, :except
+        only = serializable_hash_config opts, :only
+
+        self.class.uploaders.each_with_object(super(opts)) 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
+        end
+      end
+
+      private
+
+      def serializable_hash_config opts, key
+        opts&.dig(key) && Array.wrap(opts[:key]).map(&:to_s)
+      end
+
+      def add_column_to_serializable_hash? column, only, except
+        if only
+          only.include? column
+        elsif except
+          !except.include? column
+        end
+      end
+    end
+  end
+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
       Card.uploaders ||= {}
@@ -21,6 +22,12 @@ module CarrierWave
       super
 
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        include CarrierWave::CardMount::Helper
+
+        def attachment
+          #{column}
+        end
+
         event :store_#{column}_event, :finalize, when: :store_#{column}_event? do
           store_#{column}!
         end
@@ -49,10 +56,6 @@ module CarrierWave
           !coded? || ENV["STORE_CODED_FILES"]
         end
 
-        def attachment
-          #{column}
-        end
-
         def store_attachment!
           set_specific.delete :#{column}
           store_#{column}!
@@ -62,15 +65,20 @@ module CarrierWave
           "#{column}".to_sym
         end
 
-        def read_uploader *args; read_attribute *args; end
-        def write_uploader *args; write_attribute *args; end
-
         def #{column}=(new_file)
-          return if new_file.blank?
+          return if new_file.blank? || identical_file?(new_file)
           self.selected_action_id = Time.now.to_i unless history?
           assign_file(new_file) { super }
         end
 
+        def identical_file? new_file
+          return false if new?
+
+          ::File.identical? #{column}.file.to_file, new_file
+        rescue StandardError
+          false
+        end
+
         def remote_#{column}_url=(url)
           assign_file(url) { super }
         end
@@ -111,24 +119,6 @@ module CarrierWave
         def #{column}_changed?
           @#{column}_changed
         end
-
-        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)
-
-          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
-        end
-
-        def reload(*)
-          @_mounters = nil
-          super
-        end
       RUBY
     end
   end

data/lib/carrier_wave/file_card_uploader/path.rb

@@ -1,8 +1,10 @@
+# extend core module from carrierwave gem
 module CarrierWave
   def self.tmp_path
     @tmp_path ||= Card.paths["tmp"].existent.first
   end
 
+  # custom uploader class for cards
   class FileCardUploader
     # path-related methods for uploader
     module Path
@@ -20,7 +22,7 @@ module CarrierWave
       end
 
       def cache_dir
-        "#{@model.files_base_dir}/cache"
+        "#{@model.files_base_dir 'tmp'}/cache"
       end
 
       # Carrierwave calls store_path without argument when it stores the file
@@ -41,7 +43,7 @@ module CarrierWave
       end
 
       def tmp_path
-        Dir.mkdir model.tmp_upload_dir unless Dir.exist? model.tmp_upload_dir
+        Dir.mkdir_p model.tmp_upload_dir
         File.join model.tmp_upload_dir, filename
       end
 

data/lib/carrier_wave/file_card_uploader.rb

@@ -1,3 +1,4 @@
+# extend the carrierwave gem modules/classes
 module CarrierWave
   # Takes care of the file upload for cards with attached files.
   # Most of the upload behaviour depends on the card itself.
@@ -235,6 +236,7 @@ module CarrierWave
     end
   end
 
+  # alterations to Carrierwave methods
   class SanitizedFile
     def content_type
       # the original content_type method doesn't seem to be very reliable
@@ -270,7 +272,7 @@ module CarrierWave
 
       # put version at the end of the filename
       def full_filename for_file
-        name = super(for_file)
+        name = super
         return unless name.present?
 
         parts = name.split "."

data/lib/carrier_wave/image_card_uploader.rb

@@ -42,12 +42,12 @@ module CarrierWave
     # end
 
     def identifier
-      full_filename(super())
+      full_filename(super)
     end
 
     # add 'original' if no version is given
     def full_filename for_file
-      name = super(for_file)
+      name = super
       if name.blank? || version_name
         name
       else

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
@@ -86,5 +87,5 @@ end
 
 # place for files if card doesn't have an id yet
 def tmp_upload_dir _action_id=nil
-  "#{files_base_dir}/#{upload_cache_card.id}"
+  "#{files_base_dir 'tmp'}/#{upload_cache_card.id}"
 end

data/set/abstract/attachment/coded.rb

@@ -6,7 +6,7 @@ end
 
 event :validate_coded_storage_type, :validate, on: :save, when: :coded? do
   storage_type_error :mod_argument_needed_to_save unless mod
-  storage_type_error :codename_needed_for_storage if codename.blank?
+  storage_type_error :codename_needed_for_storage unless coded_ok?
 end
 
 def mod= value
@@ -19,6 +19,10 @@ end
 
 private
 
+def coded_ok?
+  !codename_parts.find(&:blank?)
+end
+
 def uncode?
   (@explicit_storage_type != :coded) && !set_specific[:mod].present? && current.coded?
   # (@explicit_storage_type != :coded) && !mod && current.coded?
@@ -37,16 +41,23 @@ def mod_from_content
 end
 
 def mod_name_match cont
-  cont&.match %r{^:[^/]+/([^.]+)}
+  cont&.match %r{^:[:\w/+]+/([^./]+)\.}
 end
 
 # place for files of mod file cards
 def coded_dir new_mod=nil
-  dir = File.join mod_dir(new_mod), MOD_FILE_DIR, codename.to_s
+  dir_parts = [mod_dir(new_mod), MOD_FILE_DIR] + codename_parts
+  dir = File.join(*dir_parts)
   FileUtils.mkdir_p(dir) unless File.directory?(dir)
   dir
 end
 
+def codename_parts
+  return [codename.to_s] if name.simple?
+
+  @codename_parts ||= name.parts.map { |p| p.codename&.to_s }
+end
+
 def mod_dir new_mod=nil
   mod_name = new_mod || mod
   dir = Cardio::Mod.dirs.path(mod_name) || (mod_name.to_sym == :test && "test")

data/set/abstract/attachment/paths.rb

@@ -11,8 +11,8 @@ def upload_dir
   id ? "#{files_base_dir}/#{id}" : tmp_upload_dir
 end
 
-def files_base_dir
-  dir = bucket ? bucket_config[:subdirectory] : Card.paths["files"].existent.first
+def files_base_dir type="files"
+  dir = bucket ? bucket_config[:subdirectory] : Card.paths[type].existent.first
   dir || files_base_dir_configuration_error
 end
 
@@ -24,7 +24,7 @@ end
 # used in the identifier
 def file_dir
   if coded?
-    ":#{codename}"
+    codename_parts.map { |c| ":#{c}" }.join Name.joint
   elsif cloud?
     "(#{bucket})/#{file_id}"
   else

data/set/abstract/attachment.rb

@@ -12,10 +12,7 @@ end
 
 # we need a card id for the path so we have to update db_content when we have
 # an id
-event :correct_identifier, :finalize, on: :save, when: proc { |c| !c.web? } do
-  correct_id = attachment.db_content
-  return if db_content == correct_id
-
+event :correct_identifier, :finalize, on: :save, when: :incorrect_identifier? do
   update_column :db_content, attachment.db_content
   expire
 end
@@ -36,10 +33,21 @@ event :validate_file_exist, :validate, on: :create, skip: :allowed do
   end
 end
 
-event :write_identifier, after: :save_original_filename, when: proc { |c| !c.web? } do
+event :write_identifier, after: :save_original_filename, when: :write_identifier? do
   self.content = attachment.db_content
 end
 
+def incorrect_identifier?
+  return false if web?
+
+  correct_id = attachment.db_content
+  correct_id.present? && db_content != correct_id
+end
+
+def write_identifier?
+  !web?
+end
+
 def file_ready_to_save?
   attachment.file.present? &&
     !preliminary_upload? &&
@@ -99,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
@@ -112,7 +118,7 @@ def delete_files_for_action action
   end
 end
 
-def revision action, before_action=false
+def revision action, before_action: false
   return unless (result = super)
 
   result[:empty_ok] = true
@@ -127,6 +133,10 @@ def attachment_format ext
   end
 end
 
+def original_extension
+  @original_extension ||= attachment&.extension&.sub(/^\./, "")
+end
+
 def rescuing_extension_issues
   yield
 rescue StandardError => e
@@ -134,6 +144,12 @@ rescue StandardError => e
   nil
 end
 
+def confirm_original_extension ext
+  return unless ["file", original_extension].member? ext
+
+  original_extension
+end
+
 def detect_extension ext
   return unless (mime_types = MIME::Types[attachment.content_type])
 
@@ -143,13 +159,3 @@ 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/all/file_utils.rb

@@ -30,10 +30,10 @@ module ClassMethods
 
   def draft_actions_with_attachment
     Card::Action.find_by_sql(
-      "SELECT * FROM card_actions "\
-        "INNER JOIN cards ON card_actions.card_id = cards.id "\
-        "WHERE cards.type_id IN (#{Card::FileID}, #{Card::ImageID}) "\
-        "AND card_actions.draft = true"
+      "SELECT * FROM card_actions " \
+      "INNER JOIN cards ON card_actions.card_id = cards.id " \
+      "WHERE cards.type_id IN (#{Card::FileID}, #{Card::ImageID}) " \
+      "AND card_actions.draft = true"
     )
   end
 

data/set/self/favicon.rb

@@ -11,7 +11,7 @@ format :html do
   end
 
   def raw_help_text
-    "A favicon (or shortcut icon) is a small image used by browsers to help identify "\
-    "your website. [[http://www.decko.org/favicon|How to customize your favicon]]"
+    "A favicon (or shortcut icon) is a small image used by browsers to help identify " \
+      "your website. [[http://www.decko.org/favicon|How to customize your favicon]]"
   end
 end

data/set/type/file.rb

@@ -1,5 +1,6 @@
 attachment :file, uploader: CarrierWave::FileCardUploader
 
+# sheared method for action identification
 module SelectedAction
   def select_action_by_params params
     # skip action table lookups for current revision

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.1
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
 - Gerry Gleason
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.108.1
+        version: 1.109.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.108.1
+        version: 1.109.1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -88,28 +87,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 description: ''
 email:
 - info@decko.org
@@ -139,12 +138,13 @@ 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
+- data/transform/20250204175412_fix_compound_self_sets.rb
 - lib/card/mod/carrierwave.rb
 - lib/carrier_wave/card_mount.rb
+- lib/carrier_wave/card_mount/helper.rb
 - lib/carrier_wave/file_card_uploader.rb
 - lib/carrier_wave/file_card_uploader/path.rb
 - lib/carrier_wave/image_card_uploader.rb
@@ -180,7 +180,6 @@ metadata:
   documentation_url: http://docs.decko.org/
   card-mod: carrierwave
   card-mod-group: gem-defaults
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,15 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.8
 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);