no_phone 0.0.1 → 0.0.2

data/lib/no_phone/version.rb

@@ -1,3 +1,3 @@
 module NoPhone
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/no_phone.rb

@@ -1,13 +1,32 @@
 module NoPhone
 
-  def self.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
+  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 msisdnize(number)
+      number = normalize(number)
+      number = "47#{number}" unless number =~ /^\+/
+        number.gsub!(/^\+/, '')
+      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
+    end
   end
 end

data/spec/isdnize_spec.rb

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

data/spec/normalize_spec.rb

@@ -21,9 +21,13 @@ describe NoPhone, "#normalize" do
         NoPhone.normalize("+47123456789").should == "#{number}9"
       end
 
-      it "removes extraneous +signs" do
+      it "removes extraneous prepended +signs" do
         NoPhone.normalize("++4712345678").should == number
       end
+
+      it "strips interspersed +signs" do
+        NoPhone.normalize("+47123+45+678").should == number
+      end
     end
 
     context "without country code" do
@@ -52,6 +56,7 @@ describe NoPhone, "#normalize" do
       NoPhone.normalize("(123)45678").should == number
     end
 
+
   end
 
   context "International numbers" do

data/spec/validation_spec.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Simen Svale Skogsrud, Katrina Owen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +02:00
+date: 2011-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,10 @@ files:
 - lib/no_phone.rb
 - lib/no_phone/version.rb
 - no_phone.gemspec
+- spec/isdnize_spec.rb
 - spec/normalize_spec.rb
 - spec/spec_helper.rb
+- spec/validation_spec.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/no_phone
 licenses: []
@@ -83,5 +85,7 @@ signing_key:
 specification_version: 3
 summary: Norwegian phone number scrubber
 test_files: 
+- spec/isdnize_spec.rb
 - spec/normalize_spec.rb
 - spec/spec_helper.rb
+- spec/validation_spec.rb