simple_form_extension 1.4.15 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82af1dba00fbb08a47aee5b4349f302fcbac1913
-  data.tar.gz: e81162516676385c045eee7112ce549d49e82452
+  metadata.gz: b0923a6c64e3a373fe4cd5112d4f45c5e7ea3c2c
+  data.tar.gz: b4545d0d4570bc4a9674a605d52989d504eaea4e
 SHA512:
-  metadata.gz: eb6b95c398462365a174815ceb82e344da1131401be8f0fd80b625a99ccc0409537c34ad17426cc1e5dcffdada246712645fd3a56b73ea80e12a6dac42998d5e
-  data.tar.gz: 97cd330f20ba85b9aa97dee5bcaaa27ca46f58b2486e8b8f0c4d812e4ed9e945f2063ec685b5c3921528e19d019ba8cd1417ff0dde5de074323d3dff349e116a
+  metadata.gz: 7d90c6780273260f670ea82c4936a5dac17f30ee2c39c27bec505f0fc61d628b700c0b810ef2f9c09e3e51d9e12afe2725af167caa89f641b3f014d3a3ef26ff
+  data.tar.gz: 946edfa5efa417d9d78242eba9e3a4b449fabccfaba9287bb5ee4176675393f7980528e6cc281152243521f445a6ad516f619d9e65e08d296219ac8f1a4e4b61

data/lib/simple_form_extension/file_concern.rb

@@ -0,0 +1,62 @@
+module SimpleFormExtension
+  module FileConcern
+    def existing_file_tag
+      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
+          "#{ _translate('file.existing_file') } : ".html_safe
+        end +
+
+        file_preview_and_remove_button
+      end
+    end
+
+    def file_preview_and_remove_button
+      content_tag(:div, class: 'btn-group') 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 +
+
+          existing_file_name
+        end +
+
+        remove_file_button
+      end
+    end
+
+    def existing_file_name
+      if object.try(:"#{ attribute_name }?")
+        object.send(:"#{ attribute_name }_file_name").html_safe
+      elsif (attachment = object.try(attribute_name)).try(:attached?)
+        attachment.filename.to_s
+      end
+    end
+
+    def remove_file_button
+      return unless object.respond_to?(:"#{ remove_attachment_method }=")
+
+      content_tag(:button, class: 'btn btn-default', type: 'button', data: { dismiss: 'existing-file' }) do
+        content_tag(:i, '', class: 'fa fa-remove', data: { :'removed-class' => 'fa fa-refresh' }) +
+        @builder.hidden_field(remove_attachment_method, class: 'remove-file-input', value: nil)
+      end
+    end
+
+    def remove_attachment_method
+      options[:remove_method] || :"remove_#{ attribute_name }"
+    end
+
+    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).try(:service_url)
+      end
+    end
+  end
+end

data/lib/simple_form_extension/inputs/file_input.rb

@@ -2,6 +2,7 @@ module SimpleFormExtension
   module Inputs
     class FileInput < SimpleForm::Inputs::Base
       include SimpleFormExtension::Translations
+      include SimpleFormExtension::FileConcern
 
       delegate :content_tag, to: :template
 
@@ -35,63 +36,6 @@ module SimpleFormExtension
 
         existing_file_tag
       end
-
-      def existing_file_tag
-        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
-            "#{ _translate('file.existing_file') } : ".html_safe
-          end +
-
-          content_tag(:div, class: 'btn-group') 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') +
-              "&nbsp;".html_safe +
-
-              existing_file_name
-            end +
-
-            remove_file_button
-          end
-        end
-      end
-
-      def existing_file_name
-        return unless file_exists?
-
-        if object.try(:"#{ attribute_name }?")
-          object.send(:"#{ attribute_name }_file_name").html_safe
-        elsif (attachment = object.try(attribute_name)).try(:attached?)
-          attachment.filename.to_s
-        end
-      end
-
-      def remove_file_button
-        return unless object.respond_to?(:"#{ remove_attachment_method }=")
-
-        content_tag(:button, class: 'btn btn-default', type: 'button', data: { dismiss: 'existing-file' }) do
-          content_tag(:i, '', class: 'fa fa-remove', data: { :'removed-class' => 'fa fa-refresh' }) +
-          @builder.hidden_field(remove_attachment_method, class: 'remove-file-input', value: nil)
-        end
-      end
-
-      def remove_attachment_method
-        options[:remove_method] || :"remove_#{ attribute_name }"
-      end
-
-      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
 end

data/lib/simple_form_extension/inputs/image_input.rb

@@ -2,6 +2,7 @@ module SimpleFormExtension
   module Inputs
     class ImageInput < SimpleForm::Inputs::Base
       include SimpleFormExtension::Translations
+      include SimpleFormExtension::FileConcern
 
       delegate :content_tag, :image_tag, to: :template
 
@@ -27,45 +28,56 @@ module SimpleFormExtension
             end
           end +
 
-          content_tag(:div, class: 'fileinput-preview thumbnail') do
-            existing_image_tag
-          end
+          existing_image_tag
         end
       end
 
       def existing_image_tag
         # If an existing paperclip image is found
-        if image_exists?
+        if file_exists?
+          file_preview_and_remove_button
+        else
+          content_tag(:div, class: 'fileinput-preview thumbnail') do
+            content_tag(:div, '', class: 'empty-thumbnail')
+          end
+        end
+      end
+
+      def image
+        @image ||= object.try(attribute_name)
+      end
+
+      def file_preview_and_remove_button
+        if image.variable? || image.previewable?
           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
-            image_tag(image_url, style: 'height: 100%; width: 100%; display: block;', data: { toggle: 'existing-file' }) +
-            remove_image_button
+          content_tag(:div, class: 'fileinput-preview thumbnail') do
+            content_tag(:div, style: container_style, data: { provides: 'existing-file' }) do
+              image_tag(
+                file_url,
+                style: 'height: 100%; width: 100%; display: block;', data: { toggle: 'existing-file' }
+              ) +
+              remove_image_button
+            end
           end
         else
-          content_tag(:div, '', class: 'empty-thumbnail')
+          super
         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
+      def file_url
         if object.try(:"#{ attribute_name }?")
           object.send(attribute_name).url(image_style)
-        elsif (image = object.try(attribute_name)).try(:attached?)
-          if image.variable?
-            image.variant(resize: "400x150>")
+        elsif (attachment = object.try(attribute_name)).try(:attached?)
+          if attachment.variable?
+            attachment.variant(resize: "400x150>")
+          elsif attachment.previewable?
+            attachment.preview(resize: "400x150>")
           else
-            image
+            attachment.service_url
           end
         end
       end
@@ -81,10 +93,6 @@ module SimpleFormExtension
         end
       end
 
-      def remove_attachment_method
-        options[:remove_method] || :"remove_#{ attribute_name }"
-      end
-
       def image_style
         styles = object.send(attribute_name).styles.map(&:first)
         # Check if there's a :thumb or :thumbnail style in attachment definition

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.4.15"
+  VERSION = "1.4.16"
 end

data/lib/simple_form_extension.rb

@@ -9,6 +9,7 @@ module SimpleFormExtension
   eager_autoload do
     autoload :Translations
     autoload :ResourceNameHelper
+    autoload :FileConcern
     autoload :Components
     autoload :Inputs
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.4.15
+  version: 1.4.16
 platform: ruby
 authors:
 - Glyph-fr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,6 +118,7 @@ files:
 - lib/simple_form_extension/components/icons.rb
 - lib/simple_form_extension/components/popovers.rb
 - lib/simple_form_extension/ext/form_builder.rb
+- lib/simple_form_extension/file_concern.rb
 - lib/simple_form_extension/inputs.rb
 - lib/simple_form_extension/inputs/boolean_input.rb
 - lib/simple_form_extension/inputs/collection_check_boxes_input.rb