activestorage-validator 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc9fae7338e419736df276e25e94e198cdc8a0ca9a2b80210c3175d684f5f22
-  data.tar.gz: 6b9be22b0d25c70bcf08cc51a05f9443982963d7e42e3817b90c60a596e5e071
+  metadata.gz: 7dd3596f7f7c5643a6bb22c897877b3d622acf3d525884108b047e02bfb36792
+  data.tar.gz: f705a000c6d22a36770bee09629c28c8fd3f5322c7e7ab48194aa8b5a976571d
 SHA512:
-  metadata.gz: 57e1e9cd4353cfcb2aaeee8a2eef4bbedfe49b3382a3cacc7281fa1e5ec5ca1aa10158465a42e6eff8c2dbfd375b16f9ddb26c3027d1b337ca8fd0b41824c94b
-  data.tar.gz: 597d5cd7f32091fcf00a196fa4bd9d7404e5f129db45d0235c70768a01167d47ae9ec361b635b2732add9ba8be45c2bb2fef6db5a4b67e676130dfe7cf9fd13a
+  metadata.gz: bb4c1f92c407d40b7bc8658f59bb94e5126db2f6418b9667ad45538c8a1cd91251b896db728a422c403a5c04292bb93f8759f6c9db3e606e71c767940f91a6fb
+  data.tar.gz: 50763f805cf34602d88bd07b805dcf0321e5f64ab2b50078209d6a201cfa95095cf7009cef688ebf85706eb8105f2669dee43656ba046a7ec86b542c7304f0a6

data/.github/workflows/rspec.yml

@@ -23,21 +23,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { ruby: "3.0", gemfile: "rails61" }
-          - { ruby: "3.1", gemfile: "rails61" }
-          - { ruby: "3.2", gemfile: "rails61" }
-          - { ruby: "3.0", gemfile: "rails70" }
-          - { ruby: "3.1", gemfile: "rails70" }
-          - { ruby: "3.2", gemfile: "rails70" }
-          - { ruby: "3.0", gemfile: "rails71" }
-          - { ruby: "3.1", gemfile: "rails71" }
-          - { ruby: "3.2", gemfile: "rails71" }
-          - { ruby: "3.2", gemfile: "rails72" }
           - { ruby: "3.3", gemfile: "rails72" }
           - { ruby: "3.4", gemfile: "rails72" }
-          - { ruby: "3.2", gemfile: "rails80" }
+          - { ruby: "4.0", gemfile: "rails72" }
           - { ruby: "3.3", gemfile: "rails80" }
           - { ruby: "3.4", gemfile: "rails80" }
+          - { ruby: "4.0", gemfile: "rails80" }
+          - { ruby: "3.3", gemfile: "rails81" }
+          - { ruby: "3.4", gemfile: "rails81" }
+          - { ruby: "4.0", gemfile: "rails81" }
     steps:
       - name: Install packages
         run: |

data/.gitignore

@@ -14,3 +14,4 @@
 gemfiles/*.lock
 *.sqlite
 Gemfile.local
+CLAUDE.local.md

data/README.md

@@ -55,9 +55,9 @@ end
 
 | Option        | Description                                                                                 |
 |--------------|---------------------------------------------------------------------------------------------|
-| content_type | Allowed MIME types. Accepts a symbol (`:web_image`, `:image`, `:audio`, `:video`, `:text`), an array of MIME types, a regular expression, or a string (single MIME type). |
-| size_range   | Allowed file size range (e.g. `1..5.megabytes`)                                             |
-| extension    | Allowed file extensions. Accepts a String or an Array of Strings. Case-insensitive, leading dot optional. Files without an extension are rejected. |
+| content_type | Allowed MIME types. Accepts a symbol (`:web_image`, `:image`, `:audio`, `:video`, `:text`), an array of MIME types, a regular expression, or a string (single MIME type). Or a Proc/lambda returning one of the above. |
+| size_range   | Allowed file size range (e.g. `1..5.megabytes`). Or a Proc/lambda returning a Range.        |
+| extension    | Allowed file extensions. Accepts a String or an Array of Strings. Case-insensitive, leading dot optional. Files without an extension are rejected. Or a Proc/lambda returning one of the above. |
 
 ### content_type Examples
 
@@ -82,6 +82,29 @@ end
 
 The leading dot is optional (`"mp3"` and `".mp3"` behave the same), and matching is case-insensitive (`PHOTO.JPG` matches `extension: "jpg"`).
 
+## Dynamic Options (Proc/lambda)
+
+Every option (`content_type`, `size_range`, `extension`) also accepts a Proc/lambda,
+so you can decide the allowed values per record at validation time:
+
+```ruby
+validates :avatar, blob: {
+  content_type: ->(record) { record.premium? ? %w[image/png image/jpeg] : :web_image },
+  size_range:   ->(record) { 1..(record.premium? ? 20.megabytes : 5.megabytes) }
+}
+```
+
+The Proc is resolved with the same arity convention as Rails' built-in validators
+(the same rule used by `if:` / `unless:`):
+
+- **No argument** (`-> { ... }`) — called as-is.
+- **One argument** (`->(record) { ... }`) — the record is passed in.
+
+The Proc must return a value of one of the types the option already accepts
+(a Symbol/Array/Regexp/String for `content_type`, a Range for `size_range`, a
+String/Array for `extension`). For `has_many_attached`, the Proc is evaluated
+once per record (not per attached file).
+
 ## I18n Error Message Options
 
 Validation error messages are I18n compatible. The following interpolation keys are available in your translation files, according to the validator's implementation:

data/activestorage-validator.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.3.0'
 
-  spec.add_dependency "rails", ">= 6.1.0"
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_dependency "rails", ">= 7.2.0"
+  spec.add_development_dependency "bundler", ">= 2.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "combustion"

data/gemfiles/rails72.gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem 'rails', '~> 7.2.0'
 gem 'sqlite3'

data/gemfiles/rails80.gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem 'rails', '~> 8.0.0'
 gem 'sqlite3'

data/gemfiles/rails81.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 8.1.0'
+gem 'sqlite3'
+
+gemspec path: '../'

data/lib/activestorage/validator/blob.rb

@@ -4,25 +4,23 @@ module ActiveRecord
       def validate_each(record, attribute, values) # rubocop:disable Metrics/AbcSize
         return unless values.attached?
 
+        size_range   = resolve_option(record, options[:size_range])
+        content_type = resolve_option(record, options[:content_type])
+        extension    = resolve_option(record, options[:extension])
+
         Array(values).each do |value|
-          if options[:size_range].present?
-            if options[:size_range].min > value.blob.byte_size
-              record.errors.add(attribute, :min_size_error, min_size: ActiveSupport::NumberHelper.number_to_human_size(options[:size_range].min), filename: value.blob.filename.to_s)
-            elsif options[:size_range].max < value.blob.byte_size
-              record.errors.add(attribute, :max_size_error, max_size: ActiveSupport::NumberHelper.number_to_human_size(options[:size_range].max), filename: value.blob.filename.to_s)
-            end
-          end
+          validate_size(record, attribute, value, size_range) if size_range.present?
 
-          unless valid_content_type?(value.blob)
+          unless valid_content_type?(value.blob, content_type)
             record.errors.add(attribute, :content_type, filename: value.blob.filename.to_s)
           end
 
-          unless valid_extension?(value.blob)
+          unless valid_extension?(value.blob, extension)
             record.errors.add(
               attribute,
               :extension,
               filename: value.blob.filename.to_s,
-              extension: Array(options[:extension]).map { |e| normalize_extension(e) }.join(', ')
+              extension: Array(extension).map { |e| normalize_extension(e) }.join(', ')
             )
           end
         end
@@ -30,27 +28,46 @@ module ActiveRecord
 
       private
 
-        def valid_content_type?(blob)
-          return true if options[:content_type].nil?
+        # Resolve only when the value is a Proc, using the same arity convention
+        # as Rails' built-in validators: arity 0 calls the proc as-is, otherwise
+        # the record is passed in. Anything else (Symbol/String/Array/Regexp/
+        # Range/nil) is returned untouched, preserving backward compatibility.
+        def resolve_option(record, value)
+          return value unless value.is_a?(Proc)
+
+          value.arity.zero? ? value.call : value.call(record)
+        end
+
+        def validate_size(record, attribute, value, size_range)
+          byte_size = value.blob.byte_size
+          if size_range.min > byte_size
+            record.errors.add(attribute, :min_size_error, min_size: ActiveSupport::NumberHelper.number_to_human_size(size_range.min), filename: value.blob.filename.to_s)
+          elsif size_range.max < byte_size
+            record.errors.add(attribute, :max_size_error, max_size: ActiveSupport::NumberHelper.number_to_human_size(size_range.max), filename: value.blob.filename.to_s)
+          end
+        end
+
+        def valid_content_type?(blob, content_type)
+          return true if content_type.nil?
 
-          case options[:content_type]
+          case content_type
           when Regexp
-            options[:content_type].match?(blob.content_type)
+            content_type.match?(blob.content_type)
           when Array
-            options[:content_type].include?(blob.content_type)
+            content_type.include?(blob.content_type)
           when :web_image
             ActiveStorage.web_image_content_types.include?(blob.content_type)
           when Symbol
-            blob.public_send("#{options[:content_type]}?")
+            blob.public_send("#{content_type}?")
           else
-            options[:content_type] == blob.content_type
+            content_type == blob.content_type
           end
         end
 
-        def valid_extension?(blob)
-          return true if options[:extension].nil?
+        def valid_extension?(blob, extension)
+          return true if extension.nil?
 
-          allowed = Array(options[:extension]).map { |e| normalize_extension(e) }
+          allowed = Array(extension).map { |e| normalize_extension(e) }
           actual = normalize_extension(blob.filename.extension)
           return false if actual.empty?
 

data/lib/activestorage/validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module Validator
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/skills/activestorage-validator/SKILL.md

@@ -54,9 +54,15 @@ end
 
 | Option | Accepts | Notes |
 | --- | --- | --- |
-| `content_type` | Symbol / Array / Regexp / String | Allowed MIME type(s). See matching below. |
-| `size_range` | Range | Allowed byte size, e.g. `1..(5.megabytes)`. |
-| `extension` | String / Array | Allowed filename extension(s). |
+| `content_type` | Symbol / Array / Regexp / String / Proc | Allowed MIME type(s). See matching below. |
+| `size_range` | Range / Proc | Allowed byte size, e.g. `1..(5.megabytes)`. |
+| `extension` | String / Array / Proc | Allowed filename extension(s). |
+
+Any option also accepts a **Proc/lambda** returning a value of the listed type,
+resolved with the same arity convention as Rails' built-in validators (`if:` /
+`unless:`): `-> { ... }` is called as-is, `->(record) { ... }` receives the
+record. For `has_many_attached` the Proc is evaluated once per record. Example:
+`content_type: ->(record) { record.premium? ? %w[image/png] : :web_image }`.
 
 ### `content_type` matching
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-validator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - aki
@@ -15,26 +15,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -107,11 +107,9 @@ files:
 - config/locales/ja.yml
 - config/locales/pl.yml
 - config/locales/pt-br.yml
-- gemfiles/rails61.gemfile
-- gemfiles/rails70.gemfile
-- gemfiles/rails71.gemfile
 - gemfiles/rails72.gemfile
 - gemfiles/rails80.gemfile
+- gemfiles/rails81.gemfile
 - lib/activestorage/validator.rb
 - lib/activestorage/validator/blob.rb
 - lib/activestorage/validator/version.rb
@@ -127,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/rails61.gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gem 'rails', '6.1.4'
-gem 'sqlite3', '~> 1.4'
-gem 'concurrent-ruby', '< 1.3.5'
-
-gemspec path: '../'

data/gemfiles/rails70.gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gem 'rails', '~> 7.0.0'
-gem 'sqlite3', '~> 1.4'
-gem 'concurrent-ruby', '< 1.3.5'
-
-gemspec path: '../'

data/gemfiles/rails71.gemfile

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-gem 'rails', '~> 7.1.0'
-gem 'sqlite3'
-
-gemspec path: '../'