roshi 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 96f2b09d4f9a2cfc7266be05fee56a50bbad6609
-  data.tar.gz: 673294fba72c81de66be3d7a6f13b7ed4f8e9a21
+SHA256:
+  metadata.gz: '0299322983ffc79bebf28dc2f3fe565358cccc519c951431b4334956ddc0bd15'
+  data.tar.gz: 8a411586358501cbaba8bdac48a2f138995fecca26c08946c4aa6fd56d69bc9a
 SHA512:
-  metadata.gz: dd07de35b85f1b1211b6831d4f70e69ad2f06a5ad3790252ba167871bc4a12468127558b73007a6df0820b3d005ea5465b66b4f348fea5df181727f70995c07b
-  data.tar.gz: b5ad9b612f018af303a5d806694078574226c395abad44fa7ff6c0d6fdba3ad4041daa74eb7a9f3c3bfc7df597f4d5f98599d14136be6bc19ece295ab0e7db95
+  metadata.gz: 29f04b76606b7bcf6db5f0055f2841c3db9f6719cbed77d5ca1b2a344077953144af44c1e2dc7b6bd6806bf0829a0cf422befefec95c60f764f177b07d7a01d1
+  data.tar.gz: b6152c193cc72fdcfa8e69273f912da792274c685832b45a4d6311a02bd49faee786e2f9be5cb11cfbd8e4715f14db71cacb17fd511e77e08c4ed6621988cd2d

data/README.md

@@ -29,10 +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 :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.rb

@@ -1,7 +1,7 @@
 require 'active_model'
 require 'roshi/version'
 %w(
-  email zip_code phone_number date hiragana
+  email zip_code phone_number date hiragana katakana
   version_number available_word numerical_comparison
 ).each do |validator_name|
   require "roshi/active_model/validations/#{validator_name}_validator"

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

@@ -3,7 +3,7 @@ module ActiveModel
     class EmailValidator < EachValidator
       def validate_each(record, attribute, value)
         # http://emailregex.com
-        unless value =~ /\A([\w+!#$%&'*+\/=?^`{|}~\-].?)+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i
+        unless value =~ URI::MailTo::EMAIL_REGEXP
           record.errors.add(attribute, options[:message] || I18n.t('errors.messages.invalid'))
         end
       end

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

@@ -0,0 +1,12 @@
+module ActiveModel
+  module Validations
+    class KatakanaValidator < EachValidator
+      def validate_each(record, attribute, value)
+        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
+    end
+  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{4}\z/i,
-        with_hiphenation: /\A\d{2,4}\-\d{2,4}\-\d{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.0'
+  VERSION = '0.9.0'
 end

data/roshi.gemspec

@@ -6,8 +6,8 @@ require 'roshi/version'
 Gem::Specification.new do |spec|
   spec.name          = 'roshi'
   spec.version       = Roshi::VERSION
-  spec.authors       = ['kawahiro311', 'Kta-M']
-  spec.email         = ['hiro.kawasaki0311@gmail.com', 'mohri1219@gmail.com']
+  spec.authors       = ['kawahiro311', 'Kta-M', 'nmbakfm']
+  spec.email         = ['hiro.kawasaki0311@gmail.com', 'mohri1219@gmail.com', 'nmbakfm@gmail.com']
 
   spec.summary       = %q{ActiveModel/ActiveRecord Validation Collection}
   spec.description   = %q{ActiveModel/ActiveRecord Validation Collection For Mainly Japanese}
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activemodel'
   spec.add_development_dependency 'bundler', "~> 1.9"
-  spec.add_development_dependency 'rake', "~> 10.0"
+  spec.add_development_dependency 'rake', "~> 12.3.3"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: roshi
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - kawahiro311
 - Kta-M
+- nmbakfm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -45,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +86,7 @@ description: ActiveModel/ActiveRecord Validation Collection For Mainly Japanese
 email:
 - hiro.kawasaki0311@gmail.com
 - mohri1219@gmail.com
+- nmbakfm@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -101,6 +103,7 @@ files:
 - lib/roshi/active_model/validations/date_validator.rb
 - lib/roshi/active_model/validations/email_validator.rb
 - lib/roshi/active_model/validations/hiragana_validator.rb
+- lib/roshi/active_model/validations/katakana_validator.rb
 - lib/roshi/active_model/validations/numerical_comparison_validator.rb
 - lib/roshi/active_model/validations/phone_number_validator.rb
 - lib/roshi/active_model/validations/version_number_validator.rb
@@ -125,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveModel/ActiveRecord Validation Collection