simple_form_extension 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f868b4a2d8599c08598babf5c93553c242e598
-  data.tar.gz: 7de75d91710269d5b868745b58dc2be76ae57425
+  metadata.gz: f0338091f5342355cd9faac5bf9fbdf3e274e982
+  data.tar.gz: c15a1a437cca0be6afd7550f22912fa8f828fac4
 SHA512:
-  metadata.gz: 109c9511811e094eda60597a24cc572501f6377a63144178777f9b47cf5bc832617f0d2e2be88b4cef06a768e8a91128a5f22107579779ee16d4dfb02280d147
-  data.tar.gz: 7919082735dab36ab13b7dcf98f536dd8a9cf84dff06e4dd9b5f351bcb0b6d9b33759ff65cf6e97c090835dbe2dbc4279a9667983d3d04a8d1ece58ce94136a8
+  metadata.gz: ab595dfbdf82e7e5667fbe2ad2ef08cafcf4202efca56fc85cefe7fa9b605a42cd353138d604565bf099609946b7ce46da61a916f4f3ea43fcd189a4e52ac58f
+  data.tar.gz: 48243d079d49b90c8cc7b48ba9ca1c644c5aba7a126307e1922bae5c46cc454ef5be582df34d5f15f393eed12d774d300da27f116de9dff8fc148222e43ba92c

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+**/.DS_Store

data/lib/simple_form_extension/inputs/file_input.rb

@@ -37,9 +37,7 @@ module SimpleFormExtension
       end
 
       def existing_file_tag
-        return '' unless has_file?
-
-        url = object.send(attribute_name).url
+        return '' unless file_exists?
 
         content_tag(:div, class: 'input-group help-block existing-file', data: { provides: 'existing-file'}) do
           content_tag(:span, class: 'input-group-addon') do
@@ -47,7 +45,7 @@ module SimpleFormExtension
           end +
 
           content_tag(:div, class: 'btn-group') do
-            content_tag(:a, class: 'btn btn-default ', href: url, target: '_blank', data: { toggle: 'existing-file' }) do
+            content_tag(:a, class: 'btn btn-default ', href: file_url, target: '_blank', data: { toggle: 'existing-file' }) do
               content_tag(:i, '', class: 'fa fa-file') +
               " ".html_safe +
               object.send(:"#{ attribute_name }_file_name").html_safe
@@ -71,8 +69,17 @@ module SimpleFormExtension
         options[:remove_method] || :"remove_#{ attribute_name }"
       end
 
-      def has_file?
-        @has_file ||= object.send(:"#{ attribute_name }?")
+      def file_exists?
+        @file_exists ||= object.try(:"#{ attribute_name }?") ||
+                         object.try(attribute_name).try(:attached?)
+      end
+
+      def file_url
+        if object.try(:"#{ attribute_name }?")
+          object.send(attribute_name)
+        elsif object.try(attribute_name).try(:attached?)
+          object.try(attribute_name)
+        end
       end
     end
   end

data/lib/simple_form_extension/inputs/image_input.rb

@@ -34,9 +34,8 @@ module SimpleFormExtension
       end
 
       def existing_image_tag
-        if @builder.object.send(:"#{ attribute_name }?")
-          image_url = @builder.object.send(attribute_name).url(image_style)
-
+        # If an existing paperclip image is found
+        if image_exists?
           container_style = 'position: relative; height: 100%; width: 100%; min-height: 50px;min-width: 58px; display: block;'
 
           content_tag(:div, style: container_style, data: { provides: 'existing-file' }) do
@@ -48,6 +47,25 @@ module SimpleFormExtension
         end
       end
 
+      # Returns true if a paperclip or active_storage attachment already exists
+      # for that model field
+      #
+      def image_exists?
+        object.try(:"#{ attribute_name }?") ||
+          object.try(attribute_name).try(:attached?)
+      end
+
+      # Returns the paperclip or active_storage attachment url to show in the
+      # preview thumbnail
+      #
+      def image_url
+        if object.try(:"#{ attribute_name }?")
+          object.send(attribute_name).url(image_style)
+        elsif object.try(attribute_name).try(:attached?)
+          object.try(attribute_name).variant(resize: "400x150>")
+        end
+      end
+
       def remove_image_button
         return unless object.respond_to?(:"#{ remove_attachment_method }=")
 
@@ -64,7 +82,7 @@ module SimpleFormExtension
       end
 
       def image_style
-        styles = @builder.object.send(attribute_name).styles.map(&:first)
+        styles = object.send(attribute_name).styles.map(&:first)
         # Check if there's a :thumb or :thumbnail style in attachment definition
         thumb = styles.find { |s| %w(thumb thumbnail).include?(s.to_s) }
         # Return the potentially smallest size !

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - Glyph-fr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,6 @@ files:
 - lib/generators/simple_form_extension/templates/config/locales/simple_form_extension.fr.yml
 - lib/generators/simple_form_extension/templates/config/locales/simple_form_extension.it.yml
 - lib/simple_form_extension.rb
-- lib/simple_form_extension/.DS_Store
 - lib/simple_form_extension/components.rb
 - lib/simple_form_extension/components/icons.rb
 - lib/simple_form_extension/components/popovers.rb
@@ -136,20 +135,16 @@ files:
 - lib/simple_form_extension/translations.rb
 - lib/simple_form_extension/version.rb
 - simple_form_extension.gemspec
-- vendor/.DS_Store
-- vendor/assets/.DS_Store
 - vendor/assets/images/simple_form_extension/bootstrap-colorpicker/alpha-horizontal.png
 - vendor/assets/images/simple_form_extension/bootstrap-colorpicker/alpha.png
 - vendor/assets/images/simple_form_extension/bootstrap-colorpicker/hue-horizontal.png
 - vendor/assets/images/simple_form_extension/bootstrap-colorpicker/hue.png
 - vendor/assets/images/simple_form_extension/bootstrap-colorpicker/saturation.png
-- vendor/assets/javascripts/.DS_Store
 - vendor/assets/javascripts/bootstrap-colorpicker.js
 - vendor/assets/javascripts/bootstrap-slider.js
 - vendor/assets/javascripts/jasny-bootstrap.js
 - vendor/assets/javascripts/jquery.datetimepicker.js
 - vendor/assets/javascripts/simple_form_extension.coffee
-- vendor/assets/javascripts/simple_form_extension/.DS_Store
 - vendor/assets/javascripts/simple_form_extension/colorpicker.coffee
 - vendor/assets/javascripts/simple_form_extension/datetimepicker.coffee
 - vendor/assets/javascripts/simple_form_extension/fileinput.coffee
@@ -183,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: This gems adds custom common input types to simple form.