card-mod-carrierwave 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a2af21e5caf0c6c695e722cc3a97b27366a0efa2d52f5e13bb1722ec979731
-  data.tar.gz: cf3f344bd209ddf88b85b4b037660254ab8c82aea5cf0d0138c8f1fa31b40165
+  metadata.gz: af54c8d9b6dd92aa82b0c8c6c4bb628db93f587719f3f32d180186cdaea28b3d
+  data.tar.gz: fd615e28d1721b69180c89153088fab1649cda08faca0fc8c8ed82a42d612385
 SHA512:
-  metadata.gz: 259779a3dbf7d7bbe4106a9630f2afd8fdcee17bb2283f3f99504e533368d02f534fbd0269708f74dce01c9bc995587faebfc8c682ac7975683e6f29bfedc9ee
-  data.tar.gz: 71ad7c23e067986dcc1cc6f3f4301f2e87806dc83cab3763dc77658bc029ed570e75fd098cfe3d4418655228419e078dd878cc4050bdaf2fc4a61fec2d33241d
+  metadata.gz: 4feb890ba0bbaa2150544e44bbc09295e0cc5acd0c67a910af1fdc10d60bcbfcc24151ab433e09af5178f8a4ed07392b39a04c093e0784aa1679cddb1ab30594
+  data.tar.gz: 53ca6ac88541efd2e576661c20f2c4fff8b79cc11990e43b6a2d9872d001e1d5a1e9d4e471e3678997c0aa90a2b94f13455a8765b29a55136f6cb665b16d6ebc

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -88,28 +88,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.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.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -171,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
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: File and Image handling