lib/barometer/base.rb in attack-barometer-0.3.2 vs lib/barometer/base.rb in attack-barometer-0.5.0

@@ -1,52 +1,80 @@
 module Barometer
-
   class Base
     
     # allow the configuration of specific weather APIs to be used,
     # and the order in which they would be used
-    @@selection = { 1 => [:wunderground] }
-    def self.selection; @@selection; end;
-    def self.selection=(hash); @@selection = hash; end;
+    #
+    @@config = { 1 => [:wunderground] }
+    def self.config; @@config; end;
+    def self.config=(hash); @@config = hash; end;
     
     attr_reader   :query
     attr_accessor :weather, :success
     
     def initialize(query=nil)
       @query = Barometer::Query.new(query)
       @weather = Barometer::Weather.new
       @success = false
     end
     
+    # iterate through all the configured sources and
+    # collect weather data for each one
+    #
     def measure(metric=nil)
       return nil unless @query
 
       level = 1
       until self.success?
-        if sources = @@selection[level]
-          if sources.is_a?(Array)
-            sources.each do |source|
-              measurement = Barometer.source(source.to_sym).measure(@query, metric)
-              @success = true if measurement.success?
-              @weather.measurements << measurement
-            end
-          else  
-            measurement = Barometer.source(sources.to_sym).measure(@query, metric)
-            @success = true if measurement.success?
-            @weather.measurements << measurement
-          end
+        if sources = @@config[level]
+          _dig(sources, nil, metric)
         else
           raise OutOfSources
         end
         level += 1
       end
-      
       @weather
     end
     
-    def success?
-      @success
+    def success?; @success; end
+    
+    private
+    
+    # iterate through the setup until we have a source name (and possibly
+    # a config for that source), then measure with that source
+    #
+    # this allows for many different config formats, like
+    # { 1 => :wunderground }
+    # { 1 => [:wunderground]}
+    # { 1 => [:wunderground, :yahoo]}
+    # { 1 => [:wunderground, {:yahoo => {:weight => 2}}]}
+    # { 1 => {:wunderground => {:weight => 2}}}
+    # { 1 => [{:wunderground => {:weight => 2}}]}
+    #
+    def _dig(data, config=nil, metric=nil)
+      if data.is_a?(String) || data.is_a?(Symbol)
+        _measure(data, config, metric)
+      elsif data.is_a?(Array)
+        data.each do |datum|
+          _dig(datum, nil, metric)
+        end
+      elsif data.is_a?(Hash)
+        data.each do |datum, config|
+          _dig(datum, config, metric)
+        end
+      end
     end
+    
+    # do that actual source measurement
+    #
+    def _measure(datum, config=nil, metric=nil)
+      Barometer.source(datum.to_sym).keys = config[:keys] if (config && config[:keys])
+      measurement = Barometer.source(datum.to_sym).measure(@query, metric)
+      if config && config[:weight]
+        measurement.weight = config[:weight]
+      end
+      @success = true if measurement.success?
+      @weather.measurements << measurement
+    end
 
   end
-
 end
\ No newline at end of file