carrierwave-bombshelter 0.1.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c830e118a3048b76347216008b0f720fd2bbb59e
-  data.tar.gz: aece90372866fb87faaf591293ab5d16a78783b0
+  metadata.gz: dce2ab6cee5e0c117fe94303c3836757d310eeef
+  data.tar.gz: e409298b581bff00c3b85e957ef883e526384acf
 SHA512:
-  metadata.gz: 08b443db602a3b6ba29e16983f8e807d2db799a81853802ce8dc67c546676384f88a98f9b8bc00d2b40006842fd45225e7ecbb6a47d39d91bf96983fa187bd6e
-  data.tar.gz: cccd0d26230e80c9500a94988ba5e916ddb9ced50099f1aab5d0d035fe407893ac843b7f87d8217cbaf51bccb9f31dfdac26cdee4aa75a44e96e150221b25e29
+  metadata.gz: 6f6b29efd717baccd4ddd4af8a0a963170332490cc7b6673e442f84e1074838da0bc741f4cc2122b5e8c755c8ab985f6ede810bf314b02b970512b0550ba302a
+  data.tar.gz: 4bb42f073af153d38d2d52e6ac28dd1441f9a748a2f549d3d86ed0c15d0aaa97666324b032ad1d69592741d626ead7caa2189ebb5ab6d315f414a123456c3b0f

data/lib/carrierwave/bombshelter.rb

@@ -14,7 +14,7 @@ module CarrierWave
     extend ActiveSupport::Concern
 
     included do
-      before :cache, :check_pixel_dimensions!
+      before :cache, :protect_from_image_bomb!
     end
 
     def max_pixel_dimensions
@@ -23,11 +23,21 @@ module CarrierWave
 
     private
 
-    def check_pixel_dimensions!(new_file)
-      sizes = FastImage.size(new_file.path)
-      max_sizes = max_pixel_dimensions
+    def protect_from_image_bomb!(new_file)
+      image = FastImage.new(new_file.path)
+      check_image_type!(image)
+      check_pixel_dimensions!(image)
+    end
+
+    def check_image_type!(image)
+      return if image.type
+      fail CarrierWave::IntegrityError,
+           I18n.translate(:'errors.messages.not_image')
+    end
 
-      return if !sizes || (sizes[0] <= max_sizes[0] && sizes[1] <= max_sizes[1])
+    def check_pixel_dimensions!(image)
+      max_sizes = max_pixel_dimensions
+      return if image.size[0] <= max_sizes[0] && image.size[1] <= max_sizes[1]
 
       fail CarrierWave::IntegrityError,
            I18n.translate(

data/lib/carrierwave/bombshelter/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module BombShelter
-    VERSION = '0.1.0.2'
+    VERSION = '0.1.1'
   end
 end

data/lib/locale/en.yml

@@ -2,3 +2,4 @@ en:
   errors:
     messages:
       pixel_dimensions_error: "Image size should be less than or equal to %{x_size}x%{y_size}"
+      not_image: "File is not an image"

data/lib/locale/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  errors:
+    messages:
+      pixel_dimensions_error: "La taille de l'image doit être inférieure ou égale à %{x_size}x%{y_size}"
+      not_image: "Fichier est pas une image"

data/lib/locale/ru.yml

@@ -2,3 +2,4 @@ ru:
   errors:
     messages:
       pixel_dimensions_error: "Изображение не должно превышать размера %{x_size}x%{y_size}"
+      not_image: "Файл не является изображением"

data/lib/locale/tr.yml

@@ -0,0 +1,5 @@
+tr:
+  errors:
+    messages:
+      pixel_dimensions_error: "Göürüntü boyutu %{x_size}x%{y_size} ölçüsüne eşit yada daha küçük olmalıdır"
+      not_image: "Dosya bir görüntü değil"

data/lib/locale/zh-TW.yml

@@ -0,0 +1,5 @@
+zh-TW:
+  errors:
+    messages:
+      pixel_dimensions_error: "圖片大小必須小於等於%{x_size}x%{y_size}"
+      not_image: "文件不是图像"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-bombshelter
 version: !ruby/object:Gem::Version
-  version: 0.1.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - DarthSim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,10 @@ files:
 - lib/carrierwave/bombshelter.rb
 - lib/carrierwave/bombshelter/version.rb
 - lib/locale/en.yml
+- lib/locale/fr.yml
 - lib/locale/ru.yml
+- lib/locale/tr.yml
+- lib/locale/zh-TW.yml
 homepage: https://github.com/DarthSim/carrierwave-bombshelter
 licenses:
 - MIT