weary 1.0.0.rc1 → 1.0.0

data/Gemfile

@@ -4,6 +4,11 @@ gemspec
 
 gem "rake", "~> 0.9.2"
 
+group :test do
+  gem "rspec", "~> 2.9.0"
+  gem "webmock", "~> 1.8.5"
+end
+
 group :doc do
   gem "yard", "~> 0.7.5"
   gem "yard-tomdoc", "~> 0.4.0"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    weary (1.0.0.rc1)
-      addressable (~> 2.2.6)
+    weary (1.0.0)
+      addressable (~> 2.2.7)
       multi_json (~> 1.1.0)
       promise (~> 0.3.0)
       rack (~> 1.4.0)
@@ -11,25 +11,25 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.2.7)
     crack (0.3.1)
     diff-lcs (1.1.3)
     multi_json (1.1.0)
     promise (0.3.0)
     rack (1.4.1)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     simple_oauth (0.1.5)
     tomparse (0.2.0)
-    webmock (1.7.10)
-      addressable (~> 2.2, > 2.2.5)
+    webmock (1.8.5)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yard (0.7.5)
     yard-tomdoc (0.4.0)
@@ -42,8 +42,8 @@ PLATFORMS
 DEPENDENCIES
   jruby-openssl
   rake (~> 0.9.2)
-  rspec (~> 2.8.0)
+  rspec (~> 2.9.0)
   weary!
-  webmock (~> 1.7.10)
+  webmock (~> 1.8.5)
   yard (~> 0.7.5)
   yard-tomdoc (~> 0.4.0)

data/README.md

@@ -131,7 +131,7 @@ Authentication, by default is done by either `Weary::Middleware::BasicAuth` or `
 
 The point is, **it's just Rack**.
 
-## Release Candidate
+## Weary needs your help.
 
 At this point, I need _your_ help to further Weary along. I'd love to see more examples that utilize the Rackness of Weary: using Devise, Warden, or mounted in a Rails application.
 

data/lib/weary/middleware/oauth.rb

@@ -1,17 +1,16 @@
 require 'weary/middleware'
 require 'simple_oauth'
 
+SimpleOAuth::Header::ATTRIBUTE_KEYS << :verifier
+
 module Weary
   module Middleware
     class OAuth
       AUTH_HEADER = "HTTP_AUTHORIZATION"
 
-      def initialize(app, consumer_key, access_token)
+      def initialize(app, oauth_options)
         @app = app
-        @oauth = {
-          :consumer_key => consumer_key,
-          :token => access_token
-        }
+        @oauth = oauth_options
       end
 
       def call(env)

data/lib/weary/request.rb

@@ -5,10 +5,9 @@ require 'rack'
 require 'weary/env'
 require 'weary/adapter'
 
-autoload :Middleware, 'weary/middleware'
-autoload :MultiJson, 'multi_json'
-
 module Weary
+  autoload :Middleware, 'weary/middleware'
+  autoload :MultiJson, 'multi_json'
   # A Request is an interface to an http request. It doesn't actually make the
   # request. Instead, it builds itself up into a Rack environment. A Request
   # object is technically a Rack middleware, with a call method. The Request
@@ -112,10 +111,14 @@ module Weary
       @basic_auth
     end
 
-    def oauth(consumer_key=nil, access_token=nil)
-      if !consumer_key.nil? && !access_token.nil?
+    def oauth(consumer_key=nil, access_token=nil, token_secret=nil, consumer_secret=nil)
+      if !consumer_key.nil?
         @oauth = true
-        use Weary::Middleware::OAuth, [consumer_key, access_token]
+        options = {:consumer_key => consumer_key}
+        options[:token] = access_token unless access_token.nil? || access_token.empty?
+        options[:token_secret] = token_secret unless token_secret.nil? || token_secret.empty?
+        options[:consumer_secret] = consumer_secret unless consumer_secret.nil? || consumer_secret.empty?
+        use Weary::Middleware::OAuth, [options]
       end
       @oauth
     end
@@ -131,7 +134,7 @@ module Weary
     end
 
     def use(middleware, *args, &block)
-      @middlewares << [middleware, args, block]
+      @middlewares << [middleware, args.compact, block]
     end
 
     private

data/lib/weary/resource.rb

@@ -59,7 +59,7 @@ module Weary
     # Rack-friendly).
     def use(middleware, *args, &block)
       @middlewares ||= []
-      @middlewares << [middleware, args, block]
+      @middlewares << [middleware, args.compact, block]
     end
 
     # Convenience method to set a User Agent Header
@@ -84,9 +84,9 @@ module Weary
     #         :consumer_key)
     # token - The parameter in which to expect the user access token (defaults
     #         to :token)
-    def oauth!(key = :consumer_key, token = :token)
+    def oauth!(key = :consumer_key, token = :token, secret = :token_secret, consumer_secret = :consumer_secret)
       @authenticates = :oauth
-      @credentials = [key, token]
+      @credentials = [key, token, secret, consumer_secret]
     end
 
     # Does the Resource anticipate some sort of authentication parameters?
@@ -130,13 +130,13 @@ module Weary
       mapping = url.keys.map {|k| [k, params.delete(k) || params.delete(k.to_sym)] }
       request = Weary::Request.new url.expand(Hash[mapping]), @method do |r|
         r.headers headers
+        if !@middlewares.nil? && !@middlewares.empty?
+          @middlewares.each {|middleware| r.use *middleware }
+        end
         if !expected_params.empty?
           r.params params.reject {|k,v| !expects? k }
         end
         r.send @authenticates, *credentials if authenticates?
-        if !@middlewares.nil? && !@middlewares.empty?
-          @middlewares.each {|middleware| r.use *middleware }
-        end
       end
       yield request if block_given?
       request

data/lib/weary/version.rb

@@ -1,3 +1,3 @@
 module Weary
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0"
 end

data/spec/weary/middleware/oauth_spec.rb

@@ -10,12 +10,12 @@ describe Weary::Middleware::OAuth do
     end
 
     it_behaves_like "a Rack application" do
-      subject { described_class.new(@request, "consumer_key", "access_token") }
+      subject { described_class.new(@request, :consumer_key => "consumer_key", :token => "access_token") }
       let(:env) { @request.env }
     end
 
     it "prepares the Authorization header for the request" do
-      middleware = described_class.new(@request, "consumer_key", "access_token")
+      middleware = described_class.new(@request, :consumer_key => "consumer_key", :token => "access_token")
       middleware.call(@request.env)
       signed_header = middleware.sign(@request.env)
       a_request(:get, @url).

data/spec/weary/request_spec.rb

@@ -183,7 +183,8 @@ describe Weary::Request do
     it "adds a Middleware to the stack to sign the request" do
       req = described_class.new "https://api.github.com/gists", "POST"
       cred = ["consumer_key", "access_token"]
-      req.should_receive(:use).with(Weary::Middleware::OAuth, cred)
+      expected = {:consumer_key => cred.first, :token => cred.last}
+      req.should_receive(:use).with(Weary::Middleware::OAuth, [expected])
       req.oauth *cred
     end
 

data/weary.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors = ["Mark Wunsch"]
   s.email = %q{mark@markwunsch.com}
   s.summary = %q{A framework and DSL for the consumption of RESTful web services.}
-  s.description = %q{A framework and DSL to Ruby clients to RESTful web services. }
+  s.description = %q{A framework and DSL to construct Ruby clients to RESTful web services. }
   s.homepage = %q{http://github.com/mwunsch/weary}
   s.rubyforge_project = %q{weary}
 
@@ -18,10 +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.6"
+  s.add_runtime_dependency "addressable", "~> 2.2.7"
   s.add_runtime_dependency "promise", "~> 0.3.0"
   s.add_runtime_dependency "simple_oauth", "~> 0.1.5"
   s.add_runtime_dependency "multi_json", "~> 1.1.0"
-  s.add_development_dependency "rspec", "~> 2.8.0"
-  s.add_development_dependency "webmock", "~> 1.7.10"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: weary
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Mark Wunsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70096837531960 !ruby/object:Gem::Requirement
+  requirement: &70118788987500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096837531960
+  version_requirements: *70118788987500
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70096837531380 !ruby/object:Gem::Requirement
+  requirement: &70118788986800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70096837531380
+  version_requirements: *70118788986800
 - !ruby/object:Gem::Dependency
   name: promise
-  requirement: &70096837530880 !ruby/object:Gem::Requirement
+  requirement: &70118788985960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096837530880
+  version_requirements: *70118788985960
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70096837530400 !ruby/object:Gem::Requirement
+  requirement: &70118788985280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70096837530400
+  version_requirements: *70118788985280
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70096837529860 !ruby/object:Gem::Requirement
+  requirement: &70118788984680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,30 +65,8 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096837529860
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70096837529320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *70096837529320
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70096837528800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.10
-  type: :development
-  prerelease: false
-  version_requirements: *70096837528800
-description: ! 'A framework and DSL to Ruby clients to RESTful web services. '
+  version_requirements: *70118788984680
+description: ! 'A framework and DSL to construct Ruby clients to RESTful web services. '
 email: mark@markwunsch.com
 executables: []
 extensions: []
@@ -149,13 +127,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3096398000685977380
+      hash: -931495693225517600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -931495693225517600
 requirements: []
 rubyforge_project: weary
 rubygems_version: 1.8.11