fiveruns-dash-ruby 0.8.0 → 0.8.1

data/lib/fiveruns/dash/configuration.rb

@@ -66,12 +66,13 @@ module Fiveruns::Dash
     #   add_recipe :ruby
     def add_recipe(name, options = {}, &block)
       Fiveruns::Dash.register_recipe(name, options, &block) if block_given?
-
       if Fiveruns::Dash.recipes[name]
         Fiveruns::Dash.recipes[name].each do |recipe|
           if !recipes.include?(recipe) && recipe.matches?(options)
             recipes << recipe
-            recipe.add_to(self) 
+            with_recipe_settings(options.reject { |k, _| k == :url }) do
+              recipe.add_to(self) 
+            end
           end
         end
       else
@@ -90,13 +91,27 @@ module Fiveruns::Dash
     
     # Optionally fired by recipes when included
     def added
-      yield
+      yield current_recipe_settings
     end
     
     #######
     private
     #######
     
+    def with_recipe_settings(settings = {})
+      recipe_settings_stack << settings
+      yield 
+      recipe_settings_stack.pop
+    end
+    
+    def current_recipe_settings
+      recipe_settings_stack.last
+    end
+    
+    def recipe_settings_stack
+      @recipe_settings_stack ||= []
+    end
+    
     def normalize_version_comparator(comparator)
       comparator.to_s == '=' ? '==' : comparator
     end

data/lib/fiveruns/dash/recipe.rb

@@ -28,13 +28,21 @@ module Fiveruns::Dash
     end
     
     def add_to(configuration)
-      self.class.in_scope self do
+      self.class.in_scope(self) do
         @block.call(configuration)
       end
     end
     
+    # Currently :url is the only criteria; all other parts
+    # of the hash are settings to be passed on to the recipe
     def matches?(criteria)
-      criteria.all? { |k, v| options[k] == v }
+      criteria.all? do |k, v|
+        if [:url].include?(k)
+          options[k] == v
+        else
+          true
+        end
+      end
     end
     
     def ==(other)

data/test/recipe_test.rb

@@ -79,6 +79,20 @@ class RecipeTest < Test::Unit::TestCase
           assert_metrics(*%w(test2))
         end
       end
+      context "and passing settings" do
+        setup do
+          recipe :settings1, :url => 'http://example.com' do |r|
+            r.added do |settings|
+              r.counter(settings[:metric]) { }
+            end
+          end
+          config.add_recipe :settings1, :metric => :bar
+        end
+        should "pass them to the `added' block" do
+          assert_equal 1, config.metrics.size
+          assert_equal 'bar', config.metrics.first.name
+        end
+      end
     end
     
     context "when added" do

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 0
+:patch: 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -08:00
+date: 2009-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency