file_validators 2.3.0 → 3.0.0.beta1

data/lib/file_validators/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FileValidators
-  VERSION = '2.3.0'
+  VERSION = '3.0.0.beta1'
 end

data/spec/integration/combined_validators_integration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack/test/uploaded_file'
 
@@ -52,7 +54,7 @@ describe 'Combined File Validators integration with ActiveModel' do
     before :all do
       Person.class_eval do
         Person.reset_callbacks(:validate)
-        validates_file_size :avatar, { less_than: 20.kilobytes }
+        validates_file_size :avatar, less_than: 20.kilobytes
         validates_file_content_type :avatar, allow: 'image/jpeg'
       end
     end

data/spec/integration/file_content_type_validation_integration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack/test/uploaded_file'
 
@@ -69,7 +71,8 @@ describe 'File Content Type integration with ActiveModel' do
       before :all do
         Person.class_eval do
           Person.reset_callbacks(:validate)
-          validates :avatar, file_content_type: { allow: ['image/jpeg', 'text/plain'], mode: :strict }
+          validates :avatar, file_content_type: { allow: ['image/jpeg', 'text/plain'],
+                                                  mode: :strict }
         end
       end
 
@@ -97,7 +100,7 @@ describe 'File Content Type integration with ActiveModel' do
       before :all do
         Person.class_eval do
           Person.reset_callbacks(:validate)
-          validates :avatar, file_content_type: { allow: lambda { |record| ['image/jpeg', 'text/plain'] },
+          validates :avatar, file_content_type: { allow: ->(_record) { ['image/jpeg', 'text/plain'] },
                                                   mode: :strict }
         end
       end
@@ -177,7 +180,8 @@ describe 'File Content Type integration with ActiveModel' do
       before :all do
         Person.class_eval do
           Person.reset_callbacks(:validate)
-          validates :avatar, file_content_type: { exclude: ['image/jpeg', 'text/plain'], mode: :strict }
+          validates :avatar, file_content_type: { exclude: ['image/jpeg', 'text/plain'],
+                                                  mode: :strict }
         end
       end
 
@@ -205,7 +209,8 @@ describe 'File Content Type integration with ActiveModel' do
       before :all do
         Person.class_eval do
           Person.reset_callbacks(:validate)
-          validates :avatar, file_content_type: { exclude: lambda { |record| /^image\/.*/ }, mode: :strict }
+          validates :avatar, file_content_type: { exclude: ->(_record) { /^image\/.*/ },
+                                                  mode: :strict }
         end
       end
 
@@ -229,7 +234,8 @@ describe 'File Content Type integration with ActiveModel' do
     before :all do
       Person.class_eval do
         Person.reset_callbacks(:validate)
-        validates :avatar, file_content_type: { allow: /^image\/.*/, exclude: 'image/png', mode: :strict }
+        validates :avatar, file_content_type: { allow: /^image\/.*/, exclude: 'image/png',
+                                                mode: :strict }
       end
     end
 
@@ -334,22 +340,28 @@ 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 do
+        subject.avatar = '{"filename":"img140910_88338.GIF","content_type":"image/gif","size":13150}'
+      end
+
       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 do
+        subject.avatar = '{"filename":"img140910_88338.jpg","content_type":"image/jpeg","size":13150}'
+      end
+
       it { is_expected.to be_valid }
     end
 
     context 'empty json string' do
-      before { subject.avatar = "{}" }
+      before { subject.avatar = '{}' }
       it { is_expected.to be_valid }
     end
 
     context 'empty string' do
-      before { subject.avatar = "" }
+      before { subject.avatar = '' }
       it { is_expected.to be_valid }
     end
   end
@@ -365,12 +377,26 @@ 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 do
+        subject.avatar = {
+          'filename' => 'img140910_88338.GIF',
+          'content_type' => 'image/gif',
+          'size' => 13_150
+        }
+      end
+
       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 do
+        subject.avatar = {
+          'filename' => 'img140910_88338.jpg',
+          'content_type' => 'image/jpeg',
+          'size' => 13_150
+        }
+      end
+
       it { is_expected.to be_valid }
     end
 
@@ -391,22 +417,22 @@ describe 'File Content Type integration with ActiveModel' do
     subject { Person.new }
 
     context 'for one invalid content type' do
-      before {
+      before do
         subject.avatar = [
           Rack::Test::UploadedFile.new(@sample_text_path, 'text/plain'),
           Rack::Test::UploadedFile.new(@cute_path, 'image/jpeg')
         ]
-      }
+      end
       it { is_expected.not_to be_valid }
     end
 
     context 'for two invalid content types' do
-      before {
+      before do
         subject.avatar = [
           Rack::Test::UploadedFile.new(@sample_text_path, 'text/plain'),
           Rack::Test::UploadedFile.new(@sample_text_path, 'text/plain')
         ]
-      }
+      end
 
       it 'is invalid and adds just one error' do
         expect(subject).not_to be_valid
@@ -415,12 +441,12 @@ describe 'File Content Type integration with ActiveModel' do
     end
 
     context 'for valid content type' do
-      before {
+      before do
         subject.avatar = [
           Rack::Test::UploadedFile.new(@cute_path, 'image/jpeg'),
           Rack::Test::UploadedFile.new(@cute_path, 'image/jpeg')
         ]
-      }
+      end
       it { is_expected.to be_valid }
     end
 

data/spec/integration/file_size_validator_integration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack/test/uploaded_file'
 
@@ -44,7 +46,7 @@ describe 'File Size Validator integration with ActiveModel' do
       before :all do
         Person.class_eval do
           Person.reset_callbacks(:validate)
-          validates :avatar, file_size: { in: lambda { |record| 20.kilobytes..40.kilobytes } }
+          validates :avatar, file_size: { in: ->(_record) { 20.kilobytes..40.kilobytes } }
         end
       end
 
@@ -99,8 +101,8 @@ describe 'File Size Validator integration with ActiveModel' do
       before :all do
         Person.class_eval do
           Person.reset_callbacks(:validate)
-          validates :avatar, file_size: { greater_than: lambda { |record| 20.kilobytes },
-                                          less_than:    lambda { |record| 40.kilobytes } }
+          validates :avatar, file_size: { greater_than: ->(_record) { 20.kilobytes },
+                                          less_than:    ->(_record) { 40.kilobytes } }
         end
       end
 
@@ -218,22 +220,28 @@ 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 do
+        subject.avatar = '{"filename":"img140910_88338.GIF","content_type":"image/gif","size":13150}'
+      end
+
       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 do
+        subject.avatar = '{"filename":"img140910_88338.GIF","content_type":"image/gif","size":33150}'
+      end
+
       it { is_expected.to be_valid }
     end
 
     context 'empty json string' do
-      before { subject.avatar = "{}" }
+      before { subject.avatar = '{}' }
       it { is_expected.to be_valid }
     end
 
     context 'empty json string' do
-      before { subject.avatar = "" }
+      before { subject.avatar = '' }
       it { is_expected.to be_valid }
     end
   end
@@ -249,12 +257,26 @@ 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 do
+        subject.avatar = {
+          'filename' => 'img140910_88338.GIF',
+          'content_type' => 'image/gif',
+          'size' => 13_150
+        }
+      end
+
       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 do
+        subject.avatar = {
+          'filename' => 'img140910_88338.GIF',
+          'content_type' => 'image/gif',
+          'size' => 33_150
+        }
+      end
+
       it { is_expected.to be_valid }
     end
 
@@ -275,22 +297,22 @@ describe 'File Size Validator integration with ActiveModel' do
     subject { Person.new }
 
     context 'when size of one file is less than the specified size' do
-      before {
+      before do
         subject.avatar = [
           Rack::Test::UploadedFile.new(@cute_path),
           Rack::Test::UploadedFile.new(@chubby_bubble_path)
         ]
-      }
+      end
       it { is_expected.not_to be_valid }
     end
 
     context 'when size of all files is within the specified size' do
-      before {
+      before do
         subject.avatar = [
           Rack::Test::UploadedFile.new(@cute_path),
           Rack::Test::UploadedFile.new(@cute_path)
         ]
-      }
+      end
 
       it 'is invalid and adds just one error' do
         expect(subject).not_to be_valid
@@ -299,12 +321,12 @@ describe 'File Size Validator integration with ActiveModel' do
     end
 
     context 'when size of all files is less than the specified size' do
-      before {
+      before do
         subject.avatar = [
           Rack::Test::UploadedFile.new(@chubby_bubble_path),
           Rack::Test::UploadedFile.new(@chubby_bubble_path)
         ]
-      }
+      end
 
       it { is_expected.to be_valid }
     end

data/spec/lib/file_validators/utils/content_type_detector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'tempfile'
 

data/spec/lib/file_validators/utils/media_type_spoof_detector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe FileValidators::Utils::MediaTypeSpoofDetector do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ActiveModel::Validations::FileContentTypeValidator do
@@ -17,57 +19,85 @@ describe ActiveModel::Validations::FileContentTypeValidator do
         before { build_validator allow: 'image/jpg' }
         it { is_expected.to allow_file_content_type('image/jpg', @validator) }
       end
-  
+
       context 'as an regexp' do
         before { build_validator allow: /^image\/.*/ }
         it { is_expected.to allow_file_content_type('image/png', @validator) }
       end
-  
+
       context 'as a list' do
         before { build_validator allow: ['image/png', 'image/jpg', 'image/jpeg'] }
         it { is_expected.to allow_file_content_type('image/png', @validator) }
       end
 
       context 'as a proc' do
-        before { build_validator allow: lambda { |record| ['image/png', 'image/jpg', 'image/jpeg'] } }
+        before { build_validator allow: ->(_record) { ['image/png', 'image/jpg', 'image/jpeg'] } }
         it { is_expected.to allow_file_content_type('image/png', @validator) }
       end
     end
-  
+
     context 'with a disallowed type' do
       context 'as a string' do
         before { build_validator allow: 'image/png' }
         it { is_expected.not_to allow_file_content_type('image/jpeg', @validator) }
       end
-  
+
       context 'as a regexp' do
         before { build_validator allow: /^text\/.*/ }
         it { is_expected.not_to allow_file_content_type('image/png', @validator) }
       end
 
       context 'as a proc' do
-        before { build_validator allow: lambda { |record| /^text\/.*/ } }
+        before { build_validator allow: ->(_record) { /^text\/.*/ } }
         it { is_expected.not_to allow_file_content_type('image/png', @validator) }
       end
-  
+
       context 'with :message option' do
         context 'without interpolation' do
-          before { build_validator allow: 'image/png', message: 'should be a PNG image' }
-          it { is_expected.not_to allow_file_content_type('image/jpeg', @validator, message: 'Avatar should be a PNG image') }
+          before do
+            build_validator allow: 'image/png',
+                            message: 'should be a PNG image'
+          end
+
+          it do
+            is_expected.not_to allow_file_content_type(
+              'image/jpeg', @validator,
+              message: 'Avatar should be a PNG image'
+            )
+          end
         end
-  
+
         context 'with interpolation' do
-          before { build_validator allow: 'image/png', message: 'should have content type %{types}' }
-          it { is_expected.not_to allow_file_content_type('image/jpeg', @validator,
-                                                          message: 'Avatar should have content type image/png') }
-          it { is_expected.to allow_file_content_type('image/png', @validator,
-                                                          message: 'Avatar should have content type image/png') }
+          before do
+            build_validator allow: 'image/png',
+                            message: 'should have content type %{types}'
+          end
+
+          it do
+            is_expected.not_to allow_file_content_type(
+              'image/jpeg', @validator,
+              message: 'Avatar should have content type image/png'
+            )
+          end
+
+          it do
+            is_expected.to allow_file_content_type(
+              'image/png', @validator,
+              message: 'Avatar should have content type image/png'
+            )
+          end
         end
       end
 
       context 'default message' do
         before { build_validator allow: 'image/png' }
-        it { is_expected.not_to allow_file_content_type('image/jpeg', @validator, message: 'Avatar file should be one of image/png') }
+
+        it do
+          is_expected.not_to allow_file_content_type(
+            'image/jpeg', @validator,
+            message: 'Avatar file should be one of image/png'
+          )
+        end
       end
     end
   end
@@ -78,23 +108,23 @@ describe ActiveModel::Validations::FileContentTypeValidator do
         before { build_validator exclude: 'image/gif' }
         it { is_expected.to allow_file_content_type('image/png', @validator) }
       end
-  
+
       context 'as an regexp' do
         before { build_validator exclude: /^text\/.*/ }
         it { is_expected.to allow_file_content_type('image/png', @validator) }
       end
-  
+
       context 'as a list' do
         before { build_validator exclude: ['image/png', 'image/jpg', 'image/jpeg'] }
         it { is_expected.to allow_file_content_type('image/gif', @validator) }
       end
 
       context 'as a proc' do
-        before { build_validator exclude: lambda { |record| ['image/png', 'image/jpg', 'image/jpeg'] } }
+        before { build_validator exclude: ->(_record) { ['image/png', 'image/jpg', 'image/jpeg'] } }
         it { is_expected.to allow_file_content_type('image/gif', @validator) }
       end
     end
-  
+
     context 'with a disallowed type' do
       context 'as a string' do
         before { build_validator exclude: 'image/gif' }
@@ -107,28 +137,56 @@ describe ActiveModel::Validations::FileContentTypeValidator do
       end
 
       context 'as an proc' do
-        before { build_validator exclude: lambda { |record| /^text\/.*/ } }
+        before { build_validator exclude: ->(_record) { /^text\/.*/ } }
         it { is_expected.not_to allow_file_content_type('text/plain', @validator) }
       end
-  
+
       context 'with :message option' do
         context 'without interpolation' do
-          before { build_validator exclude: 'image/png', message: 'should not be a PNG image' }
-          it { is_expected.not_to allow_file_content_type('image/png', @validator, message: 'Avatar should not be a PNG image') }
+          before do
+            build_validator exclude: 'image/png',
+                            message: 'should not be a PNG image'
+          end
+
+          it do
+            is_expected.not_to allow_file_content_type(
+              'image/png', @validator,
+              message: 'Avatar should not be a PNG image'
+            )
+          end
         end
-  
+
         context 'with interpolation' do
-          before { build_validator exclude: 'image/png', message: 'should not have content type %{types}' }
-          it { is_expected.not_to allow_file_content_type('image/png', @validator,
-                                                          message: 'Avatar should not have content type image/png') }
-          it { is_expected.to allow_file_content_type('image/jpeg', @validator,
-                                                      message: 'Avatar should not have content type image/jpeg') }
+          before do
+            build_validator exclude: 'image/png',
+                            message: 'should not have content type %{types}'
+          end
+
+          it do
+            is_expected.not_to allow_file_content_type(
+              'image/png', @validator,
+              message: 'Avatar should not have content type image/png'
+            )
+          end
+
+          it do
+            is_expected.to allow_file_content_type(
+              'image/jpeg', @validator,
+              message: 'Avatar should not have content type image/jpeg'
+            )
+          end
         end
       end
 
       context 'default message' do
         before { build_validator exclude: 'image/png' }
-        it { is_expected.not_to allow_file_content_type('image/png', @validator, message: 'Avatar file cannot be image/png') }
+
+        it do
+          is_expected.not_to allow_file_content_type(
+            'image/png', @validator,
+            message: 'Avatar file cannot be image/png'
+          )
+        end
       end
     end
   end
@@ -151,7 +209,7 @@ describe ActiveModel::Validations::FileContentTypeValidator do
         expect { build_validator argument => 'image/jpg' }.not_to raise_error
         expect { build_validator argument => ['image/jpg'] }.not_to raise_error
         expect { build_validator argument => /^image\/.*/ }.not_to raise_error
-        expect { build_validator argument => lambda { |record| 'image/jpg' } }.not_to raise_error
+        expect { build_validator argument => ->(_record) { 'image/jpg' } }.not_to raise_error
       end
 
       it "raises argument error if :#{argument} is neither a string, array, regexp nor proc" do