file_validators 2.2.0.beta1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75fbf34dcce7be5b3770f09d4068c00f50f2cd9d
-  data.tar.gz: e81f181e641308492a13b1ef3ed5034724d2a7f6
+  metadata.gz: 0353fd8c53123663ec484c7172c2df4d572f95dd
+  data.tar.gz: b1eb811cfea7257288ff5e588621f78aeff39896
 SHA512:
-  metadata.gz: abb281ff04de1964a07f19d2ee5fa5ccc51f63827b0ae7bb2628c3ddc36379d16ad48e9aa037d5e16ed18a6ab5d0690b0cc866a263c48ce9a754006c53204d9f
-  data.tar.gz: 01417d071f54021f5c8ad73b6a9eb5d35c7b49b29c450037dd2b3b40cbaa13fb9250bf9cfc66931385caab5e2bd934b51987329a736a87645ce6cfa7063bee6c
+  metadata.gz: 002f91a5243bf85650572ecb80a5283a25aafd6cdda3d4e9fe19bba988f597f3db228e583dc113bb54fb1c7973bc0caa9fc409592f10ff1c75c075438959fcf7
+  data.tar.gz: a1860e71ee7054624f2cf368802e1af2ee302886ecfca99c0ff43b948c6cf3af3d9264e62b1c877220fb465c18a5df6e11b507d42dbe03c29612e0e2f8513dd7

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.2.3
   - ruby-head
   - jruby-9.0.4.0
+  - jruby-9.1.7.0
 
 gemfile:
   - gemfiles/activemodel_5.0.gemfile
@@ -14,5 +15,11 @@ gemfile:
   - gemfiles/activemodel_3.2.gemfile
 
 matrix:
+  exclude:
+  - rvm: 2.0
+    gemfile: gemfiles/activemodel_5.0.gemfile
+  - rvm: jruby-9.0.4.0
+    gemfile: gemfiles/activemodel_5.0.gemfile
+
   allow_failures:
-    - rvm: ruby-head
+  - rvm: ruby-head

data/Appraisals

@@ -1,17 +1,21 @@
 appraise 'activemodel-3.2' do
   gem 'activemodel', '3.2.22.5'
+  gem 'rack', '1.6.5'
 end
 
 appraise 'activemodel-4.0' do
   gem 'activemodel', '4.0.13'
+  gem 'rack', '1.6.5'
 end
 
 appraise 'activemodel-4.1' do
   gem 'activemodel', '4.1.6'
+  gem 'rack', '1.6.5'
 end
 
 appraise 'activemodel-4.2' do
   gem 'activemodel', '4.2.7.1'
+  gem 'rack', '1.6.5'
 end
 
 appraise 'activemodel-5.0' do

data/file_validators.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'cocaine', '~> 0.5.4'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.1.0'
+  s.add_development_dependency 'rspec', '~> 3.5.0'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rack-test'
 end

data/gemfiles/activemodel_3.2.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "activemodel", "3.2.22.5"
+gem "rack", "1.6.5"
 
 gemspec :path => "../"

data/gemfiles/activemodel_4.0.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "activemodel", "4.0.13"
+gem "rack", "1.6.5"
 
 gemspec :path => "../"

data/gemfiles/activemodel_4.1.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "activemodel", "4.1.6"
+gem "rack", "1.6.5"
 
 gemspec :path => "../"

data/gemfiles/activemodel_4.2.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "activemodel", "4.2.7.1"
+gem "rack", "1.6.5"
 
 gemspec :path => "../"

data/lib/file_validators/validators/file_size_validator.rb

@@ -17,7 +17,7 @@ module ActiveModel
         unless values.empty?
           options.slice(*CHECKS.keys).each do |option, option_value|
             option_value = option_value.call(record) if option_value.is_a?(Proc)
-            if values.any? { |v| not valid_size?(v.size, option, option_value) }
+            if values.any? { |v| not valid_size?(value_byte_size(v), option, option_value) }
               record.errors.add(attribute,
                                 "file_size_is_#{option}".to_sym,
                                 filtered_options(values).merge!(detect_error_options(option_value)))
@@ -57,7 +57,16 @@ module ActiveModel
         end
       end
 
+      def value_byte_size(value)
+        if value.respond_to?(:byte_size)
+          value.byte_size
+        else
+          value.size
+        end
+      end
+
       def valid_size?(size, option, option_value)
+        return false if size.nil?
         if option_value.is_a?(Range)
           option_value.send(CHECKS[option], size)
         else

data/lib/file_validators/version.rb

@@ -1,3 +1,3 @@
 module FileValidators
-  VERSION = '2.2.0.beta1'
+  VERSION = '2.3.0'
 end

data/spec/lib/file_validators/validators/file_size_validator_spec.rb

@@ -168,6 +168,12 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
   end
 
+  context 'exceptional file size' do
+    before { build_validator less_than: 3.kilobytes }
+
+    it { is_expected.to allow_file_size(0, @validator) } # zero-byte file
+    it { is_expected.not_to allow_file_size(nil, @validator) }
+  end
 
   context 'using the helper' do
     before { Dummy.validates_file_size :avatar, in: (5.kilobytes..10.kilobytes) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_validators
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ahmad Musaffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -169,9 +169,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1