active_shrine 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 698b07ac6ab5b98eecfeae48419c2c5203cf6ae8f2c3e1c924aa0c2de6ee3513
-  data.tar.gz: 56439876a6a623a4e3d27f0b9080f00197b444430043d74ddecf6ccb3c0f9542
+  metadata.gz: 68420676b709a0b738732e6d4e998b2010a28188d0af8d6ec47d9274f86f8c30
+  data.tar.gz: c8c1e33ad01d3d07b54fab1b8beedec11800a1e4f44a489ece88eefb939063f6
 SHA512:
-  metadata.gz: 629bf6b87acb29d9f4468d2869b8d20dd736e28817ca129061661b78f2245d646faae0dd81fb6d52404a9901d9beae9a25ce5a76c88ac013d38f4ada48f6b0e0
-  data.tar.gz: c171501c31fe29b67b8240aa89dad180bbdc10fe6e11d7d142ab4c9f9f7c1a05945d6fe633404bacb6e23148299a5812793b4bd27b1594a0d4f580acf99518a3
+  metadata.gz: b87b2538807f950cd060feda4088dccbdf8a2fc145208eb1d0bb485c7f57b80efab78a6dea56306fcb2c30fda53bfc736d32e011a1ac44d744ca927df4755f50
+  data.tar.gz: b5e9904ec3fcd54f08d944f639d222642b46d336d0088a4aebd25c83c999100d4d7fa8fe421bfc95dbcb4314bbb5f68e7c458d5a6243543da0aa922786b4f4fc

data/README.md

@@ -121,7 +121,7 @@ After checking out the repo:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/active_shrine.
+Bug reports and pull requests are welcome on GitHub at https://github.com/radioactive-labs/active_shrine.
 
 ## License
 
@@ -129,4 +129,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the ActiveShrine project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/active_shrine/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the ActiveShrine project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/active_shrine/blob/main/CODE_OF_CONDUCT.md).

data/lib/active_shrine/attachment.rb

@@ -36,8 +36,8 @@ module ActiveShrine
 
     before_save :maybe_store_record
 
-    def url
-      file_url
+    def url(derivative=nil)
+      file_url(derivative) || file_url
     end
 
     def content_type

data/lib/active_shrine/model.rb

@@ -137,7 +137,12 @@ module ActiveShrine
 
         scope :"with_attached_#{name}", -> { includes(:"#{name}_attachment") }
 
-        after_save { shrine_attachment_changes[name.to_s]&.save }
+        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) }
 
@@ -201,7 +206,7 @@ module ActiveShrine
       # <tt>active_shrine_attachments.record_type</tt> polymorphic type column of
       # the corresponding rows.
       def has_many_attached(name, uploader: ::Shrine, dependent: :destroy, strict_loading: false)
-        _, attachment_class_name = resolve_attachment_class(uploader)
+        attachment_class, attachment_class_name = resolve_attachment_class(uploader)
 
         generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
           # frozen_string_literal: true
@@ -232,7 +237,12 @@ module ActiveShrine
 
         scope :"with_attached_#{name}", -> { includes(:"#{name}_attachments") }
 
-        after_save { shrine_attachment_changes[name.to_s]&.save }
+        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.0"
+  VERSION = "0.3.2"
 end

metadata

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