weary 1.0.1 → 1.1.0

data/spec/weary/adapters/excon_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+describe Weary::Adapter::Excon do
+  before do
+    @url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
+    @request = Weary::Request.new @url
+  end
+
+  describe "class methods" do
+    it_behaves_like "an Adapter" do
+      before do
+        stub_request(:get, @url).
+           to_return(:status => 200, :body => "", :headers => {})
+      end
+
+      subject { described_class }
+      let(:env) { @request.env }
+    end
+
+    describe ".call" do
+      it "performs the request through the connect method" do
+        described_class.stub(:connect) { Rack::Response.new("", 200, {})}
+        described_class.should_receive :connect
+        described_class.call(@request.env)
+      end
+    end
+
+    describe ".connect" do
+      before do
+        stub_request(:get, @url)
+      end
+
+      it "performs the http request" do
+        req = Rack::Request.new(@request.env)
+        described_class.connect(req)
+        a_request(:get, @url).should have_been_made
+      end
+
+      it "sets appropriate request headers" do
+        @request.headers 'User-Agent' => Weary::USER_AGENTS['Lynx 2.8.4rel.1 on Linux']
+        req = Rack::Request.new(@request.env)
+        described_class.connect(req)
+        a_request(:get, @url).with(:headers => @request.headers).should have_been_made
+      end
+
+      it "sets the body of the request" do
+        stub_request(:post, @url)
+
+        @request.method = "POST"
+        @request.params :foo => "baz"
+        req = Rack::Request.new(@request.env)
+        described_class.connect(req)
+        a_request(:post, @url).with(:body => "foo=baz").should have_been_made
+      end
+    end
+  end
+
+  describe "#connect" do
+    it "calls the class method `.connect`" do
+      described_class.stub(:connect) { [200, {'Content-Type' => 'text/plain'}, [""]] }
+      described_class.should_receive(:connect)
+      described_class.new.connect(Rack::Request.new(@request.env))
+    end
+  end
+
+  describe "#call" do
+    it "uses the overriden `#connect` method" do
+      instance = described_class.new
+      instance.stub(:connect) { Rack::Response.new [""], 501, {"Content-Type" => "text/plain"} }
+      instance.should_receive(:connect)
+      instance.call(@request.env)
+    end
+  end
+
+  it_behaves_like "an Adapter" do
+    before do
+      stub_request(:get, @url).
+         to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    subject { described_class }
+    let(:env) { @request.env }
+  end
+
+
+end

data/spec/weary/adapters/nethttp_spec.rb

@@ -6,83 +6,92 @@ describe Weary::Adapter::NetHttp do
     @request = Weary::Request.new @url
   end
 
-  describe ".call" do
-    before do
-      stub_request(:get, @url).
-         to_return(:status => 200, :body => "", :headers => {})
-    end
+  describe "class methods" do
+    it_behaves_like "an Adapter" do
+      before do
+        stub_request(:get, @url).
+           to_return(:status => 200, :body => "", :headers => {})
+      end
 
-    it_behaves_like "a Rack application" do
       subject { described_class }
       let(:env) { @request.env }
     end
 
-    it "performs the request through the connect method" do
-      described_class.stub(:connect) { Rack::Response.new("", 200, {})}
-      described_class.should_receive :connect
-      described_class.call(@request.env)
+    describe ".call" do
+      it "performs the request through the connect method" do
+        described_class.stub(:connect) { Rack::Response.new("", 200, {})}
+        described_class.should_receive :connect
+        described_class.call(@request.env)
+      end
     end
-  end
 
-  describe "#call" do
-    it "calls the class method `.call`" do
-      described_class.stub(:call) { [200, {'Content-Type' => 'text/plain'}, [""]] }
-      described_class.should_receive(:call)
-      described_class.new.call(@request.env)
-    end
-  end
+    describe ".connect" do
+      before do
+        stub_request(:get, @url)
+      end
 
-  describe ".connect" do
-    before do
-      stub_request(:get, @url)
-    end
+      it "performs the http request" do
+        req = Rack::Request.new(@request.env)
+        described_class.connect(req)
+        a_request(:get, @url).should have_been_made
+      end
 
-    it "performs the http request" do
-      req = Rack::Request.new(@request.env)
-      described_class.connect(req)
-      a_request(:get, @url).should have_been_made
-    end
+      it "sets appropriate request headers" do
+        @request.headers 'User-Agent' => Weary::USER_AGENTS['Lynx 2.8.4rel.1 on Linux']
+        req = Rack::Request.new(@request.env)
+        described_class.connect(req)
+        a_request(:get, @url).with(:headers => @request.headers).should have_been_made
+      end
 
-    it "returns a Rack::Response" do
-      req = Rack::Request.new(@request.env)
-      described_class.connect(req).should be_kind_of Rack::Response
+      it "sets the body of the request" do
+        stub_request(:post, @url)
+        @request.method = "POST"
+        @request.params :foo => "baz"
+        req = Rack::Request.new(@request.env)
+        described_class.connect(req)
+        a_request(:post, @url).with(:body => "foo=baz").should have_been_made
+      end
     end
 
-    it "sets appropriate request headers" do
-      @request.headers 'User-Agent' => Weary::USER_AGENTS['Lynx 2.8.4rel.1 on Linux']
-      req = Rack::Request.new(@request.env)
-      described_class.connect(req)
-      a_request(:get, @url).with(:headers => @request.headers).should have_been_made
+    describe ".socket" do
+      it "sets up the http connection" do
+        req = Rack::Request.new(@request.env)
+        described_class.socket(req).should be_kind_of Net::HTTP
+      end
     end
 
-    it "sets the body of the request" do
-      stub_request(:post, @url)
-      @request.method = "POST"
-      @request.params :foo => "baz"
-      req = Rack::Request.new(@request.env)
-      described_class.connect(req)
-      a_request(:post, @url).with(:body => "foo=baz").should have_been_made
+    describe ".request_class" do
+      it "gets the Net::HTTP request class for the request method" do
+        described_class.request_class("POST").should be Net::HTTP::Post
+      end
     end
   end
 
-  describe ".normalize_request_headers" do
-    it "removes the HTTP_ prefix from request headers" do
-      @request.headers 'User-Agent' => Weary::USER_AGENTS['Lynx 2.8.4rel.1 on Linux']
-      headers = described_class.normalize_request_headers(@request.env)
-      headers.should have_key "User-Agent"
+  describe "#connect" do
+    it "calls the class method `.connect`" do
+      described_class.stub(:connect) { [200, {'Content-Type' => 'text/plain'}, [""]] }
+      described_class.should_receive(:connect)
+      described_class.new.connect(Rack::Request.new(@request.env))
     end
   end
 
-  describe ".socket" do
-    it "sets up the http connection" do
-      req = Rack::Request.new(@request.env)
-      described_class.socket(req).should be_kind_of Net::HTTP
+  describe "#call" do
+    it "uses the overriden `#connect` method" do
+      instance = described_class.new
+      instance.stub(:connect) { Rack::Response.new [""], 501, {"Content-Type" => "text/plain"} }
+      instance.should_receive(:connect)
+      instance.call(@request.env)
     end
   end
 
-  describe ".request_class" do
-    it "gets the Net::HTTP request class for the request method" do
-      described_class.request_class("POST").should be Net::HTTP::Post
+  it_behaves_like "an Adapter" do
+    before do
+      stub_request(:get, @url).
+         to_return(:status => 200, :body => "", :headers => {})
     end
+
+    subject { described_class.new }
+    let(:env) { @request.env }
   end
+
 end

data/spec/weary/adapters/typhoeus_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+begin
+  describe Weary::Adapter::Typhoeus do
+    before do
+      @url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
+      @request = Weary::Request.new @url
+    end
+
+    describe "class methods" do
+      it_behaves_like "an Adapter" do
+        before do
+          stub_request(:get, @url).
+             to_return(:status => 200, :body => "", :headers => {})
+        end
+
+        subject { described_class }
+        let(:env) { @request.env }
+      end
+
+      describe ".call" do
+        it "performs the request through the connect method" do
+          described_class.stub(:connect) { Rack::Response.new("", 200, {})}
+          described_class.should_receive :connect
+          described_class.call(@request.env)
+        end
+      end
+    end
+
+    describe "#connect" do
+      it "calls the class method `.connect`" do
+        described_class.stub(:connect) { [200, {'Content-Type' => 'text/plain'}, [""]] }
+        described_class.should_receive(:connect)
+        described_class.new.connect(Rack::Request.new(@request.env))
+      end
+    end
+
+    describe "#call" do
+      it "uses the overriden `#connect` method" do
+        instance = described_class.new
+        instance.stub(:connect) { Rack::Response.new [""], 501, {"Content-Type" => "text/plain"} }
+        instance.should_receive(:connect)
+        instance.call(@request.env)
+      end
+    end
+
+    it_behaves_like "an Adapter" do
+      before do
+        stub_request(:get, @url).
+           to_return(:status => 200, :body => "", :headers => {})
+      end
+
+      subject { described_class }
+      let(:env) { @request.env }
+    end
+
+  end
+
+rescue LoadError => e
+  warn <<-MSG
+    [warn] Received a LoadError when attempting to load the Typhoeus adapter,
+    and skipping the specs.
+
+    #{e.message}
+
+    Make sure Typhoeus is in the $LOAD_PATH.
+  MSG
+end

data/spec/weary/client_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 require 'rack/lobster'
 
 describe Weary::Client do
+  it_behaves_like "a Requestable" do
+    subject { Class.new(Weary::Client) }
+  end
+
   describe "::resource" do
     before do
       @url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"

data/spec/weary/deferred_spec.rb

@@ -20,7 +20,7 @@ describe Weary::Deferred do
 
     it "with a factory method" do
       deferred = described_class.new @request.perform, @struct, lambda {|model, response| response.status }
-      deferred.should eq 501
+      deferred.should eql 501
     end
   end
 

data/spec/weary/middleware/basic_auth_spec.rb

@@ -10,12 +10,12 @@ describe Weary::Middleware::BasicAuth do
     end
 
     it_behaves_like "a Rack application" do
-      subject { described_class.new(@request, ["mwunsch", "secret"]) }
+      subject { described_class.new(@request, "mwunsch", "secret") }
       let(:env) { @request.env }
     end
 
     it "prepares the Authorization header for the request" do
-      middleware = described_class.new(@request, ["mwunsch", "secret"])
+      middleware = described_class.new(@request, "mwunsch", "secret")
       middleware.call(@request.env)
       a_request(:get, @url).should have_been_made
     end

data/spec/weary/middleware/timeout_spec.rb

@@ -0,0 +1,24 @@
+require 'weary/middleware/timeout'
+require 'spec_helper'
+
+describe Weary::Middleware::Timeout do
+  describe "#call" do
+    before do
+      @url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
+      @request = Weary::Request.new @url
+      stub_request(:get, @request.uri.to_s).to_timeout
+    end
+
+    it_behaves_like "a Rack application" do
+      subject { described_class.new(@request) }
+      let(:env) { @request.env }
+    end
+
+    it "returns a 504 (Gateway Timeout) when no response is received in time" do
+      middleware = described_class.new(@request)
+      status, header, body = middleware.call(@request.env)
+      status.should eql 504
+    end
+
+  end
+end

data/spec/weary/request_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Weary::Request do
+  it_behaves_like "a Requestable" do
+    subject { described_class.new "http://github.com/api/v2/json/repos/show/mwunsch/weary" }
+  end
+
   describe "#uri" do
     subject { described_class.new "http://github.com/api/v2/json/repos/show/mwunsch/weary" }
 
@@ -97,16 +101,6 @@ describe Weary::Request do
     subject { described_class.new "http://github.com/api/v2/json/repos/show/mwunsch/weary" }
     let(:hash) { {'User-Agent' => Weary::USER_AGENTS['Lynx 2.8.4rel.1 on Linux']} }
 
-    it "sets headers for the request" do
-      subject.headers(hash)
-      subject.instance_variable_get(:@headers).should eql hash
-    end
-
-    it "gets previously set headers" do
-      subject.headers(hash)
-      subject.headers.should eql hash
-    end
-
     it "updates the env with the Rack-friendly key" do
       subject.headers(hash)
       subject.env.should have_key('HTTP_USER_AGENT')
@@ -118,21 +112,6 @@ describe Weary::Request do
     end
   end
 
-  describe "#user_agent" do
-    subject { described_class.new "http://github.com/api/v2/json/repos/show/mwunsch/weary" }
-    let(:agent) { 'RSpec' }
-
-    it "updates the #headers hash with a User-Agent" do
-      subject.user_agent agent
-      subject.headers.should have_key 'User-Agent'
-    end
-
-    it "sets the user agent for the headers" do
-      subject.user_agent agent
-      subject.headers['User-Agent'].should be agent
-    end
-  end
-
   describe "#params" do
     it "sets the query string for a GET request" do
       req = described_class.new "http://api.twitter.com/version/users/show.json"
@@ -142,8 +121,7 @@ describe Weary::Request do
 
     it "sets the rack input for a POST request" do
       req = described_class.new "https://api.github.com/gists", "POST"
-      req.params :public => true,
-               :files  => { "file1.txt" => { :content => "String file contents"}}
+      req.params :public => true
       req.env['rack.input'].read.should eql req.params
     end
 
@@ -196,20 +174,6 @@ describe Weary::Request do
     end
   end
 
-  describe "#adapter" do
-    subject { described_class.new "http://github.com/api/v2/json/repos/show/mwunsch/weary" }
-
-    it "sets a new adapter to set the connection" do
-      klass = Class.new { include Weary::Adapter }
-      subject.adapter(klass)
-      subject.adapter.should be klass
-    end
-
-    it "defaults to the Net::HTTP adapter" do
-      subject.adapter.should be Weary::Adapter::NetHttp
-    end
-  end
-
   describe "#perform" do
     subject do
       url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
@@ -233,7 +197,7 @@ describe Weary::Request do
   end
 
   describe "#use" do
-    it "adds a middleware to the stack" do
+    it "runs middleware through the calling stack" do
       req = described_class.new "http://github.com/api/v2/json/repos/show/mwunsch/weary"
       req.adapter(Class.new { include Weary::Adapter })
       # Rack::Runtime sets an "X-Runtime" response header