phone_classifier 0.0.6 → 0.0.8

data/lib/phone_classifier.rb

@@ -36,16 +36,20 @@ class PhoneClassifier
 
   def is_number_of_type numbers
     parts = Phony.split Phony.normalize(@number)
-    forbidden_numbers = numbers[parts.shift]
+    ndcs = numbers[parts.shift]
     prefix = parts.shift
 
-    # This is a hotfix for strange behaviour.
-    # I don't know why but some numbers are split ["45", false, "40", "53", "25", "77"]
-    until prefix.is_a? String
+    return false unless ndcs # if we don't know the country, we can make no assumptions
+
+    # countries without NDCs (Denmark) have this parts structure ["45", false, "40", "53", "25", "77"]
+    until parts.size == 0 || prefix.is_a?(String)
       prefix = parts.shift
+
     end
 
-    forbidden_numbers.each { |n| return true if prefix.match(/^#{n}$/) } unless forbidden_numbers.nil?
+
+    ndcs.each { |n| return true if prefix.match(/^#{n}$/) } unless ndcs.nil?
+
     false
   end
 

data/lib/phone_classifier/mobile.rb

@@ -6,12 +6,12 @@
       @@mobile ||= {
           '1' => %w{ [2-9].. }, # USA
           '30' => %w{ 6.. }, # Greece
-          '31' => %w{6}, # Netherlands
+          '31' => %w{ 6 }, # Netherlands
           '32' => %w{4..}, # Belgium
           '33' => %w{6 7}, # France
           '34' => %w{6. 7.}, # Spain
           '36' => %w{ 20 30 31 70 }, # Hungary
-          '39' => %w{3...}, # Italy
+          '39' => %w{3..}, # Italy
           '40' => %w{ 7. }, # Romania
           '41' => %w{ 7[6-9] }, # Switerzland
           '43' => %w{ 67 68 644 65. 66. }, # Austria
@@ -26,7 +26,7 @@
           '91' => %w{ 91 92 93 94 97 98 99 }, # India
           '94' => %w{ 71 72 75 77 78 }, # Sri Lanka
           '98' => %w{ 91. 92. 93. } , #Iran
-          '212' => %w{ 6.  }, # Morocco
+          '212' => %w{ 6  }, # Morocco
           '213' => %w{ 55 66 697 699 77 790 796 }, # Algeria
           '233' => %w{ 20 23 24 26 27 28 50 54 57 }, # Ghana
           '234' => %w{ 702[1-9] 70[3-9] 8[01][2-9] }, # Nigeria

data/spec/phone_classifier_spec.rb

@@ -5,6 +5,12 @@ require 'spec_helper'
 
 describe PhoneClassifier do
 
+  context 'it handles invalid number' do
+    it 'does not timeout' do
+      PhoneClassifier.new('52726').kind.should == :landline
+    end
+  end
+
   context "it classifies a phone number" do
 
     let(:phone_number) { "41791234567" }
@@ -336,9 +342,19 @@ describe PhoneClassifier do
       PhoneClassifier.new(phone_number).kind.should == :mobile
     end
 
-    it "should set Malaysian service numbers " do
-      phone_number = "60 999 123 123"
-      PhoneClassifier.new(phone_number).kind.should == :forbidden
+
+  end
+
+  context "Moroccon Numbers" do
+
+    it "should set Moroocan mobile numbers" do
+      phone_number = "212 6 52 22 11 44"
+      PhoneClassifier.new(phone_number).kind.should == :mobile
+    end
+
+    it "should set Morocoan landline numbers " do
+      phone_number = "212 45 1234 123"
+      PhoneClassifier.new(phone_number).kind.should == :landline
     end
 
 

metadata

@@ -2,14 +2,14 @@
 name: phone_classifier
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Jens-Christian Fischer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement