bhf 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932f7d8d57a82dcf9d1c785d1be981f72b707a11
-  data.tar.gz: 5ab00950684b143db5555fc4c818169eedb0ee42
+  metadata.gz: 29fb186c6102a0cb1b84f5513b67e5a669bcab2a
+  data.tar.gz: 8ce8a99cfd1a2397d981b5e8162ff9f2bc226e7a
 SHA512:
-  metadata.gz: 046a8e067945c9123c4a06ab185b2426bceb8b33b98ab7792da4ecf9985c4a0951a5d3422454e6769890111b03d44c1d432ec0a9354f7f5948a13d056daa5c75
-  data.tar.gz: 88f0a7dfbb47bd1f63062f02c752a684f0918a07a7d16eacce924cd4c36086699f750bf253a01a2d082343646bb358f9fa5a64f60cc23f3976cdf8bef97f4c7d
+  metadata.gz: c20a468692b5edba95a704aef66b930b381611caf152efc7c0b1455537ba7a1171e8da04e4ec8e38862e67e5d34d2fd2d076854ac999b27c8cb7e11ae8157f7a
+  data.tar.gz: 7312dbc5e72879cd9fa38053e58854568901d3b50959fc3eccc9076b04e882280f214f60ec27010855cff8f824bb8173fd066bcb3fdcd7d1c0556bfcac68eee2

data/app/helpers/bhf/application_helper.rb

@@ -31,5 +31,9 @@ module Bhf
       end
     end
 
+    def type_is_image?(type)
+      Bhf::PAPERCLIP_IMAGE_TYPES.include?(type)
+    end
+    
   end
 end

data/app/helpers/bhf/entries_helper.rb

@@ -16,10 +16,6 @@ module Bhf
       }
     end
     
-    def is_image?(file)
-      ! file.match(/\.png|\.jpg|\.jpeg|\.gif|\.svg/i).nil?
-    end
-    
     def reflection_title(f, field)
       title = f.object.class.human_attribute_name(field.reflection.name)
       if field.link

data/app/views/bhf/entries/form/column/_paperclip.haml

@@ -3,10 +3,10 @@
   = node f, field do
     - file = f.object.send(field.name)
     - if file.file?
-      - if ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif'].include?(f.object.send("#{field.name}_content_type"))
+      - if type_is_image?(file.content_type)
         = image_tag find_smallest_size_url_for_file(file), class: 'uploaded_image'
       - else
-        = link_to f.object.send("#{field.name}_file_name"), file.url, class: 'uploaded_file'
+        = link_to file.original_filename, file.url, class: 'uploaded_file'
 
       - if f.object.respond_to?(:"#{field.name}_destroy")
         .file_delete

data/app/views/bhf/pages/macro/column/_paperclip.haml

@@ -1,5 +1,6 @@
 - unless object.send(column.name).blank?
-  - if ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif'].include?(object.send("#{column.name}_content_type"))
-    = image_tag object.send(column.name), alt: object.send(column.name), class: 'preview_image'
+  - file = object.send(column.name)
+  - if type_is_image?(file.content_type)
+    = image_tag find_smallest_size_url_for_file(file), alt: object.send(column.name), class: 'preview_image'
   - else
-    = link_to object.send("#{column.name}_file_name"), object.send(column.name).url
+    = file.original_filename

data/lib/bhf.rb

@@ -44,4 +44,5 @@ module Bhf
       end
     end
   end
+  PAPERCLIP_IMAGE_TYPES = ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Anton Pawlik