lib/credy/rules.rb in credy-0.1.1 vs lib/credy/rules.rb in credy-0.2.0

@@ -3,76 +3,64 @@
 module Credy
 
   class Rules
 
     # Return all the rules from yml files
-    def self.all
-      @rules ||= begin
-        rules = {}
-        Dir.glob "#{Credy.root}/data/*.yml" do |filename|
-          r = YAML::load IO.read(filename)
-          rules.merge! r
-        end
-        rules
-      end
+    def self.raw
+      @rules ||= load_rules("#{Credy.root}/data/*.yml")
     end
 
     # Change hash format to process rules
-    def self.flatten(global_rules = false)
+    def self.all
       rules = []
 
-      all.each do |type, details|
-        
-        if global_rules
-          # Add general rules
-          global_prefixes = details['prefix']
-          if global_prefixes
-            global_prefixes = [global_prefixes] unless global_prefixes.is_a? Array
-
-            global_prefixes.each do |prefix|
-              rules.push({
-                prefix: prefix.to_s,
-                length: details['length'],
-                type: type
-              })
-            end
-          end
+      raw.each do |type, details|
+        # Add general rules
+        Array(details['prefix']).each do |prefix|
+          rules.push({
+            prefix: prefix.to_s,
+            length: details['length'],
+            type:   type
+          })
         end
 
         # Process each country
-        if details['countries']
-          details['countries'].each do |country, prefixes|
-            prefixes = [prefixes] unless prefixes.is_a? Array
-
-            # Add a rule for each prefix
-            prefixes.each do |prefix|
-              rules.push({
-                prefix: prefix.to_s,
-                length: details['length'],
-                type: type,
-                country: country,
-              })
-            end
+        Array(details['countries']).each do |country, prefixes|
+          # Add a rule for each prefix
+          Array(prefixes).each do |prefix|
+            rules.push({
+              prefix: prefix.to_s,
+              length: details['length'],
+              type:   type,
+              country: country,
+            })
           end
         end
 
       end
 
-      # Sort rules by prefix length
-      rules.sort! { |x, y|  y[:prefix].length <=> x[:prefix].length }
-
-      rules
+      # Sort by prefix length
+      rules.sort { |x, y|  y[:prefix].length <=> x[:prefix].length }
     end
 
     # Returns rules according to given filters
-    def self.filter(filters = {}, global_rules = false)
-      flatten(global_rules).select do |rule|
+    def self.filter(filters = {})
+      all.select do |rule|
         [:country, :type].each do |condition|
           break false if filters[condition] && filters[condition] != rule[condition]
           true
         end
       end
     end
 
+    def self.load_rules(files)
+      {}.tap do |rules|
+        Dir.glob(files) do |filename|
+          rules.merge! YAML::load IO.read(filename)
+        end
+      end
+    end
+    private_class_method :load_rules
+
   end
 
-end
\ No newline at end of file
+end