+ Move work to the initialization stage (instead of during runtime)

floere · Mar 18, 2013 · e71e18c · e71e18c
1 parent 8464c77
commit e71e18c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/lib/phony/dsl.rb b/lib/phony/dsl.rb
@@ -49,9 +49,11 @@ class DSL
     # Example:
     #   country '27', # CC, followed by rules, for example fixed(2) >> ...
     #
-    def country country_code, country, validator = nil
+    def country country_code, country, validators = nil
       Phony::CountryCodes.instance.add country_code, country
-      Phony::Validators.instance.add country_code, validator if validator
+      [*validators].each do |validator|
+        Phony::Validators.instance.add country_code, validator
+      end if validators
     end
 
     # National matcher & splitters.

diff --git a/lib/phony/validators.rb b/lib/phony/validators.rb
@@ -25,15 +25,15 @@ def initialize
       @country_validators = {}
     end
 
-
     def self.instance
       @instance ||= new
     end
 
-    # Add a specific country validator (or an array of validators)
+    # Add a specific country validator.
     #
     def add cc, validator
-      @country_validators[cc] = validator
+      @country_validators[cc] ||= []
+      @country_validators[cc] << validator
     end
 
     # Is the given number plausible?
@@ -72,7 +72,7 @@ def plausible? number, hints = {}
 
       # Country specific checks.
       #
-      validators = [*validator_for(cc)]
+      validators = validators_for cc
       validators.map do |validator|
         return false unless validator.plausible? ndc, rest
       end
@@ -82,12 +82,12 @@ def plausible? number, hints = {}
       return false
     end
 
-    def validator_for cc
+    def validators_for cc
-      @country_validators[cc] || default_validator
+      @country_validators[cc] || default_validators
     end
 
-    def default_validator
+    def default_validators
-      @default_validator ||= Validator.new
+      @default_validators ||= [Validator.new]
     end
 
   end