weary 1.0.1 → 1.1.0

data/spec/weary/requestable_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Weary::Requestable do
+
+  it_behaves_like "a Requestable" do
+    subject { Class.new { include Weary::Requestable }.new }
+  end
+
+end

data/spec/weary/resource_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Weary::Resource do
+  it_behaves_like "a Requestable" do
+    url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
+    subject { described_class.new "GET", url }
+  end
+
   describe "#url" do
     it "is an Addressable::Template" do
       url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
@@ -67,17 +72,9 @@ describe Weary::Resource do
     end
   end
 
-  describe "#headers" do
-    it "prepares headers for the request" do
-      url = "http://github.com/api/v2/json/repos/show/{user}/{repo}"
-      resource = described_class.new "GET", url
-      resource.headers 'User-Agent' => 'RSpec'
-      resource.headers.should eql 'User-Agent' => 'RSpec'
-    end
-  end
-
   describe "#use" do
     it "adds a middleware to the stack and passes them onto the request" do
+      require 'rack/lobster'
       url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"
       resource = described_class.new "GET", url
       resource.use Rack::Lobster
@@ -86,15 +83,6 @@ describe Weary::Resource do
     end
   end
 
-  describe "#user_agent" do
-    it "updates the #headers hash with a User-Agent" do
-      url = "http://github.com/api/v2/json/repos/show/{user}/{repo}"
-      resource = described_class.new "GET", url
-      resource.user_agent 'RSpec'
-      resource.headers.should eql 'User-Agent' => 'RSpec'
-    end
-  end
-
   describe "#basic_auth!" do
     subject do
       url = "http://github.com/api/v2/json/repos/show/mwunsch/weary"

data/spec/weary/response_spec.rb

@@ -95,5 +95,15 @@ describe Weary::Response do
       response = Weary::Response.new "", 404, {'Content-Type' => 'text/plain'}
       expect { response.parse }.to raise_error
     end
+
+    it "receives an optional block for custom parsing" do
+      message = "Hello, world."
+      dump = Marshal.dump(message)
+      response = Weary::Response.new dump, 200, {'Content-Type' => 'text/plain'}
+      parsed = response.parse do |body, content_type|
+        Marshal.load(body)
+      end
+      parsed.should eql message
+    end
   end
 end

data/weary.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency "rack", "~> 1.4.0"
-  s.add_runtime_dependency "addressable", "~> 2.2.7"
+  s.add_runtime_dependency "addressable", "~> 2.3.2"
   s.add_runtime_dependency "promise", "~> 0.3.0"
   s.add_runtime_dependency "simple_oauth", "~> 0.1.5"
-  s.add_runtime_dependency "multi_json", "~> 1.2.0"
+  s.add_runtime_dependency "multi_json", "~> 1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weary
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70166012867980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70166012867980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70166012867300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70166012867300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: promise
-  requirement: &70166012866680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70166012866680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70166012866020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +69,28 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70166012866020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70166012864500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70166012864500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: ! 'A framework and DSL to construct Ruby clients to RESTful web services. '
 email: mark@markwunsch.com
 executables: []
@@ -82,7 +107,9 @@ files:
 - Rakefile
 - lib/weary.rb
 - lib/weary/adapter.rb
+- lib/weary/adapters/excon.rb
 - lib/weary/adapters/net_http.rb
+- lib/weary/adapters/typhoeus.rb
 - lib/weary/client.rb
 - lib/weary/deferred.rb
 - lib/weary/env.rb
@@ -90,7 +117,9 @@ files:
 - lib/weary/middleware/basic_auth.rb
 - lib/weary/middleware/content_type.rb
 - lib/weary/middleware/oauth.rb
+- lib/weary/middleware/timeout.rb
 - lib/weary/request.rb
+- lib/weary/requestable.rb
 - lib/weary/resource.rb
 - lib/weary/response.rb
 - lib/weary/route.rb
@@ -98,16 +127,22 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_a_rack_app.rb
 - spec/support/shared_examples_for_a_rack_env.rb
+- spec/support/shared_examples_for_a_requestable.rb
 - spec/support/shared_examples_for_a_uri.rb
+- spec/support/shared_examples_for_an_adapter.rb
 - spec/weary/adapter_spec.rb
+- spec/weary/adapters/excon_spec.rb
 - spec/weary/adapters/nethttp_spec.rb
+- spec/weary/adapters/typhoeus_spec.rb
 - spec/weary/client_spec.rb
 - spec/weary/deferred_spec.rb
 - spec/weary/env_spec.rb
 - spec/weary/middleware/basic_auth_spec.rb
 - spec/weary/middleware/content_type_spec.rb
 - spec/weary/middleware/oauth_spec.rb
+- spec/weary/middleware/timeout_spec.rb
 - spec/weary/request_spec.rb
+- spec/weary/requestable_spec.rb
 - spec/weary/resource_spec.rb
 - spec/weary/response_spec.rb
 - spec/weary/route_spec.rb
@@ -133,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: weary
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A framework and DSL for the consumption of RESTful web services.
@@ -141,16 +176,22 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_a_rack_app.rb
 - spec/support/shared_examples_for_a_rack_env.rb
+- spec/support/shared_examples_for_a_requestable.rb
 - spec/support/shared_examples_for_a_uri.rb
+- spec/support/shared_examples_for_an_adapter.rb
 - spec/weary/adapter_spec.rb
+- spec/weary/adapters/excon_spec.rb
 - spec/weary/adapters/nethttp_spec.rb
+- spec/weary/adapters/typhoeus_spec.rb
 - spec/weary/client_spec.rb
 - spec/weary/deferred_spec.rb
 - spec/weary/env_spec.rb
 - spec/weary/middleware/basic_auth_spec.rb
 - spec/weary/middleware/content_type_spec.rb
 - spec/weary/middleware/oauth_spec.rb
+- spec/weary/middleware/timeout_spec.rb
 - spec/weary/request_spec.rb
+- spec/weary/requestable_spec.rb
 - spec/weary/resource_spec.rb
 - spec/weary/response_spec.rb
 - spec/weary/route_spec.rb