no_phone 0.0.3 → 0.0.4

data/lib/no_phone.rb

@@ -1,41 +1,39 @@
 module NoPhone
 
-  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
+  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)
-      number = normalize(number)
-      number = "47#{number}" unless number =~ /^\+/
-        number.gsub!(/^\+/, '')
-      number
-    end
+  def msisdnize(number)
+    number = normalize(number)
+    number = "47#{number}" unless number =~ /^\+/
+      number.gsub!(/^\+/, '')
+    number
+  end
 
-    def unmsisdnize(number)
-      normalize("+#{number}") if number
-    end
+  def unmsisdnize(number)
+    normalize("+#{number}") if number
+  end
 
-    def valid?(number)
-      return false if number.nil?
-      return false if number == ""
-      case number.strip
-      when /\A\+?[0-9[:space:]]+\z/
-        return true
-      end
-      false
+  def 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
 
-    # Norway-centric. True if not a norwegian number.
-    def international?(number)
-      !!(normalize(number) =~ /^\+/)
-    end
+  # Norway-centric. True if not a norwegian number.
+  def international?(number)
+    !!(normalize(number) =~ /^\+/)
   end
 end

data/lib/no_phone/version.rb

@@ -1,3 +1,3 @@
 module NoPhone
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/international_spec.rb

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

data/spec/isdnize_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 describe NoPhone, "#msisdnize" do
   it "adds country code to naked norwegian-ish numbers" do
-    NoPhone.msisdnize("12345678").should eq("4712345678")
+    NoPhoneWrapper.msisdnize("12345678").should eq("4712345678")
   end
 
   it "removes +sign from international number" do
-    NoPhone.msisdnize("+123456789").should eq("123456789")
+    NoPhoneWrapper.msisdnize("+123456789").should eq("123456789")
   end
 end
 
 describe NoPhone, "#unmsisdnize" do
   it "localizes norwegian numbers" do
-    NoPhone.unmsisdnize("4712345678").should eq("12345678")
+    NoPhoneWrapper.unmsisdnize("4712345678").should eq("12345678")
   end
 
   it "adds a + to international numbers" do
-    NoPhone.unmsisdnize("123456789").should eq("+123456789")
+    NoPhoneWrapper.unmsisdnize("123456789").should eq("+123456789")
   end
 end

data/spec/normalize_spec.rb

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

data/spec/spec_helper.rb

@@ -2,3 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'no_phone'
+
+class NoPhoneWrapper
+  extend NoPhone
+end

data/spec/validation_spec.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Simen Svale Skogsrud, Katrina Owen