benschwarz-smoke 0.3.10 → 0.3.11

data/README.markdown

@@ -69,15 +69,10 @@ Integrity [is running for smoke](http://integrity.ffolio.net/smoke)
 
 
 ### TODO (working on, just mental notes)
-
-* Secrets
-* Checkout experimental fakeweb version to stub out the yql specs
-
 #### Later / maybe
 * YQL w/oAuth
 * YQL Subqueries?
 * Implement basic auth for sources
-* Allow for sources to explicitly set the content type being returned for those stupid content providers
 
 
 #### For wiki pages (docs, later)
@@ -90,7 +85,7 @@ Integrity [is running for smoke](http://integrity.ffolio.net/smoke)
 * Sort, Reverse
 * Keep, Discard
 * Truncate
-
+* Manually setting the content type for a url
 
 ### Copyright
 

data/VERSION.yml

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

data/lib/smoke/request.rb

@@ -12,7 +12,7 @@ module Smoke
     SUPPORTED_TYPES = %w(json xml javascript)
     attr_reader :uri, :content_type, :body, :type
        
-    def initialize(uri, *options)
+    def initialize(uri, options = {})
       @uri, @options = uri, options
       dispatch
     end
@@ -29,7 +29,7 @@ module Smoke
         @body = request
       }.join
       
-      present! unless @options.include?(:raw_response)
+      present! unless @options[:raw_response]
       
     rescue RestClient::Exception => e
       Failure.new(@uri, e)
@@ -41,7 +41,7 @@ module Smoke
     end
     
     def set_type
-      @type = (SUPPORTED_TYPES.detect{|t| @content_type =~ /#{t}/ } || "unknown").to_sym
+      @type =  @options[:type] || (SUPPORTED_TYPES.detect{|t| @content_type =~ /#{t}/ } || "unknown").to_sym
     end
     
     def parse!

data/lib/smoke/source/data.rb

@@ -20,14 +20,18 @@ module Smoke
     #   end
     class Data < Origin
       attr_reader :request
-
-      def url(source_url)
-        @url = source_url
+      
+      # 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)
+      def dispatch          
+        @request = Smoke::Request.new(@url, @options)
         self.items = @request.body
       end
     end

data/lib/smoke/source/feed.rb

@@ -16,7 +16,7 @@ module Smoke
       
       protected
       def dispatch
-        @requests = @feeds.map{|f| Smoke::Request.new(f, :raw_response) }
+        @requests = @feeds.map{|f| Smoke::Request.new(f, {:raw_response => true}) }
         self.items = @requests.map{|r| ::SimpleRSS.parse(r.body).items }.flatten
       end
     end

data/lib/smoke/source/yql.rb

@@ -23,7 +23,6 @@ module Smoke
       def select(what = :all)
         @select = what.join(",") and return if what.is_a? Array
         @select = "*" and return if what == :all
-        @select = what.to_s
       end
       
       # from corresponds to the from fragment of the YQL query

data/spec/smoke/origin_spec.rb

@@ -146,7 +146,7 @@ describe Smoke::Origin do
       
       Smoke.data :feed_preperation_call_order do
         prepare do 
-          url "http://domain.tld/#{username}/feed"
+          url "http://domain.tld/#{username}/feed", :type => :json
         end
         
         path :photos, :photo

data/spec/smoke/request_spec.rb

@@ -13,11 +13,11 @@ describe Smoke::Request do
   end
     
   it "should have a content type" do
-    @request.content_type.should =~ /text\/json/
+    @request.content_type.should == "text/plain; charset=utf-8"
   end
   
   it "should be a raw string response" do
-    request = Smoke::Request.new(@url, :raw_response)
+    request = Smoke::Request.new(@url, :raw_response => true)
     request.body.should == "{\"photos\":{\"page\":1, \"pages\":1, \"perpage\":100, \"total\":\"2\", \"photo\":[{\"id\":\"3443335843\", \"owner\":\"36821533@N00\", \"secret\":\"5a15f0bfb9\", \"server\":\"3305\", \"farm\":4, \"title\":\"How I roll\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"3345220961\", \"owner\":\"36821533@N00\", \"secret\":\"a1dd2b9eca\", \"server\":\"3581\", \"farm\":4, \"title\":\"My desk\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}]}, \"stat\":\"ok\"}"
   end
   
@@ -34,4 +34,16 @@ describe Smoke::Request do
       request.body.should == "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n\t\"http://www.w3.org/TR/html4/strict.dtd\">\n<html>\n\t<head>\n\t\t<title>New street represent</title>\n\t\t<style type=\"text/css\" media=\"screen\">\n\t\t\tbody {\n\t\t\t\tfont-family: helvetica, arial, sans-serif;\n\t\t\t\tfont-size: 2em;\n\t\t\t\tbackground-color: black;\n\t\t\t\tletter-spacing: -3px;\n\t\t\t\tmargin: 0 auto;\n\t\t\t}\n\t\t\th1 {\n\t\t\t\tposition: absolute;\n\t\t\t\tright: 0;\n\t\t\t\tbackground-color: #666;\n\t\t\t\twidth: 4em;\n\t\t\t}\n\t\t</style>\n\t</head>\n\t<body>\n\t\t<h1>Massive</h1>\n\t</body>\n</html>"
     end
   end
+  
+  describe "format returns" do
+    it "should have a content type of :manual" do
+      request = Smoke::Request.new(@url, :type => :manual)
+      request.type.should == :manual
+    end
+    
+    it "should have a content type of unknown" do
+      request = Smoke::Request.new(@url)
+      request.type.should == :unknown
+    end
+  end
 end

data/spec/smoke/source/data_spec.rb

@@ -5,7 +5,7 @@ describe "'Data' source" do
     FakeWeb.register_uri("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"
+      url "http://photos.tld/index.json", :type => :json
       
       path :photos, :photo
     end
@@ -40,4 +40,26 @@ describe "'Data' source" do
       end
     end
   end
+  
+  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")
+    end
+    
+    it "should fail" do
+      @source = Smoke.data(:flickr) do
+        url "http://photos.tld/no-format"
+        path :photos, :photo
+      end
+      lambda { @source.output }.should raise_error
+    end
+    
+    it "should not fail" do
+      @source = Smoke.data(:flickr) do
+        url "http://photos.tld/no-format", :type => :json
+        path :photos, :photo
+      end
+      lambda { @source.output }.should_not raise_error
+    end
+  end
 end

data/spec/supports/flickr-photo.json

@@ -2,6 +2,6 @@ HTTP/1.1 200 OK
 Date: Mon, 1 Jan 2000 01:00:00 GMT
 Vary: Accept-Encoding
 Connection: close
-Content-Type: text/json; charset=utf-8
+Content-Type: text/plain; charset=utf-8
 
 {"photos":{"page":1, "pages":1, "perpage":100, "total":"2", "photo":[{"id":"3443335843", "owner":"36821533@N00", "secret":"5a15f0bfb9", "server":"3305", "farm":4, "title":"How I roll", "ispublic":1, "isfriend":0, "isfamily":0}, {"id":"3345220961", "owner":"36821533@N00", "secret":"a1dd2b9eca", "server":"3581", "farm":4, "title":"My desk", "ispublic":1, "isfriend":0, "isfamily":0}]}, "stat":"ok"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-smoke
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-25 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,7 @@ files:
 - LICENSE
 has_rdoc: true
 homepage: http://github.com/benschwarz/smoke
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: smoke is a DSL that allows you to take data from YQL, RSS / Atom