phony 2.19.1 → 2.20.8

data/spec/lib/phony/country_spec.rb

@@ -12,12 +12,12 @@ describe Phony::Country do
     end
     describe '#clean' do
       it 'cleans the number' do
-        country.clean('+41-44-123-12-12').should eql '41441231212'
+        expect(country.clean('+41-44-123-12-12')).to eq '41441231212'
       end
     end
     describe '#vanity_to_number' do
       it 'turns the vanity number into a number' do
-        country.vanity_to_number('1-800-HELLO').should eql '1-800-43556'
+        expect(country.vanity_to_number('1-800-HELLO')).to eq '1-800-43556'
       end
     end
   end
@@ -32,27 +32,27 @@ describe Phony::Country do
         described_class.new national_code
       end
       it 'splits correctly' do
-        country.split('112').should == [nil, false, '112']
+        expect(country.split('112')).to eq [nil, false, '112']
       end
     end
     describe 'San Marino' do
       it 'normalizes correctly' do
-        Phony.normalize('+3780549903549').should == '3780549903549'
+        expect(Phony.normalize('+3780549903549')).to eq '3780549903549'
       end
       xit 'automatically adds the sole NC' do
-        Phony.normalize('+378903549').should == '3780549903549'
+        expect(Phony.normalize('+378903549')).to eq '3780549903549'
       end
     end
     describe 'Japan' do
       it 'normalizes correctly' do
-        Phony.normalize('+81-03-1234-5634').should == '81312345634'
-        Phony.normalize('03-1234-5634', cc: '81').should == '81312345634'
+        expect(Phony.normalize('+81-03-1234-5634')).to eq '81312345634'
+        expect(Phony.normalize('03-1234-5634', cc: '81')).to eq '81312345634'
       end
       it 'formats correctly' do
-        Phony.format('81312345634').should == '+81-3-1234-5634'
+        expect(Phony.format('81312345634')).to eq '+81-3-1234-5634'
       end
       it 'splits correctly' do
-        Phony.split('81312345634').should == %w(81 3 1234 5634)
+        expect(Phony.split('81312345634')).to eq %w(81 3 1234 5634)
       end
     end
   end
@@ -68,12 +68,12 @@ describe Phony::Country do
     
     describe "split" do
       it "should handle ZH" do
-        country.split('443643532').should == [nil, '44', '364', '35', '32']
+        expect(country.split('443643532')).to eq [nil, '44', '364', '35', '32']
       end
     end
     describe 'normalize' do
       it "should handle ZH" do
-        country.normalize('0443643532').should == '443643532'
+        expect(country.normalize('0443643532')).to eq '443643532'
       end
     end
   end
@@ -93,10 +93,10 @@ describe Phony::Country do
     
     describe "split" do
       it "should handle ZH" do
-        country.split('443643532').should == [nil, '44', '364', '35', '32']
+        expect(country.split('443643532')).to eq [nil, '44', '364', '35', '32']
       end
       it "should handle 800" do
-        country.split('800333666').should == [nil, '800', '333', '666']
+        expect(country.split('800333666')).to eq [nil, '800', '333', '666']
       end
     end
   end

data/spec/lib/phony/dsl_spec.rb

@@ -7,9 +7,13 @@ describe Phony::DSL do
   let(:dsl) { described_class.new }
 
   it 'has a todo' do
+    result = nil
+    
     Phony.define do
-      todo.split("123456789012345").should == [nil, false, '123456789012345']
+      result = todo.split("123456789012345")
     end
+    
+    expect(result).to eq [nil, false, '123456789012345']
   end
   
   describe 'match' do
@@ -17,7 +21,7 @@ describe Phony::DSL do
       expect { dsl.match(/123/) }.to raise_error("Regexp /123/ needs a group in it that defines which digits belong to the NDC.")
     end
     it 'should return a Phony::NationalSplitters::Regex' do
-      dsl.match(/(123)/).class.name.should == Phony::NationalSplitters::Regex.name
+      expect(dsl.match(/(123)/).class.name).to eq Phony::NationalSplitters::Regex.name
     end
   end
 

data/spec/lib/phony/local_splitters/regex_spec.rb

@@ -16,40 +16,37 @@ describe Phony::LocalSplitters::Regex do
   end
   
   describe 'split' do
-    before(:each) do
-      # Norway as example.
-      #
-      @splitter = described_class.instance_for(/^[489].*$/ => [3,2,3], :fallback => [2,2,2,2])
-    end
+    # Norway.
+    let(:splitter) { described_class.instance_for(/^[489].*$/ => [3,2,3], :fallback => [2,2,2,2]) }
     it 'splits a number correctly' do
-      @splitter.split('21234567').should == ['21','23','45','67']
+      expect(splitter.split('21234567')).to eq ['21','23','45','67']
     end
     it 'splits a number correctly' do
-      @splitter.split('31234567').should == ['31','23','45','67']
+      expect(splitter.split('31234567')).to eq ['31','23','45','67']
     end
     it 'splits a number correctly' do
-      @splitter.split('41234567').should == ['412','34','567']
+      expect(splitter.split('41234567')).to eq ['412','34','567']
     end
     it 'splits a number correctly' do
-      @splitter.split('51234567').should == ['51','23','45','67']
+      expect(splitter.split('51234567')).to eq ['51','23','45','67']
     end
     it 'splits a number correctly' do
-      @splitter.split('61234567').should == ['61','23','45','67']
+      expect(splitter.split('61234567')).to eq ['61','23','45','67']
     end
     it 'splits a number correctly' do
-      @splitter.split('71234567').should == ['71','23','45','67']
+      expect(splitter.split('71234567')).to eq ['71','23','45','67']
     end
     it 'splits a number correctly' do
-      @splitter.split('81234567').should == ['812','34','567']
+      expect(splitter.split('81234567')).to eq ['812','34','567']
     end
     it 'splits a number correctly' do
-      @splitter.split('91234567').should == ['912','34','567']
+      expect(splitter.split('91234567')).to eq ['912','34','567']
     end
     it 'splits it fast' do
-      performance_of { @splitter.split('21234567').should == ['21','23','45','67'] }.should < 0.00005
+      expect(performance_of { splitter.split('21234567') }).to be < 0.00005
     end
     it 'splits it fast' do
-      performance_of { @splitter.split('91234567').should == ['912','34','567'] }.should < 0.00004
+      expect(performance_of { splitter.split('91234567') }).to be < 0.00004
     end
   end
 

data/spec/lib/phony/national_code_spec.rb

@@ -5,87 +5,57 @@ describe Phony::NationalCode do
   describe 'split' do
     context 'regression' do
       describe 'iceland' do
-        before(:each) do
+        let(:national) do
           national_splitter = Phony::NationalSplitters::None.instance_for
           local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 4]
 
-          @national         = Phony::NationalCode.new national_splitter, local_splitter
+          Phony::NationalCode.new national_splitter, local_splitter
         end
         it 'splits correctly' do
-          @national.split('112').should == [nil, false, '112']
+          expect(national.split('112')).to eq [nil, false, '112']
         end
       end
     end
     context 'with fixed ndc (Swiss)' do
-      before(:each) do
+      let(:national) do
         national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
         local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
         
-        @national         = Phony::NationalCode.new national_splitter, local_splitter
+        Phony::NationalCode.new national_splitter, local_splitter
       end
       it 'splits correctly' do
-        @national.split('443643532').should == [nil, '44', '364', '35', '32']
+        expect(national.split('443643532')).to eq [nil, '44', '364', '35', '32']
       end
       it 'splits correctly' do
-        @national.split('44364353').should == [nil, '44', '364', '35', '3']
+        expect(national.split('44364353')).to eq [nil, '44', '364', '35', '3']
       end
       it 'normalizes correctly' do
-        @national.normalize('044364353').should == '44364353'
+        expect(national.normalize('044364353')).to eq '44364353'
       end
       it 'normalizes correctly' do
-        @national.normalize('44364353').should == '44364353'
+        expect(national.normalize('44364353')).to eq '44364353'
       end
     end
     context 'with fixed ndc (French)' do
-      before(:each) do
+      let(:national) do
         national_splitter = Phony::NationalSplitters::Fixed.instance_for 1
         local_splitter    = Phony::LocalSplitters::Fixed.instance_for [2, 2, 2, 2]
         
-        @national         = Phony::NationalCode.new national_splitter, local_splitter
+        Phony::NationalCode.new national_splitter, local_splitter
       end
       it 'splits correctly' do
-        @national.split('142278186').should == [nil, '1', '42', '27', '81', '86']
+        expect(national.split('142278186')).to eq [nil, '1', '42', '27', '81', '86']
       end
       it 'splits correctly' do
-        @national.split('14227818').should == [nil, '1', '42', '27', '81', '8']
+        expect(national.split('14227818')).to eq [nil, '1', '42', '27', '81', '8']
       end
       it 'normalizes correctly' do
-        @national.normalize('0142278186').should == '142278186'
+        expect(national.normalize('0142278186')).to eq '142278186'
       end
       it 'normalizes correctly' do
-        @national.normalize('142278186').should == '142278186'
+        expect(national.normalize('142278186')).to eq '142278186'
       end
     end
-    # context 'normalizing' do
-    #   context 'false' do
-    #     before(:each) do
-    #       @national = Phony::NationalCode.new nil, nil, false
-    #     end
-    #     it 'normalizes an italian case correctly' do
-    #       @national.normalize('0909709511').should == '0909709511'
-    #     end
-    #   end
-    #   context 'true' do
-    #     before(:each) do
-    #       national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
-    #       local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
-    #       @national = Phony::NationalCode.new national_splitter, local_splitter, true
-    #     end
-    #     it 'normalizes a swiss case correctly' do
-    #       @national.normalize('044364353').should == '44364353'
-    #     end
-    #   end
-    #   context 'nil (true)' do
-    #     before(:each) do
-    #       national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
-    #       local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
-    #       @national = Phony::NationalCode.new national_splitter, local_splitter, nil
-    #     end
-    #     it 'normalizes a swiss case correctly' do
-    #       @national.normalize('044364353').should == '44364353'
-    #     end
-    #   end
-    # end
   end
   
 end

data/spec/lib/phony/national_splitters/fixed_spec.rb

@@ -4,45 +4,41 @@ describe Phony::NationalSplitters::Fixed do
   
   describe 'instance_for' do
     it 'caches' do
-      Phony::NationalSplitters::Fixed.instance_for(3).should equal(Phony::NationalSplitters::Fixed.instance_for(3))
+      expect(Phony::NationalSplitters::Fixed.instance_for(3)).to eq Phony::NationalSplitters::Fixed.instance_for(3)
     end
     it 'caches correctly' do
-      Phony::NationalSplitters::Fixed.instance_for(1).should_not equal(Phony::NationalSplitters::Fixed.instance_for(2))
+      expect(Phony::NationalSplitters::Fixed.instance_for(1)).to_not eq Phony::NationalSplitters::Fixed.instance_for(2)
     end
   end
   
   describe 'split' do
-    before(:each) do
-      @splitter = Phony::NationalSplitters::Fixed.new 2
-    end
+    let(:splitter) { Phony::NationalSplitters::Fixed.new(2) }
     it 'splits correctly' do
-      @splitter.split('443643532').should == [nil, '44', '3643532']
+      expect(splitter.split('443643532')).to eq [nil, '44', '3643532']
     end
     it 'splits correctly even when the number is too long' do
-      @splitter.split('44364353211').should == [nil, '44', '364353211']
+      expect(splitter.split('44364353211')).to eq [nil, '44', '364353211']
     end
     it 'splits correctly even when the number is too short' do
-      @splitter.split('443').should == [nil, '44','3']
+      expect(splitter.split('443')).to eq [nil, '44','3']
     end
     it 'has a length of 2' do
-      @splitter.length.should == 2
+      expect(splitter.length).to eq 2
     end
   end
   describe 'split' do
-    before(:each) do
-      @splitter = Phony::NationalSplitters::Fixed.new nil
-    end
+    let(:splitter) { Phony::NationalSplitters::Fixed.new(nil) }
     it 'splits correctly' do
-      @splitter.split('443643532').should == [nil, '443643532']
+      expect(splitter.split('443643532')).to eq [nil, '443643532']
     end
     it 'splits correctly even when the number is too long' do
-      @splitter.split('44364353211').should == [nil, '44364353211']
+      expect(splitter.split('44364353211')).to eq [nil, '44364353211']
     end
     it 'splits correctly even when the number is too short' do
-      @splitter.split('443').should == [nil, '443']
+      expect(splitter.split('443')).to eq [nil, '443']
     end
     it 'has a length of nil' do
-      @splitter.length.should == nil
+      expect(splitter.length).to eq nil
     end
   end
   

data/spec/lib/phony/national_splitters/none_spec.rb

@@ -4,7 +4,7 @@ describe Phony::NationalSplitters::None do
   
   describe 'instance_for' do
     it 'caches' do
-      described_class.instance_for.should equal(described_class.instance_for)
+      expect(described_class.instance_for).to eq described_class.instance_for
     end
   end
   
@@ -13,13 +13,13 @@ describe Phony::NationalSplitters::None do
   
     describe 'split' do
       it 'splits correctly into ndc and rest' do
-        splitter.split('123456789').should == [nil, false, '123456789']
+        expect(splitter.split('123456789')).to eq [nil, false, '123456789']
       end
     end
     
     describe 'length' do
       it 'is always 0' do
-        splitter.length.should be_zero
+        expect(splitter.length).to be_zero
       end
     end
     

data/spec/lib/phony/national_splitters/variable_spec.rb

@@ -4,34 +4,30 @@ describe Phony::NationalSplitters::Variable do
   
   describe 'split' do
     context 'normal' do
-      before(:each) do
-        @splitter = Phony::NationalSplitters::Variable.new 4, ['1', '316', '67', '68', '669', '711']
-      end
+      let(:splitter) { Phony::NationalSplitters::Variable.new 4, ['1', '316', '67', '68', '669', '711'] }
       it "handles Vienna" do
-        @splitter.split('198110').should == [nil, '1', '98110']
+        expect(splitter.split('198110')).to eq [nil, '1', '98110']
       end
       it "handles some mobile services" do
-        @splitter.split('66914093902').should == [nil, '669', '14093902']
+        expect(splitter.split('66914093902')).to eq [nil, '669', '14093902']
       end
       it "handles Graz" do
-        @splitter.split('3161234567891').should == [nil, '316', '1234567891']
+        expect(splitter.split('3161234567891')).to eq [nil, '316', '1234567891']
       end
       it "handles Rohrau" do
-        @splitter.split('2164123456789').should == [nil, '2164', '123456789']
+        expect(splitter.split('2164123456789')).to eq [nil, '2164', '123456789']
       end
       it 'has an NDC length of 3' do
-        @splitter.length.should == (1..3)
+        expect(splitter.length).to eq (1..3)
       end
     end
     context 'special handling for using the variable size splitter for Swiss service numbers' do
-      before(:each) do
-        @splitter = Phony::NationalSplitters::Variable.new 2, ['800']
-      end
+      let(:splitter) { Phony::NationalSplitters::Variable.new 2, ['800'] }
       it "should handle swiss service numbers" do
-        @splitter.split('800223344').should == [nil, '800', '223344']
+        expect(splitter.split('800223344')).to eq [nil, '800', '223344']
       end
       it 'has an NDC length of 3' do
-        @splitter.length.should == (3..3)
+        expect(splitter.length).to eq (3..3)
       end
     end
   end

data/spec/lib/phony/vanity_spec.rb

@@ -8,22 +8,22 @@ describe Phony::Vanity do
 
   describe '.replace' do
     it 'replaces letters with digits' do
-      vanity.replace('1-800-HELLO').should == '1-800-43556'
+      expect(vanity.replace('1-800-HELLO')).to eq '1-800-43556'
     end
   end
   
   describe '.vanity?' do
     it 'returns true on a vanity number' do
-      vanity.vanity?('800HELLOES').should == true
+      expect(vanity.vanity?('800HELLOES')).to eq true
     end
     it 'returns false on a non-vanity number' do
-      vanity.vanity?('8004355637').should == false
+      expect(vanity.vanity?('8004355637')).to eq false
     end
   end
   
   describe '.normalized' do
     it 'normalizes the vanity number' do
-      vanity.normalized('1-800-HELLO').should == '1800HELLO'
+      expect(vanity.normalized('1-800-HELLO')).to eq '1800HELLO'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.20.8
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -115,26 +115,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and
   formatting.
 test_files:
-- spec/lib/phony_spec.rb
-- spec/lib/phony/trunk_code_spec.rb
-- spec/lib/phony/country_spec.rb
-- spec/lib/phony/national_code_spec.rb
+- spec/functional/config_spec.rb
+- spec/functional/plausibility_spec.rb
 - spec/lib/phony/countries_spec.rb
+- spec/lib/phony/country_codes_spec.rb
+- spec/lib/phony/country_spec.rb
 - spec/lib/phony/dsl_spec.rb
-- spec/lib/phony/national_splitters/variable_spec.rb
+- spec/lib/phony/local_splitters/fixed_spec.rb
+- spec/lib/phony/local_splitters/regex_spec.rb
+- spec/lib/phony/national_code_spec.rb
+- spec/lib/phony/national_splitters/default_spec.rb
+- spec/lib/phony/national_splitters/fixed_spec.rb
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
-- spec/lib/phony/national_splitters/fixed_spec.rb
-- spec/lib/phony/national_splitters/default_spec.rb
-- spec/lib/phony/country_codes_spec.rb
-- spec/lib/phony/local_splitters/regex_spec.rb
-- spec/lib/phony/local_splitters/fixed_spec.rb
+- spec/lib/phony/national_splitters/variable_spec.rb
+- spec/lib/phony/trunk_code_spec.rb
 - spec/lib/phony/vanity_spec.rb
-- spec/functional/config_spec.rb
-- spec/functional/plausibility_spec.rb
+- spec/lib/phony_spec.rb