card-mod-carrierwave 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91d51960354436b85df108967757650bdd9713965eedd25f7f7e03092e2ae58
-  data.tar.gz: aa239da9035dcb91b615dcd634981c22a8b061630f10f394e6776ff291b7ecc8
+  metadata.gz: af54c8d9b6dd92aa82b0c8c6c4bb628db93f587719f3f32d180186cdaea28b3d
+  data.tar.gz: fd615e28d1721b69180c89153088fab1649cda08faca0fc8c8ed82a42d612385
 SHA512:
-  metadata.gz: 6d7fbddc2d23f057e739048afe54aa1793b3a6ee6cef889ff84978838b3bc55b1bd5b225654491c6dc85b14ab9fd75d56c3e94eceae1143fc9a375d8c5600705
-  data.tar.gz: 7b7316b9ff90b00a3248d9bad5ca535509137bb44083465a5236d415d8fb65997408fe8d07e6223000b218aa0aebdbccfc25074509f314313401c372204f1585
+  metadata.gz: 4feb890ba0bbaa2150544e44bbc09295e0cc5acd0c67a910af1fdc10d60bcbfcc24151ab433e09af5178f8a4ed07392b39a04c093e0784aa1679cddb1ab30594
+  data.tar.gz: 53ca6ac88541efd2e576661c20f2c4fff8b79cc11990e43b6a2d9872d001e1d5a1e9d4e471e3678997c0aa90a2b94f13455a8765b29a55136f6cb665b16d6ebc

data/config/admin.yml

@@ -0,0 +1,4 @@
+cardtypes:
+  upload:
+    - file
+    - image

data/lib/carrier_wave/card_mount.rb

@@ -1,7 +1,10 @@
 require "carrierwave"
 
 module CarrierWave
-  # adapt carrierwave mount to cards
+  # Adapt carrierwave mount to cards.
+  # We translate the active record hooks in
+  # https://github.com/carrierwaveuploader/carrierwave/blob/v3.0.5/lib/carrierwave/orm/activerecord.rb
+  # to card events.
   module CardMount
     include CarrierWave::Mount
 
@@ -18,14 +21,12 @@ module CarrierWave
       super
 
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        event :store_#{column}_event, :finalize,
-              on: :save, when: :store_#{column}_event? do
+        event :store_#{column}_event, :finalize, when: :store_#{column}_event? do
           store_#{column}!
         end
 
         # remove files only if card has no history
-        event :remove_#{column}_event, :finalize,
-              on: :delete, when: proc { |c| !c.history? } do
+        event :remove_#{column}_event, :finalize, on: :delete, when: :no_history? do
           remove_#{column}!
         end
 
@@ -33,13 +34,13 @@ module CarrierWave
           mark_remove_#{column}_false
         end
 
-        event :store_previous_changes_for_#{column}_event, :store,
-              on: :update, when: proc { |c| !c.history? } do
-          store_previous_changes_for_#{column}
+        event :reset_previous_changes_for_#{column}_event, :finalize,
+              when: :no_history? do
+          reset_previous_changes_for_#{column}
         end
 
-        event :remove_previously_stored_#{column}_event, :finalize,
-              on: :update, when: proc { |c| !c.history?} do
+        event :remove_previously_stored_#{column}_event, :finalize, on: :update,
+              when: :no_history? do
           remove_previously_stored_#{column}
         end
 
@@ -61,13 +62,8 @@ module CarrierWave
           "#{column}".to_sym
         end
 
-        def read_uploader *args
-          read_attribute *args
-        end
-
-        def write_uploader *args
-          write_attribute *args
-        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?
@@ -128,7 +124,20 @@ module CarrierWave
             end
           end
         end
+
+        def reload(*)
+          @_mounters = nil
+          super
+        end
       RUBY
     end
   end
+
+  # The temporary identifiers from Carrierwave's mounters kill CardMount;
+  # We don't seem to need them.
+  class Mounter
+    def write_temporary_identifier
+      # noop
+    end
+  end
 end

data/lib/carrier_wave/file_card_uploader.rb

@@ -175,6 +175,10 @@ module CarrierWave
       end
     end
 
+    def temporary_identifier
+      db_content
+    end
+
     # @option opts [Symbol] :absolute - return absolute url
     def url opts={}
       if model.cloud?
@@ -234,13 +238,26 @@ module CarrierWave
   class SanitizedFile
     def content_type
       # the original content_type method doesn't seem to be very reliable
-      # It uses mime_magic_content_type  - which returns invalid/invalid for css files
-      # that start with a comment - as the second option.  (we switch the order and
-      # use it as the third option)
+      # It uses declared_content_type  - which sometimes returns "text/plain" for asset
+      # files for unknown reasons.  (we switch the order and use it as the third option)
       @content_type ||=
-        existing_content_type ||
-        mini_mime_content_type ||
-        mime_magic_content_type
+        guessed_safe_content_type ||
+        identified_content_type ||
+        declared_content_type ||
+        Marcel::MimeType::BINARY
+    end
+
+    def guessed_safe_content_type
+      # overrides the default method which was returning "application/javascript" instead
+      # of "text/javascript" for our .js files.
+      return unless path
+
+      type = Marcel::Magic.by_path(original_filename).to_s
+      if type.start_with? "text/", "application/json'"
+        type
+      elsif type == "application/javascript"
+        "text/javascript"
+      end
     end
   end
 
@@ -254,6 +271,8 @@ module CarrierWave
       # put version at the end of the filename
       def full_filename for_file
         name = super(for_file)
+        return unless name.present?
+
         parts = name.split "."
         basename = [parts.shift, version_name].compact.join("-")
         "#{basename}.#{parts.join('.')}"

data/lib/carrier_wave/image_card_uploader.rb

@@ -3,7 +3,7 @@ require "mini_magick"
 module CarrierWave
   # Adds image specific version handling to {FileCardUploader}.
   # The ImageCardUploader creates five versions of different sizes when it
-  # uploads an imagae file:
+  # uploads an image file:
   # icon (16x16), small (75x75), medium (200X200), large (500x500) and
   # the original size.
   class ImageCardUploader < FileCardUploader
@@ -48,7 +48,7 @@ module CarrierWave
     # add 'original' if no version is given
     def full_filename for_file
       name = super(for_file)
-      if version_name
+      if name.blank? || version_name
         name
       else
         parts = name.split "."

data/set/abstract/attachment/coded.rb

@@ -29,13 +29,17 @@ def storage_type_error error_name
 end
 
 def mod_from_content
-  if (m = content&.match %r{^:[^/]+/([^.]+)})
+  if (m = mod_name_match content)
     m[1] # current mod_file format
   else
     mod_from_deprecated_content
   end
 end
 
+def mod_name_match cont
+  cont&.match %r{^:[^/]+/([^.]+)}
+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

data/set/abstract/attachment.rb

@@ -12,7 +12,10 @@ 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: :create, when: proc { |c| !c.web? } do
+event :correct_identifier, :finalize, on: :save, when: proc { |c| !c.web? } do
+  correct_id = attachment.db_content
+  return if db_content == correct_id
+
   update_column :db_content, attachment.db_content
   expire
 end
@@ -20,7 +23,7 @@ end
 event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_to_save? do
   return unless @current_action
 
-  @current_action.update! comment: original_filename
+  @current_action.comment = original_filename
 end
 
 event :validate_file_exist, :validate, on: :create, skip: :allowed do
@@ -101,10 +104,10 @@ def duplicate?
 end
 
 def delete_files_for_action action
-  with_selected_action_id(action.id) do
+  with_selected_action_id action.id do
     attachment.file.delete
     attachment.versions.each_value do |version|
-      version.file.delete
+      version.file&.delete
     end
   end
 end

data/set/type/file.rb

@@ -9,15 +9,15 @@ module SelectedAction
 
   def last_content_action_id
     # find action id from content (saves lookups)
-    db_content.to_s.split(%r{[/.]})[-2]
+    aid = db_content.to_s.split(%r{[/.]})[-2]
+    aid.number? ? aid.to_i : nil
   end
 end
 include SelectedAction
 
 format do
   view :source do
-    file = card.attachment
-    file.valid? ? contextualize_path(file.url) : ""
+    source
   end
 
   view :core do
@@ -32,17 +32,22 @@ format do
 
   def handle_source
     rescuing_file_source_error do
-      source = _render_source
-      if source.blank?
+      src = source
+      if src.blank?
         ""
       elsif block_given?
-        yield source
+        yield src
       else
-        source
+        src
       end
     end
   end
 
+  def source
+    file = card.attachment
+    file.valid? ? contextualize_path(file.url) : ""
+  end
+
   def selected_version
     card.attachment
   end
@@ -69,12 +74,24 @@ format :file do
     args_for_send_file
   end
 
+  private
+
   def args_for_send_file
     file = selected_version
     [file.path, { type: file.content_type,
                   filename: "#{card.name.safe_key}#{file.extension}",
                   x_sendfile: true,
-                  disposition: (params[:format] == "file" ? "attachment" : "inline") }]
+                  disposition: disposition }]
+  end
+
+  def disposition
+    if params[:disposition]
+      params[:disposition]
+    elsif params[:format] == "file"
+      "attachment"
+    else
+      "inline"
+    end
   end
 
   def set_response_headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,84 +18,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.12'
 - !ruby/object:Gem::Dependency
   name: ssrf_filter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: marcel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: card-mod-history
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -107,6 +121,7 @@ files:
 - README.md
 - assets/script/upload.js.coffee
 - assets/style/file.scss
+- config/admin.yml
 - config/early/carrierwave.rb
 - config/early/mini_magick.rb
 - config/locales/de.yml
@@ -156,7 +171,7 @@ files:
 - set/type/image/html_views.rb
 homepage: https://decko.org
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   source_code_uri: https://github.com/decko-commons/decko
   homepage_uri: https://decko.org
@@ -173,14 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: File and Image handling