roshi 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a6f3d2ba408df338768dddc5c023ce93b26e17cee8edc977f1035f5cfa1dc47
-  data.tar.gz: 49a159c70ecfa3f2ae4551cd6f4a9adee8cb4e7bdf1737947e045a1713dc9c84
+  metadata.gz: 941c355a142a261c61928481ee8a1ebeceecce89d37f2491168b15c975369411
+  data.tar.gz: b3214c0160dc30074bb7fe189b6f485abea1466928cae7a687d91ea89a0f92f1
 SHA512:
-  metadata.gz: bf1dc354f76a69d2ba75068e40a81fa06298361aea896adf104d7be4e76eabb1a09d5e0a600579e48aaa928603723c62eea28f2055e10a1ed2fcf7ef72190df0
-  data.tar.gz: e5dce5021199db9832bdfec2c8b3d73787bd1a3bf62f465b3ede7522661694d96b3309b7a54b0978ceaf3c799a3c85f12251584937afe4e24de861f99c7e369e
+  metadata.gz: ce7abc148ade4c43749fbae9f2adaad0ce568ddeb4867c0d57a5090e25b1548ccc77e04ab46f946351abdc57e71c3ecfd62433898588fc3c3593ca79e4ad8ed1
+  data.tar.gz: 6b7a293822cba0ee6c39d7d65d3501ef0a8c931a036c8c71a22be0e6bd286f667897242866d773ac213d0988edfd0673c4b278306befd4ab1d9129aeb87603f2

data/README.md

@@ -29,11 +29,11 @@ class TestModel
   validates :zip_code, zip_code: true # zip_code: { hiphenation: true }
   validates :phone_number, phone_number: true # phone_number: { hiphenation: true }
   validates :date, date: true
-  validates :hiragana, hiragana: true
-  validates :katakana, katakana: true
+  validates :hiragana, hiragana: true # hiragana: { allow_space: true }
+  validates :katakana, katakana: true # katakana: { allow_space: true }
   validates :version_number, version_number: true
-  validates :accept_word, available_word: {accept_words: %w(accept available)}
-  validates :reject_word, available_word: {reject_words: %w(reject unavailable)}
+  validates :accept_word, available_word: { accept_words: %w(accept available) }
+  validates :reject_word, available_word: { reject_words: %w(reject unavailable) }
   validates :large_value, numerical_comparison: { greater_than: :small_value }
   validates :large_value, numerical_comparison: { greater_than_or_equal_to: :small_value }
   validates :large_value, numerical_comparison: { equal_to: :small_value }

data/lib/roshi/active_model/validations/hiragana_validator.rb

@@ -2,7 +2,8 @@ module ActiveModel
   module Validations
     class HiraganaValidator < EachValidator
       def validate_each(record, attribute, value)
-        unless value =~ /\A[\p{hiragana}ー－]*\z/i
+        space = options[:allow_space] ? '[:blank:]' : ''
+        unless value =~ /\A[\p{hiragana}#{space}ー－]*\z/i
           record.errors.add(attribute, options[:message] || I18n.t('errors.messages.invalid'))
         end
       end

data/lib/roshi/active_model/validations/katakana_validator.rb

@@ -2,7 +2,8 @@ module ActiveModel
   module Validations
     class KatakanaValidator < EachValidator
       def validate_each(record, attribute, value)
-        unless value =~ /\A[\p{katakana}ー－]*\z/i
+        space = options[:allow_space] ? '[:blank:]' : ''
+        unless value =~ /\A[\p{katakana}ー－#{space}]*\z/i
           record.errors.add(attribute, options[:message] || I18n.t('errors.messages.invalid'))
         end
       end

data/lib/roshi/active_model/validations/phone_number_validator.rb

@@ -2,9 +2,9 @@ module ActiveModel
   module Validations
     class PhoneNumberValidator < EachValidator
       REGEXES = {
-        default: /\A\d{2,4}\-?\d{2,4}\-?\d{3,4}\z/i,
-        with_hiphenation: /\A\d{2,4}\-\d{2,4}\-\d{3,4}\z/i,
-        without_hiphenation: /\A\d{6,12}\z/i
+        default: /\A0\d{1,4}\-?\d{1,4}\-?\d{1,4}\z/i,
+        with_hiphenation: /\A0\d{1,4}\-\d{1,4}\-\d{1,4}\z/i,
+        without_hiphenation: /\A0\d{9,10}\z/i
       }
 
       def validate_each(record, attribute, value)
@@ -16,8 +16,8 @@ module ActiveModel
                  when options[:hiphenation] == false
                    REGEXES[:without_hiphenation]
                  end
-
-        unless value =~ regexp
+        valid_length = [10, 11].include?((value.gsub('-', '').length))
+        unless value =~ regexp && valid_length
           record.errors.add(attribute, options[:message] || I18n.t('errors.messages.invalid'))
         end
       end

data/lib/roshi/version.rb

@@ -1,3 +1,3 @@
 module Roshi
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roshi
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - kawahiro311
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: ActiveModel/ActiveRecord Validation Collection