activestorage-validator 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b66feb405437ad34641613c818d1fee5d8130235ab77b30ab07630ca7a09560
-  data.tar.gz: 00417b87e52603376cca1afc253e336b8ac5a090fbdbb386f43ae2062a73bdb0
+  metadata.gz: 7dd3596f7f7c5643a6bb22c897877b3d622acf3d525884108b047e02bfb36792
+  data.tar.gz: f705a000c6d22a36770bee09629c28c8fd3f5322c7e7ab48194aa8b5a976571d
 SHA512:
-  metadata.gz: 457cd27983de69c7d3e1e0f9c9226fb5b67410be17e4f64132220ce0953a4c4a9345eed292628343eb4f373bbdd83aab501f6036eb689a2627f86cff22207c49
-  data.tar.gz: a7ea46c6d09ea311b7329bc63b94355c543a568a562d8db413f447a479238aae295d42edbcf29665969b4083af97624ad16a8d984a9e41120fee2dac68135f92
+  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:
@@ -117,6 +140,23 @@ en:
 - Some features may not work depending on your ActiveStorage or Rails version.
 - Validation error messages are I18n compatible and support interpolation keys as described above.
 
+## Agent skill
+
+This repo ships an [agent skill](skills/activestorage-validator/) (`SKILL.md`,
+plus a Japanese `SKILL-ja.md`) that teaches coding agents when and how to apply
+`activestorage-validator`. Install it into your project with the GitHub CLI:
+
+```sh
+gh skill install aki77/activestorage-validator
+```
+
+> `gh skill` is currently a GitHub CLI preview feature.
+
+Alternatively, if your project already pulls `activestorage-validator` in via
+Bundler, the [bundler-skills](https://github.com/aki77/bundler-skills) plugin
+auto-syncs this skill on `bundle install` — keeping the skill version locked to
+the gem version.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub via [issues](https://github.com/aki77/activestorage-validator/issues) or [pull requests](https://github.com/aki77/activestorage-validator/pulls).

data/activestorage-validator.gemspec

@@ -17,16 +17,16 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(%r{^skills/.*-ja\.md$}) }
   end
   spec.bindir        = "exe"
   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.6.0'
+    VERSION = '0.8.0'
   end
 end

data/skills/activestorage-validator/SKILL.md

@@ -0,0 +1,138 @@
+---
+name: activestorage-validator
+description: "Validate ActiveStorage attachments (content type, file size, file extension) with the activestorage-validator gem's `blob` validator. Use when adding validations to has_one_attached / has_many_attached attributes."
+---
+
+# activestorage-validator
+
+A Rails gem that adds a `blob` validator for ActiveStorage attachments. It
+validates content type, file size, and file extension on both
+`has_one_attached` and `has_many_attached` attributes.
+
+## First: determine applicability
+
+Use this gem **only** for validating ActiveStorage attachments. For ordinary
+(non-attachment) attributes, use the standard Rails validators (`presence`,
+`length`, `numericality`, etc.).
+
+| What you validate | Tool |
+| --- | --- |
+| ActiveStorage attachment (content type / size / extension) | **`blob:` validator (this gem)** |
+| Plain string/number/boolean columns | Standard Rails validators |
+| Presence of the attachment itself | `presence: true` (works alongside `blob:`) |
+
+There is no special read path — declare `validates ..., blob: { ... }` and the
+attachment is validated like any other Rails validation on `save`/`valid?`.
+
+## Usage
+
+Declare validations on the model with the `blob:` validator.
+
+```ruby
+class User < ApplicationRecord
+  has_one_attached :avatar
+  has_many_attached :photos
+
+  # Allow only web image files (PNG, JPEG, GIF, WebP)
+  validates :avatar, presence: true, blob: { content_type: :web_image }
+
+  # Allow only JPEG/PNG, up to 5MB per file
+  validates :photos, presence: true, blob: {
+    content_type: ["image/png", "image/jpg", "image/jpeg"],
+    size_range: 1..(5.megabytes)
+  }
+
+  # Regexp content_type + required extension (AND condition)
+  validates :audio, blob: { content_type: "audio/mpeg", extension: %w[mp3] }
+end
+```
+
+> For `has_many_attached`, every option (including `size_range`) is applied to
+> **each file individually**.
+
+## Options (all optional, combine freely)
+
+| Option | Accepts | Notes |
+| --- | --- | --- |
+| `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
+
+- **`:web_image`** — special-cased to `ActiveStorage.web_image_content_types`
+  (PNG, JPEG, GIF, WebP). Use this instead of `:image` when you want only
+  browser-safe images.
+- **Other Symbol** (`:image`, `:audio`, `:video`, `:text`) — calls the
+  ActiveStorage built-in predicate `blob.image?` / `blob.audio?` / etc.
+- **Array** — `["image/png", "image/jpeg"]`: exact membership of the blob's
+  content type in the list.
+- **Regexp** — `%r{^image/}`: matched against the blob's content type.
+- **String** — `"application/pdf"`: exact equality.
+
+### `extension` matching
+
+- Accepts a String (`"mp3"`) or Array (`%w[mp3 m4a]`).
+- Leading dot is optional (`"mp3"` == `".mp3"`).
+- Case-insensitive (`PHOTO.JPG` matches `extension: "jpg"`).
+- **A file with no extension is always rejected** when `extension` is set.
+- When combined with `content_type`, both must pass (AND). E.g.
+  `{ content_type: "audio/mpeg", extension: %w[mp3] }` rejects a `.wav` file
+  even if its MIME type happens to be `audio/mpeg`.
+
+## I18n error messages
+
+Errors are I18n-compatible. Error types and their interpolation keys:
+
+| Error type | Interpolation keys | When |
+| --- | --- | --- |
+| `content_type` | `filename` | content type not allowed |
+| `min_size_error` | `filename`, `min_size` | smaller than `size_range.min` |
+| `max_size_error` | `filename`, `max_size` | larger than `size_range.max` |
+| `extension` | `filename`, `extension` | extension not allowed (or missing) |
+
+`min_size` / `max_size` are humanized (`ActiveSupport::NumberHelper.number_to_human_size`).
+`extension` is the allowed list joined by `, `.
+
+```yaml
+# config/locales/en.yml
+en:
+  errors:
+    messages:
+      content_type: "%{filename} has an invalid content type"
+      min_size_error: "%{filename} is too small (minimum is %{min_size})"
+      max_size_error: "%{filename} is too large (maximum is %{max_size})"
+      extension: "%{filename} has an invalid file extension (allowed: %{extension})"
+```
+
+The gem ships default messages for 7 locales: `en`, `ja`, `de`, `es`, `fr`,
+`pl`, `pt-br`. Override them in your app's locale files using the keys above.
+
+## Behavior details
+
+- **Unattached values are skipped.** Validation returns early unless the
+  attachment is attached, so `blob:` does not enforce presence — add
+  `presence: true` separately if the attachment is required.
+- **Size boundaries are inclusive.** A blob is valid when
+  `size_range.min <= byte_size <= size_range.max`. Below min → `min_size_error`;
+  above max → `max_size_error`.
+- **Extension normalization** is `downcase` + strip a single leading dot; an
+  empty resulting extension (no extension on the file) fails.
+- Options are independent — omit any you don't need; only the present ones run.
+
+## Pitfalls
+
+- A file **without an extension** is rejected whenever `extension:` is set —
+  even if its content type is allowed. Don't set `extension:` if you accept
+  extension-less uploads.
+- For `has_many_attached`, `size_range` applies **per file**, not to the total.
+- `blob:` alone does **not** require an attachment; pair it with `presence: true`
+  when the upload is mandatory.
+- No special read/preload path exists — this is a plain `EachValidator`; it runs
+  on standard `valid?` / `save`.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-validator
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - aki
 bindir: exe
 cert_chain: []
-date: 2026-04-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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,14 +107,13 @@ 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
+- skills/activestorage-validator/SKILL.md
 homepage: https://github.com/aki77/activestorage-validator
 licenses:
 - MIT
@@ -126,14 +125,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: ActiveStorage blob validator.
 test_files: []

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: '../'