file_validators 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a185e059287eb886b2f0aca6f8654d0860f97d
-  data.tar.gz: 087b21a3812ec49de9dd0df345521792631b2925
+  metadata.gz: 862ed2a30f76ed277f22f80773319c3627f991dd
+  data.tar.gz: c434e6754743f0f6cd819992a0d4475bc5fc8176
 SHA512:
-  metadata.gz: ba536373220e03c3e4da79095baad18015dfec6f152cca7fca98f8ba0b1c9b64488b6f447497153e959d3eb1980f07015b32f2c1717638fda8002bb99232d1c7
-  data.tar.gz: cf6d97528247cae02d8c42824c42938e37e57b2ff73045cd429ecb601c23784ce058afe3ef8969994ef83f7366482132818b724b2c00c0a28390d52650a5fb4a
+  metadata.gz: 33426eed1c228b06716a841826221a4f6cb87ed508cc1c58c745ff432c5a18915d8230e5d227146d6a4642488baf3f9e5d4c326b947de7bbb5e6cf8b5d221efc
+  data.tar.gz: b0b2f36ce62fc8dd9f93fff6ac65a5a6440499893c3ac09e8a8f053914f89d9180e6a9999c570d49382265688f15ffe7bce10d92809bd012e78573119760afa5

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.2
   - 1.9.3
+  - 2.2.2
 gemfile:
   - gemfiles/activemodel_4.2.gemfile
   - gemfiles/activemodel_4.1.gemfile

data/README.md

@@ -142,7 +142,6 @@ of the files. It also detects media type spoofing (see more in [security](#secur
 `:relaxed` mode uses file name to detect the content type using `mime-types` gem.
 If mode option is not set then the validator uses form supplied content type.
 ```ruby
-# string
 validates :avatar, file_content_type: { allow: 'image/jpeg', mode: :strict }
 validates :avatar, file_content_type: { allow: 'image/jpeg', mode: :relaxed }
 ```

data/lib/file_validators/validators/file_content_type_validator.rb

@@ -12,6 +12,7 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
+        value = JSON.parse(value) if value.is_a?(String)
         unless value.blank?
           mode = option_value(record, :mode)
           content_type = get_content_type(value, mode)
@@ -63,7 +64,6 @@ module ActiveModel
           file_name = get_file_name(value)
           MIME::Types.type_for(file_name).first
         else
-          value = JSON.parse(value) if value.is_a?(String)
           value = OpenStruct.new(value) if value.is_a?(Hash)
           value.content_type
         end

data/lib/file_validators/validators/file_size_validator.rb

@@ -13,9 +13,9 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
+        value = JSON.parse(value) if value.is_a?(String)
         unless value.blank?
           options.slice(*CHECKS.keys).each do |option, option_value|
-            value = JSON.parse(value) if value.is_a?(String)
             value = OpenStruct.new(value) if value.is_a?(Hash)
             option_value = option_value.call(record) if option_value.is_a?(Proc)
             unless valid_size?(value.size, option, option_value)

data/lib/file_validators/version.rb

@@ -1,3 +1,3 @@
 module FileValidators
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/integration/file_content_type_validation_integration_spec.rb

@@ -342,6 +342,11 @@ describe 'File Content Type integration with ActiveModel' do
       before { subject.avatar = "{\"filename\":\"img140910_88338.jpg\",\"content_type\":\"image/jpeg\",\"size\":13150}" }
       it { is_expected.to be_valid }
     end
+
+    context 'empty json string' do
+      before { subject.avatar = "{}" }
+      it { is_expected.to be_valid }
+    end
   end
 
   context 'image data as hash' do
@@ -355,12 +360,17 @@ describe 'File Content Type integration with ActiveModel' do
     subject { Person.new }
 
     context 'for invalid content type' do
-      before { subject.avatar = { "filename":"img140910_88338.GIF", "content_type":"image/gif", "size":13150 } }
+      before { subject.avatar = { "filename" => "img140910_88338.GIF", "content_type" => "image/gif", "size" => 13150 } }
       it { is_expected.not_to be_valid }
     end
 
     context 'for valid content type' do
-      before { subject.avatar = { "filename":"img140910_88338.jpg", "content_type":"image/jpeg", "size":13150 } }
+      before { subject.avatar = { "filename" => "img140910_88338.jpg", "content_type" => "image/jpeg", "size" => 13150 } }
+      it { is_expected.to be_valid }
+    end
+
+    context 'empty hash' do
+      before { subject.avatar = {} }
       it { is_expected.to be_valid }
     end
   end

data/spec/integration/file_size_validator_integration_spec.rb

@@ -226,6 +226,11 @@ describe 'File Size Validator integration with ActiveModel' do
       before { subject.avatar = "{\"filename\":\"img140910_88338.GIF\",\"content_type\":\"image/gif\",\"size\":33150}" }
       it { is_expected.to be_valid }
     end
+
+    context 'empty json string' do
+      before { subject.avatar = "{}" }
+      it { is_expected.to be_valid }
+    end
   end
 
   context 'image data as hash' do
@@ -239,12 +244,17 @@ describe 'File Size Validator integration with ActiveModel' do
     subject { Person.new }
 
     context 'when file size is less than the specified size' do
-      before { subject.avatar = { "filename":"img140910_88338.GIF", "content_type":"image/gif", "size":13150 } }
+      before { subject.avatar = { "filename" => "img140910_88338.GIF", "content_type" => "image/gif", "size" => 13150 } }
       it { is_expected.not_to be_valid }
     end
 
     context 'when file size within the specified size' do
-      before { subject.avatar = { "filename":"img140910_88338.GIF", "content_type":"image/gif", "size":33150 } }
+      before { subject.avatar = { "filename" => "img140910_88338.GIF", "content_type" => "image/gif", "size" => 33150 } }
+      it { is_expected.to be_valid }
+    end
+
+    context 'empty hash' do
+      before { subject.avatar = {} }
       it { is_expected.to be_valid }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_validators
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ahmad Musaffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel