file_validators 2.0.2 → 3.0.0.beta2

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

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
-require 'file_validators/validators/file_size_validator'
 
 describe ActiveModel::Validations::FileSizeValidator do
   class Dummy
@@ -8,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
 
@@ -21,7 +22,7 @@ describe ActiveModel::Validations::FileSizeValidator do
   subject { Dummy }
 
   def build_validator(options)
-    @validator = ActiveModel::Validations::FileSizeValidator.new(options.merge(attributes: :avatar))
+    @validator = described_class.new(options.merge(attributes: :avatar))
   end
 
   context 'with :in option' do
@@ -34,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) }
@@ -52,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) }
@@ -70,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) }
@@ -87,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) }
@@ -103,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) }
@@ -120,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) }
@@ -130,51 +133,101 @@ 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 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 { 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(
+          4.kilobytes, @validator,
+          message: "Avatar file size must be greater than or equal to #{@storage_units[5120]}"
+        )
+      end
     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) }
 
     it 'adds the validator to the class' do
-      expect(Dummy.validators_on(:avatar)).to include(ActiveModel::Validations::FileSizeValidator)
+      expect(Dummy.validators_on(:avatar)).to include(described_class)
     end
   end
 
@@ -183,10 +236,10 @@ describe ActiveModel::Validations::FileSizeValidator do
       expect { build_validator message: 'Some message' }.to raise_error(ArgumentError)
     end
 
-    (ActiveModel::Validations::FileSizeValidator::CHECKS.keys - [:in]).each do |argument|
+    (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
@@ -196,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,8 +1,11 @@
+# frozen_string_literal: true
+
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
-require_relative '../lib/file_validators'
+require 'file_validators'
 require 'rspec'
 require 'coveralls'
 
@@ -10,8 +13,13 @@ Coveralls.wear!
 
 locale_path = Dir.glob(File.dirname(__FILE__) + '/locale/*.yml')
 I18n.load_path += locale_path unless I18n.load_path.include?(locale_path)
+I18n.enforce_available_locales = false
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
+  config.include Helpers
+
+  # Suppress stdout in the console
+  config.before { allow($stdout).to receive(:write) }
 end

data/spec/support/fakeio.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'stringio'
+
+class FakeIO
+  attr_reader :original_filename, :content_type
+
+  def initialize(content, filename: nil, content_type: nil)
+    @io = StringIO.new(content)
+    @original_filename = filename
+    @content_type = content_type
+  end
+
+  extend Forwardable
+  delegate %i[read rewind eof? close size] => :@io
+end

data/spec/support/helpers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Helpers
+  def fakeio(content = 'file', **options)
+    FakeIO.new(content, **options)
+  end
+end

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.0.2
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Ahmad Musaffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +39,21 @@ 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: rake
+  name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: mini_mime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.58.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.58.2
 description: Adds file validators to ActiveModel
 email:
 - musaffa_csemm@yahoo.com
@@ -117,24 +173,27 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".tool-versions"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - README.rdoc
 - Rakefile
 - file_validators.gemspec
-- gemfiles/activemodel_3.0.gemfile
-- gemfiles/activemodel_3.1.gemfile
 - gemfiles/activemodel_3.2.gemfile
 - gemfiles/activemodel_4.0.gemfile
 - gemfiles/activemodel_4.1.gemfile
 - gemfiles/activemodel_4.2.gemfile
+- gemfiles/activemodel_5.0.gemfile
+- gemfiles/activemodel_5.2.gemfile
 - lib/file_validators.rb
+- lib/file_validators/error.rb
 - lib/file_validators/locale/en.yml
-- lib/file_validators/utils/content_type_detector.rb
-- lib/file_validators/utils/media_type_spoof_detector.rb
+- lib/file_validators/mime_type_analyzer.rb
 - lib/file_validators/validators/file_content_type_validator.rb
 - lib/file_validators/validators/file_size_validator.rb
 - lib/file_validators/version.rb
@@ -146,12 +205,13 @@ files:
 - spec/integration/combined_validators_integration_spec.rb
 - spec/integration/file_content_type_validation_integration_spec.rb
 - spec/integration/file_size_validator_integration_spec.rb
-- spec/lib/file_validators/utils/content_type_detector_spec.rb
-- spec/lib/file_validators/utils/media_type_spoof_detector_spec.rb
+- spec/lib/file_validators/mime_type_analyzer_spec.rb
 - spec/lib/file_validators/validators/file_content_type_validator_spec.rb
 - spec/lib/file_validators/validators/file_size_validator_spec.rb
 - spec/locale/en.yml
 - spec/spec_helper.rb
+- spec/support/fakeio.rb
+- spec/support/helpers.rb
 - spec/support/matchers/allow_content_type.rb
 - spec/support/matchers/allow_file_size.rb
 homepage: https://github.com/musaffa/file_validators
@@ -169,12 +229,11 @@ 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.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveModel file validators
@@ -187,11 +246,12 @@ test_files:
 - spec/integration/combined_validators_integration_spec.rb
 - spec/integration/file_content_type_validation_integration_spec.rb
 - spec/integration/file_size_validator_integration_spec.rb
-- spec/lib/file_validators/utils/content_type_detector_spec.rb
-- spec/lib/file_validators/utils/media_type_spoof_detector_spec.rb
+- spec/lib/file_validators/mime_type_analyzer_spec.rb
 - spec/lib/file_validators/validators/file_content_type_validator_spec.rb
 - spec/lib/file_validators/validators/file_size_validator_spec.rb
 - spec/locale/en.yml
 - spec/spec_helper.rb
+- spec/support/fakeio.rb
+- spec/support/helpers.rb
 - spec/support/matchers/allow_content_type.rb
 - spec/support/matchers/allow_file_size.rb