active_storage_validations 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee7d6623af014086158c960b7ef7408f4cf7527536f57539765351357160189
-  data.tar.gz: 6819ee596bd09560ca801fade1006bfbe4bf03b820b7ca1b0f84eafe0bb47ac1
+  metadata.gz: a82f321d71985caf479d40c9546bc6b0c216ba97670d200e775be3274cf9a35c
+  data.tar.gz: 3a80b0ad6db919d7968a2162214004240d152648ee2ac8c4c4eafe1119834c1c
 SHA512:
-  metadata.gz: c1a79fa7e8825320b308f8a689b3b09763072ec8093c5fc1f43e4686dad3dd05b4d345ce8d62149b23865b5c215b90dcdd68b292ea4ccef26456e752a35aad5a
-  data.tar.gz: 69517cf6f0d5a5c64c39416945f06bb31ccb6c5b1c0288d883005184c96e353d44a3f9479767783bd9aae856ee2157a6ffdde48ebdb6abbf23a5f4972fd8f3b0
+  metadata.gz: c3d19095f455bb32b649c4ab0bfc7ae50d2d29eae69d5b3a593d6dd556de9ba7c527eb4afe9ec8032638adec23f664d200bcfab75cd726f51be97492266fc1b0
+  data.tar.gz: 6ab99b207ef0399354c56d499d004cd287c22a56fd1648a5c2f948eace0050e00d13d12e3bb2ca38ba730edf2539b3843637383a8d3c8dc6424daa91f764164c

data/README.md

@@ -117,7 +117,7 @@ end
 
 ## Internationalization (I18n)
 
-Active Storage Validations use I18n for errors messages. For this add there keys in your translation file:
+Active Storage Validations uses I18n for error messages. For this, add these keys in your translation file:
 
 ```yml
 en:
@@ -137,19 +137,18 @@ en:
       dimension_height_less_than_or_equal_to: "height must be less than or equal to %{length} pixel."
       dimension_width_equal_to: "width must be equal to %{length} pixel."
       dimension_height_equal_to: "height must be equal to %{length} pixel."
-      aspect_ratio_not_square: "doesn't a square image"
-      aspect_ratio_not_portrait: "doesn't contain a portrait image"
-      aspect_ratio_not_landscape: "doesn't contain a landscape image"
-      aspect_ratio_is_not: "doesn't contain aspect ratio of %{aspect_ratio}"
+      aspect_ratio_not_square: "must be a square image"
+      aspect_ratio_not_portrait: "must be a portrait image"
+      aspect_ratio_not_landscape: "must be a landscape image"
+      aspect_ratio_is_not: "must have an aspect ratio of %{aspect_ratio}"
       aspect_ratio_unknown: "has an unknown aspect ratio"
-
 ```
 
-In some cases Active Storage Validations provides variables to help you customize messages:
+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.
+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_types" containing the list of authorized content types.
 
-It's variables are not used by default to leave the choice to the user.
+The variables are not used by default to leave the choice to the user.
 
 For example :
 
@@ -194,7 +193,7 @@ Provides RSpec-compatible and Minitest-compatible matchers for testing the valid
 
 ### RSpec
 
-In spec_helper.rb, you'll need to require the matchers:
+In `spec_helper.rb`, you'll need to require the matchers:
 
 ```ruby
 require 'active_storage_validations/matchers'
@@ -209,7 +208,7 @@ end
 ```
 
 Example (Note that the options are chainable):
-    
+
 ```ruby
 describe User do
   it { is_expected.to validate_attached_of(:avatar) }
@@ -243,7 +242,7 @@ require 'active_storage_validations/matchers'
 
 And _extend_ the module:
 
-```bash
+```ruby
 class ActiveSupport::TestCase
   extend ActiveStorageValidations::Matchers
 end
@@ -281,14 +280,13 @@ end
 * verify how it works with direct upload
 * better error message when content_size is invalid
 * add more translations
-* add aspect ratio validation
 
 ## Tests & Contributing
 
 To run tests in root folder of gem:
 
 * `BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle exec rake test` to run for Rails 5.2
-* `BUNDLE_GEMFILE=gemfiles/rails_6.0.gemfile bundle exec rake test` to run for Rails 6.0
+* `BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle exec rake test` to run for Rails 6.0
 
 To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migrate`).
 
@@ -296,12 +294,13 @@ To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migr
 
 - There is an issue in Rails which it possible to get if you have added a validation and generating for example an image preview of attachments. It can be fixed with this:
 
-```
+```erb
   <% if @user.avatar.attached? && @user.avatar.attachment.blob.present? && @user.avatar.attachment.blob.persisted? %>
     <%= image_tag @user.avatar %>
   <% end %>
 ```
-This is Rails issue. And according to commits it will be fixed in Rails 6.
+
+This is a Rails issue, and is fixed in Rails 6.
 
 ## Contributing
 You are welcome to contribute.
@@ -327,6 +326,9 @@ You are welcome to contribute.
 - https://github.com/giovannibonetti
 - https://github.com/dlepage
 - https://github.com/StefSchenkelaars
+- https://github.com/willnet
+- https://github.com/mohanklein
+- https://github.com/High5Apps
 
 ## License
 

data/config/locales/ja.yml

@@ -0,0 +1,22 @@
+ja:
+  errors:
+    messages:
+      content_type_invalid: "のContent Typeが不正です"
+      file_size_out_of_range: "の容量 %{file_size} が許容範囲外です"
+      limit_out_of_range: "の数が許容範囲外です"
+      image_metadata_missing: "は不正な画像です"
+      dimension_min_inclusion: "は %{width} x %{height} ピクセル以上の大きさにしてください"
+      dimension_max_inclusion: "は %{width} x %{height} ピクセル以下の大きさにしてください"
+      dimension_width_inclusion: "の横幅は %{min} ピクセル以上 %{max} ピクセル以下にしてください"
+      dimension_height_inclusion: "の縦幅は %{min} ピクセル以上 %{max} ピクセル以下にしてください"
+      dimension_width_greater_than_or_equal_to: "の横幅は %{length} ピクセル以上にしてください"
+      dimension_height_greater_than_or_equal_to: "の縦幅は %{length} ピクセル以上にしてください"
+      dimension_width_less_than_or_equal_to: "の横幅は %{length} ピクセル以下にしてください"
+      dimension_height_less_than_or_equal_to: "の縦幅は %{length} ピクセル以下にしてください"
+      dimension_width_equal_to: "の横幅は %{length} ピクセルにしてください"
+      dimension_height_equal_to: "の縦幅は %{length} ピクセルにしてください"
+      aspect_ratio_not_square: "は正方形にしてください"
+      aspect_ratio_not_portrait: "は縦長にしてください"
+      aspect_ratio_not_landscape: "は横長にしてください"
+      aspect_ratio_is_not: "のアスペクト比は %{aspect_ratio} にしてください"
+      aspect_ratio_unknown: "のアスペクト比を取得できませんでした"

data/lib/active_storage_validations/metadata.rb

@@ -19,11 +19,12 @@ module ActiveStorageValidations
     private
 
     def read_image
-      if file.is_a?(String)
-        blob = ActiveStorage::Blob.find_signed(file)
+      is_string = file.is_a?(String)
+      if is_string || file.is_a?(ActiveStorage::Blob)
+        blob = is_string ? ActiveStorage::Blob.find_signed(file) : file
 
         tempfile = Tempfile.new(["ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter])
-        tempfile.binmode 
+        tempfile.binmode
 
         blob.download do |chunk|
           tempfile.write(chunk)

data/lib/active_storage_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,7 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/fr.yml
+- config/locales/ja.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/uk.yml