smoke 0.5.14 → 0.5.15

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 14
+:patch: 15
 :major: 0
 :minor: 5

data/lib/smoke.rb

@@ -34,7 +34,12 @@ module Smoke
     end
     
     # Access registered smoke source instances
-    def method_missing(sym)
+    # 
+    # Arguments can be sent as key/value pairs to inject abstract properties:
+    # Usage:
+    #   Smoke.twitter(:username => "benschwarz")
+    def method_missing(sym, args = {})
+      args.each_pair {|k, v| self[sym].send(k, v) }
       self[sym]
     end
     

data/lib/smoke/origin.rb

@@ -1,6 +1,6 @@
 module Smoke
   class Origin
-    attr_reader :items
+    attr_reader :items, :requirements
     attr_accessor :name
     
     def initialize(name, &block)
@@ -129,11 +129,23 @@ module Smoke
     #   
     #   # End use
     #   Smoke[:twitter].username(:benschwarz).output
-    def prepare(&block)
+    def prepare(args = {}, &block)
+      @requirements = args.delete(:require) || []
+      
       raise ArgumentError, "requires a block" unless block_given?
       @prepare << block
     end
     
+    # Used to store or retreive variables that are used to query services. 
+    #
+    # Usage: 
+    #   Smoke.twitter.username("benschwarz").output
+    # 
+    # As you can see, the method is chainable, many properties can be
+    # set at once, although it may be cleaner to use the method argument method:
+    # 
+    # Demo:
+    #   Smoke.twitter(:username => "benschwarz").output
     def method_missing(symbol, *args, &block)
       ivar = "@#{symbol}"
       

data/spec/smoke/origin_spec.rb

@@ -47,7 +47,6 @@ describe Smoke::Origin do
     
     it "should output xml" do
       Smoke.test.output(:xml).should include "<?xml version=\"1.0\"?>"
-      Smoke.test.output(:xml).should == "<?xml version=\"1.0\"?>\n<items>\n  <item>\n    <title>Platypus</title>\n    <name>Peter</name>\n  </item>\n</items>\n"
     end
     
     describe "filtering" do
@@ -125,32 +124,37 @@ describe Smoke::Origin do
     
     describe "before setting variables" do
       it "should fail" do
-        lambda { Smoke[:feed_preperation_call_order].output }.should raise_error(NameError)
+        lambda { Smoke.feed_preperation_call_order.output }.should raise_error(NameError)
       end
     end
     
     describe "setting abstract properties" do
       it "should not respond to a property that hasn't been set" do
-        lambda { Smoke[:feed_preperation_call_order].abstract }.should raise_error(NoMethodError)
+        lambda { Smoke.feed_preperation_call_order.abstract }.should raise_error(NoMethodError)
       end
       
       it "should allow setting a property" do
-        lambda { Smoke[:feed_preperation_call_order].abstract(:value) }.should_not raise_error(NoMethodError)
-        Smoke[:feed_preperation_call_order].abstract.should == :value
+        lambda { Smoke.feed_preperation_call_order.abstract(:value) }.should_not raise_error(NoMethodError)
+        Smoke.feed_preperation_call_order.abstract.should == :value
+      end
+      
+      it "should set properties using method arguments" do
+        lambda { Smoke.feed_preperation_call_order(:method_arg => :value) }.should_not raise_error(NoMethodError)
+        Smoke.feed_preperation_call_order.method_arg.should == :value
       end
       
       it "should chain the source when setting a property" do
-        Smoke[:feed_preperation_call_order].abstract(:value).should be_an_instance_of(Smoke::Source::Data)
+        Smoke.feed_preperation_call_order.abstract(:value).should be_an_instance_of(Smoke::Source::Data)
       end
     end
     
     describe "after setting variables" do
       it "should output successfully" do
-        lambda { Smoke[:feed_preperation_call_order].username("benschwarz").output }.should_not raise_error
+        lambda { Smoke.feed_preperation_call_order.username("benschwarz").output }.should_not raise_error
       end
       
       it "should have used the correct url" do
-        Smoke[:feed_preperation_call_order].request.uri.should == @url
+        Smoke.feed_preperation_call_order.request.uri.should == @url
       end
     end
   end
@@ -189,12 +193,12 @@ describe Smoke::Origin do
     end
     
     it "should respond to insert" do
-      Smoke[:insertion].should respond_to(:insert)
+      Smoke.insertion.should respond_to(:insert)
     end
     
     it "should insert values into each key" do
-      Smoke[:insertion].output.first.should have_key :source
-      Smoke[:insertion].output.first[:source].should == "twitter"
+      Smoke.insertion.output.first.should have_key :source
+      Smoke.insertion.output.first[:source].should == "twitter"
     end
   end
   
@@ -222,4 +226,26 @@ describe Smoke::Origin do
       Smoke[:reversed].output.should == Smoke[:sorting].output.reverse
     end
   end
+  
+  describe "requirements" do
+    before :all do      
+      Smoke.data :requirements do
+        prepare :require => [:username, :feed] do 
+          url "http://domain.tld/#{feed}/#{username}/feed.json", :type => :json
+        end
+        
+        path :photos, :photo
+      end
+    end
+    
+    it "should respond to requirements" do
+      Smoke.requirements.should respond_to(:requirements)
+    end
+    
+    it "should list its requirements" do
+      Smoke.requirements.requirements.should include(:username)
+      Smoke.requirements.requirements.should include(:feed)
+      Smoke.requirements.requirements.length.should == 2
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smoke
 version: !ruby/object:Gem::Version 
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 +10:00
+date: 2009-09-29 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,7 +172,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.