smoke 0.5.15 → 0.5.16

data/VERSION.yml

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

data/lib/smoke/origin.rb

@@ -6,7 +6,7 @@ module Smoke
     def initialize(name, &block)
       raise StandardError, "Sources must have a name" unless name
       @name = name
-      @items, @prepare, @transformation = [], [], []
+      @items, @prepare, @requirements, @transformation = [], [], [], []
 
       activate!
       instance_eval(&block) if block_given?
@@ -130,7 +130,7 @@ module Smoke
     #   # End use
     #   Smoke[:twitter].username(:benschwarz).output
     def prepare(args = {}, &block)
-      @requirements = args.delete(:require) || []
+      @requirements = [args.delete(:require)].flatten
       
       raise ArgumentError, "requires a block" unless block_given?
       @prepare << block

data/lib/smoke/output/xml.rb

@@ -6,8 +6,10 @@ module Smoke
           xml.items {
             items.each do |item|
               xml.item {
-                item.each_pair do |key, value|
-                  xml.send(key, value)
+                %w(id type class).each{|m| item["#{m}_".to_sym] = item.delete(m.to_sym) }
+                
+                item.each do |k, v|
+                  xml.send(k, v)
                 end
               }
             end

data/spec/smoke/origin_spec.rb

@@ -233,8 +233,12 @@ describe Smoke::Origin do
         prepare :require => [:username, :feed] do 
           url "http://domain.tld/#{feed}/#{username}/feed.json", :type => :json
         end
-        
-        path :photos, :photo
+      end
+      
+      Smoke.data :single_requirement do
+        prepare :require => :username do 
+          url "http://domain.tld/#{feed}/#{username}/feed.json", :type => :json
+        end
       end
     end
     
@@ -246,6 +250,12 @@ describe Smoke::Origin do
       Smoke.requirements.requirements.should include(:username)
       Smoke.requirements.requirements.should include(:feed)
       Smoke.requirements.requirements.length.should == 2
+      Smoke.requirements.requirements.should be_an_instance_of(Array)
+    end
+    
+    it "should have a single requirement, within an array" do
+      Smoke.single_requirement.requirements.should be_an_instance_of(Array)
     end
+    
   end
 end

data/spec/smoke/output/xml_spec.rb

@@ -3,7 +3,10 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 describe Smoke::Output::XML do
   before do
     @tree = :tree
-    @items = [{:animal => "monkey", :mammal => true}, {:animal => "elephant"}]
+    @items = [
+      {:id => 1, :class => "first", :type => "mammal", :animal => "monkey"}, 
+      {:id => 2, :class => "second", :type => "mammal", :animal => "elephant"}
+    ]
     @xml = Smoke::Output::XML.generate(@tree, @items)
     @document = Nokogiri::XML(@xml)
   end
@@ -21,4 +24,20 @@ describe Smoke::Output::XML do
       item.content.should =~ /monkey/
     end
   end
+end
+
+describe "Smoke XML output with real data" do
+  before :all do
+    @url = "http://domain.tld/feed.json"
+    FakeWeb.register_uri(@url, :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
+    
+    Smoke.data :real_xml_output do
+      url "http://domain.tld/feed.json", :type => :json
+      path :photos, :photo
+    end
+  end
+  
+  it "should not error" do
+    Smoke.real_xml_output.output(:xml).should include "<?xml"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smoke
 version: !ruby/object:Gem::Version 
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 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.