validate_japanese 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9acfe3d1bdf887988fb7cc027645397c9140dee56ea2e1e69f5b1c9673869ece
-  data.tar.gz: 2e07b99e2d41d9bd93ceb7e115653fcc3ea53a5766c52ad7cd8a9489609184b2
+  metadata.gz: a1125eae18b605eb80240b7e5113c0c150911b517245cf873e6a83444e8178bc
+  data.tar.gz: fba0fc9c1d12ec4a7dc4e068d91aab2e3c8fb9ac38c6d4fd6a0330f24dd9ccff
 SHA512:
-  metadata.gz: 3575a2a96e8439acdb2e563c51e79707bbb7ee92b2b6e923eba8b9b9a44d3c739bc16b7ded4ba2f3be67da71bcb84b5a926ba08d0fbf82514019ba47d6ff9c54
-  data.tar.gz: d25db84555426d9c61ecd64352ee508c889b4ece7ae2f435f1543fceeebe418200d4119a4d6b41cef205ca5f2fe704c135f2cf57ef7958ca2cc8e44e09236816
+  metadata.gz: 704cddafdc01f91b21f96133c900d99eed6f33f97fcf109b1125a56fb41ba14a512c3adda31bce9c336a9be6c3c22321dde1e4f197e98cd7b81c977abb62885f
+  data.tar.gz: 2fb39e0fd7fe91b56445ae0a130d431d54c9b7d63f9cf4a59dc3a88bb15325d1d584effcc12304220b3d8d29537e5f5d19530579bcc6bf577ddc65d8a46ed8a3

data/Gemfile.lock

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

data/README.md

@@ -23,7 +23,7 @@ validates :name, japanese: true
 
 ```ruby
 class User < ApplicationRecord
-  # hiragana katakana hankaku_kana kanji suji zenkaku_suji choonpu
+  # hiragana katakana hankaku_kana kanji suji zenkaku_suji "ー－" + "-"
   validates :name, japanese: true
 
   # hiragana "ぁ-ん" + "ー－"
@@ -47,7 +47,7 @@ class User < ApplicationRecord
   # hiragana katakana "ぁ-ん" + "ァ-ン" + "ー－"
   validates :name, japanese: {only: %i(hiragana katakana)}
 
-  # japanese + "、。"
+  # japanese "、。"
   validates :name, japanese: {concat: '、。'}
 end
 ```

data/lib/locale/ja.yml

@@ -1,5 +1,5 @@
 en:
-  dic:
+  validate_japanese:
     hiragana: ひらがな
     katakana: カタカナ
     hankaku_kana: 半角カナ

data/lib/validate_japanese/japanese_validator.rb

@@ -17,8 +17,14 @@ module ActiveModel
       ZENKAKU_SUJI = "０-９"
 
       def validate_each(record, attribute, value)
-        unless value.to_s.match? build_regexp(options)
-          record.errors.add(attribute, options[:message] || :invalid)
+        keys, regexp = build_regexp(options)
+
+        unless value.to_s.match? regexp
+          if options[:message]
+            record.errors.add(attribute, options[:message])
+          else
+            record.errors.add(attribute, :invalid_japanese, kind: available_kind(keys))
+          end
         end
       end
 
@@ -52,15 +58,15 @@ module ActiveModel
           base += options[:concat].to_s
         end
 
-        Regexp.new("#{PREFIX}[#{base}]+#{SUFFIX}")
+        [keys, Regexp.new("#{PREFIX}[#{base}]+#{SUFFIX}")]
       end
 
       def const(name)
         self.class.const_get(name.upcase)
       end
 
-      def available_kind
-        # TODO
+      def available_kind(keys, sep = '')
+        keys.reject {|k| %i(choonpu hankaku_choonpu).include?(k)}.map {|k| I18n.t("validate_japanese.#{k}")}.join(sep)
       end
     end
   end

data/lib/validate_japanese/version.rb

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

metadata

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