RubyGems - phony - Versions diffs - 2.5.1 → 2.5.2 - Mend

phony 2.5.1 → 2.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +8 -8
data/lib/phony/countries/cambodia.rb +1 -1
data/spec/functional/normalize_spec.rb +93 -1
data/spec/lib/phony/country_codes_spec.rb +14 -11
data/spec/lib/phony_spec.rb +0 -92
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWMxM2MzZDlmZmI3ODE0MGM0YTkyM2YxMDhlZjllMWFmZGVlYjQxOA==
+    MjgyNzBkYTU1NDg4NDE3OWNjZjU3YzVmODc3MWY2MjBlNTRkY2E4NQ==
   data.tar.gz: !binary |-
-    OTIzOTJkNzZmNjMxYWE0YjI2ZDJjOWNjMjk4MDllMDZkYjg0YWI5Yw==
+    M2U4YTMxNWM1NjA4ZTI4MjM0MWMxMzRlYTg4MDA0YmRmMzEyOGVkNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzEyMTA0MDJlNTVmNGFiYTUzYjU1M2Y1OWNlMGUxYjJiOGFjZTk1NjBhN2Jk
-    YmIwNTQ4NDUxNjRkNzMzYmQ0M2JlMDI0NDY4YWIwZmFkNmM3OGY5NTIyNDZk
-    MjNkZTFjYjg4ZmU2YTkwOWE4OTYwOWFmOWI0MjI2ZmZlZmFkMzU=
+    NWQ4YTI5Y2I0NDFhZDgyNjE5NDIyNjc0MWUyZjQyNTAwMzRlYWM4NmNkYmNi
+    MGE0ZThmOTk2NWM3YzRhZmEzNmZjYWFhZTZjY2ZjMzNlNzliOTk1MGE5MGNl
+    MjI0NjdiNDJiNjRjYzcxMjRhNGJmODUwNWIzMGYxZmQ1Yjg0ZDQ=
   data.tar.gz: !binary |-
-    NTJlOTYzNjNjOGIxNzlkMTkzNjA2YjRiZWZlOWVlY2Y1OTNjZmM4NDJlY2Iy
-    ZThhYzc3MTExYjQ2YWNlY2I0NzNhOWM5MTZlYmZhZjQxMWUxOWU1MmVkNTMw
-    MTM2MDg1NjI2ODMxYWJmNGM5ZTdkNmY2OWUxMzRlMzg2MWJkNDU=
+    OGUzMmU1N2Q5NzAyMjQ0NmQyOTE3NzQxYjNjMjY3ZDNhYjc4ZTNiZmQ0MmI0
+    MGQ2MWZmMzc4ODVmMzFhM2M1M2E1NWRmOTFmM2U3YTE2ZjQ2MGI1MjUwYWUw
+    MWY4ZWQ4NDQ4ZDIzM2UzMWUzNDlhMzQ1YzVlMmJmNjcyNjcwZTY=

data/lib/phony/countries/cambodia.rb CHANGED Viewed

@@ -77,7 +77,7 @@ six_or_seven_digit_mobile_prefixes = [
 ]
 Phony.define do
-  country '855', one_of(six_digit_mobile_prefixes)   >> matched_split(/^[1-9]/ => [3, 3]) |
+  country '855', trunk('0') | one_of(six_digit_mobile_prefixes)   >> matched_split(/^[1-9]/ => [3, 3]) |
                  one_of(seven_digit_mobile_prefixes) >> matched_split(/^[2-9]/ => [3, 4]) |
                  one_of(six_or_seven_digit_mobile_prefixes) >> matched_split(
                    /^[2-9]\d{5}$/ => [3, 3], /^[1-9]\d{6}$/ => [3, 4]

data/spec/functional/normalize_spec.rb CHANGED Viewed

@@ -1,9 +1,18 @@
 require 'spec_helper'
-describe 'Phony.normalize' do
+describe 'Phony#normalize' do
   describe 'cases' do
+    describe 'regressions' do
+      it '#151' do
+        # Normalizes, but this is a non-real case.
+        #
+        Phony.normalize('1-111-111-1111').should        == '1111111111'
+        Phony.normalize('111-111-1111', cc: '1').should == '1111111111'
+      end
+    end
     it 'handles the US (with cc) correctly' do
       Phony.normalize('+1 724 999 9999').should == '17249999999'
     end
@@ -22,6 +31,89 @@ describe 'Phony.normalize' do
     it 'handles a German number with extra 0' do
       Phony.normalize('+49 0 209 22 33 44 55').should == '4920922334455'
     end
+    it 'should normalize a too short number' do
+      Phony.normalize('+972').should eql '972'
+    end
+    it 'should normalize an already normalized number' do
+      Phony.normalize('41443643533').should eql '41443643533'
+    end
+    it 'should normalize a format number' do
+      Phony.normalize('+41 44 364 35 33').should eql '41443643533'
+    end
+    it 'should normalize a 00 number' do
+      Phony.normalize('0041 44 364 35 33').should eql '41443643533'
+    end
+    it 'should normalize a service number' do
+      Phony.normalize('+41 800 11 22 33').should eql '41800112233'
+    end
+    it 'should remove characters from the number' do
+      Phony.normalize('John: +41 44 364 35 33').should eql '41443643533'
+    end
+    it 'should normalize one of these crazy american numbers' do
+      Phony.normalize('1 (703) 451-5115').should eql '17034515115'
+    end
+    it 'should normalize another one of these crazy american numbers' do
+      Phony.normalize('1-888-407-4747').should eql '18884074747'
+    end
+    it 'should normalize a number with colons' do
+      Phony.normalize('1.906.387.1698').should eql '19063871698'
+    end
+    it 'should normalize a number with erroneous zero inside' do
+      Phony.normalize('+410443643533').should eql '41443643533'
+    end
+    it 'should not normalize a number with a correct zero inside' do
+      Phony.normalize('+390909709511').should eql '390909709511'
+    end
+    it "handles completely crazy 'numbers'" do
+      Phony.normalize('Hello, I am Cora, the 41th parrot, and 44 is my 364 times 35 funky number. 32.').should eql '41443643532'
+    end
+    context 'special trunk prefixes are not handled' do
+      it 'normalizes Hungary' do
+        Phony.normalize('36 0630245506').should eql '360630245506'
+      end
+      it 'normalizes Russia' do
+        Phony.normalize('7 8 342 1234567').should eql '783421234567'
+      end
+      it 'normalizes Lithuania' do
+        Phony.normalize('370 8 5 1234567').should eql '370851234567'
+      end
+      it 'normalizes Belarus' do
+        Phony.normalize('375 152450911').should eql '375152450911'
+      end
+    end
+    describe 'exceptions' do
+      it 'raises on nil' do
+        expect {
+          Phony.normalize nil
+        }.to raise_error(ArgumentError, 'Phone number cannot be nil. Use e.g. number && Phony.normalize(number).')
+      end
+      it 'raises if number starts with reserved zero code' do
+        expect do
+          Phony.normalize '+00 00 00 00 01'
+        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
+      end
+      it 'raises a nice error message' do
+        expect do
+          Phony.normalize 'test'
+        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
+      end
+    end
+    describe 'country-based' do
+      it 'normalizes the US correctly' do
+        Phony["1"].normalize("555 1234567890").should eql '5551234567890'
+        Phony["1"].normalize("+1 555 1234567890").should eql '5551234567890'
+        Phony["1"].normalize("+1 (0) 555 1234567890").should eql '5551234567890'
+      end
+      it 'normalizes Japan correctly' do
+        Phony["81"].normalize("80 1234 5634").should eql '8012345634'
+        Phony["81"].normalize("Hello    80 1234 5634").should eql '8012345634'
+      end
+    end
   end
 end

data/spec/lib/phony/country_codes_spec.rb CHANGED Viewed

@@ -1,11 +1,11 @@
 require 'spec_helper'
 describe Phony::CountryCodes do
   before(:all) do
     @countries = Phony::CountryCodes.instance
   end
   describe 'international_absolute_format=' do
     it 'formats correctly' do
       @countries.formatted('41443643532', :format => :international).should eql '+41 44 364 35 32'
@@ -13,9 +13,9 @@ describe Phony::CountryCodes do
     it 'formats correctly' do
       old_format = @countries.international_absolute_format
       @countries.international_absolute_format = '!!! %s%s%s'
       @countries.formatted('41443643532', :format => :international).should eql '!!! 41 44 364 35 32'
       @countries.international_absolute_format = old_format
     end
   end
@@ -26,9 +26,9 @@ describe Phony::CountryCodes do
     it 'formats correctly' do
       old_format = @countries.international_relative_format
       @countries.international_relative_format = '000 %s%s%s'
       @countries.formatted('41443643532', :format => :international_relative).should eql '000 41 44 364 35 32'
       @countries.international_relative_format = old_format
     end
   end
@@ -39,21 +39,21 @@ describe Phony::CountryCodes do
     it 'formats correctly' do
       old_format = @countries.national_format
       @countries.national_format = '%s%s'
       # Removes CC 1, but adds national call prefix 1.
       #
       @countries.formatted('11231231234', :format => :national).should eql '1123 123 1234'
       @countries.national_format = old_format
     end
   end
   describe 'split' do
     it 'splits correctly' do
       @countries.split('41443643532').should eql ['41', '0', '44', '364', '35', '32']
     end
   end
   describe 'formatted' do
     it 'formats correctly' do
       @countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
@@ -74,6 +74,9 @@ describe Phony::CountryCodes do
       it 'formats Spain correctly' do
         @countries.formatted("34123456789", :format => :national).should eql '123 456 789'
       end
+      it 'formats Cambodia correctly' do
+        @countries.formatted('85512239123', :format => :national).should eql '012 239 123'
+      end
     end
     context 'default' do
       it "should format swiss numbers" do
@@ -187,5 +190,5 @@ describe Phony::CountryCodes do
       end
     end
   end
 end

data/spec/lib/phony_spec.rb CHANGED Viewed

@@ -5,12 +5,6 @@ require 'spec_helper'
 describe Phony do
   describe 'regression' do
-    it '#151' do
-      # Normalizes, but this is a non-real case.
-      #
-      described_class.normalize('1-111-111-1111').should        == '1111111111'
-      described_class.normalize('111-111-1111', cc: '1').should == '1111111111'
-    end
     it 'best effort #152' do
       described_class.split('39694805123').should == ['39', '694805123', []]
       described_class.format('39694805123').should == '+39 694805123 '
@@ -27,87 +21,6 @@ describe Phony do
     end
   end
-  describe 'normalize' do
-    describe 'exceptions' do
-      it 'raises on nil' do
-        expect {
-          Phony.normalize nil
-        }.to raise_error(ArgumentError, 'Phone number cannot be nil. Use e.g. number && Phony.normalize(number).')
-      end
-      it 'raises if number starts with reserved zero code' do
-        expect do
-          Phony.normalize '+00 00 00 00 01'
-        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
-      end
-      it 'raises a nice error message' do
-        expect do
-          Phony.normalize 'test'
-        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
-      end
-    end
-    describe 'some examples' do
-      it 'should normalize a too short number' do
-        Phony.normalize('+972').should eql '972'
-      end
-      it 'should normalize an already normalized number' do
-        Phony.normalize('41443643533').should eql '41443643533'
-      end
-      it 'should normalize a format number' do
-        Phony.normalize('+41 44 364 35 33').should eql '41443643533'
-      end
-      it 'should normalize a 00 number' do
-        Phony.normalize('0041 44 364 35 33').should eql '41443643533'
-      end
-      it 'should normalize a service number' do
-        Phony.normalize('+41 800 11 22 33').should eql '41800112233'
-      end
-      it 'should remove characters from the number' do
-        Phony.normalize('John: +41 44 364 35 33').should eql '41443643533'
-      end
-      it 'should normalize one of these crazy american numbers' do
-        Phony.normalize('1 (703) 451-5115').should eql '17034515115'
-      end
-      it 'should normalize another one of these crazy american numbers' do
-        Phony.normalize('1-888-407-4747').should eql '18884074747'
-      end
-      it 'should normalize a number with colons' do
-        Phony.normalize('1.906.387.1698').should eql '19063871698'
-      end
-      it 'should normalize a number with erroneous zero inside' do
-        Phony.normalize('+410443643533').should eql '41443643533'
-      end
-      it 'should not normalize a number with a correct zero inside' do
-        Phony.normalize('+390909709511').should eql '390909709511'
-      end
-      context 'special trunk prefixes are not handled' do
-        it 'normalizes Hungary' do
-          Phony.normalize('36 0630245506').should eql '360630245506'
-        end
-        it 'normalizes Russia' do
-          Phony.normalize('7 8 342 1234567').should eql '783421234567'
-        end
-        it 'normalizes Lithuania' do
-          Phony.normalize('370 8 5 1234567').should eql '370851234567'
-        end
-        it 'normalizes Belarus' do
-          Phony.normalize('375 152450911').should eql '375152450911'
-        end
-      end
-    end
-    describe 'country-based' do
-      it 'normalizes the US correctly' do
-        Phony["1"].normalize("555 1234567890").should eql '5551234567890'
-        Phony["1"].normalize("+1 555 1234567890").should eql '5551234567890'
-        Phony["1"].normalize("+1 (0) 555 1234567890").should eql '5551234567890'
-      end
-      it 'normalizes Japan correctly' do
-        Phony["81"].normalize("80 1234 5634").should eql '8012345634'
-        Phony["81"].normalize("Hello    80 1234 5634").should eql '8012345634'
-      end
-    end
-  end
   describe 'formatted' do
     it 'is an alias of format' do
       Phony.formatted('41443643532').should eql '+41 44 364 35 32'
@@ -275,11 +188,6 @@ describe Phony do
   end
   context 'minimal cases' do
-    context 'normalizing' do
-      it "handles completely crazy 'numbers'" do
-        Phony.normalize('Hello, I am Cora, the 41th parrot, and 44 is my 364 times 35 funky number. 32.').should eql '41443643532'
-      end
-    end
     context 'splitting' do
       describe 'exceptions' do
         it 'should raise on split nil' do

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national