benschwarz-smoke 0.3.11 → 0.4.0

data/VERSION.yml

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

data/lib/smoke/origin.rb

@@ -22,15 +22,14 @@ module Smoke
     def output(type = :ruby)
       prepare!
       dispatch if respond_to? :dispatch
-      output = (@items.length == 1) ? @items.first : @items
       
       case type
       when :json
-        return ::JSON.generate(output)
+        return ::JSON.generate(@items)
       when :yaml
-        return YAML.dump(output)
+        return YAML.dump(@items)
       else
-        return output
+        return @items
       end      
     end
     

data/spec/smoke/origin_spec.rb

@@ -24,7 +24,7 @@ describe Smoke::Origin do
     end
     
     it "should output a single hash rather than a hash in an array when there is one item" do
-      Smoke[:test].truncate(1).output.should == {:title => "Kangaroo", :name => "Kelly"}
+      Smoke[:test].truncate(1).output.should == [{:title => "Kangaroo", :name => "Kelly"}]
     end
   end
   
@@ -42,7 +42,7 @@ describe Smoke::Origin do
     end
     
     it "should truncate results given a length" do
-      Smoke[:test].truncate(1).output.should be_an_instance_of(Hash)
+      Smoke[:test].truncate(1).output.size.should == 1
     end
     
     describe "filtering" do
@@ -69,7 +69,7 @@ describe Smoke::Origin do
       end
       
       it "should only contain items that match" do
-        Smoke[:keep].keep(:head, /^K/).output.should == {:head => "Kangaroo", :name => "Kelly"}
+        Smoke[:keep].keep(:head, /^K/).output.should == [{:head => "Kangaroo", :name => "Kelly"}]
       end
       
       it "should discard items" do
@@ -77,7 +77,7 @@ describe Smoke::Origin do
       end
       
       it "should not contain items that match" do
-        Smoke[:discard].discard(:head, /^K/).output.should == {:head => "Platypus", :name => "Peter"}
+        Smoke[:discard].discard(:head, /^K/).output.should == [{:head => "Platypus", :name => "Peter"}]
       end
     end
   end

data/spec/smoke/source/yql_spec.rb

@@ -73,7 +73,7 @@ describe "YQL" do
     end
 
     it "should be a respository" do
-      Smoke[:smoke].output.should have_key(:repository)
+      Smoke[:smoke].output.first.should have_key(:repository)
     end
 
     it "should respond to use" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-smoke
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ben Schwarz