activestorage-validator 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e219b0a7a48931178b22053cfe7bcde70bd54b09ffe8845034366f18d984f964
-  data.tar.gz: f7cf49daa5173000b4c7ad796e4df57d73b425bfdf0e6db6764e732228eea8ae
+  metadata.gz: 581d8fd7eb76407a49d99929d0882eab59e29d193ca0200ffb871e32917fb8b6
+  data.tar.gz: acc60f49380c73c732e23d56aed5b2fe399fdaac7567214c43b3d1fe9bc3a774
 SHA512:
-  metadata.gz: b15f5858646799dab6af1e050b080885265d9e1755c42b838b00a1f6461af23f08ffbb5d10b840515ea18f3b9477daa3ee596a993926d0c4b4d7a7f009ef7d01
-  data.tar.gz: 4c3ffb53043130c2161a69391d1c3fd81c7e3c674612f34a148734793a95fc5862d4c2a4653c417920ad845c8c030f4c539fd141cd8cedfd73bb5e7473d375a1
+  metadata.gz: 55c2fc909292f0bbfb6f5a9a0c6a99f7a9eacddab0640bc3e49152a40b2bdfc63b501b4aa20a0f2fdd4c8b52b27041fa77ff90d21b4bc2a88284de60d142810a
+  data.tar.gz: 6c0efaec232cd0ecc6b175e350427d55d02af366d45c2b668ed4f488a7447f5007e19a5ac6aab65bb9442f0f911b4d08ab9bba6b5e39207ed1765d87af007abb

data/.github/workflows/rspec.yml

@@ -0,0 +1,42 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Build
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7, 3.0]
+        gemfile: [rails60, rails61]
+    steps:
+      - name: Install packages
+        run: |
+          sudo apt update -y
+          sudo apt install -y libsqlite3-dev
+
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run rspec
+        run: bundle exec rspec

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+/Gemfile.lock
+*.sqlite
+Gemfile.local

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [Unreleased]
+
+## 0.2.0
+
+- Drop support for rails 5.2
+
+## 0.1.5
+
+- Add French locale (#24)
+
+## 0.1.4
+
+- Updated test environment to rails 6.0.0
+- Add pt-br locale (#22)
+
+## 0.1.3
+
+- Update dependency
+- Add German locale
+
 ## 0.1.2
 
 - Fix typo

data/Gemfile

@@ -5,4 +5,10 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in activestorage-validator.gemspec
 gemspec
 
-gem 'sqlite3'
+local_gemfile = "Gemfile.local"
+
+if File.exist?(local_gemfile)
+  eval_gemfile(local_gemfile) # rubocop:disable Security/Eval
+else
+  gem 'sqlite3'
+end

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/activestorage-validator.svg)](https://rubygems.org/gems/activestorage-validator)
+[![Build](https://github.com/aki77/activestorage-validator/workflows/Build/badge.svg)](https://github.com/aki77/activestorage-validator/actions)
+
 # ActiveStorage Validator
 
 ActiveStorage blob validator.
@@ -26,11 +29,13 @@ class User < ApplicationRecord
   has_many_attached :photos
 
   validates :avatar, presence: true, blob: { content_type: :image } # supported options: :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 }
+  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
 ```
 
+Note: For `has_many_attached`, size is validated on each file individually. In the code above, `:photos` validation allows any number of photos to be upload, each one being 5 MB or less in size.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/aki77/activestorage-validator. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/activestorage-validator.gemspec

@@ -23,8 +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", "~> 5.2.0"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "rails", ">= 6.0.4.1"
+  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"
 end

data/config/locales/de.yml

@@ -0,0 +1,7 @@
+de:
+  activerecord:
+    errors:
+      messages:
+        content_type: "ist kein gültiges Dateiformat"
+        min_size_error: "Dateigröße sollte weniger als %{min_size} betragen"
+        max_size_error: "Dateigröße sollte weniger als %{max_size} betragen"

data/config/locales/fr.yml

@@ -0,0 +1,7 @@
+fr:
+  activerecord:
+    errors:
+      messages:
+        content_type: "n'est pas un format de fichier valide"
+        min_size_error: "La taille du fichier doit être supérieure à %{min_size}"
+        max_size_error: "La taille du fichier doit être inférieure à %{max_size}"

data/config/locales/pt-br.yml

@@ -0,0 +1,7 @@
+pt-br:
+  activerecord:
+    errors:
+      messages:
+        content_type: "não é um formato válido"
+        min_size_error: "tamanho do arquivo deve ser maior que %{min_size}"
+        max_size_error: "tamanho do arquivo deve ser menor que %{max_size}"

data/config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/gemfiles/rails60.gemfile

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

data/gemfiles/rails61.gemfile

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

data/lib/activestorage/validator/blob.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module Validations
-    class BlobValidator < ActiveModel::EachValidator
+    class BlobValidator < ::ActiveModel::EachValidator
       def validate_each(record, attribute, values) # rubocop:disable Metrics/AbcSize
         return unless values.attached?
 

data/lib/activestorage/validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module Validator
-    VERSION = "0.1.2"
+    VERSION = '0.2.0'
   end
 end

data/lib/activestorage/validator.rb

@@ -1,6 +1,9 @@
-require 'activestorage/validator/blob'
 require 'activestorage/validator/version'
 
+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

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-validator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - aki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveStorage blob validator.
 email:
 - aki77@users.noreply.github.com
@@ -73,21 +87,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - activestorage-validator.gemspec
 - bin/console
 - bin/setup
+- config.ru
+- config/locales/de.yml
 - config/locales/en.yml
+- config/locales/fr.yml
 - config/locales/ja.yml
+- config/locales/pt-br.yml
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/activestorage/validator.rb
 - lib/activestorage/validator/blob.rb
 - lib/activestorage/validator/version.rb
@@ -110,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveStorage blob validator.

data/Gemfile.lock

@@ -1,144 +0,0 @@
-PATH
-  remote: .
-  specs:
-    activestorage-validator (0.1.2)
-      rails (~> 5.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
-      globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (1.2.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.9.0)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activestorage-validator!
-  bundler (~> 1.16)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  sqlite3
-
-BUNDLED WITH
-   1.17.1