smoke 0.5.10 → 0.5.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 10
+:patch: 11
 :major: 0
 :minor: 5

data/lib/smoke/source/join.rb

@@ -14,6 +14,28 @@ module Smoke
         super((names << "joined").join("_").to_sym, &block)
       end
       
+      # Rename sources immediately after they've been joined together
+      # Usage:
+      #   Smoke.join(:delicious, :twitter, :flickr) do
+      #     name :web_stream
+      #   end
+      def name(rename = nil)
+        return @name if rename.nil?
+        Smoke.rename(@name => rename)
+      end
+      
+      def method_missing(symbol, *args, &block)
+        ivar = "@#{symbol}"
+
+        unless args.empty?
+          sources.each do |source| 
+            source.last.instance_variable_set(ivar, args.pop)
+          end
+        end
+
+        return self
+      end
+      
       protected
       def sources
         Smoke.active_sources.find_all{|k, v| @names.include?(k) }
@@ -22,6 +44,7 @@ module Smoke
       def dispatch
         # Recall dispatch
         sources.each do |source|
+          source.last.send(:prepare!)
           source.last.send(:dispatch) if source.last.respond_to?(:dispatch)
         end
         

data/spec/smoke/source/join_spec.rb

@@ -11,9 +11,7 @@ describe "Join" do
     before do
       @source = Smoke.join(:a, :b)
     end
-    
-    # it_should_behave_like "all sources"
-    
+        
     it "should be named in a_b_joined" do
       Smoke[:a_b_joined].should be_an_instance_of(Smoke::Source::Join)
     end
@@ -34,6 +32,20 @@ describe "Join" do
       Smoke[:a_b_joined].should respond_to(:output)
     end
     
+    describe "renaming, within a block" do
+      it "should respond to name" do
+        Smoke[:a_b_joined].should respond_to(:name)
+      end
+      
+      it "should rename the source" do      
+        Smoke.join(:b, :c) do
+          name :bee_and_cee
+        end
+        
+        Smoke[:bee_and_cee].should_not be_nil
+      end
+    end
+        
     describe "dispatching" do
       before :all do
         FakeWeb.register_uri("http://photos.tld", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
@@ -48,6 +60,35 @@ describe "Join" do
         Smoke[:should_dispatch].should_receive(:dispatch)
         Smoke.join(:a, :should_dispatch).output
       end
+      
+      it "should call prepare blocks before dispatching" do
+        Smoke.data(:prepare_dispatch) do
+          prepare do
+            url "http://photos.tld"
+          end
+          
+          path :photos, :photo
+        end
+
+        Smoke.join(:prepare_dispatch) do
+          name :always_be_prepared
+        end
+        
+        lambda { Smoke.always_be_prepared.output }.should_not raise_error(ArgumentError)
+      end
+    end
+    
+    describe "variable injection" do
+      before :all do
+        TestSource.source :variable
+        TestSource.source :injection
+        Smoke.join(:variable, :injection)
+      end
+      
+      it "should inject variables to its source items" do
+        Smoke.variable_injection_joined.some_ivar("value")
+        Smoke.variable.some_ivar.should == "value"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smoke
 version: !ruby/object:Gem::Version 
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 +10:00
+date: 2009-09-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.2
 signing_key: 
 specification_version: 3
 summary: smoke is a Ruby based DSL that allows you to query web services such as YQL, RSS / Atom and JSON or XML in an elegant manner.