simple_form_extension 1.4.18 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 93cd36ca721b1ef45750cd496e120b4de0213843
-  data.tar.gz: b148a00b9dd74be84423994f66ce08f828248794
+SHA256:
+  metadata.gz: 38aa08ea4a8cf92f6fc0cc37e25626842ae034d35244b917f6043d3da61ec28f
+  data.tar.gz: 695288388ad82f16580b7bfd1bf04590e20d070fb82d1595e5c23ad732a7331a
 SHA512:
-  metadata.gz: 2c822388163ade7cbda89576e6349e28d063613d5b1b868df9158193302cd2ddcbaeb38deae33d8d6bbdc380d0e8ce1730c252230d7a8510080c4bc51e04f95f
-  data.tar.gz: 308a1c6b4c212da8e33820be2b6e830fca4273e029692ee14ad8cc18cd8cf691df51dfa58c65d0e579e81e4016868850fe89079c94909d3b917c59719155ab76
+  metadata.gz: c06e4eaa4ff32484bd0dea6e9fa5727dde895796d10a9a9996eb7cd8b18c953619ee16b0b2ff85250c6843353934ca3e4b57886ad49884d64d071f7a0f2b3aa6
+  data.tar.gz: e6a67846e389e65734d7cff721f692db9ddd3601b298af8c0faa443ad90a1d4acc697870689ac87be9d1078f9fd65782681f3fa941de53ab948c94b4f42f9702

data/README.md

@@ -142,7 +142,7 @@ You can customize the name of the setter that will be called with the
 #### :selectize
 
 The selectize field allows you to create a powerful select field using the
-[Selectize](https://brianreavis.github.io/selectize.js/) javascript plugin.
+[Selectize](https://selectize.github.io/selectize.js/) javascript plugin.
 
 ```ruby
 = form.input :items, as: :selectize, collection: Item.all

data/lib/simple_form_extension/file_concern.rb

@@ -26,9 +26,10 @@ module SimpleFormExtension
     end
 
     def existing_file_name
-      if object.try(:"#{ attribute_name }?")
+      if paperclip_attachment_attached?
         object.send(:"#{ attribute_name }_file_name").html_safe
-      elsif (attachment = object.try(attribute_name)).try(:attached?)
+      elsif activestorage_attachment_attached?
+        attachment = object.send(attribute_name)
         attachment.filename.to_s
       end
     end
@@ -47,16 +48,25 @@ module SimpleFormExtension
     end
 
     def file_exists?
-      @file_exists ||= object.try(:"#{ attribute_name }?") ||
-                       object.try(attribute_name).try(:attached?)
+      @file_exists ||= paperclip_attachment_attached? || activestorage_attachment_attached?
     end
 
     def file_url
-      if object.try(:"#{ attribute_name }?")
+      if paperclip_attachment_attached?
         object.send(attribute_name)
-      elsif object.try(attribute_name).try(:attached?)
-        object.try(attribute_name).try(:service_url)
+      elsif activestorage_attachment_attached?
+        object.send(attribute_name).try(:service_url) || object.send(attribute_name).try(:url)
       end
     end
+
+    def paperclip_attachment_attached?
+      @paperclip_attachment_attached ||= object.try(:"#{ attribute_name }?")
+    end
+
+    def activestorage_attachment_attached?
+      @activestorage_attachment_attached ||=
+        object.try(attribute_name).try(:attached?) &&
+        object.try(attribute_name).blob
+    end
   end
 end

data/lib/simple_form_extension/inputs/image_input.rb

@@ -70,13 +70,13 @@ module SimpleFormExtension
       # preview thumbnail
       #
       def file_url
-        if object.try(:"#{ attribute_name }?")
+        if paperclip_attachment_attached?
           object.send(attribute_name).url(image_style)
-        elsif (attachment = object.try(attribute_name)).try(:attached?)
-          if attachment.variable?
-            attachment.variant(resize: "400x150>")
-          elsif attachment.previewable?
-            attachment.preview(resize: "400x150>")
+        elsif activestorage_attachment_attached?
+          attachment = object.send(attribute_name)
+
+          if attachment.representable?
+            attachment.representation(resize: "400x150>")
           else
             attachment.service_url
           end

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.4.18"
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.4.18
+  version: 1.5.0
 platform: ruby
 authors:
 - Glyph-fr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -163,7 +163,7 @@ homepage: http://www.glyph.fr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,9 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: This gems adds custom common input types to simple form.
 test_files: []