validate_japanese 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cec650ea68939253db44b7af6d4d773ee238480fcbcbc72623a3f704967a76e5
-  data.tar.gz: 8ba384ccd7964eee845155f44cba576d6624338ab3e44412b2b2277288790411
+  metadata.gz: f23f115e40c7bd4b713fe9d9c2ef28517cc6ad764c8599492000202808e379f6
+  data.tar.gz: ba56c45e85a420e57fd5e838a0e6a799325149029a1d32fff18ebcad42f5a4fe
 SHA512:
-  metadata.gz: 71dd21a5408d9024c19bddfafff37e68f46e5d6e821e0553d71773cc3db81acff9f62cbe397b9c9f4cdc172ed496001b22753be1a7aeef3c0f44029532b65127
-  data.tar.gz: 5cd4c91cf3d8a74521e203747e4f90f0dd72f80e2923d34f1b8ab48945a749e331962372f00b4854d0306e85dc0210adc5588725e57d50c55a10626d783b6a81
+  metadata.gz: bc166b08fe163b7a25432e9f0cdd4824b438b159b79a0711bd566be83900c3410c435bd0824f61b791944ad9cc4ef12728f6fef2c3d11432eabe265ac84bd9bd
+  data.tar.gz: 9bc69cdcfa60c1a15429fd82ca9bbb70b355a1d9afb28aabcebb8aa32af8f94deab09792e913aa8c2fb4d4b77145c755fc5cea80d2537717b8240ec0c04cd3e4

data/.travis.yml

@@ -12,10 +12,6 @@ rvm:
 env:
   global:
     - TRAVIS=true
-  matrix:
-    - DB=mysql
-    - DB=postgres
-    - DB=sqlite
 
 # We want to use `sudo: false` because the container infrastructure is supposed
 # to be faster, but Travis is having issues with containers lately ..

data/Gemfile.lock

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

data/README.md

@@ -16,13 +16,34 @@ gem 'validate_japanese'
 Add a validation rule to your model.
 
 ```ruby
-validates :name, hiragana: true
+validates :name, japanese: true
 ```
 
-or
+## Usage
 
 ```ruby
-validates_japanese :name
+class User < ApplicationRecord
+  # hiragana katakana hankaku_kana kanji suji zenkaku_suji choonpu
+  validates :name, japanese: true
+
+  # only hiragana "ぁ-ん"
+  validates :name, japanese: {hiragana: true}
+
+  # only katakana "ァ-ン"
+  validates :name, japanese: {katakana: true}
+
+  # only hankaku_kana "ｧ-ﾝﾞﾟ"
+  validates :name, japanese: {hankaku_kana: true}
+
+  # only kanji "一-龠々"
+  validates :name, japanese: {kanji: true}
+
+  # only suji "0-9"
+  validates :name, japanese: {suji: true}
+
+  # only zenkaku_suji "０-９"
+  validates :name, japanese: {zenkaku_suji: true}
+end
 ```
 
 ## Implementation

data/lib/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      invalid_japanese: is not a valid Japanese

data/lib/validate_japanese/japanese_validator.rb

@@ -0,0 +1,50 @@
+module ActiveModel
+  module Validations
+    class JapaneseValidator < ::ActiveModel::EachValidator
+      PREFIX = "\\A"
+      SUFFIX = "\\z"
+      KUHAKU = "\\s"
+      CHOONPU = "ー－"
+
+      ALPHABET = "a-zA-Z"
+      ZENKAKU_ALPHABET = "ａ-ｚＡ-Ｚ"
+      HIRAGANA = "ぁ-ん"
+      KATAKANA = "ァ-ン"
+      HANKAKU_KANA = "ｧ-ﾝﾞﾟ"
+      KANJI = "一-龠々"
+      SUJI = "0-9"
+      ZENKAKU_SUJI = "０-９"
+
+      def validate_each(record, attribute, value)
+        unless value.to_s.match? build_regexp(options)
+          record.errors.add(attribute, options[:message] || :invalid)
+        end
+      end
+
+      private
+
+      def build_regexp(options)
+        options = options.except(:message)
+        japanese = %i(hiragana katakana hankaku_kana kanji suji zenkaku_suji choonpu)
+        keys = []
+
+        if options.empty?
+          keys.concat japanese
+        elsif options.has_key?(:only)
+          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}")
+      end
+
+      def const(name)
+        self.class.const_get(name.upcase)
+      end
+    end
+  end
+end

data/lib/validate_japanese/version.rb

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

data/lib/validate_japanese.rb

@@ -1,12 +1,9 @@
 require "active_support"
 require "active_record"
+require 'active_support/i18n'
+I18n.load_path += Dir[File.dirname(__FILE__) + "/locale/*.yml"]
 require "validate_japanese/version"
-require "validate_japanese/validations/hiragana_validator"
-require "validate_japanese/model"
-
-ActiveSupport.on_load(:active_record) do
-  include(ValidateJapanese::Model)
-end
+require "validate_japanese/japanese_validator"
 
 module ValidateJapanese
   class Error < StandardError; end

data/validate_japanese.gemspec

@@ -31,6 +31,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_rubygems_version = ">= 1.3.6"
+  spec.required_ruby_version = ">= 2.3.0"
+
   spec.add_dependency "activerecord", [">= 4.2", "< 6.0"]
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate_japanese
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,9 +105,9 @@ files:
 - gemfiles/ar_4.2.gemfile
 - gemfiles/ar_5.1.gemfile
 - gemfiles/ar_5.2.gemfile
+- lib/locale/en.yml
 - lib/validate_japanese.rb
-- lib/validate_japanese/model.rb
-- lib/validate_japanese/validations/hiragana_validator.rb
+- lib/validate_japanese/japanese_validator.rb
 - lib/validate_japanese/version.rb
 - validate_japanese.gemspec
 homepage: https://github.com/ts-3156/validate_japanese
@@ -125,12 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/lib/validate_japanese/model.rb

@@ -1,13 +0,0 @@
-require "active_support/concern"
-
-module ValidateJapanese
-  module Model
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def validates_japanese(*attr_names)
-        validates_with ::ActiveModel::Validations::HiraganaValidator, _merge_attributes(attr_names)
-      end
-    end
-  end
-end

data/lib/validate_japanese/validations/hiragana_validator.rb

@@ -1,11 +0,0 @@
-module ActiveModel
-  module Validations
-    class HiraganaValidator < ::ActiveModel::EachValidator
-      def validate_each(record, attribute, value)
-        unless value =~ /\A[ぁ-んー－]+\z/
-          record.errors.add(attribute, options[:message] || :invalid)
-        end
-      end
-    end
-  end
-end