active_shrine 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: febb0b3a70dd46f389f6c152b835d5119429221993922c1ba1bc7029468e1cb7
-  data.tar.gz: bec1e1fba9f38d806032782af7ac0137819345c6ef72f63eee86b9786c7e5bf5
+  metadata.gz: 995a4b8dce06a3080e166a8953c6fc3af4b6df04bdfc68a7e291b9a106990f4f
+  data.tar.gz: 857c7b1fbe6976f22c1bb0d20e95173117c29d20c36298fbbe13e9189e125c97
 SHA512:
-  metadata.gz: 4afaf0a2dca9474a4722168fed7da28568c59ef82ed227b203b1846e14fca0fa851c103af298a5c2daa8417577250f82ba0d8fbca9390f06779a3e63d8cb4b95
-  data.tar.gz: e206891de1e623b33883c6a95679d477040454c4e88b0fdc98bef1f0ac8abc96d06ffb4c2b8150a49b524abd86c06a28459981177733868742fbcc900a171a46
+  metadata.gz: 332f75c6d900ba40f7304fecd0f9d8220ebb2784098824be24d904ab34f875eac625ead20ace853922159c632a66a6281246d3549ba8a6a319b6e50dc32e87df
+  data.tar.gz: 8ffd4133f22f296d0bb18b26f05e4546d2aeee0710e456ea3dcf78d42c0f693e3576c2529fd5ab9fb686c5e30c8c79ea7e37186da2e2a6dfbfecd5680712eef1

data/lib/active_shrine/attached/changes/create_one.rb

@@ -23,6 +23,14 @@ module ActiveShrine
         end
 
         def save
+          unless attachment.valid?
+            attachment.errors.each do |error|
+              record.errors.add(name, error.message)
+            end
+            
+            raise ActiveRecord::RecordInvalid.new(record)
+          end
+
           record.public_send(:"#{name}_attachment=", attachment)
         end
 

data/lib/active_shrine/attachment.rb

@@ -36,75 +36,77 @@ module ActiveShrine
 
     before_save :maybe_store_record
 
-    def url
-      file_url
-    end
-
-    def content_type
-      file.mime_type
-    end
-
-    def filename
-      file.original_filename
-    end
+    module AttachmentMethods
+      def url
+        file_url
+      end
 
-    def extension
-      file.extension
-    end
+      def content_type
+        file.mime_type
+      end
 
-    def representable?
-      %r{image/.*}.match? content_type
-    end
+      def filename
+        file.original_filename
+      end
 
-    def signed_id
-      # add the id to ensure uniqueness
-      value = ({id:, file: file.to_json} if file.present?) || {}
-      Rails.application.message_verifier(:active_shrine_attachment).generate value
-    end
+      def extension
+        file.extension
+      end
 
-    def file=(value)
-      # It is the same file. we are good to go.
-      return if value == signed_id
-
-      if value.is_a?(String)
-        # it is an already uploaded file. either
-        # - via direct upload so the form is sending us a json hash to set
-        # - or was set because a previous submission failed, so the form is sending us the signed_id
-        begin
-          # attempt to parse as a json hash
-          value = JSON.parse value
-        rescue JSON::ParserError
-          # this is not a valid json hash, let's check if it is a valid signed_id
-          unsigned = Rails.application.message_verifier(:active_shrine_attachment).verify value
-          value = JSON.parse unsigned["file"]
-        end
+      def representable?
+        %r{image/.*}.match? content_type
       end
 
-      super(value)
-    rescue ActiveSupport::MessageVerifier::InvalidSignature
-      errors.add(:file, "is invalid")
-    end
+      def signed_id
+        # add the id to ensure uniqueness
+        value = ({id:, file: file.to_json} if file.present?) || {}
+        Rails.application.message_verifier(:active_shrine_attachment).generate value
+      end
 
-    def purge
-      file_attacher.destroy_block { destroy } if file_attacher.respond_to?(:destroy_block)
-      destroy
-    end
+      def file=(value)
+        # It is the same file. we are good to go.
+        return if value == signed_id
+
+        if value.is_a?(String)
+          # it is an already uploaded file. either
+          # - via direct upload so the form is sending us a json hash to set
+          # - or was set because a previous submission failed, so the form is sending us the signed_id
+          begin
+            # attempt to parse as a json hash
+            value = JSON.parse value
+          rescue JSON::ParserError
+            # this is not a valid json hash, let's check if it is a valid signed_id
+            unsigned = Rails.application.message_verifier(:active_shrine_attachment).verify value
+            value = JSON.parse unsigned["file"]
+          end
+        end
 
-    def purge_later
-      file_attacher.destroy_background
-      file_attacher.instance_variable_set :@file, nil # prevent shrine from attempting to destroy the file again
-      destroy
-    rescue NoMethodError
-      raise NotImplementedError, ("You need to enable Shrine backgrounding to use purge_later: " \
-                                  "https://shrinerb.com/docs/plugins/backgrounding")
-    end
+        super(value)
+      rescue ActiveSupport::MessageVerifier::InvalidSignature
+        errors.add(:file, "is invalid")
+      end
 
-    private
+      def purge
+        file_attacher.destroy_block { destroy } if file_attacher.respond_to?(:destroy_block)
+        destroy
+      end
 
-    def maybe_store_record
-      return unless record.present?
+      def purge_later
+        file_attacher.destroy_background
+        file_attacher.instance_variable_set :@file, nil # prevent shrine from attempting to destroy the file again
+        destroy
+      rescue NoMethodError
+        raise NotImplementedError, ("You need to enable Shrine backgrounding to use purge_later: " \
+                                    "https://shrinerb.com/docs/plugins/backgrounding")
+      end
 
-      metadata.merge! record_type:, record_id:
+      private
+  
+      def maybe_store_record
+        return unless record.present?
+  
+        metadata.merge! record_type:, record_id:
+      end
     end
   end
 end

data/lib/active_shrine/model.rb

@@ -48,6 +48,7 @@ module ActiveShrine
           # Dynamically create a new class that inherits from ActiveShrine::Attachment
           Class.new(::ActiveShrine::Attachment) do
             include uploader::Attachment(:file)
+            include ::ActiveShrine::Attachment::AttachmentMethods
           end.tap do |klass|
             # Define the class in the ActiveShrine namespace
             ActiveShrine.const_set(:"#{uploader}Attachment", klass)
@@ -139,9 +140,6 @@ module ActiveShrine
 
         after_save do
           shrine_attachment_changes[name.to_s]&.save
-        rescue => e
-          errors.add(name, :invalid, message: "failed to save. Please make sure it is a valid file.")
-          raise ActiveRecord::RecordInvalid.new(self)
         end
 
         after_commit(on: %i[create update]) { shrine_attachment_changes.delete(name.to_s) }
@@ -239,9 +237,6 @@ module ActiveShrine
 
         after_save do
           shrine_attachment_changes[name.to_s]&.save
-        rescue => e
-          errors.add(name, :invalid, message: "failed to save. Please make sure it is a valid file.")
-          raise ActiveRecord::RecordInvalid.new(self)
         end
 
         after_commit(on: %i[create update]) { shrine_attachment_changes.delete(name.to_s) }

data/lib/active_shrine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveShrine
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shrine
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Radioactive Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties