active_storage_validations 0.8.2 → 0.9.4

data/lib/active_storage_validations/matchers/size_validator_matcher.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# Big thank you to the paperclip validation matchers:
+# https://github.com/thoughtbot/paperclip/blob/v6.1.0/lib/paperclip/matchers/validate_attachment_size_matcher.rb
+module ActiveStorageValidations
+  module Matchers
+    def validate_size_of(name)
+      SizeValidatorMatcher.new(name)
+    end
+
+    class SizeValidatorMatcher
+      def initialize(attribute_name)
+        @attribute_name = attribute_name
+        @low = @high = nil
+      end
+
+      def description
+        "validate file size of #{@attribute_name}"
+      end
+
+      def less_than(size)
+        @high = size - 1.byte
+        self
+      end
+
+      def less_than_or_equal_to(size)
+        @high = size
+        self
+      end
+
+      def greater_than(size)
+        @low = size + 1.byte
+        self
+      end
+
+      def greater_than_or_equal_to(size)
+        @low = size
+        self
+      end
+
+      def between(range)
+        @low, @high = range.first, range.last
+        self
+      end
+
+      def matches?(subject)
+        @subject = subject.is_a?(Class) ? subject.new : subject
+        responds_to_methods && lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
+      end
+
+      def failure_message
+        "is expected to validate file size of #{@attribute_name} to be between #{@low} and #{@high} bytes"
+      end
+
+      def failure_message_when_negated
+        "is expected to not validate file size of #{@attribute_name} to be between #{@low} and #{@high} bytes"
+      end
+
+      protected
+
+      def responds_to_methods
+        @subject.respond_to?(@attribute_name) &&
+          @subject.public_send(@attribute_name).respond_to?(:attach) &&
+          @subject.public_send(@attribute_name).respond_to?(:detach)
+      end
+
+      def lower_than_low?
+        @low.nil? || !passes_validation_with_size(@low - 1)
+      end
+
+      def higher_than_low?
+        @low.nil? || passes_validation_with_size(@low + 1)
+      end
+
+      def lower_than_high?
+        @high.nil? || @high == Float::INFINITY || passes_validation_with_size(@high - 1)
+      end
+
+      def higher_than_high?
+        @high.nil? || @high == Float::INFINITY || !passes_validation_with_size(@high + 1)
+      end
+
+      def passes_validation_with_size(new_size)
+        io = Tempfile.new('Hello world!')
+        Matchers.stub_method(io, :size, new_size) do
+          @subject.public_send(@attribute_name).attach(io: io, filename: 'test.png', content_type: 'image/pg')
+          @subject.validate
+          @subject.errors.details[@attribute_name].all? { |error| error[:error] != :file_size_out_of_range }
+        end
+      end
+    end
+  end
+end

data/lib/active_storage_validations/metadata.rb

@@ -19,11 +19,22 @@ module ActiveStorageValidations
     private
 
     def read_image
-      if file.is_a?(String)
-        blob = ActiveStorage::Blob.find_signed(file)
+      is_string = file.is_a?(String)
+      if is_string || file.is_a?(ActiveStorage::Blob)
+        if is_string
+          # If Rails 5.2 or 6.0, use `find_signed`
+          if Rails::VERSION::MAJOR < 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR == 0)
+            blob = ActiveStorage::Blob.find_signed(file)
+          # If Rails 6.1 or higher, use `find_signed!`
+          elsif Rails::VERSION::MAJOR > 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1)
+            blob = ActiveStorage::Blob.find_signed!(file)
+          end
+        else
+          blob = file
+        end
 
         tempfile = Tempfile.new(["ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter])
-        tempfile.binmode 
+        tempfile.binmode
 
         blob.download do |chunk|
           tempfile.write(chunk)

data/lib/active_storage_validations/size_validator.rb

@@ -25,7 +25,7 @@ module ActiveStorageValidations
         next if content_size_valid?(file.blob.byte_size)
 
         errors_options[:file_size] = number_to_human_size(file.blob.byte_size)
-        record.errors.add(attribute, :file_size_out_of_range, errors_options)
+        record.errors.add(attribute, :file_size_out_of_range, **errors_options)
         break
       end
     end

data/lib/active_storage_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  VERSION = '0.8.2'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,35 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.5
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.5
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.9.5
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,6 +106,17 @@ files:
 - Rakefile
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
+- config/locales/it.yml
+- config/locales/ja.yml
+- config/locales/nl.yml
+- config/locales/pl.yml
+- config/locales/pt-BR.yml
+- config/locales/ru.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
+- config/locales/vi.yml
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
@@ -113,6 +124,11 @@ files:
 - lib/active_storage_validations/dimension_validator.rb
 - lib/active_storage_validations/engine.rb
 - lib/active_storage_validations/limit_validator.rb
+- lib/active_storage_validations/matchers.rb
+- lib/active_storage_validations/matchers/attached_validator_matcher.rb
+- lib/active_storage_validations/matchers/content_type_validator_matcher.rb
+- lib/active_storage_validations/matchers/dimension_validator_matcher.rb
+- lib/active_storage_validations/matchers/size_validator_matcher.rb
 - lib/active_storage_validations/metadata.rb
 - lib/active_storage_validations/railtie.rb
 - lib/active_storage_validations/size_validator.rb
@@ -137,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage