active_storage_validations 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4d056a6bc935d7d423adedecf19fc841ba2d4711315eb4586cc54f39f0cc7a
-  data.tar.gz: a2474738de0db8878368672a4fdf393a06ab18f3db87a9a3ff320c4e7a0536ed
+  metadata.gz: 813f828596f4fd712cff8e2f7f2b3fea5c668f03616bc3f621b8af742f7adff1
+  data.tar.gz: 57da59dd3aa086c343d51a191b2a4990100d2f4bd4c846d30ca9e41dafaa3ca9
 SHA512:
-  metadata.gz: 256142921c422090717ce89451700a9635a83ac69e52709ba07bf3a8acfa18a15a7e328a47e232e4aa0ff5237fabe7d0b5f73fe3a9e1bf13458fad665887cd9b
-  data.tar.gz: 550358993e4bfa899503821d3dcdbbf8c4daced1255f9daff4bbd2c603164f439228b230a4d3cd05155395325a838e2112dd7a956e9373bfb73e42219a5a761a
+  metadata.gz: 712ba73b0a9bfa737f09e003519aa9cbaa19dfdabd177ddcdefbff3f002a55f9758204808e0736136b61411b764eac922762cd6a90cd757f7cff610f6c560879
+  data.tar.gz: ddb33ce32755b8cac68fb2106fedd4a8a682d8c44edc6d639171a8e323fdd8c681b32d83336fcc807ecbc31a648b0a5304a996d1390f5d1e548c52caf9179b86

data/README.md

@@ -64,7 +64,10 @@ class User < ApplicationRecord
   has_many_attached :photos
 
   validates :avatar, attached: true, content_type: :png # Mime[:png].to_s => 'image/png'
+  # or
   validates :photos, attached: true, content_type: [:png, :jpg, :jpeg]
+  # or
+  validates :avatar, content_type: /\Aimage\/.*\z/
 end
 ```
 

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -2,24 +2,23 @@
 
 require_relative 'metadata.rb'
 
-if Rails::VERSION::MAJOR >= 6
-  module ActiveStorageValidations
-    class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
-      AVAILABLE_CHECKS = %i[with].freeze
-      PRECISION = 3
-
-      def initialize(options)
-        require 'mini_magick' unless defined?(MiniMagick)
-        super(options)
-      end
-
+module ActiveStorageValidations
+  class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
+    AVAILABLE_CHECKS = %i[with].freeze
+    PRECISION = 3
+
+    def initialize(options)
+      require 'mini_magick' unless defined?(MiniMagick)
+      super(options)
+    end
 
-      def check_validity!
-        return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-        raise ArgumentError, 'You must pass "aspect_ratio: :OPTION" option to the validator'
-      end
 
+    def check_validity!
+      return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
+      raise ArgumentError, 'You must pass "aspect_ratio: :OPTION" option to the validator'
+    end
 
+    if Rails::VERSION::MAJOR >= 6
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
 
@@ -34,74 +33,8 @@ if Rails::VERSION::MAJOR >= 6
           break
         end
       end
-
-
-      private
-
-
-      def is_valid?(record, attribute, metadata)
-        if metadata[:width].to_i <= 0 || metadata[:height].to_i <= 0
-          add_error(record, attribute, options[:message].presence || :image_metadata_missing)
-          return false
-        end
-
-        case options[:with]
-        when :square
-          return true if metadata[:width] == metadata[:height]
-          add_error(record, attribute, :aspect_ratio_not_square)
-
-        when :portrait
-          return true if metadata[:height] > metadata[:width]
-          add_error(record, attribute, :aspect_ratio_not_portrait)
-
-        when :landscape
-          return true if metadata[:width] > metadata[:height]
-          add_error(record, attribute, :aspect_ratio_not_landscape)
-
-        else
-          if options[:with] =~ /is\_(\d*)\_(\d*)/
-            x = $1.to_i
-            y = $2.to_i
-
-            return true if (x.to_f / y).round(PRECISION) == (metadata[:width].to_f / metadata[:height]).round(PRECISION)
-
-            add_error(record, attribute, :aspect_ratio_is_not, "#{x}x#{y}")
-          else
-            add_error(record, attribute, :aspect_ratio_unknown)
-          end
-        end
-        false
-      end
-
-
-      def add_error(record, attribute, type, interpolate = options[:with])
-        key = options[:message].presence || type
-        return if record.errors.added?(attribute, key)
-        record.errors.add(attribute, key, aspect_ratio: interpolate)
-      end
-
-    end
-  end
-
-else
-  # Rails 5
-  module ActiveStorageValidations
-    class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
-      AVAILABLE_CHECKS = %i[with].freeze
-      PRECISION = 3
-
-      def initialize(options)
-        require 'mini_magick' unless defined?(MiniMagick)
-        super(options)
-      end
-
-
-      def check_validity!
-        return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-        raise ArgumentError, 'You must pass "aspect_ratio: :OPTION" option to the validator'
-      end
-
-
+    else
+      # Rails 5
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
   
@@ -116,52 +49,52 @@ else
           break
         end
       end
+    end
 
 
-      private
+    private
 
 
-      def is_valid?(record, attribute, metadata)
-        if metadata[:width].to_i <= 0 || metadata[:height].to_i <= 0
-          add_error(record, attribute, options[:message].presence || :image_metadata_missing)
-          return false
-        end
+    def is_valid?(record, attribute, metadata)
+      if metadata[:width].to_i <= 0 || metadata[:height].to_i <= 0
+        add_error(record, attribute, options[:message].presence || :image_metadata_missing)
+        return false
+      end
 
-        case options[:with]
-        when :square
-          return true if metadata[:width] == metadata[:height]
-          add_error(record, attribute, :aspect_ratio_not_square)
+      case options[:with]
+      when :square
+        return true if metadata[:width] == metadata[:height]
+        add_error(record, attribute, :aspect_ratio_not_square)
 
-        when :portrait
-          return true if metadata[:height] > metadata[:width]
-          add_error(record, attribute, :aspect_ratio_not_portrait)
+      when :portrait
+        return true if metadata[:height] > metadata[:width]
+        add_error(record, attribute, :aspect_ratio_not_portrait)
 
-        when :landscape
-          return true if metadata[:width] > metadata[:height]
-          add_error(record, attribute, :aspect_ratio_not_landscape)
+      when :landscape
+        return true if metadata[:width] > metadata[:height]
+        add_error(record, attribute, :aspect_ratio_not_landscape)
 
-        else
-          if options[:with] =~ /is\_(\d*)\_(\d*)/
-            x = $1.to_i
-            y = $2.to_i
+      else
+        if options[:with] =~ /is\_(\d*)\_(\d*)/
+          x = $1.to_i
+          y = $2.to_i
 
-            return true if (x.to_f / y).round(PRECISION) == (metadata[:width].to_f / metadata[:height]).round(PRECISION)
+          return true if (x.to_f / y).round(PRECISION) == (metadata[:width].to_f / metadata[:height]).round(PRECISION)
 
-            add_error(record, attribute, :aspect_ratio_is_not, "#{x}x#{y}")
-          else
-            add_error(record, attribute, :aspect_ratio_unknown)
-          end
+          add_error(record, attribute, :aspect_ratio_is_not, "#{x}x#{y}")
+        else
+          add_error(record, attribute, :aspect_ratio_unknown)
         end
-        false
       end
+      false
+    end
 
 
-      def add_error(record, attribute, type, interpolate = options[:with])
-        key = options[:message].presence || type
-        return if record.errors.added?(attribute, key)
-        record.errors.add(attribute, key, aspect_ratio: interpolate)
-      end
-
+    def add_error(record, attribute, type, interpolate = options[:with])
+      key = options[:message].presence || type
+      return if record.errors.added?(attribute, key)
+      record.errors.add(attribute, key, aspect_ratio: interpolate)
     end
+
   end
-end
+end

data/lib/active_storage_validations/content_type_validator.rb

@@ -11,7 +11,7 @@ module ActiveStorageValidations
       errors_options[:message] = options[:message] if options[:message].present?
 
       files.each do |file|
-        next if content_type_valid?(file)
+        next if is_valid?(file)
 
         errors_options[:content_type] = content_type(file)
         record.errors.add(attribute, :content_type_invalid, errors_options)
@@ -20,7 +20,7 @@ module ActiveStorageValidations
     end
 
     def types
-      (Array.wrap(options[:with]) + Array.wrap(options[:in])).map do |type|
+      (Array.wrap(options[:with]) + Array.wrap(options[:in])).compact.map do |type|
         Mime[type] || type
       end
     end
@@ -33,8 +33,12 @@ module ActiveStorageValidations
       file.blob.present? && file.blob.content_type
     end
 
-    def content_type_valid?(file)
-      file.blob.present? && file.blob.content_type.in?(types)
+    def is_valid?(file)
+      if options[:with].is_a?(Regexp)
+        options[:with].match?(content_type(file).to_s)
+      else
+        content_type(file).in?(types)
+      end
     end
   end
 end

data/lib/active_storage_validations/dimension_validator.rb

@@ -2,39 +2,39 @@
 
 require_relative 'metadata.rb'
 
-if Rails::VERSION::MAJOR >= 6
-  module ActiveStorageValidations
-    class DimensionValidator < ActiveModel::EachValidator # :nodoc
-      AVAILABLE_CHECKS = %i[width height min max].freeze
-
-      def initialize(options)
-        require 'mini_magick' unless defined?(MiniMagick)
-
-        [:width, :height].each do |length|
-          if options[length] and options[length].is_a?(Hash)
-            if range = options[length][:in]
-              raise ArgumentError, ":in must be a Range" unless range.is_a?(Range)
-              options[length][:min], options[length][:max] = range.min, range.max
-            end
+module ActiveStorageValidations
+  class DimensionValidator < ActiveModel::EachValidator # :nodoc
+    AVAILABLE_CHECKS = %i[width height min max].freeze
+
+    def initialize(options)
+      require 'mini_magick' unless defined?(MiniMagick)
+
+      [:width, :height].each do |length|
+        if options[length] and options[length].is_a?(Hash)
+          if range = options[length][:in]
+            raise ArgumentError, ":in must be a Range" unless range.is_a?(Range)
+            options[length][:min], options[length][:max] = range.min, range.max
           end
         end
-        [:min, :max].each do |dim|
-          if range = options[dim]
-            raise ArgumentError, ":#{dim} must be a Range (width..height)" unless range.is_a?(Range)
-            options[:width] = { dim => range.first }
-            options[:height] = { dim => range.last }
-          end
+      end
+      [:min, :max].each do |dim|
+        if range = options[dim]
+          raise ArgumentError, ":#{dim} must be a Range (width..height)" unless range.is_a?(Range)
+          options[:width] = { dim => range.first }
+          options[:height] = { dim => range.last }
         end
-        super
       end
+      super
+    end
 
 
-      def check_validity!
-        return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-        raise ArgumentError, 'You must pass either :width, :height, :min or :max to the validator'
-      end
+    def check_validity!
+      return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
+      raise ArgumentError, 'You must pass either :width, :height, :min or :max to the validator'
+    end
 
 
+    if Rails::VERSION::MAJOR >= 6
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
 
@@ -48,107 +48,8 @@ if Rails::VERSION::MAJOR >= 6
           break
         end
       end
-
-
-      def is_valid?(record, attribute, file_metadata)
-        # Validation fails unless file metadata contains valid width and height.
-        if file_metadata[:width].to_i <= 0 || file_metadata[:height].to_i <= 0
-          add_error(record, attribute, options[:message].presence || :image_metadata_missing)
-          return false
-        end
-
-        # Validation based on checks :min and :max (:min, :max has higher priority to :width, :height).
-        if options[:min] || options[:max]
-          if options[:min] && (
-            (options[:width][:min] && file_metadata[:width] < options[:width][:min]) ||
-            (options[:height][:min] && file_metadata[:height] < options[:height][:min])
-            )
-            add_error(record, attribute, options[:message].presence || :"dimension_min_inclusion", width: options[:width][:min], height: options[:height][:min])
-            return false
-          end
-          if options[:max] && (
-            (options[:width][:max] && file_metadata[:width] > options[:width][:max]) ||
-            (options[:height][:max] && file_metadata[:height] > options[:height][:max])
-            )
-            add_error(record, attribute, options[:message].presence || :"dimension_max_inclusion", width: options[:width][:max], height: options[:height][:max])
-            return false
-          end
-
-        # Validation based on checks :width and :height.
-        else
-          [:width, :height].each do |length|
-            next unless options[length]
-            if options[length].is_a?(Hash)
-              if options[length][:in] && (file_metadata[length] < options[length][:min] || file_metadata[length] > options[length][:max])
-                add_error(record, attribute, options[:message].presence || :"dimension_#{length}_inclusion", min: options[length][:min], max: options[length][:max])
-                return false
-              else
-                if options[length][:min] && file_metadata[length] < options[length][:min]
-                  add_error(record, attribute, options[:message].presence || :"dimension_#{length}_greater_than_or_equal_to", length: options[length][:min])
-                  return false
-                end
-                if options[length][:max] && file_metadata[length] > options[length][:max]
-                  add_error(record, attribute, options[:message].presence || :"dimension_#{length}_less_than_or_equal_to", length: options[length][:max])
-                  return false
-                end
-              end
-            else
-              if file_metadata[length] != options[length]
-                add_error(record, attribute, options[:message].presence || :"dimension_#{length}_equal_to", length: options[length])
-                return false            
-              end
-            end
-          end
-        end
-
-        true # valid file
-      end
-
-      def add_error(record, attribute, type, *attrs)
-        key = options[:message].presence || type
-        return if record.errors.added?(attribute, key)
-        record.errors.add(attribute, key, *attrs)
-      end    
-
-    end
-  end
-
-
-
-else
-  # Rails 5
-  module ActiveStorageValidations
-    class DimensionValidator < ActiveModel::EachValidator # :nodoc
-      AVAILABLE_CHECKS = %i[width height min max].freeze
-
-      def initialize(options)
-        require 'mini_magick' unless defined?(MiniMagick)
-
-        [:width, :height].each do |length|
-          if options[length] and options[length].is_a?(Hash)
-            if range = options[length][:in]
-              raise ArgumentError, ":in must be a Range" unless range.is_a?(Range)
-              options[length][:min], options[length][:max] = range.min, range.max
-            end
-          end
-        end
-        [:min, :max].each do |dim|
-          if range = options[dim]
-            raise ArgumentError, ":#{dim} must be a Range (width..height)" unless range.is_a?(Range)
-            options[:width] = { dim => range.first }
-            options[:height] = { dim => range.last }
-          end
-        end
-        super
-      end
-
-
-      def check_validity!
-        return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-        raise ArgumentError, 'You must pass either :width, :height, :min or :max to the validator'
-      end
-
-
+    else
+      # Rails 5
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
   
@@ -161,69 +62,68 @@ else
           break
         end
       end
+    end
+
 
+    def is_valid?(record, attribute, file_metadata)
+      # Validation fails unless file metadata contains valid width and height.
+      if file_metadata[:width].to_i <= 0 || file_metadata[:height].to_i <= 0
+        add_error(record, attribute, options[:message].presence || :image_metadata_missing)
+        return false
+      end
 
-      def is_valid?(record, attribute, file_metadata)
-        # Validation fails unless file metadata contains valid width and height.
-        if file_metadata[:width].to_i <= 0 || file_metadata[:height].to_i <= 0
-          add_error(record, attribute, options[:message].presence || :image_metadata_missing)
+      # Validation based on checks :min and :max (:min, :max has higher priority to :width, :height).
+      if options[:min] || options[:max]
+        if options[:min] && (
+          (options[:width][:min] && file_metadata[:width] < options[:width][:min]) ||
+          (options[:height][:min] && file_metadata[:height] < options[:height][:min])
+          )
+          add_error(record, attribute, options[:message].presence || :"dimension_min_inclusion", width: options[:width][:min], height: options[:height][:min])
+          return false
+        end
+        if options[:max] && (
+          (options[:width][:max] && file_metadata[:width] > options[:width][:max]) ||
+          (options[:height][:max] && file_metadata[:height] > options[:height][:max])
+          )
+          add_error(record, attribute, options[:message].presence || :"dimension_max_inclusion", width: options[:width][:max], height: options[:height][:max])
           return false
         end
 
-        # Validation based on checks :min and :max (:min, :max has higher priority to :width, :height).
-        if options[:min] || options[:max]
-          if options[:min] && (
-            (options[:width][:min] && file_metadata[:width] < options[:width][:min]) ||
-            (options[:height][:min] && file_metadata[:height] < options[:height][:min])
-            )
-            add_error(record, attribute, options[:message].presence || :"dimension_min_inclusion", width: options[:width][:min], height: options[:height][:min])
-            return false
-          end
-          if options[:max] && (
-            (options[:width][:max] && file_metadata[:width] > options[:width][:max]) ||
-            (options[:height][:max] && file_metadata[:height] > options[:height][:max])
-            )
-            add_error(record, attribute, options[:message].presence || :"dimension_max_inclusion", width: options[:width][:max], height: options[:height][:max])
-            return false
-          end
-
-        # Validation based on checks :width and :height.
-        else
-          [:width, :height].each do |length|
-            next unless options[length]
-            if options[length].is_a?(Hash)
-              if options[length][:in] && (file_metadata[length] < options[length][:min] || file_metadata[length] > options[length][:max])
-                add_error(record, attribute, options[:message].presence || :"dimension_#{length}_inclusion", min: options[length][:min], max: options[length][:max])
+      # Validation based on checks :width and :height.
+      else
+        [:width, :height].each do |length|
+          next unless options[length]
+          if options[length].is_a?(Hash)
+            if options[length][:in] && (file_metadata[length] < options[length][:min] || file_metadata[length] > options[length][:max])
+              add_error(record, attribute, options[:message].presence || :"dimension_#{length}_inclusion", min: options[length][:min], max: options[length][:max])
+              return false
+            else
+              if options[length][:min] && file_metadata[length] < options[length][:min]
+                add_error(record, attribute, options[:message].presence || :"dimension_#{length}_greater_than_or_equal_to", length: options[length][:min])
                 return false
-              else
-                if options[length][:min] && file_metadata[length] < options[length][:min]
-                  add_error(record, attribute, options[:message].presence || :"dimension_#{length}_greater_than_or_equal_to", length: options[length][:min])
-                  return false
-                end
-                if options[length][:max] && file_metadata[length] > options[length][:max]
-                  add_error(record, attribute, options[:message].presence || :"dimension_#{length}_less_than_or_equal_to", length: options[length][:max])
-                  return false
-                end
               end
-            else
-              if file_metadata[length] != options[length]
-                add_error(record, attribute, options[:message].presence || :"dimension_#{length}_equal_to", length: options[length])
-                return false            
+              if options[length][:max] && file_metadata[length] > options[length][:max]
+                add_error(record, attribute, options[:message].presence || :"dimension_#{length}_less_than_or_equal_to", length: options[length][:max])
+                return false
               end
             end
+          else
+            if file_metadata[length] != options[length]
+              add_error(record, attribute, options[:message].presence || :"dimension_#{length}_equal_to", length: options[length])
+              return false            
+            end
           end
         end
-
-        true # valid file
       end
 
-      def add_error(record, attribute, type, *attrs)
-        key = options[:message].presence || type
-        return if record.errors.added?(attribute, key)
-        record.errors.add(attribute, key, *attrs)
-      end    
-
+      true # valid file
     end
-  end
 
-end
+    def add_error(record, attribute, type, *attrs)
+      key = options[:message].presence || type
+      return if record.errors.added?(attribute, key)
+      record.errors.add(attribute, key, *attrs)
+    end    
+
+  end
+end

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage