smoke 0.5.16 → 0.5.17

data/README.markdown

@@ -18,6 +18,10 @@ Then you can output as a plain ruby object or one of your other favourites (JSON
 * Early [screencast](http://vimeo.com/4272804) to get developer / peer feedback
 
 
+## Install
+
+    gem install smoke -s http://gemcutter.org
+
 ## The concept
 
 The concept comes from using [Yahoo Pipes](http://pipes.yahoo.com) to make web based mash ups: Get a list of tv shows for my torrent client, compile a recipe book or make tools to give me a list of albums that artists in my music library are about to be released.
@@ -69,7 +73,7 @@ Source definition:
 
 Execution: 
 
-    Smoke[:delicious].username("bschwarz").output
+    Smoke.delicious.username("bschwarz").output
 
 
 ### TODO (working on, just mental notes)

data/Rakefile

@@ -11,9 +11,9 @@ begin
     gem.homepage = "http://github.com/benschwarz/smoke"
     gem.authors = ["Ben Schwarz"]
     gem.files = FileList['lib/**/*.rb', 'rdoc/**/*', '[A-Z]*', 'spec/**/*', 'vendor/**/*'].to_a
+    gem.add_development_dependency("fakeweb", ">= 1.2.5")
     gem.add_dependency("simple-rss", "1.2")
     gem.add_dependency("json", ">= 1.1.3")
-    gem.add_dependency("fakeweb", "1.2.5")
     gem.add_dependency("crack", ">= 0.1.1")
     gem.add_dependency("moneta", "0.6.0")
     gem.add_dependency("rest-client", "1.0.3")

data/VERSION.yml

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

data/lib/smoke.rb

@@ -28,7 +28,7 @@ module Smoke
     #     Smoke.yql(:ruby) do ....
     # Then access it:
     #     Smoke[:ruby]
-    #     => #<Smoke::Source::YQL::0x18428d4...
+    #     => #<Smoke::YQL::0x18428d4...
     def [](source)
       active_sources[source]
     end
@@ -54,8 +54,16 @@ module Smoke
     end
     
     # Returns all activated smoke sources
-    def active_sources
-      @@active_sources
+    def active_sources; @@active_sources; end
+    
+    # Returns all exposed sources
+    def exposed_sources
+      active_sources.reject{|k,v| !v.exposed? }
+    end
+
+    # Returns all concealed sources
+    def concealed_sources
+      active_sources.reject{|k,v| !v.concealed? }
     end
     
     # Rename a source 
@@ -95,9 +103,9 @@ module Smoke
       @@config 
     end
     
-    def yql(name, &block); Smoke::Source::YQL.new(name, &block); end
-    def data(name, &block); Smoke::Source::Data.new(name, &block); end
-    def feed(name, &block); Smoke::Source::Feed.new(name, &block); end
+    def yql(name, &block);  Smoke::YQL.new(name, &block);  end
+    def data(name, &block); Smoke::Data.new(name, &block); end
+    def feed(name, &block); Smoke::Feed.new(name, &block); end
     
     # Join multiple sources together into a single feed
     # Usage:
@@ -105,12 +113,17 @@ module Smoke
     #     name :stream
     #     path :photos, :photo
     #   end
-    def join(*names, &block); Smoke::Source::Join.new(names, &block); end
+    def join(*names, &block); Smoke::Join.new(names, &block); end
   end
 end
 
 %w(core_ext/hash core_ext/string smoke/cache smoke/request smoke/origin smoke/output/xml).each {|r| require File.join(File.dirname(__FILE__), r)}
 
+# Autoload the source classes
+%w(YQL Data Feed Join).each do |r|
+  Smoke.autoload(r.to_sym, File.join(File.dirname(__FILE__), "smoke", "source", r.downcase))
+end
+
 class Object # :nodoc: 
   include Smoke
 end

data/lib/smoke/origin.rb

@@ -1,11 +1,12 @@
 module Smoke
   class Origin
-    attr_reader :items, :requirements
+    attr_reader :items, :requirements, :exposed
     attr_accessor :name
     
     def initialize(name, &block)
       raise StandardError, "Sources must have a name" unless name
       @name = name
+      @exposed = true
       @items, @prepare, @requirements, @transformation = [], [], [], []
 
       activate!
@@ -237,6 +238,14 @@ module Smoke
       @items = @items[0..(length - 1)]
     end
     
+    # Expose and conceal, this is stictly a feature of rack/smoke.
+    # concealed sources will not be "available"
+    # Simply marking off sources, more than anything else
+    def expose; @exposed = true; end
+    def conceal; @exposed = false; end
+    def exposed?; @exposed; end
+    def concealed?; !@exposed; end
+    
     private
     def prepare!
       @prepare.each{|block| block.call} unless @prepare.empty?
@@ -247,6 +256,8 @@ module Smoke
     end
     
     def symbolize_keys!
+      # If its an array, we flatten it and symbolise the keys.
+      # Otherwise, we leave it as is.
       @items = items.flatten.map{|i| i.symbolize_keys! } if items.respond_to? :flatten
     end
     
@@ -260,6 +271,4 @@ module Smoke
       Smoke.activate(@name, self)
     end
   end
-end
-
-Dir["#{File.dirname(__FILE__)}/source/*.rb"].each &method(:require)
+end

data/lib/smoke/request.rb

@@ -9,10 +9,10 @@ module Smoke
       end
     end
     
-    SUPPORTED_TYPES = %w(json xml javascript)
+    SUPPORTED_TYPES = %w(json xml javascript excel)
     @@request_options = {
       :user_agent       => Smoke.config[:user_agent],
-      :accept_encoding  => "gzip"
+      :accept_encoding  => "gzip, deflate"
     }
     
     attr_reader :uri, :content_type, :body
@@ -44,6 +44,10 @@ module Smoke
           @body = ::Crack::JSON.parse(@body).symbolize_keys!
         when :xml
           @body = ::Crack::XML.parse(@body).symbolize_keys!
+        when :excel
+          # Convert the excel document into an XML document
+          doc = @body
+          ::Crack::XML.parse().symbolize_keys!
         when :unknown
           Smoke.log.warn "Smoke Request: Format unknown for #{@uri} (#{@content_type})"
       end      

data/lib/smoke/source/data.rb

@@ -1,39 +1,37 @@
 module Smoke
-  module Source # :nodoc:    
-    # The "Data" source allows you to query
-    # datasources that are "complete" urls
-    # and rely on the automagic object parsing 
-    # that smoke provides.
-    #
-    # For example, you may use this source
-    # to query a complete restful api call
-    # unpackage the xml response and get a 
-    # clean ruby object.
-    #
-    # Data can take as many urls as you'd like
-    # to throw at it.
-    #
-    # Usage:
-    #   Smoke.data(:ruby) do
-    #     url "http://api.flickr.com/services/rest/?user_id=36821533%40N00&tags=benschwarz-site&nojsoncallback=1&method=flickr.photos.search&format=json&api_key=your_api_key_here
-    #     path :photos, :photo
-    #   end
-    class Data < Origin
-      attr_reader :request
-      
-      # The URL that you'd like smoke to source its data from
-      # You can also set the type for silly servers that don't set a correct content-type (Flickr!)
-      # Example:
-      #   url "http://site.com/resource.json", :type => :json
-      def url(source_url, options = {})
-        @url, @options = source_url, options
-      end
-      
-      protected
-      def dispatch          
-        @request = Smoke::Request.new(@url, @options)
-        self.items = @request.body
-      end
+  # The "Data" source allows you to query
+  # datasources that are "complete" urls
+  # and rely on the automagic object parsing 
+  # that smoke provides.
+  #
+  # For example, you may use this source
+  # to query a complete restful api call
+  # unpackage the xml response and get a 
+  # clean ruby object.
+  #
+  # Data can take as many urls as you'd like
+  # to throw at it.
+  #
+  # Usage:
+  #   Smoke.data(:ruby) do
+  #     url "http://api.flickr.com/services/rest/?user_id=36821533%40N00&tags=benschwarz-site&nojsoncallback=1&method=flickr.photos.search&format=json&api_key=your_api_key_here
+  #     path :photos, :photo
+  #   end
+  class Data < Origin
+    attr_reader :request
+    
+    # The URL that you'd like smoke to source its data from
+    # You can also set the type for silly servers that don't set a correct content-type (Flickr!)
+    # Example:
+    #   url "http://site.com/resource.json", :type => :json
+    def url(source_url, options = {})
+      @url, @options = source_url, options
+    end
+    
+    protected
+    def dispatch          
+      @request = Smoke::Request.new(@url, @options)
+      self.items = @request.body
     end
   end
 end

data/lib/smoke/source/feed.rb

@@ -1,24 +1,22 @@
 module Smoke
-  module Source # :nodoc:
-    # Feed can take multiple rss or atom feeds and munge them up together.
-    # 
-    # Usage:
-    #   Smoke.feed(:ruby) do
-    #     url "domain.tld/rss"
-    #     url "site.tld/atom"
-    #   end
-    class Feed < Origin
-      attr_reader :requests
-      
-      def url(feed_uri)
-        (@feeds ||= [] ) << feed_uri
-      end
-      
-      protected
-      def dispatch
-        @requests = @feeds.map{|f| Smoke::Request.new(f, {:raw_response => true}) }
-        self.items = @requests.map{|r| ::SimpleRSS.parse(r.body).items }.flatten
-      end
+  # Feed can take multiple rss or atom feeds and munge them up together.
+  # 
+  # Usage:
+  #   Smoke.feed(:ruby) do
+  #     url "domain.tld/rss"
+  #     url "site.tld/atom"
+  #   end
+  class Feed < Origin
+    attr_reader :requests
+    
+    def url(feed_uri)
+      (@feeds ||= [] ) << feed_uri
+    end
+    
+    protected
+    def dispatch
+      @requests = @feeds.map{|f| Smoke::Request.new(f, {:raw_response => true}) }
+      self.items = @requests.map{|r| ::SimpleRSS.parse(r.body).items }.flatten
     end
   end
 end

data/lib/smoke/source/join.rb

@@ -1,56 +1,54 @@
 module Smoke
-  module Source # :nodoc:
-    # The "Joiner" source is a special source
-    # that can be used to join multiple sources together
-    # and proxy call dispatch for each source
-    #
+  # The "Joiner" source is a special source
+  # that can be used to join multiple sources together
+  # and proxy call dispatch for each source
+  #
+  # Usage:
+  #   Smoke.join(:delicious, :twitter, :flickr) do
+  #     path :photos, :photo
+  #   end
+  class Join < Origin # :nodoc: 
+    def initialize(names, &block)
+      @names = names
+      super((names << "joined").join("_").to_sym, &block)
+    end
+    
+    # Rename sources immediately after they've been joined together
     # Usage:
     #   Smoke.join(:delicious, :twitter, :flickr) do
-    #     path :photos, :photo
+    #     name :web_stream
     #   end
-    class Join < Origin # :nodoc: 
-      def initialize(names, &block)
-        @names = names
-        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}"
+    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.last)
-          end
+      unless args.empty?
+        sources.each do |source| 
+          source.last.instance_variable_set(ivar, args.last)
         end
-
-        return self
       end
-      
-      protected
-      def sources
-        Smoke.active_sources.find_all{|k, v| @names.include?(k) }
+
+      return self
+    end
+    
+    protected
+    def sources
+      Smoke.active_sources.find_all{|k, v| @names.include?(k) }
+    end
+    
+    def dispatch
+      # Recall dispatch
+      sources.each do |source|
+        source.last.send(:prepare!)
+        source.last.send(:dispatch) if source.last.respond_to?(:dispatch)
       end
       
-      def dispatch
-        # Recall dispatch
-        sources.each do |source|
-          source.last.send(:prepare!)
-          source.last.send(:dispatch) if source.last.respond_to?(:dispatch)
-        end
-        
-        # Re-map items
-        @items = sources.map {|source| source.last.items }.flatten
-      end
+      # Re-map items
+      @items = sources.map {|source| source.last.items }.flatten
     end
   end
 end

data/lib/smoke/source/yql.rb

@@ -1,85 +1,83 @@
 module Smoke
-  module Source # :nodoc:      
-    # YQL will call to Yahoo YQL services
+  # YQL will call to Yahoo YQL services
+  #
+  # Usage:
+  #   Smoke.yql(:ruby) do
+  #     select  :all
+  #     from    "search.web"
+  #     where   :query, "ruby"
+  #   end
+  class YQL < Origin
+    API_BASE = "http://query.yahooapis.com/v1/public/yql"
+    attr_reader :request
+    
+    # Select indicates what YQL will be selecting
+    # Usage:
+    #   select :all
+    #   => "SELECT *"
+    #   select :title
+    #   => "SELECT title"
+    #   select :title, :description
+    #   => "SELECT title, description"
+    def select(what = :all)
+      @select = what.join(",") and return if what.is_a? Array
+      @select = "*" and return if what == :all
+      @select = what and return
+    end
+    
+    # from corresponds to the from fragment of the YQL query
+    # Usage: 
+    #   from "search.web"
+    # or
+    #   from :html
+    def from(source)
+      @from = source.join(',') and return if source.is_a? Array
+      @from = source.to_s
+    end
+    
+    # where is a straight up match, no fancy matchers
+    # are currently supported
+    # Usage:
+    #   where :xpath, "//div/div/a"
+    # or
+    #   where :query, "python"
+    def where(column, value)
+      @where = @where || []
+      @where << "#{column.to_s} = '#{value}'"
+    end
+    
+    # `use` can be used to set the url location of the data-table
+    # that you want YQL to search upon
     #
     # Usage:
-    #   Smoke.yql(:ruby) do
-    #     select  :all
-    #     from    "search.web"
-    #     where   :query, "ruby"
-    #   end
-    class YQL < Origin
-      API_BASE = "http://query.yahooapis.com/v1/public/yql"
-      attr_reader :request
-      
-      # Select indicates what YQL will be selecting
-      # Usage:
-      #   select :all
-      #   => "SELECT *"
-      #   select :title
-      #   => "SELECT title"
-      #   select :title, :description
-      #   => "SELECT title, description"
-      def select(what = :all)
-        @select = what.join(",") and return if what.is_a? Array
-        @select = "*" and return if what == :all
-        @select = what and return
-      end
-      
-      # from corresponds to the from fragment of the YQL query
-      # Usage: 
-      #   from "search.web"
-      # or
-      #   from :html
-      def from(source)
-        @from = source.join(',') and return if source.is_a? Array
-        @from = source.to_s
-      end
-      
-      # where is a straight up match, no fancy matchers
-      # are currently supported
-      # Usage:
-      #   where :xpath, "//div/div/a"
-      # or
-      #   where :query, "python"
-      def where(column, value)
-        @where = @where || []
-        @where << "#{column.to_s} = '#{value}'"
-      end
-      
-      # `use` can be used to set the url location of the data-table
-      # that you want YQL to search upon
-      #
-      # Usage:
-      #   use "http://datatables.org/alltables.env"
-      def use(url)
-        params.merge!({:env => url})
-      end
-      
-      protected
-      def params 
-        @params || @params = {}
-      end
-      
-      def dispatch
-        @request = Smoke::Request.new(build_uri)
-        self.items = @request.body
-      end
-      
-      private
-      def build_uri
-        chunks = []
-        default_opts = {
-          :q => build_query,
-          :format => "json"
-        }.merge(params).each {|k,v| chunks << "#{k}=#{v}" }
-        
-        return URI.encode(API_BASE + "?" + chunks.join("&"))
-      end
+    #   use "http://datatables.org/alltables.env"
+    def use(url)
+      params.merge!({:env => url})
+    end
+    
+    protected
+    def params 
+      @params || @params = {}
+    end
+    
+    def dispatch
+      @request = Smoke::Request.new(build_uri)
+      self.items = @request.body
+    end
+    
+    private
+    def build_uri
+      chunks = []
+      default_opts = {
+        :q => build_query,
+        :format => "json"
+      }.merge(params).each {|k,v| chunks << "#{k}=#{v}" }
       
-      def build_query
-        "SELECT #{@select} FROM #{@from} WHERE #{@where.join(" AND ")}"
-      end
+      return URI.encode(API_BASE + "?" + chunks.join("&"))
+    end
+    
+    def build_query
+      "SELECT #{@select} FROM #{@from} WHERE #{@where.join(" AND ")}"
     end
   end
 end

data/spec/smoke/cache_spec.rb

@@ -53,7 +53,7 @@ describe Smoke::Cache do
       end
       
       @url = "http://memory.tld/store"
-      FakeWeb.register_uri(@url, :file => File.join(SPEC_DIR, 'supports', 'slashdot.xml'))
+      FakeWeb.register_uri(:get, @url, :body => File.join(SPEC_DIR, 'supports', 'slashdot.xml'))
       
       require 'moneta/memory'
       @store = Moneta::Memory.new

data/spec/smoke/input/xls_spec.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
+
+describe "parsing excel" do
+  before :all do
+    @url = "http://fake.tld/canned/xls"
+    @web_search = File.join(SPEC_DIR, 'supports', 'gov_act_toliets.xls')
+    FakeWeb.register_uri(:get, @url, :response => @web_search)
+    
+    @request = Smoke::Request.new(@url, {:type => :excel})
+  end
+  
+  it "should automagically parse it" do
+    puts @request.body.keys
+  end
+end

data/spec/smoke/origin_spec.rb

@@ -111,7 +111,7 @@ describe Smoke::Origin do
   describe "call order" do
     before :all do
       @url = "http://domain.tld/benschwarz/feed"
-      FakeWeb.register_uri(@url, :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
+      FakeWeb.register_uri(:get, @url, :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
       
       Smoke.data :feed_preperation_call_order do
         prepare do 
@@ -144,7 +144,7 @@ describe Smoke::Origin do
       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::Data)
       end
     end
     

data/spec/smoke/output/xml_spec.rb

@@ -29,7 +29,7 @@ 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'))
+    FakeWeb.register_uri(:get, @url, :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
     
     Smoke.data :real_xml_output do
       url "http://domain.tld/feed.json", :type => :json

data/spec/smoke/request_spec.rb

@@ -4,7 +4,7 @@ describe Smoke::Request do
   before do
     @url = "http://fake.tld/canned/"
     @web_search = File.join(SPEC_DIR, 'supports', 'flickr-photo.json')
-    FakeWeb.register_uri(@url, :response => @web_search)
+    FakeWeb.register_uri(:get, @url, :response => @web_search)
     @request = Smoke::Request.new(@url)
   end
   
@@ -26,7 +26,7 @@ describe Smoke::Request do
       # Gzip response should come out exactly the same as the plain text response
       @gzip_response = File.join(SPEC_DIR, 'supports', 'gzip_response.txt')
       @url = "http://fake.tld/gzip"
-      FakeWeb.register_uri(@url, :response => @gzip_response, :content_encoding => "gzip")
+      FakeWeb.register_uri(:get, @url, :response => @gzip_response, :content_encoding => "gzip")
     end
     
     it "should transparently handle a gzipped response" do

data/spec/smoke/shared_spec.rb

@@ -137,7 +137,7 @@ shared_examples_for "all sources" do
   describe "call order" do
     before :all do
       @url = "http://domain.tld/benschwarz/feed"
-      FakeWeb.register_uri(@url, :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
+      FakeWeb.register_uri(:get, @url, :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
       
       Smoke.data :feed_preperation_call_order do
         prepare do 
@@ -165,7 +165,7 @@ shared_examples_for "all sources" do
       end
       
       it "should chain the source when setting a property" do
-        @source.abstract(:value).should be_an_instance_of(Smoke::Source::Data)
+        @source.abstract(:value).should be_an_instance_of(Smoke::Data)
       end
     end
     

data/spec/smoke/source/data_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
 describe "'Data' source" do
   before :all do
-    FakeWeb.register_uri("http://photos.tld/index.json", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
+    FakeWeb.register_uri(:get, "http://photos.tld/index.json", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
     
     @source = Smoke.data(:photos) do
       url "http://photos.tld/index.json", :type => :json
@@ -14,7 +14,7 @@ describe "'Data' source" do
   # it_should_behave_like "all sources"
   
   it "should have been activated" do
-    Smoke[:photos].should(be_an_instance_of(Smoke::Source::Data))
+    Smoke[:photos].should(be_an_instance_of(Smoke::Data))
   end
   
   it "should be a list of things" do
@@ -43,7 +43,7 @@ describe "'Data' source" do
   
   describe "making a request to a web service without a correctly set content-type in return" do
     before :each do
-      FakeWeb.register_uri("http://photos.tld/no-format", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'), :content_type => "text/plain")
+      FakeWeb.register_uri(:get, "http://photos.tld/no-format", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'), :content_type => "text/plain")
     end
     
     it "should fail" do

data/spec/smoke/source/feed_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
 describe "Feed" do
   before :all do
-    FakeWeb.register_uri("http://slashdot.org/index.rdf", :file => File.join(SPEC_DIR, 'supports', 'slashdot.xml'))
+    FakeWeb.register_uri(:get, "http://slashdot.org/index.rdf", :body => File.join(SPEC_DIR, 'supports', 'slashdot.xml'))
     
     @source = Smoke.feed(:slashdot) do
       url "http://slashdot.org/index.rdf"
@@ -17,7 +17,7 @@ describe "Feed" do
   # it_should_behave_like "all sources"
   
   it "should have been activated" do
-    Smoke[:slashdot].should(be_an_instance_of(Smoke::Source::Feed))
+    Smoke[:slashdot].should(be_an_instance_of(Smoke::Feed))
   end
   
   it "should be a list of things" do

data/spec/smoke/source/join_spec.rb

@@ -13,7 +13,7 @@ describe "Join" do
     end
         
     it "should be named in a_b_joined" do
-      Smoke[:a_b_joined].should be_an_instance_of(Smoke::Source::Join)
+      Smoke[:a_b_joined].should be_an_instance_of(Smoke::Join)
     end
     
     it "should contain items from sources a and b" do
@@ -49,7 +49,7 @@ describe "Join" do
         
     describe "dispatching" do
       before :all do
-        FakeWeb.register_uri("http://photos.tld", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
+        FakeWeb.register_uri(:get, "http://photos.tld", :response => File.join(SPEC_DIR, 'supports', 'flickr-photo.json'))
 
         Smoke.data(:should_dispatch) do
           url "http://photos.tld"

data/spec/smoke/source/yql_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
 describe "YQL" do
   before :all do
-    FakeWeb.register_uri("http://query.yahooapis.com:80/v1/public/yql?q=SELECT%20*%20FROM%20search.web%20WHERE%20query%20=%20'ruby'&format=json", :response => File.join(SPEC_DIR, 'supports', 'search-web.json.yql'))
+    FakeWeb.register_uri(:get, "http://query.yahooapis.com:80/v1/public/yql?q=SELECT%20*%20FROM%20search.web%20WHERE%20query%20=%20'ruby'&format=json", :response => File.join(SPEC_DIR, 'supports', 'search-web.json.yql'))
     
     @source = Smoke.yql(:search) do
       select  :all
@@ -19,7 +19,7 @@ describe "YQL" do
   # it_should_behave_like "all sources"
   
   it "should have been activated" do
-    Smoke[:search].should(be_an_instance_of(Smoke::Source::YQL))
+    Smoke[:search].should(be_an_instance_of(Smoke::YQL))
   end
   
   it "should be a list of things" do
@@ -28,7 +28,7 @@ describe "YQL" do
   
   describe "select" do
     before do
-      FakeWeb.register_uri("http://query.yahooapis.com:80/v1/public/yql?q=SELECT%20url%20FROM%20search.images%20WHERE%20query%20=%20'amc%20pacer'&format=json", :response => File.join(SPEC_DIR, 'supports', 'amc_pacer.json.yql'))
+      FakeWeb.register_uri(:get, "http://query.yahooapis.com:80/v1/public/yql?q=SELECT%20url%20FROM%20search.images%20WHERE%20query%20=%20'amc%20pacer'&format=json", :response => File.join(SPEC_DIR, 'supports', 'amc_pacer.json.yql'))
       
       Smoke.yql(:pacer) do
         select :url
@@ -81,7 +81,7 @@ describe "YQL" do
   
   describe "yql definitions" do
     before do
-      FakeWeb.register_uri("http://query.yahooapis.com:80/v1/public/yql?q=SELECT%20*%20FROM%20github.repo%20WHERE%20id%20=%20'benschwarz'%20AND%20repo%20=%20'smoke'&format=json&env=http://datatables.org/alltables.env", :response => File.join(SPEC_DIR, 'supports', 'datatables.yql'))
+      FakeWeb.register_uri(:get, "http://query.yahooapis.com:80/v1/public/yql?q=SELECT%20*%20FROM%20github.repo%20WHERE%20id%20=%20'benschwarz'%20AND%20repo%20=%20'smoke'&format=json&env=http://datatables.org/alltables.env", :response => File.join(SPEC_DIR, 'supports', 'datatables.yql'))
       
       Smoke.yql(:smoke) do
         use "http://datatables.org/alltables.env"

data/spec/smoke_spec.rb

@@ -11,6 +11,15 @@ describe Smoke do
       Smoke[:a].should == @source_a
     end
     
+    it "should be a hash" do
+      Smoke.active_sources.should be_an_instance_of(Hash)
+    end
+    
+    it "should have its name as the hash key" do
+      key = Smoke.active_sources.keys.first
+      Smoke.active_sources[key].name.should == key
+    end
+    
     describe "accessing via method call" do
       it "should allow access to the sources via a method call" do
         Smoke.a.should == @source_a 
@@ -58,4 +67,38 @@ describe Smoke do
       end
     end
   end
+  
+  describe "exposed and concealed" do
+    before :all do
+      TestSource.source :exposed_by_default
+      
+      TestSource.source :exposed do
+        expose
+      end
+      
+      TestSource.source :concealed do
+        conceal
+      end
+    end
+    
+    describe "exposed_sources" do
+      it "should be a hash" do
+        Smoke.exposed_sources.should be_an_instance_of(Hash)
+      end
+      
+      it "should be exposed sources only" do
+        Smoke.exposed_sources.values.should_not include(Smoke.concealed)
+      end
+    end
+    
+    describe "concealed_sources" do
+      it "should be a hash" do
+        Smoke.concealed_sources.should be_an_instance_of(Hash)
+      end
+      
+      it "should be concealed sources only" do
+        Smoke.concealed_sources.values.should_not include(Smoke.exposed)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smoke
 version: !ruby/object:Gem::Version 
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,38 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-29 00:00:00 +10:00
+date: 2009-10-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: simple-rss
-  type: :runtime
+  name: fakeweb
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: 1.2.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: simple-rss
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: "1.2"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.5
+        version: 1.1.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: crack
@@ -129,6 +129,7 @@ files:
 - rdoc/rdoc-style.css
 - spec/core_ext/hash_spec.rb
 - spec/smoke/cache_spec.rb
+- spec/smoke/input/xls_spec.rb
 - spec/smoke/origin_spec.rb
 - spec/smoke/output/xml_spec.rb
 - spec/smoke/request_spec.rb
@@ -143,6 +144,7 @@ files:
 - spec/supports/amc_pacer.json.yql
 - spec/supports/datatables.yql
 - spec/supports/flickr-photo.json
+- spec/supports/gov_act_toliets.xls
 - spec/supports/gzip_response.txt
 - spec/supports/search-web.json.yql
 - spec/supports/search-web.xml.yql
@@ -179,6 +181,7 @@ summary: smoke is a Ruby based DSL that allows you to query web services such as
 test_files: 
 - spec/core_ext/hash_spec.rb
 - spec/smoke/cache_spec.rb
+- spec/smoke/input/xls_spec.rb
 - spec/smoke/origin_spec.rb
 - spec/smoke/output/xml_spec.rb
 - spec/smoke/request_spec.rb