file_validators 2.3.0 → 3.0.0.beta1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ActiveModel::Validations::FileSizeValidator do
@@ -7,9 +9,9 @@ describe ActiveModel::Validations::FileSizeValidator do
 
   def storage_units
     if defined?(ActiveSupport::NumberHelper) # Rails 4.0+
-      { 5120 => '5 KB',       10240 => '10 KB' }
+      { 5120 => '5 KB',       10_240 => '10 KB' }
     else
-      { 5120 => '5120 Bytes', 10240 => '10240 Bytes' }
+      { 5120 => '5120 Bytes', 10_240 => '10240 Bytes' }
     end
   end
 
@@ -33,7 +35,7 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
 
     context 'as a proc' do
-      before { build_validator in: lambda { |record| (5.kilobytes..10.kilobytes) } }
+      before { build_validator in: ->(_record) { (5.kilobytes..10.kilobytes) } }
 
       it { is_expected.to allow_file_size(7.kilobytes, @validator) }
       it { is_expected.not_to allow_file_size(4.kilobytes, @validator) }
@@ -51,7 +53,7 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
 
     context 'as a proc' do
-      before { build_validator greater_than_or_equal_to: lambda { |record| 10.kilobytes } }
+      before { build_validator greater_than_or_equal_to: ->(_record) { 10.kilobytes } }
 
       it { is_expected.to allow_file_size(11.kilobytes, @validator) }
       it { is_expected.to allow_file_size(10.kilobytes, @validator) }
@@ -69,7 +71,7 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
 
     context 'as a proc' do
-      before { build_validator less_than_or_equal_to: lambda { |record| 10.kilobytes } }
+      before { build_validator less_than_or_equal_to: ->(_record) { 10.kilobytes } }
 
       it { is_expected.to allow_file_size(9.kilobytes, @validator) }
       it { is_expected.to allow_file_size(10.kilobytes, @validator) }
@@ -86,7 +88,7 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
 
     context 'as a proc' do
-      before { build_validator greater_than: lambda { |record| 10.kilobytes } }
+      before { build_validator greater_than: ->(_record) { 10.kilobytes } }
 
       it { is_expected.to allow_file_size(11.kilobytes, @validator) }
       it { is_expected.not_to allow_file_size(10.kilobytes, @validator) }
@@ -102,7 +104,7 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
 
     context 'as a proc' do
-      before { build_validator less_than: lambda { |record| 10.kilobytes } }
+      before { build_validator less_than: ->(_record) { 10.kilobytes } }
 
       it { is_expected.to allow_file_size(9.kilobytes, @validator) }
       it { is_expected.not_to allow_file_size(10.kilobytes, @validator) }
@@ -119,8 +121,10 @@ describe ActiveModel::Validations::FileSizeValidator do
     end
 
     context 'as a proc' do
-      before { build_validator greater_than: lambda { |record| 5.kilobytes },
-                                  less_than: lambda { |record| 10.kilobytes } }
+      before do
+        build_validator greater_than: ->(_record) { 5.kilobytes },
+                        less_than: ->(_record) { 10.kilobytes }
+      end
 
       it { is_expected.to allow_file_size(7.kilobytes, @validator) }
       it { is_expected.not_to allow_file_size(5.kilobytes, @validator) }
@@ -129,42 +133,86 @@ describe ActiveModel::Validations::FileSizeValidator do
   end
 
   context 'with :message option' do
-    before { build_validator in: (5.kilobytes..10.kilobytes),
-                             message: 'is invalid. (Between %{min} and %{max} please.)' }
+    before do
+      build_validator in: (5.kilobytes..10.kilobytes),
+                      message: 'is invalid. (Between %{min} and %{max} please.)'
+    end
 
-    it { is_expected.not_to allow_file_size(11.kilobytes, @validator,
-                                            message: "Avatar is invalid. (Between #{@storage_units[5120]} and #{@storage_units[10240]} please.)") }
+    it do
+      is_expected.not_to allow_file_size(
+        11.kilobytes, @validator,
+        message: "Avatar is invalid. (Between #{@storage_units[5120]}" \
+                 " and #{@storage_units[10_240]} please.)"
+      )
+    end
 
-    it { is_expected.to allow_file_size(7.kilobytes, @validator,
-                                        message: "Avatar is invalid. (Between #{@storage_units[5120]} and #{@storage_units[10240]} please.)") }
+    it do
+      is_expected.to allow_file_size(
+        7.kilobytes, @validator,
+        message: "Avatar is invalid. (Between #{@storage_units[5120]}" \
+                 " and #{@storage_units[10_240]} please.)"
+      )
+    end
   end
 
   context 'default error message' do
     context 'given :in options' do
       before { build_validator in: 5.kilobytes..10.kilobytes }
 
-      it { is_expected.not_to allow_file_size(11.kilobytes, @validator,
-                                              message: "Avatar file size must be between #{@storage_units[5120]} and #{@storage_units[10240]}") }
-      it { is_expected.not_to allow_file_size(4.kilobytes, @validator,
-                                              message: "Avatar file size must be between #{@storage_units[5120]} and #{@storage_units[10240]}") }
+      it do
+        is_expected.not_to allow_file_size(
+          11.kilobytes, @validator,
+          message: "Avatar file size must be between #{@storage_units[5120]}" \
+                   " and #{@storage_units[10_240]}"
+        )
+      end
+
+      it do
+        is_expected.not_to allow_file_size(
+          4.kilobytes, @validator,
+          message: "Avatar file size must be between #{@storage_units[5120]}" \
+                   " and #{@storage_units[10_240]}"
+        )
+      end
     end
 
     context 'given :greater_than and :less_than options' do
       before { build_validator greater_than: 5.kilobytes, less_than: 10.kilobytes }
 
-      it { is_expected.not_to allow_file_size(11.kilobytes, @validator,
-                                              message: "Avatar file size must be less than #{@storage_units[10240]}") }
-      it { is_expected.not_to allow_file_size(4.kilobytes, @validator,
-                                              message: "Avatar file size must be greater than #{@storage_units[5120]}") }
+      it do
+        is_expected.not_to allow_file_size(
+          11.kilobytes, @validator,
+          message: "Avatar file size must be less than #{@storage_units[10_240]}"
+        )
+      end
+
+      it do
+        is_expected.not_to allow_file_size(
+          4.kilobytes, @validator,
+          message: "Avatar file size must be greater than #{@storage_units[5120]}"
+        )
+      end
     end
 
     context 'given :greater_than_or_equal_to and :less_than_or_equal_to options' do
-      before { build_validator greater_than_or_equal_to: 5.kilobytes, less_than_or_equal_to: 10.kilobytes }
+      before do
+        build_validator greater_than_or_equal_to: 5.kilobytes,
+                        less_than_or_equal_to: 10.kilobytes
+      end
 
-      it { is_expected.not_to allow_file_size(11.kilobytes, @validator,
-                                              message: "Avatar file size must be less than or equal to #{@storage_units[10240]}") }
-      it { is_expected.not_to allow_file_size(4.kilobytes, @validator,
-                                              message: "Avatar file size must be greater than or equal to #{@storage_units[5120]}") }
+      it do
+        is_expected.not_to allow_file_size(
+          11.kilobytes, @validator,
+          message: "Avatar file size must be less than or equal to #{@storage_units[10_240]}"
+        )
+      end
+
+      it do
+        is_expected.not_to allow_file_size(
+          4.kilobytes, @validator,
+          message: "Avatar file size must be greater than or equal to #{@storage_units[5120]}"
+        )
+      end
     end
   end
 
@@ -191,7 +239,7 @@ describe ActiveModel::Validations::FileSizeValidator do
     (described_class::CHECKS.keys - [:in]).each do |argument|
       it "does not raise argument error if :#{argument} is numeric or a proc" do
         expect { build_validator argument => 5.kilobytes }.not_to raise_error
-        expect { build_validator argument => lambda { |record| 5.kilobytes } }.not_to raise_error
+        expect { build_validator argument => ->(_record) { 5.kilobytes } }.not_to raise_error
       end
 
       it "raises error if :#{argument} is neither a number nor a proc" do
@@ -201,7 +249,7 @@ describe ActiveModel::Validations::FileSizeValidator do
 
     it 'does not raise argument error if :in is a range or a proc' do
       expect { build_validator in: 5.kilobytes..10.kilobytes }.not_to raise_error
-      expect { build_validator in: lambda { |record| 5.kilobytes..10.kilobytes } }.not_to raise_error
+      expect { build_validator in: ->(_record) { 5.kilobytes..10.kilobytes } }.not_to raise_error
     end
 
     it 'raises error if :in is neither a range nor a proc' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'active_support'

data/spec/support/matchers/allow_content_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :allow_file_content_type do |content_type, validator, message|
   match do |model|
     value = double('file', path: content_type, original_filename: content_type)

data/spec/support/matchers/allow_file_size.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :allow_file_size do |size, validator, message|
   match do |model|
     value = double('file', size: size)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_validators
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Ahmad Musaffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: cocaine
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.58.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.58.2
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: Adds file validators to ActiveModel
 email:
 - musaffa_csemm@yahoo.com
@@ -117,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -169,9 +184,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1