tel_formatter 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae317999220de4a716655779151d9a7512484aa
-  data.tar.gz: 4426b6b26c0629df467355f5f0de078dc5702c85
+  metadata.gz: 090357d69744f1057bd359325d3af1684cba4ab6
+  data.tar.gz: defeddce7d8ca4e24db3b224b05a3b528481e564
 SHA512:
-  metadata.gz: b91d9c344a0f3f049562a92cbcbbcd75de545fc55c38951e82e075b48afeb0705e9c21db6d50ff1b9b7f6f1ca69f342cc6dffac9badc8840c49b1d82264e3f76
-  data.tar.gz: f3af0e6a3d023635ca48e078cc25d63b172f4a488dfb10925d852ebe2d66508d3170bdd67ec2c19a66b6d67d78da515fc09d517753f620b7d8954e0597202ccf
+  metadata.gz: fc3d97320433f4e52e7c81dfee09f02f7736f18f6e67e6e8b83bed04a8cca0f22b9b0f7dd50d9286e778e287bbb039b2ea5d7a945f01aec8290d7ef431ccbdbe
+  data.tar.gz: 9231bf6ce4dba8d471ef9458c0423cec57111a909e05bff068bf47ef694205c45514e5374e7da15fff191419f79cb319fb4d42bdfab20cc297e9b0b94b96fc55

data/.rspec

@@ -1 +1 @@
--cfs
+-c

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: bundle exec rake spec
+script: bundle exec rspec
 rvm:
   - 2.1.0
   - 2.0.0

data/README.md

@@ -28,8 +28,8 @@ Or install it yourself as:
 ```ruby
 require 'tel_formatter'
 
-Telformatter.format("0312345678") #=> "03-1234-5678"
-Telformatter.format("０３．１２３５．５６７８") #=> "03-1234-5678"
+TelFormatter.format("0312345678") #=> "03-1234-5678"
+TelFormatter.format("０３．１２３５．５６７８") #=> "03-1234-5678"
 ```
 
 ## Contributing

data/data/area_codes.txt

@@ -8,13 +8,13 @@
 0134
 0135
 0136
+0137
 01372
 01374
-0137
 01377
 0138
-01392
 0139
+01392
 01397
 01398
 0142
@@ -25,11 +25,11 @@
 01457
 0146
 01466
+015
 0152
 0153
 0154
 01547
-015
 0155
 01558
 0156
@@ -39,10 +39,10 @@
 01586
 01587
 0162
+0163
 01632
 01634
 01635
-0163
 0164
 01648
 0165
@@ -52,27 +52,27 @@
 01658
 0166
 0167
+017
 0172
 0173
 0174
 0175
 0176
-017
 0178
 0179
+018
 0182
 0183
 0184
 0185
 0186
 0187
-018
+019
 0191
 0192
 0193
 0194
 0195
-019
 0197
 0198
 022
@@ -83,18 +83,18 @@
 0226
 0228
 0229
+023
 0233
 0234
 0235
-023
 0237
 0238
+024
 0240
 0241
 0242
 0243
 0244
-024
 0246
 0247
 0248
@@ -106,9 +106,9 @@
 0257
 0258
 0259
+026
 0260
 0261
-026
 0263
 0264
 0265
@@ -116,24 +116,24 @@
 0267
 0268
 0269
-0270
 027
+0270
 0274
 0276
 0277
 0278
 0279
+028
 0280
 0282
 0283
 0284
 0285
-028
 0287
 0288
 0289
-0291
 029
+0291
 0293
 0294
 0295
@@ -141,24 +141,24 @@
 0297
 0299
 03
-0422
+04
 042
+0422
 0428
-04
 043
 0436
 0438
 0439
 044
 045
-0460
 046
+0460
 0463
 0465
 0466
 0467
-0470
 047
+0470
 0475
 0476
 0478
@@ -187,9 +187,9 @@
 0545
 0547
 0548
+055
 0550
 0551
-055
 0553
 0554
 0555
@@ -248,26 +248,26 @@
 0748
 0749
 075
-0761
 076
+0761
 0763
 0765
 0766
 0767
 0768
+077
 0770
 0771
 0772
 0773
 0774
-077
 0776
 0778
 0779
 078
+079
 0790
 0791
-079
 0794
 0795
 0796
@@ -291,12 +291,12 @@
 08387
 08388
 08396
+084
 0845
 0846
 0847
 08477
 0848
-084
 08512
 08514
 0852
@@ -314,17 +314,18 @@
 0867
 0868
 0869
+087
 0875
 0877
-087
 0879
+088
 0880
 0883
 0884
 0885
-088
 0887
 0889
+089
 0892
 0893
 0894
@@ -332,7 +333,6 @@
 0896
 0897
 0898
-089
 092
 0920
 093
@@ -346,13 +346,13 @@
 0948
 0949
 09496
+095
 0950
 0952
 0954
 0955
 0956
 0957
-095
 0959
 096
 0964
@@ -361,10 +361,10 @@
 0967
 0968
 0969
+097
 0972
 0973
 0974
-097
 0977
 0978
 0979
@@ -377,12 +377,13 @@
 0985
 0986
 0987
+099
 09912
 09913
-099
 0993
 0994
 0995
 0996
 09969
 0997
+

data/data/cellphone_codes.txt

@@ -1,3 +1,4 @@
+020
 050
 060
 070

data/data/special_codes_11.txt

@@ -0,0 +1 @@
+0800

data/lib/tel_formatter/version.rb

@@ -1,3 +1,3 @@
 module TelFormatter
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/tel_formatter.rb

@@ -3,11 +3,13 @@ require "tel_formatter/version"
 
 module TelFormatter
   AREA_CODES = File.read(File.expand_path("../../data/area_codes.txt", __FILE__)).split("\n").reverse
-  SPECIAL_CODES = File.read(File.expand_path("../../data/special_codes.txt", __FILE__)).split("\n").reverse
+  SPECIAL_CODES_10 = File.read(File.expand_path("../../data/special_codes_10.txt", __FILE__)).split("\n").reverse
+  SPECIAL_CODES_11 = File.read(File.expand_path("../../data/special_codes_11.txt", __FILE__)).split("\n").reverse
   CELLPHONE_CODES = File.read(File.expand_path("../../data/cellphone_codes.txt", __FILE__)).split("\n").reverse
   AREA_CODE_REGEXP = /\A(#{AREA_CODES.join("|")})(\d{1,4})(\d{4})\Z/
-  SPECIAL_CODE_REGEXP = /\A(#{SPECIAL_CODES.join("|")})(\d{6})\Z/
-  CELLPHONE_CODE_REGEXP = /\A(#{CELLPHONE_CODES.join("|")})(\d{4})(\d{4})\Z/
+  SPECIAL_CODE_10_REGEXP = /\A(#{SPECIAL_CODES_10.join("|")})(\d{6})\Z/
+  SPECIAL_CODE_11_REGEXP = /\A(#{SPECIAL_CODES_11.join("|")})(\d{7})\Z/
+  CELLPHONE_CODE_REGEXP = /\A(#{CELLPHONE_CODES.join("|")})([1-9]\d{3})(\d{4})\Z/
 
   def self.format(tel)
     self.split(tel).join("-")
@@ -19,7 +21,7 @@ module TelFormatter
     when 10
       if AREA_CODE_REGEXP =~ tel
         return [$1, $2, $3]
-      elsif SPECIAL_CODE_REGEXP =~ tel
+      elsif SPECIAL_CODE_10_REGEXP =~ tel
         return [$1, $2]
       else
         raise ArgumentError, "Invalid telephone number"
@@ -27,6 +29,8 @@ module TelFormatter
     when 11
       if CELLPHONE_CODE_REGEXP =~ tel
         return [$1, $2, $3]
+      elsif SPECIAL_CODE_11_REGEXP =~ tel
+        return [$1, $2]
       else
         raise ArgumentError, "Invalid telephone number"
       end

data/spec/tel_formatter_spec.rb

@@ -7,6 +7,22 @@ describe TelFormatter do
       tel = "0300000000"
       expect(TelFormatter.format(tel)).to eq("03-0000-0000")
     end
+
+    it "returns hyphenated telephone number based on split format 3 digit (eg Koganei, Tokyo) geo code" do
+      tel = "0429991111"
+      expect(TelFormatter.format(tel)).to eq("042-999-1111")
+    end
+
+    it "returns hyphenated telephone number based on split format 4 digit (eg Nishitama, Tokyo) geo code" do
+      tel = "0428991111"
+      expect(TelFormatter.format(tel)).to eq("0428-99-1111")
+    end
+
+    it "returns hyphenated telephone number based on split format 4 digit (eg Chofu, Tokyo) geo code" do
+      tel = "0422991111"
+      expect(TelFormatter.format(tel)).to eq("0422-99-1111")
+      # This should NOT be "042-299-1111"
+    end
   end
 
   describe ".split" do
@@ -21,9 +37,19 @@ describe TelFormatter do
       expect(TelFormatter.split(tel)).to eq(["01267", "0", "0000"])
       tel = "0120000000"
       expect(TelFormatter.split(tel)).to eq(["0120", "000000"])
-      tel = "09000000000"
-      expect(TelFormatter.split(tel)).to eq(["090", "0000", "0000"])
+      tel = "08099999999"
+      expect(TelFormatter.split(tel)).to eq(["080", "9999", "9999"])
+      tel = "08000000000"
+      expect(TelFormatter.split(tel)).to eq(["0800", "0000000"])
+
+      tel = "0429991111"
+      expect(TelFormatter.split(tel)).to eq(["042", "999", "1111"])
+      tel = "0428991111"
+      expect(TelFormatter.split(tel)).to eq(["0428", "99", "1111"])
+      tel = "0422991111"
+      expect(TelFormatter.split(tel)).to eq(["0422", "99", "1111"])
     end
+
     it "raises ArgumentError when Invalid number is given" do
       tel = "0200000000"
       expect { TelFormatter.split(tel) }.to raise_error(ArgumentError)
@@ -32,6 +58,7 @@ describe TelFormatter do
       tel = "050000000"
       expect { TelFormatter.split(tel) }.to raise_error(ArgumentError)
     end
+
     it "can handle Zenkaku chars and ignore non-numerical chars" do
       tel = "０３−００００−００００"
       expect(TelFormatter.split(tel)).to eq(["03", "0000", "0000"])

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: tel_formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - iTakeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -45,16 +45,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - data/area_codes.txt
 - data/cellphone_codes.txt
-- data/special_codes.txt
+- data/special_codes_10.txt
+- data/special_codes_11.txt
 - lib/tel_formatter.rb
 - lib/tel_formatter/version.rb
 - spec/spec_helper.rb
@@ -70,17 +71,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Format your telephone numbers