user_info_normalizer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d841764d1fd3d9e1f794a896ca7c97e83955ed60
-  data.tar.gz: be88099d9825589d085122fa9ef0662b0702b6a0
+  metadata.gz: 54d1cd15318fb1ef23c97aa8612464fef070c7e7
+  data.tar.gz: 9f771c6705b05053a96ce1f7f9d58384c840397e
 SHA512:
-  metadata.gz: '0902a8da6b49e654b79676004283298fb63656c8e66ded0906ce0d7e8e8cc2e552c24d9afcc05387f0509f5c5b8c4014a21deae5e2ea665f3942cea28de730ca'
-  data.tar.gz: 2a77a91ea15b885103e0b57fd4a761fb40094f3d2489c09a10d98194b4cbe2e4bdf81923a1131e66973fce91dd2c071e658538f0e1aea128fbdea3daca131461
+  metadata.gz: 7a9cc84625683ba43bc49b59607660a7bde026f98971be3bb2fbe7023d1488bacb4ccc845df6818241e0b53c8eb69e57d6339079386651fc97f48a9c485b159c
+  data.tar.gz: e63d7bff903852eb46e1dc454a383458797d4efb9fa00a65a7c5964d730b62a24ccf08827f7ec58f294de5f98e923912f6181f6218e4079e5191bf00012d7913

data/Gemfile

@@ -4,10 +4,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in user_info_normalizer.gemspec
 gemspec
-group :development do
-  gem 'byebug'
-  gem 'pry'
-  gem 'pry-rails'
-  gem 'pry-byebug'
-  gem 'rspec-rails'
-end
+#gem 'rspec-rails'
+# group :development do
+#   gem 'byebug'
+#   gem 'pry'
+#   gem 'pry-rails'
+#   gem 'pry-byebug'
+#   gem 'rspec-rails'
+# end

data/Gemfile.lock

@@ -1,37 +1,35 @@
 PATH
   remote: .
   specs:
-    user_info_normalizer (0.3.0)
+    user_info_normalizer (0.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.3)
-    byebug (10.0.2)
-    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     diff-lcs (1.3)
     erubi (1.7.1)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     loofah (2.2.2)
       crass (~> 1.0.2)
@@ -41,50 +39,38 @@ GEM
     minitest (5.11.3)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-rails (0.3.6)
-      pry (>= 0.10.4)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.1)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -94,13 +80,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  byebug
-  pry
-  pry-byebug
-  pry-rails
-  rake (~> 10.0)
-  rspec (~> 3.0)
   rspec-rails
   user_info_normalizer!
 

data/lib/user_info_normalizer.rb

@@ -29,25 +29,54 @@ module UserInfoNormalizer
 
     def normalize_address
       # 数字の前後で長音などはありえないのでハイフンに直す, 数字も全角に
-      self.tr('0-9', '０-９').gsub(/([０-９])(#{UserInfoNormalizer::HYPHEN_REGEXP})/, '\1－').strip
+      self.tr('0-9', '０-９')
+          .gsub(/([０-９])(#{UserInfoNormalizer::HYPHEN_REGEXP})+/, '\1－')
+          .squeeze('－')
+          .strip
     end
 
     def normalize_zip_code
       case UserInfoNormalizer::configuration.zip_code_form
       when '123-4567'
-        self.tr('０-９', '0-9')
+        str = self.tr('０-９', '0-9')
             .gsub(/#{UserInfoNormalizer::HYPHEN_REGEXP}/, '-')
             .squeeze('-')
             .delete("^0-9|-")
+        if str.length == 7 && str =~ /\A[0-9]+\z/
+          # 数字７文字だった場合
+          str.insert(3, '-')
+        end
+        str
       else
         # default: '１２３－４５６７'
-        self.tr('0-9', '０-９')
+        str = self.tr('0-9', '０-９')
             .gsub(/#{UserInfoNormalizer::HYPHEN_REGEXP}/, '－')
             .squeeze('－')
             .delete("^０-９|－")
+        if str.length == 7 && str =~ /\A[０-９]+\z/
+          # 全角数字７文字だった場合
+          str.insert(3, '－')
+        end
+        str
       end.strip
     end
 
+    def normalize_tel
+      case UserInfoNormalizer::configuration.tel_form
+      when '012-3456-7890'
+        self.tr('０-９', '0-9').tr('　', ' ')
+                  .gsub(/#{UserInfoNormalizer::HYPHEN_REGEXP}/, '-')
+                  .squeeze('-')
+                  .delete("^0-9|-| ").strip.tr(' ', '-')
+      else
+        # default: '１２３－４５６７'
+        self.tr('0-9', '０-９').tr(' ', '　')
+                  .gsub(/#{UserInfoNormalizer::HYPHEN_REGEXP}/, '－')
+                  .squeeze('－')
+                  .delete("^０-９|－|　").strip.tr('　', '－')
+      end
+    end
+
     def to_hiragana
       NKF.nkf('-w --hiragana', self)
     end

data/lib/user_info_normalizer/configuration.rb

@@ -1,3 +1,3 @@
 class UserInfoNormalizer::Configuration
-  attr_accessor :name_kana_form, :address_form, :zip_code_form
+  attr_accessor :name_kana_form, :address_form, :zip_code_form, :tel_form
 end

data/lib/user_info_normalizer/version.rb

@@ -1,3 +1,3 @@
 module UserInfoNormalizer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/user_info_normalizer.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  # spec.add_development_dependency "bundler", "~> 1.16"
+  # spec.add_development_dependency "rake", "~> 10.0"
+  # spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: user_info_normalizer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - hirata masato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+date: 2018-08-13 00:00:00.000000000 Z
+dependencies: []
 description: normalize user's information form such as zip_code, address...
 email:
 - hirata@piano.or.jp