carrierwave-bombshelter 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f967fc711c4317a24c315f2c36d677541c776ad6
-  data.tar.gz: 9e69636cf22c3fbe5fc1f0d04f8d7779a8a90aea
+  metadata.gz: bbd247bcda53117bd19252565bae2e084a924835
+  data.tar.gz: ff0afc1ad76680fecfc64ac7d7bda7e24de8152c
 SHA512:
-  metadata.gz: 0156533849d6e3f42fdbc50badf688c02edb84da4e24242375cb26fc70fde380503738131f11483218dc8c88c3ded3e97b84226f57704361c3f6cab4bd9cac40
-  data.tar.gz: 2da176b742ab05c707d51414710a185b74b70378204aea4237319804440a82f9e6d3e16ca9795fde7a21bb95e5df66bac9db5340547cbd28fc78fb9ea1a374d4
+  metadata.gz: 8d69d4b423b4742491a35a056a013fd77b3da4189c7aa186733c0b06562b339c4c9974fa6e5d56c059b8def6f2a925fa336b13bfcf041377e514e23da5bba617
+  data.tar.gz: c338fde45f04ceccf99ad529a7bd4393a42c020fa2b2e703c3b4119f0bed7807c2b01d67ffd36f63cc18c0088db5a5e2da013567f59b95ef5cd5f6eb02dd9bd0

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.3
+  - 1.9.3
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 before_install: gem install bundler -v 1.10.6

data/carrierwave-bombshelter.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fog'
   spec.add_development_dependency 'fog-aws'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'mime-types', '< 3.0'
 
   spec.add_dependency 'activesupport', '>= 3.2.0'
   spec.add_dependency 'fastimage'

data/lib/carrierwave/bombshelter.rb

@@ -13,6 +13,11 @@ module CarrierWave
   module BombShelter
     extend ActiveSupport::Concern
 
+    FILE_WRAPPERS = [
+      CarrierWave::SanitizedFile,
+      CarrierWave::Uploader::Base
+    ]
+
     included do
       # `before` puts callback in the end of queue, but we need to run this
       # callback first.
@@ -59,14 +64,18 @@ module CarrierWave
     end
 
     def get_file(file)
-      case file
-      when CarrierWave::Storage::Fog::File
-        file.url
-      when CarrierWave::SanitizedFile, CarrierWave::Uploader::Base
-        get_file(file.file)
-      else
-        file
-      end
+      return file.url if in_fog?(file)
+      return get_file(file.file) if is_wrapped?(file)
+      file
+    end
+
+    def in_fog?(file)
+      defined?(CarrierWave::Storage::Fog) &&
+        file.is_a?(CarrierWave::Storage::Fog::File)
+    end
+
+    def is_wrapped?(file)
+      FILE_WRAPPERS.any? { |wrapper| file.is_a?(wrapper) }
     end
   end
 end

data/lib/carrierwave/bombshelter/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module BombShelter
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-bombshelter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - DarthSim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement