Match short English numbers

Govannon · Dec 18, 2009 · 69d4691 · 69d4691
1 parent 5019c74
commit 69d4691
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/number_recognizer.rb b/lib/number_recognizer.rb
@@ -1,14 +1,14 @@
 class NumberRecognizer
   attr_accessor :type
 
-  # Name -> [country code prefix match, digits after prefix]
+  # Name -> pattern
   KNOWN_FORMATS = {
-    'Dutch mobile' => [/(316|6)/, 8],
-    'Dutch landline' => [/31[12345789]/, 8],
-    'Belgian mobile' => [324, 8],
-    'Suriname' => [597,7],
-    'Dutch Antilles' => [599,7],
-    'England' => [44,10]
+    'Dutch mobile' => /(316|6)\d{8,8}/,
+    'Dutch landline' => /31[12345789]\d{8,8}/,
+    'Belgian mobile' => /324\d{8,8}/,
+    'Suriname' => /597\d{7,7}/,
+    'Dutch Antilles' => /599\d{7,7}/,
+    'England' => /44\d{9,10}/
 
   }
   attr_accessor :number
@@ -19,7 +19,7 @@ def initialize(number)
 
   def valid?
     self.type = nil
-    return false unless match = KNOWN_FORMATS.find {|name, pattern| number =~ /^0{0,2}#{pattern.first}\d{#{pattern.last},#{pattern.last}}$/}
+    return false unless match = KNOWN_FORMATS.find {|name, pattern| number =~ /^0{0,2}#{pattern}$/}
     self.type = match.first
     true
   end

diff --git a/spec/number_recognizer_spec.rb b/spec/number_recognizer_spec.rb
@@ -50,5 +50,11 @@
       @nc.should be_valid
       @nc.type.should == 'England'
     end
+
+    it 'should recognize 0044123456789 as an English number' do
+      @nc = NumberRecognizer.new('0044123456789')
+      @nc.should be_valid
+      @nc.type.should == 'England'
+    end
   end
 end