active_storage_validations 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0f851e68789d12a6cbc4ac6173b78db69614ba6faf29a920f9d5c2ecade36b1c
-  data.tar.gz: 3bff45f9bc8606a75c04311b1a8735ebe2f1e248aaaab8f3297491a8d97cfa7f
+SHA1:
+  metadata.gz: 640238a3efac3a30376f3d5079a630774727ba91
+  data.tar.gz: 01a6ff35bcdf26f1b8b0f0a5fdc55be666c47f43
 SHA512:
-  metadata.gz: c21d42b022f1a06c13d35cbc944f5c57ae594ef795517241e3fd933a3c57a2fd56630999d356b54200ddf601d86aa89823feb627894db1b3fe096b4189eee7cd
-  data.tar.gz: b14226508ca1ac0ecd53ceda8978935e20fb47ee950d6941383c1d8d076d42de35a5085dd14c6713f61cf649d963e33c363b00036a375dfc6964a107f64cdb1b
+  metadata.gz: 54c834d284344bf828b048eee45e97766892eccbdc5793b3eae5e8ae7ab9e7e5914960d467fc4fae169e738ba9caaf8f050cd326ba42fb12420ec4fff9f12f0f
+  data.tar.gz: 2e643131d9f35f5707fac32a680460b348bad03e63b985f9135f38c3de18b17e6785fab42858c8a14651378af55351d07024c171530c81e071a0e7bb8e064c35

data/README.md

@@ -34,6 +34,29 @@ class Project < ApplicationRecord
 end
 ```
 
+## Internationalization (I18n)
+
+Active Storage Validations use I18n for errors messages. For this add there keys in your translation file :
+
+```yml
+en:
+  errors:
+    messages:
+      content_type_invalid: "has an invalid content type"
+```
+
+In some cases Active Storage Validations provides variables to help you customize messages :
+
+The "content_type_invalid" key has two variables that you can use, a variable named "content_type" containing the content type of the send file and a variable named "authorized_type" containing the list of authorized content types.
+
+It's variables are not used by default to leave the choice to the user.
+
+For example :
+
+```yml
+content_type_invalid: "has an invalid content type : %{content_type}"
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -55,7 +78,6 @@ Very simple example of validation with file attached, content type check and cus
 
 ## Todo
 * verify with remote storages
-* better error message when content_type is invalid
 * travis CI
 * validation for file size
 
@@ -66,7 +88,12 @@ To run tests in root folder of gem `rake test`.
 To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rake db:migrate`).
 
 ## Contributing
-Contribution directions go here.
+You are welcome to contribute.
+
+## Contributors (BIG THANK YOU)
+- https://github.com/schweigert
+- https://github.com/tleneveu
+
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/config/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      content_type_invalid: "has an invalid content type"

data/lib/active_storage_validations.rb

@@ -1,6 +1,8 @@
 require "active_storage_validations/railtie"
 
 module ActiveStorageValidations
+  class Engine < ::Rails::Engine
+  end
 
   class AttachedValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
@@ -19,9 +21,14 @@ module ActiveStorageValidations
 
       files = Array.wrap(files)
 
+      errors_options = { authorized_types: types_to_human_format }
+      errors_options[:message] = options[:message] if options[:message].present?
+
       files.each do |file|
-        unless content_type_valid?(file) 
-          record.errors.add(attribute, options[:message].presence || :invalid)
+        unless content_type_valid?(file)
+          errors_options[:content_type] = content_type(file)
+
+          record.errors.add(attribute, :content_type_invalid, errors_options)
           return
         end
       end
@@ -31,6 +38,14 @@ module ActiveStorageValidations
       Array.wrap(options[:with]) + Array.wrap(options[:in])
     end
 
+    def types_to_human_format
+      types.join(", ")
+    end
+
+    def content_type(file)
+      file.blob.content_type
+    end
+
     def content_type_valid?(file)
       file.blob.present? && file.blob.content_type.in?(types)
     end

data/lib/active_storage_validations/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageValidations
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,6 +62,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- config/locales/en.yml
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/railtie.rb
 - lib/active_storage_validations/version.rb
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage