activestorage-validator 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7794a4dee965852bef0ebf772d56444e8fead4da8af495ebc385a22c8772a4f5
-  data.tar.gz: ed0e09adaea48bd600efe763be83dc8d97644a60c24d56e6dba4f2f7ccfe81fe
+  metadata.gz: c09a9b8ded80c3fe2be9547622aa8408fbdd9c7cd4a1beee2ab1425809f62ba9
+  data.tar.gz: 841c661ce228726b1fa7c28adcabe006bb561c50122e317b9fb628b8ebfc6630
 SHA512:
-  metadata.gz: e35d5f61512ff3cf914bd88c5420fed81b86f758b54d545761d7d76cbc57150649badc9e0a63facedfce8be2df2ca423d12b51b1ae0b5c69ed262e14fc9f6ae8
-  data.tar.gz: 8f32cebdb515d387a6df86f7dd51cab61acc3cf0cdf66059c23d0127ed6e933deeff010880c318243b95e186aca6ebfd57bcc25b86ef72bb4fa6255abfb48577
+  metadata.gz: 5ec8362922c900e8ace6185e8c23a40a8a366c671a341397189e6035eeda0c1ca8826d49ae0d244bcbcaa655d2dbe6df367640914bb5e0edf54d143be03ecb5c
+  data.tar.gz: 3528baa631ad61e40c0a04785dd92bbc60af1b442d843be91956a64c9db082085aa6ea15024ee4f37e026aeb88bfcee8e05c2a8561be422a6768a427831bc48d

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

data/.github/workflows/rspec.yml

@@ -22,18 +22,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1]
-        gemfile: [rails60, rails61, rails70]
-        exclude:
-          - ruby: 3.1
-            gemfile: rails60
+        ruby: ["3.0", 3.1, 3.2]
+        gemfile: [rails61, rails70]
     steps:
       - name: Install packages
         run: |
           sudo apt update -y
           sudo apt install -y libsqlite3-dev
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## 0.4.0
+
+- Add `content_type: :web_image` options
+
+## 0.3.0
+
+- Drop support for rails 6.0
+
 ## 0.2.2
 
 - Add polish locale (#29)

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,7 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 6.0.4.1"
+  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"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/activestorage/validator/blob.rb

@@ -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.2.2'
+    VERSION = '0.4.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,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-validator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - aki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2023-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.4.1
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.4.1
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -108,7 +108,6 @@ files:
 - config/locales/ja.yml
 - config/locales/pl.yml
 - config/locales/pt-br.yml
-- gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
 - lib/activestorage/validator.rb
@@ -118,7 +117,7 @@ homepage: https://github.com/aki77/activestorage-validator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,15 +125,15 @@ 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.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 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

data/gemfiles/rails60.gemfile

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