validate_japanese 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f23f115e40c7bd4b713fe9d9c2ef28517cc6ad764c8599492000202808e379f6
-  data.tar.gz: ba56c45e85a420e57fd5e838a0e6a799325149029a1d32fff18ebcad42f5a4fe
+  metadata.gz: 9acfe3d1bdf887988fb7cc027645397c9140dee56ea2e1e69f5b1c9673869ece
+  data.tar.gz: 2e07b99e2d41d9bd93ceb7e115653fcc3ea53a5766c52ad7cd8a9489609184b2
 SHA512:
-  metadata.gz: bc166b08fe163b7a25432e9f0cdd4824b438b159b79a0711bd566be83900c3410c435bd0824f61b791944ad9cc4ef12728f6fef2c3d11432eabe265ac84bd9bd
-  data.tar.gz: 9bc69cdcfa60c1a15429fd82ca9bbb70b355a1d9afb28aabcebb8aa32af8f94deab09792e913aa8c2fb4d4b77145c755fc5cea80d2537717b8240ec0c04cd3e4
+  metadata.gz: 3575a2a96e8439acdb2e563c51e79707bbb7ee92b2b6e923eba8b9b9a44d3c739bc16b7ded4ba2f3be67da71bcb84b5a926ba08d0fbf82514019ba47d6ff9c54
+  data.tar.gz: d25db84555426d9c61ecd64352ee508c889b4ece7ae2f435f1543fceeebe418200d4119a4d6b41cef205ca5f2fe704c135f2cf57ef7958ca2cc8e44e09236816

data/Gemfile.lock

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

data/README.md

@@ -26,23 +26,29 @@ class User < ApplicationRecord
   # hiragana katakana hankaku_kana kanji suji zenkaku_suji choonpu
   validates :name, japanese: true
 
-  # only hiragana "ぁ-ん"
+  # hiragana "ぁ-ん" + "ー－"
   validates :name, japanese: {hiragana: true}
 
-  # only katakana "ァ-ン"
+  # katakana "ァ-ン" + "ー－"
   validates :name, japanese: {katakana: true}
 
-  # only hankaku_kana "ｧ-ﾝﾞﾟ"
+  # hankaku_kana "ｧ-ﾝﾞﾟ" + "-"
   validates :name, japanese: {hankaku_kana: true}
 
-  # only kanji "一-龠々"
+  # kanji "一-龠々"
   validates :name, japanese: {kanji: true}
 
-  # only suji "0-9"
+  # suji "0-9"
   validates :name, japanese: {suji: true}
 
-  # only zenkaku_suji "０-９"
+  # zenkaku_suji "０-９"
   validates :name, japanese: {zenkaku_suji: true}
+
+  # hiragana katakana "ぁ-ん" + "ァ-ン" + "ー－"
+  validates :name, japanese: {only: %i(hiragana katakana)}
+
+  # japanese + "、。"
+  validates :name, japanese: {concat: '、。'}
 end
 ```
 

data/lib/locale/ja.yml

@@ -0,0 +1,13 @@
+en:
+  dic:
+    hiragana: ひらがな
+    katakana: カタカナ
+    hankaku_kana: 半角カナ
+    kanji: 漢字
+    suji: 数字
+    zenkaku_suji: 全角数字
+    alphabet: 英字
+    zenkaku_alphabet: 全角英字
+  errors:
+    messages:
+      invalid_japanese: に使える文字は%{kind}です。

data/lib/validate_japanese/japanese_validator.rb

@@ -5,6 +5,7 @@ module ActiveModel
       SUFFIX = "\\z"
       KUHAKU = "\\s"
       CHOONPU = "ー－"
+      HANKAKU_CHOONPU = "\\-"
 
       ALPHABET = "a-zA-Z"
       ZENKAKU_ALPHABET = "ａ-ｚＡ-Ｚ"
@@ -24,8 +25,8 @@ module ActiveModel
       private
 
       def build_regexp(options)
-        options = options.except(:message)
-        japanese = %i(hiragana katakana hankaku_kana kanji suji zenkaku_suji choonpu)
+        options = options.except(:message, :choonpu, :hankaku_choonpu, :prefix, :suffix, :kuhaku)
+        japanese = %i(hiragana katakana hankaku_kana kanji suji zenkaku_suji choonpu hankaku_choonpu)
         keys = []
 
         if options.empty?
@@ -34,17 +35,33 @@ module ActiveModel
           keys.concat options[:only]
         elsif options.has_key?(:concat)
           keys.concat japanese
-          keys.concat options[:concat].map(&:to_sym).except(*japanese)
         else
           keys.concat options.select {|_, v| v}.keys
         end
 
-        Regexp.new("#{PREFIX}[#{keys.map(&method(:const)).join}]+#{SUFFIX}")
+        if (keys.include?(:hiragana) || keys.include?(:katakana)) && keys.exclude?(:choonpu)
+          keys << :choonpu
+        end
+        if keys.include?(:hankaku_kana) && keys.exclude?(:hankaku_choonpu)
+          keys << :hankaku_choonpu
+        end
+
+        base = keys.map(&method(:const)).join
+
+        if options.has_key?(:concat)
+          base += options[:concat].to_s
+        end
+
+        Regexp.new("#{PREFIX}[#{base}]+#{SUFFIX}")
       end
 
       def const(name)
         self.class.const_get(name.upcase)
       end
+
+      def available_kind
+        # TODO
+      end
     end
   end
 end

data/lib/validate_japanese/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_japanese
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ts-3156
@@ -106,6 +106,7 @@ files:
 - gemfiles/ar_5.1.gemfile
 - gemfiles/ar_5.2.gemfile
 - lib/locale/en.yml
+- lib/locale/ja.yml
 - lib/validate_japanese.rb
 - lib/validate_japanese/japanese_validator.rb
 - lib/validate_japanese/version.rb