validate_japanese 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1125eae18b605eb80240b7e5113c0c150911b517245cf873e6a83444e8178bc
-  data.tar.gz: fba0fc9c1d12ec4a7dc4e068d91aab2e3c8fb9ac38c6d4fd6a0330f24dd9ccff
+  metadata.gz: 612abb78a67e99c387a4005dda1c80a3235ba9d21a05f55e4d6344631153b802
+  data.tar.gz: df1f5f73ef2a5840d92753cd2882f683918f66e492705f1c37251ba4d44a3c24
 SHA512:
-  metadata.gz: 704cddafdc01f91b21f96133c900d99eed6f33f97fcf109b1125a56fb41ba14a512c3adda31bce9c336a9be6c3c22321dde1e4f197e98cd7b81c977abb62885f
-  data.tar.gz: 2fb39e0fd7fe91b56445ae0a130d431d54c9b7d63f9cf4a59dc3a88bb15325d1d584effcc12304220b3d8d29537e5f5d19530579bcc6bf577ddc65d8a46ed8a3
+  metadata.gz: dc3bc136ec6a20c7dea4110733a9d0610333ff669ff6d8e647e4187eea87387cfecd014e2f25c52d09142088df9fe5c07cf2b20782501d3391c291c3f9025a9c
+  data.tar.gz: 349189e1e7710d4b3c71ca39b59c472a7e26d6b193ccb6df6cdc68d31055431eea5a934df1c712c3f5e96809646f426b80ad4dbedc150cd18a2d6c073662ec2e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validate_japanese (0.4.1)
+    validate_japanese (0.4.2)
       activerecord (>= 4.2, < 6.0)
 
 GEM

data/README.md

@@ -13,43 +13,93 @@ Add this line to your application’s Gemfile:
 gem 'validate_japanese'
 ```
 
-Add a validation rule to your model.
+Add a validation rule to your model:
 
 ```ruby
-validates :name, japanese: true
+class User < ApplicationRecord
+  validates :name, japanese: true
+end
+```
+
+I18n error message:
+
+```ruby
+User.new(name: 'invalid name').tap(&:valid?)
+# => Name に使える文字はひらがなカタカナ半角カナ漢字数字全角数字です。
 ```
 
 ## Usage
 
 ```ruby
-class User < ApplicationRecord
-  # hiragana katakana hankaku_kana kanji suji zenkaku_suji "ー－" + "-"
-  validates :name, japanese: true
+# hiragana katakana hankaku_kana kanji suji zenkaku_suji "ー－" + "-"
+validates :name, japanese: true
 
-  # hiragana "ぁ-ん" + "ー－"
-  validates :name, japanese: {hiragana: true}
+user.errors.full_messages
+# => Name に使える文字はひらがなカタカナ半角カナ漢字数字全角数字です。
+```
 
-  # katakana "ァ-ン" + "ー－"
-  validates :name, japanese: {katakana: true}
+```ruby
+# hiragana "ぁ-ん" + "ー－"
+validates :name, japanese: {hiragana: true}
 
-  # hankaku_kana "ｧ-ﾝﾞﾟ" + "-"
-  validates :name, japanese: {hankaku_kana: true}
+user.errors.full_messages
+# => Name に使える文字はひらがなです。
+```
 
-  # kanji "一-龠々"
-  validates :name, japanese: {kanji: true}
+```ruby
+# katakana "ァ-ン" + "ー－"
+validates :name, japanese: {katakana: true}
 
-  # suji "0-9"
-  validates :name, japanese: {suji: true}
+user.errors.full_messages
+# => Name に使える文字はカタカナです。
+```
 
-  # zenkaku_suji "０-９"
-  validates :name, japanese: {zenkaku_suji: true}
+```ruby
+# hankaku_kana "ｧ-ﾝﾞﾟ" + "-"
+validates :name, japanese: {hankaku_kana: true}
 
-  # hiragana katakana "ぁ-ん" + "ァ-ン" + "ー－"
-  validates :name, japanese: {only: %i(hiragana katakana)}
+user.errors.full_messages
+# => Name に使える文字は半角カナです。
+```
 
-  # japanese "、。"
-  validates :name, japanese: {concat: '、。'}
-end
+```ruby
+# kanji "一-龠々"
+validates :name, japanese: {kanji: true}
+
+user.errors.full_messages
+# => Name に使える文字は漢字です。
+```
+
+```ruby
+# suji "0-9"
+validates :name, japanese: {suji: true}
+
+user.errors.full_messages
+# => Name に使える文字は数字です。
+```
+
+```ruby
+# zenkaku_suji "０-９"
+validates :name, japanese: {zenkaku_suji: true}
+
+user.errors.full_messages
+# => Name に使える文字は全角数字です。
+```
+
+```ruby
+# hiragana katakana "ぁ-ん" + "ァ-ン" + "ー－"
+validates :name, japanese: {only: %i(hiragana katakana)}
+
+user.errors.full_messages
+# => Name に使える文字はひらがなカタカナです。
+```
+
+```ruby
+# japanese "、。"
+validates :name, japanese: {concat: '、。'}
+
+user.errors.full_messages
+# => Name に使える文字はひらがなカタカナ半角カナ漢字数字全角数字、。です。
 ```
 
 ## Implementation

data/lib/validate_japanese/japanese_validator.rb

@@ -23,7 +23,7 @@ module ActiveModel
           if options[:message]
             record.errors.add(attribute, options[:message])
           else
-            record.errors.add(attribute, :invalid_japanese, kind: available_kind(keys))
+            record.errors.add(attribute, :invalid_japanese, kind: available_kind(keys, concat: options[:concat]))
           end
         end
       end
@@ -65,8 +65,10 @@ module ActiveModel
         self.class.const_get(name.upcase)
       end
 
-      def available_kind(keys, sep = '')
-        keys.reject {|k| %i(choonpu hankaku_choonpu).include?(k)}.map {|k| I18n.t("validate_japanese.#{k}")}.join(sep)
+      def available_kind(keys, concat: nil, sep: '')
+        kind = keys.reject {|k| %i(choonpu hankaku_choonpu).include?(k)}.map {|k| I18n.t("validate_japanese.#{k}")}.join(sep)
+        kind += concat if concat
+        kind
       end
     end
   end

data/lib/validate_japanese/version.rb

@@ -1,3 +1,3 @@
 module ValidateJapanese
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_japanese
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - ts-3156