file_validators 2.1.0 → 2.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451e981eb130a49dc6c51834bd7ed4dd30652c9a
-  data.tar.gz: e6b28941ccf9ced999b0e201ad17738efb8bc767
+  metadata.gz: 75fbf34dcce7be5b3770f09d4068c00f50f2cd9d
+  data.tar.gz: e81f181e641308492a13b1ef3ed5034724d2a7f6
 SHA512:
-  metadata.gz: 8c40fa1dae6faf187cc4d3ba77db40691b9bfe58fe9fa99bc88b9fc36477b49ef06bd360ffa8a8af4e2d6f4d56421259b9d9623ab3732a06883b8e64c3f57eb4
-  data.tar.gz: 4c6aed01f6c15c42c3f917dcdbbbb4c28907ed662a16f823e33d7416005122e159f2504d4991f5fd4b7b20405b332566a1d52137164f224ce5c1504df1c45407
+  metadata.gz: abb281ff04de1964a07f19d2ee5fa5ccc51f63827b0ae7bb2628c3ddc36379d16ad48e9aa037d5e16ed18a6ab5d0690b0cc866a263c48ce9a754006c53204d9f
+  data.tar.gz: 01417d071f54021f5c8ad73b6a9eb5d35c7b49b29c450037dd2b3b40cbaa13fb9250bf9cfc66931385caab5e2bd934b51987329a736a87645ce6cfa7063bee6c

data/.gitignore

@@ -11,3 +11,5 @@ gemfiles/*.lock
 coverage/
 /.idea
 .ruby-version
+.agignore
+tags

data/.travis.yml

@@ -7,12 +7,11 @@ rvm:
   - jruby-9.0.4.0
 
 gemfile:
+  - gemfiles/activemodel_5.0.gemfile
   - gemfiles/activemodel_4.2.gemfile
   - gemfiles/activemodel_4.1.gemfile
   - gemfiles/activemodel_4.0.gemfile
   - gemfiles/activemodel_3.2.gemfile
-  - gemfiles/activemodel_3.1.gemfile
-  - gemfiles/activemodel_3.0.gemfile
 
 matrix:
   allow_failures:

data/Appraisals

@@ -1,17 +1,9 @@
-appraise 'activemodel-3.0' do
-  gem 'activemodel', '3.0.20'
-end
-
-appraise 'activemodel-3.1' do
-  gem 'activemodel', '3.1.12'
-end
-
 appraise 'activemodel-3.2' do
-  gem 'activemodel', '3.2.18'
+  gem 'activemodel', '3.2.22.5'
 end
 
 appraise 'activemodel-4.0' do
-  gem 'activemodel', '4.0.10'
+  gem 'activemodel', '4.0.13'
 end
 
 appraise 'activemodel-4.1' do
@@ -19,5 +11,9 @@ appraise 'activemodel-4.1' do
 end
 
 appraise 'activemodel-4.2' do
-  gem 'activemodel', '4.2.3'
+  gem 'activemodel', '4.2.7.1'
+end
+
+appraise 'activemodel-5.0' do
+  gem 'activemodel', '5.0.1'
 end

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 2.2.0-beta.1
+
+* [#17](https://github.com/musaffa/file_validators/pull/17) Now Supports multiple file uploads
+* As activemodel 3.0 and 3.1 doesn't support `added?` method on the Errors class, the support for both of them have been deprecated in this release.
+
+# 2.1.0
+
+* Use autoload for lazy loading of libraries.
+* Media type spoof valiation is moved to content type detector.
+* `spoofed_file_media_type` message isn't needed anymore.
+* Logger info and warning is added.

data/README.md

@@ -12,8 +12,11 @@ Any module that uses ActiveModel, for example ActiveRecord, can use these file v
 
 ## Support
 
-* ActiveModel versions: 3 and 4.
-* Rails versions: 3 and 4.
+* ActiveModel versions: 3.2, 4 and 5.
+* Rails versions: 3.2, 4 and 5.
+
+As of version `2.2`, activemodel 3.0 and 3.1 will no longer be supported.
+For activemodel 3.0 and 3.1, please use file_validators version `<= 2.1`.
 
 It has been tested to work with Carrierwave, Paperclip, Dragonfly, Refile etc file uploading solutions.
 Validations works both before and after uploads.
@@ -253,8 +256,8 @@ $ rake test:unit
 $ rake test:integration
 
 # test different active model versions
-$ appraisal install
-$ appraisal rake
+$ bundle exec appraisal install
+$ bundle exec appraisal rake
 ```
 
 ## Problems

data/file_validators.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^spec/})
   s.require_paths  = ['lib']
 
-  s.add_dependency 'activemodel', '>= 3.0'
+  s.add_dependency 'activemodel', '>= 3.2'
   s.add_dependency 'mime-types', '>= 1.0'
 
   s.add_development_dependency 'cocaine', '~> 0.5.4'

data/gemfiles/activemodel_3.2.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activemodel", "3.2.18"
+gem "activemodel", "3.2.22.5"
 
 gemspec :path => "../"

data/gemfiles/activemodel_4.0.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activemodel", "4.0.10"
+gem "activemodel", "4.0.13"
 
 gemspec :path => "../"

data/gemfiles/activemodel_4.2.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activemodel", "4.2.3"
+gem "activemodel", "4.2.7.1"
 
 gemspec :path => "../"

data/gemfiles/{activemodel_3.0.gemfile → activemodel_5.0.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activemodel", "3.0.20"
+gem "activemodel", "5.0.1"
 
 gemspec :path => "../"

data/lib/file_validators/utils/content_type_detector.rb

@@ -22,20 +22,23 @@ module FileValidators
 
       # content type detection strategy:
       #
-      # 1. empty file: returns 'inode/x-empty'
-      # 2. nonempty file: if the file is not empty then returns the content type using file command
-      # 3. invalid file: file command raises error and returns 'application/octet-stream'
+      # 1. invalid file_path: returns 'application/octet-stream'
+      # 2. empty file: returns 'inode/x-empty'
+      # 3. valid file: returns the content type using file command
+      # 4. valid file but file commoand raises error: returns 'application/octet-stream'
 
       def detect
-        empty_file? ? EMPTY_CONTENT_TYPE : content_type_from_content
+        if !File.exist?(file_path)
+          DEFAULT_CONTENT_TYPE
+        elsif File.zero?(file_path)
+          EMPTY_CONTENT_TYPE
+        else
+          content_type_from_content
+        end
       end
 
       private
 
-      def empty_file?
-        File.exists?(file_path) && File.size(file_path) == 0
-      end
-
       def content_type_from_content
         content_type = type_from_file_command
 

data/lib/file_validators/validators/file_content_type_validator.rb

@@ -9,15 +9,17 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        value = JSON.parse(value) if value.is_a?(String) && value.present?
-        unless value.blank?
+        values = parse_values(value)
+        unless values.empty?
           mode = option_value(record, :mode)
-          content_type = get_content_type(value, mode)
           allowed_types = option_content_types(record, :allow)
           forbidden_types = option_content_types(record, :exclude)
 
-          validate_whitelist(record, attribute, content_type, allowed_types)
-          validate_blacklist(record, attribute, content_type, forbidden_types)
+          values.each do |value|
+            content_type = get_content_type(value, mode)
+            validate_whitelist(record, attribute, content_type, allowed_types)
+            validate_blacklist(record, attribute, content_type, forbidden_types)
+          end
         end
       end
 
@@ -35,6 +37,14 @@ module ActiveModel
 
       private
 
+      def parse_values(value)
+        return [] unless value.present?
+
+        value = JSON.parse(value) if value.is_a?(String)
+
+        Array.wrap(value).reject { |value| value.blank? }
+      end
+
       def get_file_path(value)
         if value.try(:path)
           value.path
@@ -87,7 +97,10 @@ module ActiveModel
       end
 
       def mark_invalid(record, attribute, error, option_types)
-        record.errors.add attribute, error, options.merge(types: option_types.join(', '))
+        error_options = options.merge(types: option_types.join(', '))
+        unless record.errors.added?(attribute, error, error_options)
+          record.errors.add attribute, error, error_options
+        end
       end
     end
 

data/lib/file_validators/validators/file_size_validator.rb

@@ -13,15 +13,14 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        value = JSON.parse(value) if value.is_a?(String) && value.present?
-        unless value.blank?
+        values = parse_values(value)
+        unless values.empty?
           options.slice(*CHECKS.keys).each do |option, option_value|
-            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)
+            if values.any? { |v| not valid_size?(v.size, option, option_value) }
               record.errors.add(attribute,
                                 "file_size_is_#{option}".to_sym,
-                                filtered_options(value).merge!(detect_error_options(option_value)))
+                                filtered_options(values).merge!(detect_error_options(option_value)))
             end
           end
         end
@@ -39,6 +38,17 @@ module ActiveModel
 
       private
 
+      def parse_values(value)
+        return [] unless value.present?
+
+        value = JSON.parse(value) if value.is_a?(String)
+        return [] unless value.present?
+
+        value = OpenStruct.new(value) if value.is_a?(Hash)
+
+        Array.wrap(value).reject { |value| value.blank? }
+      end
+
       def check_options(klass, options)
         options.each do |option, value|
           unless value.is_a?(klass) || value.is_a?(Proc)

data/lib/file_validators/version.rb

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

data/spec/integration/file_content_type_validation_integration_spec.rb

@@ -379,4 +379,54 @@ describe 'File Content Type integration with ActiveModel' do
       it { is_expected.to be_valid }
     end
   end
+
+  context 'image data as array' do
+    before :all do
+      Person.class_eval do
+        Person.reset_callbacks(:validate)
+        validates :avatar, file_content_type: { allow: 'image/jpeg' }
+      end
+    end
+
+    subject { Person.new }
+
+    context 'for one invalid content type' do
+      before {
+        subject.avatar = [
+          Rack::Test::UploadedFile.new(@sample_text_path, 'text/plain'),
+          Rack::Test::UploadedFile.new(@cute_path, 'image/jpeg')
+        ]
+      }
+      it { is_expected.not_to be_valid }
+    end
+
+    context 'for two invalid content types' do
+      before {
+        subject.avatar = [
+          Rack::Test::UploadedFile.new(@sample_text_path, 'text/plain'),
+          Rack::Test::UploadedFile.new(@sample_text_path, 'text/plain')
+        ]
+      }
+
+      it 'is invalid and adds just one error' do
+        expect(subject).not_to be_valid
+        expect(subject.errors.count).to eq 1
+      end
+    end
+
+    context 'for valid content type' do
+      before {
+        subject.avatar = [
+          Rack::Test::UploadedFile.new(@cute_path, 'image/jpeg'),
+          Rack::Test::UploadedFile.new(@cute_path, 'image/jpeg')
+        ]
+      }
+      it { is_expected.to be_valid }
+    end
+
+    context 'empty array' do
+      before { subject.avatar = [] }
+      it { is_expected.to be_valid }
+    end
+  end
 end

data/spec/integration/file_size_validator_integration_spec.rb

@@ -263,4 +263,67 @@ describe 'File Size Validator integration with ActiveModel' do
       it { is_expected.to be_valid }
     end
   end
+
+  context 'image data as array' do
+    before :all do
+      Person.class_eval do
+        Person.reset_callbacks(:validate)
+        validates :avatar, file_size: { greater_than: 20.kilobytes }
+      end
+    end
+
+    subject { Person.new }
+
+    context 'when size of one file is less than the specified size' do
+      before {
+        subject.avatar = [
+          Rack::Test::UploadedFile.new(@cute_path),
+          Rack::Test::UploadedFile.new(@chubby_bubble_path)
+        ]
+      }
+      it { is_expected.not_to be_valid }
+    end
+
+    context 'when size of all files is within the specified size' do
+      before {
+        subject.avatar = [
+          Rack::Test::UploadedFile.new(@cute_path),
+          Rack::Test::UploadedFile.new(@cute_path)
+        ]
+      }
+
+      it 'is invalid and adds just one error' do
+        expect(subject).not_to be_valid
+        expect(subject.errors.count).to eq 1
+      end
+    end
+
+    context 'when size of all files is less than the specified size' do
+      before {
+        subject.avatar = [
+          Rack::Test::UploadedFile.new(@chubby_bubble_path),
+          Rack::Test::UploadedFile.new(@chubby_bubble_path)
+        ]
+      }
+
+      it { is_expected.to be_valid }
+    end
+
+    context 'one file' do
+      context 'when file size is out of range' do
+        before { subject.avatar = [Rack::Test::UploadedFile.new(@cute_path)] }
+        it { is_expected.not_to be_valid }
+      end
+
+      context 'when file size within range' do
+        before { subject.avatar = [Rack::Test::UploadedFile.new(@chubby_bubble_path)] }
+        it { is_expected.to be_valid }
+      end
+    end
+
+    context 'empty array' do
+      before { subject.avatar = [] }
+      it { is_expected.to be_valid }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 require 'file_validators'
 require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_validators
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0.beta1
 platform: ruby
 authors:
 - Ahmad Musaffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2017-02-08 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
@@ -119,19 +119,18 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Appraisals
-- CHANGELOG.mod
+- 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
 - lib/file_validators.rb
 - lib/file_validators/locale/en.yml
 - lib/file_validators/utils/content_type_detector.rb
@@ -170,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/CHANGELOG.mod

@@ -1,6 +0,0 @@
-# 2.1.0
-
-* Use autoload for lazy loading of libraries
-* Media type spoof valiation is moved to content type detector
-* spoofed_file_media_type message isn't needed anymore
-* Show logger info and warning

data/gemfiles/activemodel_3.1.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "activemodel", "3.1.12"
-
-gemspec :path => "../"