activestorage-validator 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a021d8b583438be10d8c5c4c888a1bc73df0f1c4da39e8e3d5c17185173ffac9
-  data.tar.gz: 4f9f5841b1b3619d354c2ddec01a3b99a978b1b04810b6f157f52dda3d886e97
+  metadata.gz: 354d8f902cefe6a58a25fcc97f6bcae8c878b971be3e6b9f7689e4074ba3eb7d
+  data.tar.gz: 626b6ba362b037531daa1402387f788506ecf5cb7592cb1fd6c0e05c8a43d079
 SHA512:
-  metadata.gz: b0d83e53fa6a761f1a4468495eb6ed316e8deabc845b64812e82057a30cd7851b163f3928b81f2eb5adfb5f55c94d94ec2805b9235859f43a072a71597f09796
-  data.tar.gz: 7c241829ad5520c264ae73fcd54582c836e2b3ce71b6f8fef7bc69dbb41eaf6a250fd81d4e36feaaeab11df4db20668c98b2d3eb1328c410e6e65f0c1ee251c2
+  metadata.gz: 30f39dbfc6c3a21a74590042072468bea28d910790cfbb67c5777cf403a405af5576cb5a1c4ccb775d39a0ce30c8d33d2f39c35633b0632d86f51316b0506fab
+  data.tar.gz: 809232803f18f3fd3769591376439aa171c9aa4710ad923f1212a61fbefa0524377dc0d58077f6ff6064eb739cbf508b9922007272df3b291aad7c76214ff8aa

data/.github/workflows/rspec.yml

@@ -0,0 +1,54 @@
+# 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
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7]
+        gemfile: [
+          "gemfiles/rails52.gemfile",
+          "gemfiles/rails60.gemfile",
+        ]
+    steps:
+    - name: Install packages
+      run: |
+        sudo apt update -y
+        sudo apt install -y libsqlite3-dev
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v1
+      with:
+        path: /home/runner/bundle
+        key: bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
+        restore-keys: |
+          bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        bundle config path /home/runner/bundle
+        bundle config --global gemfile ${{ matrix.gemfile }}
+        bundle install
+        bundle update
+        bundle clean
+    - 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.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
+
+## 0.1.1
+
+- Add default error messages
+
 ## 0.1.0
 
 - First Release

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.
@@ -25,11 +28,14 @@ class User < ApplicationRecord
   has_one_attached :avatar
   has_many_attached :photos
 
-  validates :avatar, precence: true, blob: { content_type: :image }
-  validates :photos, precence: true, blob: { content_type: ['image/png', 'image/jpg', 'image/jpeg'], size_range: 1..5.megabytes }
+  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 }
 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

@@ -5,7 +5,7 @@ require "activestorage/validator/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "activestorage-validator"
-  spec.version       = Activestorage::Validator::VERSION
+  spec.version       = ActiveStorage::Validator::VERSION
   spec.authors       = ["aki"]
   spec.email         = ["aki77@users.noreply.github.com"]
 
@@ -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", ">= 5.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"
 end

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/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/en.yml

@@ -0,0 +1,7 @@
+en:
+  activerecord:
+    errors:
+      messages:
+        content_type: "is not a valid file format"
+        min_size_error: "File size should be greater than %{min_size}"
+        max_size_error: "File size should be less than %{max_size}"

data/config/locales/ja.yml

@@ -0,0 +1,7 @@
+ja:
+  activerecord:
+    errors:
+      messages:
+        content_type: "のファイル形式が不正です。"
+        min_size_error: "を%{min_size}以上のサイズにしてください。"
+        max_size_error: "を%{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/gemfiles/rails52.gemfile

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

data/gemfiles/rails60.gemfile

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

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
@@ -11,3 +14,5 @@ module ActiveStorage
     end
   end
 end
+
+I18n.load_path += Dir[File.expand_path(File.join(__dir__, '../../config/locales', '*.yml')).to_s]

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 ActiveStorage
   module Validator
-    VERSION = "0.1.0"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - aki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2021-08-04 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
 - !ruby/object:Gem::Dependency
@@ -30,28 +30,28 @@ dependencies:
     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,19 +87,26 @@ 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/ja.yml
+- config/locales/pt-br.yml
+- gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - lib/activestorage/validator.rb
 - lib/activestorage/validator/blob.rb
 - lib/activestorage/validator/version.rb
@@ -108,8 +129,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.0)
-      rails (~> 5.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
-      globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.1)
-      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.0.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (1.1.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.5)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.1)
-      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.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
-      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.0)
-    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.16.2