norwegian_phone 0.0.8 → 0.0.9

data/lib/norwegian_phone/version.rb

@@ -1,3 +1,3 @@
 module NorwegianPhone
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/norwegian_phone.rb

@@ -1,46 +1,50 @@
 module NorwegianPhone
 
-  def normalize(number)
-    number ||= ""
-    number = number.gsub(/[.\- \t\r\n\(\)]/, '')
-    number.gsub!(/^(\+)(.*)/) { |m| $1 + $2.gsub(/\+/, '') }
-    number.gsub!(/^00/, '+')
-    number.gsub!(/^\+47/, '')
-    number.gsub!(/^\+*0+/, '+')
-    number.gsub!(/^47/, '') if number.size > 8
-    number
-  end
-
-  def msisdnize(number)
-    return nil if missing?(number)
+  class << self
+    def normalize(number)
+      number ||= ""
+      number = number.gsub(/[.\- \t\r\n\(\)]/, '')
+      number.gsub!(/^(\+)(.*)/) { |m| $1 + $2.gsub(/\+/, '') }
+      number.gsub!(/^00/, '+')
+      number.gsub!(/^\+47/, '')
+      number.gsub!(/^\+*0+/, '+')
+      number.gsub!(/^47/, '') if number.size > 8
+      number
+    end
 
-    number = normalize(number)
-    number = "47#{number}" unless number =~ /^\+/
-      number.gsub!(/^\+/, '')
-    number
-  end
+    def msisdnize(number)
+      return nil if missing?(number)
 
-  def unmsisdnize(number)
-    normalize("+#{number}") if number
-  end
+      number = normalize(number)
+      number = "47#{number}" unless number =~ /^\+/
+        number.gsub!(/^\+/, '')
+      number
+    end
 
-  def number_valid?(number)
-    return false if number.nil?
-    return false if number == ""
-    case number.strip
-    when /\A\+?[0-9[:space:]]+\z/
-      return true
+    def unmsisdnize(number)
+      normalize("+#{number}") if number
     end
-    false
-  end
 
-  # Norway-centric. True if not a norwegian number.
-  def international?(number)
-    !!(normalize(number) =~ /^\+/)
-  end
+    def number_valid?(number)
+      return false if number.nil?
+      return false if number == ""
+      case number.strip
+      when /\A\+?[0-9[:space:]]+\z/
+        return true
+      end
+      false
+    end
 
-  private
-    def missing?(number)
-      number.nil? || (number == "")
+    # Norway-centric. True if not a norwegian number.
+    def international?(number)
+      !!(normalize(number) =~ /^\+/)
     end
+
+    private
+
+      def missing?(number)
+        number.nil? || (number == "")
+      end
+
+  end
 end

data/spec/international_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe NorwegianPhone, "#international" do
   it "knows a norse number when it sees one" do
-    NorwegianPhoneWrapper.international?("12345678").should == false
+    NorwegianPhone.international?("12345678").should == false
   end
 
   it "knows a norse number even when it looks international" do
-    NorwegianPhoneWrapper.international?("+4712345678").should == false
+    NorwegianPhone.international?("+4712345678").should == false
   end
 
   it "correctly identifies a non-norwegian international number" do
-    NorwegianPhoneWrapper.international?("+4612345678").should == true
+    NorwegianPhone.international?("+4612345678").should == true
   end
 end

data/spec/isdnize_spec.rb

@@ -3,28 +3,28 @@ require 'spec_helper'
 describe NorwegianPhone, "#msisdnize" do
 
   it "ignores nils" do
-    NorwegianPhoneWrapper.msisdnize(nil).should eq(nil)
+    NorwegianPhone.msisdnize(nil).should eq(nil)
   end
 
   it "ignores empty strings" do
-    NorwegianPhoneWrapper.msisdnize("").should eq(nil)
+    NorwegianPhone.msisdnize("").should eq(nil)
   end
 
   it "adds country code to naked norwegian-ish numbers" do
-    NorwegianPhoneWrapper.msisdnize("12345678").should eq("4712345678")
+    NorwegianPhone.msisdnize("12345678").should eq("4712345678")
   end
 
   it "removes +sign from international number" do
-    NorwegianPhoneWrapper.msisdnize("+123456789").should eq("123456789")
+    NorwegianPhone.msisdnize("+123456789").should eq("123456789")
   end
 end
 
 describe NorwegianPhone, "#unmsisdnize" do
   it "localizes norwegian numbers" do
-    NorwegianPhoneWrapper.unmsisdnize("4712345678").should eq("12345678")
+    NorwegianPhone.unmsisdnize("4712345678").should eq("12345678")
   end
 
   it "adds a + to international numbers" do
-    NorwegianPhoneWrapper.unmsisdnize("123456789").should eq("+123456789")
+    NorwegianPhone.unmsisdnize("123456789").should eq("+123456789")
   end
 end

data/spec/normalize_spec.rb

@@ -6,54 +6,54 @@ describe NorwegianPhone, "#normalize" do
 
     context "with country code" do
       it "deletes prepended country code (47)" do
-        NorwegianPhoneWrapper.normalize("4712345678").should == number
+        NorwegianPhone.normalize("4712345678").should == number
       end
 
       it "deletes prepended 0047" do
-        NorwegianPhoneWrapper.normalize("004712345678").should == number
+        NorwegianPhone.normalize("004712345678").should == number
       end
 
       it "deletes prepended +47" do
-        NorwegianPhoneWrapper.normalize("+4712345678").should == number
+        NorwegianPhone.normalize("+4712345678").should == number
       end
 
       it "leaves extra digits intact" do
-        NorwegianPhoneWrapper.normalize("+47123456789").should == "#{number}9"
+        NorwegianPhone.normalize("+47123456789").should == "#{number}9"
       end
 
       it "removes extraneous prepended +signs" do
-        NorwegianPhoneWrapper.normalize("++4712345678").should == number
+        NorwegianPhone.normalize("++4712345678").should == number
       end
 
       it "strips interspersed +signs" do
-        NorwegianPhoneWrapper.normalize("+47123+45+678").should == number
+        NorwegianPhone.normalize("+47123+45+678").should == number
       end
     end
 
     context "without country code" do
       it "leaves extra digits intact" do
-        NorwegianPhoneWrapper.normalize("123456789").should == "#{number}9"
+        NorwegianPhone.normalize("123456789").should == "#{number}9"
       end
     end
 
     it "strips extraneous surrounding whitespace" do
-      NorwegianPhoneWrapper.normalize("\t\n  \r\n12345678  \t\r\n\n  ").should == number
+      NorwegianPhone.normalize("\t\n  \r\n12345678  \t\r\n\n  ").should == number
     end
 
     it "strips all internal whitespace" do
-      NorwegianPhoneWrapper.normalize("12    345 67 8").should == number
+      NorwegianPhone.normalize("12    345 67 8").should == number
     end
 
     it "strips dashes" do
-      NorwegianPhoneWrapper.normalize("12-34-56-78").should == number
+      NorwegianPhone.normalize("12-34-56-78").should == number
     end
 
     it "strips periods" do
-      NorwegianPhoneWrapper.normalize("12.34.56.78").should == number
+      NorwegianPhone.normalize("12.34.56.78").should == number
     end
 
     it "strips parentheses" do
-      NorwegianPhoneWrapper.normalize("(123)45678").should == number
+      NorwegianPhone.normalize("(123)45678").should == number
     end
 
 
@@ -63,39 +63,39 @@ describe NorwegianPhone, "#normalize" do
     let(:number) { "+123456789" }
 
     it "replaces 0 with +" do
-      NorwegianPhoneWrapper.normalize("0123456789").should == number
+      NorwegianPhone.normalize("0123456789").should == number
     end
 
     it "replaces 00 with +" do
-      NorwegianPhoneWrapper.normalize("00123456789").should == number
+      NorwegianPhone.normalize("00123456789").should == number
     end
 
     it "leaves + alone" do
-      NorwegianPhoneWrapper.normalize("+123456789").should == number
+      NorwegianPhone.normalize("+123456789").should == number
     end
 
     it "strips extraneous +signs" do
-      NorwegianPhoneWrapper.normalize("++123456789").should == number
+      NorwegianPhone.normalize("++123456789").should == number
     end
 
     it "strips extraneous surrounding whitespace" do
-      NorwegianPhoneWrapper.normalize("\t\n  \r\n+123456789  \t\r\n\n  ").should == number
+      NorwegianPhone.normalize("\t\n  \r\n+123456789  \t\r\n\n  ").should == number
     end
 
     it "strips all internal whitespace" do
-      NorwegianPhoneWrapper.normalize("+12    345 67 89").should == number
+      NorwegianPhone.normalize("+12    345 67 89").should == number
     end
 
     it "strips dashes" do
-      NorwegianPhoneWrapper.normalize("+12-34-56-789").should == number
+      NorwegianPhone.normalize("+12-34-56-789").should == number
     end
 
     it "strips periods" do
-      NorwegianPhoneWrapper.normalize("+12.34.56.789").should == number
+      NorwegianPhone.normalize("+12.34.56.789").should == number
     end
 
     it "strips parentheses" do
-      NorwegianPhoneWrapper.normalize("+(123)456789").should == number
+      NorwegianPhone.normalize("+(123)456789").should == number
     end
   end
 

data/spec/spec_helper.rb

@@ -2,7 +2,3 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'norwegian_phone'
-
-class NorwegianPhoneWrapper
-  extend NorwegianPhone
-end

data/spec/validation_spec.rb

@@ -2,40 +2,40 @@ require 'spec_helper'
 
 describe NorwegianPhone, "#number_valid?" do
   it "is invalid if nil" do
-    NorwegianPhoneWrapper.number_valid?(nil).should be_false
+    NorwegianPhone.number_valid?(nil).should be_false
   end
 
   it "is invalid if blank" do
-    NorwegianPhoneWrapper.number_valid?("").should be_false
+    NorwegianPhone.number_valid?("").should be_false
   end
 
   it "is invalid with letters" do
-    NorwegianPhoneWrapper.number_valid?("1abc2").should be_false
+    NorwegianPhone.number_valid?("1abc2").should be_false
   end
 
   context "with funky characters" do
     it "rejects parens" do
-      NorwegianPhoneWrapper.number_valid?("123(45)678").should be_false
+      NorwegianPhone.number_valid?("123(45)678").should be_false
     end
 
     it "rejects hyphens" do
-      NorwegianPhoneWrapper.number_valid?("123-45-678").should be_false
+      NorwegianPhone.number_valid?("123-45-678").should be_false
     end
 
     it "rejects periods" do
-      NorwegianPhoneWrapper.number_valid?("123.45.678").should be_false
+      NorwegianPhone.number_valid?("123.45.678").should be_false
     end
 
     it "rejects +sign in the middle" do
-      NorwegianPhoneWrapper.number_valid?("123+45+678").should be_false
+      NorwegianPhone.number_valid?("123+45+678").should be_false
     end
 
     it "accepts spaces" do
-      NorwegianPhoneWrapper.number_valid?("123 45 678").should be_true
+      NorwegianPhone.number_valid?("123 45 678").should be_true
     end
 
     it "accepts +sign in the beginning" do
-      NorwegianPhoneWrapper.number_valid?("+123 45 678").should be_true
+      NorwegianPhone.number_valid?("+123 45 678").should be_true
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norwegian_phone
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70273353792000 !ruby/object:Gem::Requirement
+  requirement: &70097449596920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273353792000
+  version_requirements: *70097449596920
 description: Standardizes norwegian phone numbers, and leaves international numbers
   unchanged.
 email: