activestorage-validator 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c2a3e9f4b202495bb55e509e437f4f2e668574fcaf88a6c14d785a139bb22fb
-  data.tar.gz: 417964ec62b0a599af5310c6f49de8686e453ed547dfe47c21105dc8e8ac2991
+  metadata.gz: eb2851d4b64cc39176ceaba155c80ac8989930899110e55f471c67df9d78a1bc
+  data.tar.gz: ea620cd996d2b50cf53e058fb43acc89652c5edaaa754de8f333855bab4f177e
 SHA512:
-  metadata.gz: e3a499373b966040d39d26fc2ad2610b0dd3f150032b0743cf9e6a9a57077efd85c183eaebfe388e38e2d490779273ddbe2c35dc9694f2fc5efed5572451c030
-  data.tar.gz: 4b64b3eba04af4da47d0cf14c1443af36c0027b70c0e72531dc7800f193eb71b821791f641243e056a4a6e8f7d623677729713ec426e2bf9190471ba2fdcade6
+  metadata.gz: 9288e28946a1e1fb38691329eae86807c4d781116b2f64b389a6bc4e8b3c8e87c0cff3342c1bf716693126d84d64d553a0abddd2ae7a99e4fd28855f9940f0db
+  data.tar.gz: 6098588122be931263ae237cd6e486c1a975e446578502179f6b2064ed54ef1397431e3a23ce9aa1c086ecddc3fc49e42a2d402ed725472b57587ca8cc42d975

data/.github/workflows/rspec.yml

@@ -22,15 +22,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", 3.1, 3.2]
-        gemfile: [rails61, rails70]
+        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: "3.3", gemfile: "rails80" }
+          - { ruby: "3.4", gemfile: "rails80" }
     steps:
       - name: Install packages
         run: |
           sudo apt update -y
           sudo apt install -y libsqlite3-dev
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/vendor/bundle/
 /.yardoc
 /_yardoc/
 /coverage/

data/CHANGELOG.md

@@ -1,5 +1,13 @@
+# Changelog
+
+For changelogs from version 0.5.0 onwards, please see the [GitHub Releases page](https://github.com/aki77/activestorage-validator/releases).
+
 ## [Unreleased]
 
+## 0.4.0
+
+- Add `content_type: :web_image` options
+
 ## 0.3.0
 
 - Drop support for rails 6.0

data/README.md

@@ -28,7 +28,7 @@ class User < ApplicationRecord
   has_one_attached :avatar
   has_many_attached :photos
 
-  validates :avatar, presence: true, blob: { content_type: :image } # supported options: :image, :audio, :video, :text
+  validates :avatar, presence: true, blob: { content_type: :web_image } # supported options: :web_image, :image, :audio, :video, :text
   validates :photos, presence: true, blob: { content_type: ['image/png', 'image/jpg', 'image/jpeg'], size_range: 1..(5.megabytes) }
   # validates :photos, presence: true, blob: { content_type: %r{^image/}, size_range: 1..(5.megabytes) }
 end

data/activestorage-validator.gemspec

@@ -23,6 +23,8 @@ 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.add_dependency "rails", ">= 6.1.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", ">= 12.3.3"

data/gemfiles/rails61.gemfile

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

data/gemfiles/rails70.gemfile

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

data/gemfiles/rails71.gemfile

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

data/gemfiles/rails72.gemfile

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

data/gemfiles/rails80.gemfile

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

data/lib/activestorage/validator/blob.rb

@@ -7,14 +7,14 @@ module ActiveRecord
         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))
+              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))
+              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
 
           unless valid_content_type?(value.blob)
-            record.errors.add(attribute, :content_type)
+            record.errors.add(attribute, :content_type, filename: value.blob.filename.to_s)
           end
         end
       end
@@ -29,6 +29,8 @@ module ActiveRecord
             options[:content_type].match?(blob.content_type)
           when Array
             options[: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]}?")
           else

data/lib/activestorage/validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module Validator
-    VERSION = '0.3.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/activestorage/validator.rb

@@ -4,15 +4,4 @@ ActiveSupport.on_load(:active_record) do
   require 'activestorage/validator/blob'
 end
 
-module ActiveStorage
-  # https://github.com/rails/rails/commit/42259ce904eb2538761b32a793cbe390fb8272b7
-  if Rails::VERSION::MAJOR < 6
-    class Attached::One < Attached
-      def blank?
-        attachment.blank?
-      end
-    end
-  end
-end
-
 I18n.load_path += Dir[File.expand_path(File.join(__dir__, '../../config/locales', '*.yml')).to_s]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-validator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - aki
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2025-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,7 +90,6 @@ files:
 - ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -111,6 +109,9 @@ files:
 - config/locales/pt-br.yml
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
 - lib/activestorage/validator.rb
 - lib/activestorage/validator/blob.rb
 - lib/activestorage/validator/version.rb
@@ -118,7 +119,6 @@ homepage: https://github.com/aki77/activestorage-validator
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,15 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ActiveStorage blob validator.
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.2