phony 1.6.6 → 1.6.7

data/lib/phony.rb

@@ -39,8 +39,8 @@ module Phony
 
   # Phony uses a single country codes instance.
   #
-  @codes     = CountryCodes.instance
-  @validator = Validators.instance 
+  @codes      = CountryCodes.instance
+  @validators = Validators.instance 
 
   class << self
 
@@ -85,7 +85,7 @@ module Phony
     # leaning towards being plausible.
     #
     def plausible? number, hints = {}
-      @validator.plausible? number, hints
+      @validators.plausible? number, hints
     end
 
     # def service? number

data/lib/phony/countries.rb

@@ -17,6 +17,10 @@
 # * matched_split: Give a hash of regex => format array, with a :fallback => format option.
 #                   (See Norway how it looks.)
 #
+# The third parameter to country are validations.
+# Currently, there is one method available:
+# * invalid_ndcs: Give a regexp or string to describe invalid ndc(s).
+#
 # Note: The ones that are commented are defined in their special files.
 #
 Phony.define do
@@ -29,7 +33,7 @@ Phony.define do
   #
   country '1',
           fixed(3) >> split(3,4),
-          invalid_ndcs(/911/)
+          invalid_ndcs('911') # /911/ would also work.
 
   # Kazakhstan (Republic of) & Russian Federation.
   #

data/lib/phony/country_codes.rb

@@ -26,7 +26,7 @@ module Phony
     def clean number
       # Remove non-digit chars.
       #
-      number.gsub! @@basic_normalizing_pattern, EMPTY_STRING
+      number.gsub!(@@basic_normalizing_pattern, EMPTY_STRING) || number
     end
     def normalize number
       clean number

data/lib/phony/validators.rb

@@ -49,12 +49,12 @@ module Phony
       # CC.
       #
       cc_needed = hints[:cc]
-      return false if cc_needed && cc_needed != cc
+      return false if cc_needed && !(cc_needed === cc)
       
       # NDC.
       #
       ndc_needed = hints[:ndc]
-      return false if ndc_needed && ndc_needed != ndc
+      return false if ndc_needed && !(ndc_needed === ndc)
       
       # Country specific checks.
       #

data/spec/lib/phony/validations_spec.rb

@@ -28,12 +28,47 @@ describe 'validations' do
     it "is correct for explicit checks" do
       Phony.plausible?('+41 44 111 22 33', ndc: '43').should be_false
     end
+    it "is correct for explicit checks" do
+      Phony.plausible?('+41 44 111 22 33', cc: '41', ndc: '44').should be_true
+    end
+    it "works with regexps" do
+      Phony.plausible?('+41 44 111 22 33', cc: /4(0|2)/, ndc: /4(4|5)/).should be_false
+    end
+    it "works with regexps" do
+      Phony.plausible?('+41 44 111 22 33', cc: /4(0|1)/, ndc: /4(4|5)/).should be_true
+    end
     
-    context 'countries' do
+    context 'specific countries' do
+      
+      # TODO
+      #
+      # it "is correct for Swiss numbers" do
+      #   Phony.plausible?('+41 44 111 22 33').should be_true
+      # end
       
       it "is correct for US numbers" do
+        # Sorry, still need E164 conform numbers.
+        #
+        Phony.plausible?('4346667777', cc: '1').should be_false
+        
+        # Automatic country checking.
+        #
+        Phony.plausible?('1-4346667777').should be_true
         Phony.plausible?('1-800-692-7753').should be_true
         Phony.plausible?('1-911').should be_false
+        Phony.plausible?('1-911-123-1234').should be_false
+        
+        # With string constraints.
+        #
+        Phony.plausible?('14346667777', cc: '1').should be_true
+        Phony.plausible?('14346667777', ndc: '434').should be_true
+        Phony.plausible?('14346667777', cc: '1', ndc: '434').should be_true
+        
+        # With regexp constraints.
+        #
+        Phony.plausible?('14346667777', cc: /[123]/).should be_true
+        Phony.plausible?('14346667777', ndc: /434|435/).should be_true
+        Phony.plausible?('14346667777', cc: /[123]/, ndc: /434|435/).should be_true
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national