oauth2 0.0.13 → 0.1.0

data/.gitignore

@@ -18,7 +18,16 @@ tmtags
 
 ## PROJECT::GENERAL
 coverage
+doc
 rdoc
+log
+
+## BUNDLER
+*.gem
+.bundle
 pkg
 
+## RCOV
+coverage.data
+
 ## PROJECT::SPECIFIC

data/{spec/spec.opts → .rspec}

@@ -1,2 +1,3 @@
 --color
 --backtrace
+--format=nested

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    oauth2 (0.0.14)
+      faraday (~> 0.5.0)
+      multi_json (~> 0.0.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.1.2)
+    diff-lcs (1.1.2)
+    faraday (0.5.0)
+      addressable (~> 2.1.1)
+      multipart-post (~> 1.0.1)
+      rack (~> 1.2.1)
+    json_pure (1.4.6)
+    multi_json (0.0.4)
+    multipart-post (1.0.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  faraday (~> 0.5.0)
+  json_pure (~> 1.4.6)
+  multi_json (~> 0.0.4)
+  oauth2!
+  rake (~> 0.8)
+  rcov (~> 0.9)
+  rspec (~> 2.0)

data/Rakefile

@@ -1,51 +1,31 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "oauth2"
-    gem.summary = %Q{A Ruby wrapper for the OAuth 2.0 protocol.}
-    gem.description = %Q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
-    gem.email = "michael@intridea.com"
-    gem.homepage = "http://github.com/intridea/oauth2"
-    gem.authors = ["Michael Bleigh"]
-    gem.add_dependency 'faraday', '~> 0.4.1'
-    gem.add_dependency 'multi_json', '>= 0.0.4'
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-
-  task :spec => :check_dependencies
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'rspec/core/rake_task'
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w[--color]
 end
 
-begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
+task :cleanup_rcov_files do
+  rm_rf 'coverage.data'
+end
 
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
+namespace :spec do
+  desc "Run all examples using rcov"
+  RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+    t.rcov = true
+    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+    t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
   end
-
-  task :default => :spec
-rescue LoadError
-  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
 end
 
+task :default => :spec
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "oauth2 #{version}"
+  rdoc.title = "oauth2 #{Oauth2::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/oauth2.rb

@@ -8,5 +8,4 @@ require 'oauth2/client'
 require 'oauth2/strategy/base'
 require 'oauth2/strategy/web_server'
 require 'oauth2/access_token'
-require 'oauth2/response_string'
-require 'oauth2/response_hash'
+require 'oauth2/response_object'

data/lib/oauth2/access_token.rb

@@ -9,28 +9,28 @@ module OAuth2
       @expires_in = (expires_in.nil? || expires_in == '') ? nil : expires_in.to_i
       @expires_at = Time.now + @expires_in if @expires_in
     end
-    
+
     # True if the token in question has an expiration time.
     def expires?
       !!@expires_in
     end
-    
+
     def request(verb, path, params = {}, headers = {})
       @client.request(verb, path, params.merge('access_token' => @token), headers.merge('Authorization' => "Token token=\"#{@token}\""))
     end
-    
+
     def get(path, params = {}, headers = {})
       request(:get, path, params, headers)
     end
-    
+
     def post(path, params = {}, headers = {})
       request(:post, path, params, headers)
     end
-    
+
     def put(path, params = {}, headers = {})
       request(:put, path, params, headers)
     end
-    
+
     def delete(path, params = {}, headers = {})
       request(:delete, path, params, headers)
     end

data/lib/oauth2/client.rb

@@ -37,7 +37,7 @@ module OAuth2
       self.options    = opts
       self.connection = Faraday::Connection.new(site)
       self.json       = opts.delete(:parse_json)
-      
+
       if adapter && adapter != :test
         connection.build { |b| b.adapter(adapter) }
       end
@@ -62,16 +62,13 @@ module OAuth2
       else
         resp = connection.run_request(verb, url, params, headers)
       end
+      
       case resp.status
-        when 200...201 
+        when 200...201
           if json?
-            begin
-              ResponseHash.new(resp)
-            rescue StandardError => e
-              ResponseString.new(resp)
-            end
+            return ResponseObject.from(resp)
           else
-            ResponseString.new(resp)
+            return ResponseString.new(resp)
           end
         when 401
           e = OAuth2::AccessDenied.new("Received HTTP 401 during request.")
@@ -83,9 +80,9 @@ module OAuth2
           raise e
       end
     end
-    
+
     def json?; !!@json end
 
     def web_server; OAuth2::Strategy::WebServer.new(self) end
   end
-end
+end

data/lib/oauth2/response_object.rb

@@ -0,0 +1,58 @@
+module OAuth2
+  module ResponseObject
+    def self.from(response)
+      object = MultiJson.decode(response.body)
+
+      case object
+        when Array
+          ResponseArray.new(response, object)
+        when Hash
+          ResponseHash.new(response, object)
+        else
+          ResponseString.new(response)
+      end
+    rescue
+      ResponseString.new(response)
+    end
+  
+    def self.included(base)
+      base.class_eval do
+        attr_accessor :response
+      end
+    end
+  
+    def headers; response.headers end
+    def status; response.status end
+  end
+  
+  class ResponseHash < Hash
+    include ResponseObject
+  
+    def initialize(response, hash)
+      self.response = response
+      hash.keys.each{|k| self[k] = hash[k]}
+    end
+  end
+  
+  class ResponseArray < Array
+    include ResponseObject
+  
+    def initialize(response, array)
+      self.response = response
+      super(array)
+    end
+  end
+  
+  # This special String class is returned from HTTP requests
+  # and contains the original full response along with convenience
+  # methods for accessing the HTTP status code and headers. It
+  # is returned from all access token requests.
+  class ResponseString < String
+    include ResponseObject
+
+    def initialize(response)
+      super(response.body)
+      self.response = response
+    end
+  end
+end

data/lib/oauth2/strategy/base.rb

@@ -4,20 +4,20 @@ module OAuth2
       def initialize(client)#:nodoc:
         @client = client
       end
-    
+
       def authorize_url(options = {}) #:nodoc:
         @client.authorize_url(authorize_params(options))
       end
-    
+
       def authorize_params(options = {}) #:nodoc:
-        options = options.inject({}){|h,(k,v)| h[k.to_s] = v; h}
+        options = options.inject({}){|h, (k, v)| h[k.to_s] = v; h}
         {'client_id' => @client.id}.merge(options)
       end
-      
+
       def access_token_url(options = {})
         @client.access_token_url(access_token_params(options))
       end
-      
+
       def access_token_params(options = {})
         {
           'client_id' => @client.id,
@@ -26,4 +26,4 @@ module OAuth2
       end
     end
   end
-end
+end

data/lib/oauth2/strategy/web_server.rb

@@ -6,7 +6,7 @@ module OAuth2
       def authorize_params(options = {}) #:nodoc:
         super(options).merge('type' => 'web_server')
       end
-      
+
       # Retrieve an access token given the specified validation code.
       # Note that you must also provide a <tt>:redirect_uri</tt> option
       # in order to successfully verify your request for most OAuth 2.0
@@ -26,13 +26,13 @@ module OAuth2
         expires_in = params['expires_in']
         OAuth2::AccessToken.new(@client, access, refresh, expires_in)
       end
-      
+
       # <b>DEPRECATED:</b> Use #get_access_token instead.
       def access_token(*args)
         warn '[DEPRECATED] OAuth2::Strategy::WebServer#access_token is deprecated, use #get_access_token instead. Will be removed in 0.1.0'
         get_access_token(*args)
       end
-      
+
       def access_token_params(code, options = {}) #:nodoc:
         super(options).merge({
           'type' => 'web_server',

data/lib/oauth2/version.rb

@@ -0,0 +1,3 @@
+module Oauth2
+  VERSION = "0.1.0"
+end

data/oauth2.gemspec

@@ -1,75 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/oauth2/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{oauth2}
-  s.version = "0.0.13"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name = "oauth2"
+  s.version = Oauth2::VERSION
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-08-17}
   s.description = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
-  s.email = %q{michael@intridea.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/oauth2.rb",
-     "lib/oauth2/access_token.rb",
-     "lib/oauth2/client.rb",
-     "lib/oauth2/response_hash.rb",
-     "lib/oauth2/response_string.rb",
-     "lib/oauth2/strategy/base.rb",
-     "lib/oauth2/strategy/web_server.rb",
-     "oauth2.gemspec",
-     "spec/oauth2/access_token_spec.rb",
-     "spec/oauth2/client_spec.rb",
-     "spec/oauth2/strategy/base_spec.rb",
-     "spec/oauth2/strategy/web_server_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "specs.watchr"
-  ]
-  s.homepage = %q{http://github.com/intridea/oauth2}
+  s.summary = %q{A Ruby wrapper for the OAuth 2.0 protocol.}
+  s.email = "michael@intridea.com"
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
   s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/intridea/oauth2"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A Ruby wrapper for the OAuth 2.0 protocol.}
-  s.test_files = [
-    "spec/oauth2/access_token_spec.rb",
-     "spec/oauth2/client_spec.rb",
-     "spec/oauth2/strategy/base_spec.rb",
-     "spec/oauth2/strategy/web_server_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday>, ["~> 0.4.1"])
-      s.add_runtime_dependency(%q<multi_json>, [">= 0.0.4"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<faraday>, ["~> 0.4.1"])
-      s.add_dependency(%q<multi_json>, [">= 0.0.4"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<faraday>, ["~> 0.4.1"])
-    s.add_dependency(%q<multi_json>, [">= 0.0.4"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.add_runtime_dependency("faraday", "~> 0.5.0")
+  s.add_runtime_dependency("multi_json", "~> 0.0.4")
+  s.add_development_dependency("json_pure", "~> 1.4.6")
+  s.add_development_dependency("rake", "~> 0.8")
+  s.add_development_dependency("rcov", "~> 0.9")
+  s.add_development_dependency("rspec", "~> 2.0")
 end
-

data/spec/oauth2/access_token_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe OAuth2::AccessToken do
-  let(:client) do 
-    cli = OAuth2::Client.new('abc','def', :site => 'https://api.example.com')
+  let(:client) do
+    cli = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com')
     cli.connection.build do |b|
       b.adapter :test do |stub|
         stub.get('/client?access_token=monkey') { |env| [200, {}, 'get']    }
@@ -34,27 +34,27 @@ describe OAuth2::AccessToken do
       end
     end
   end
-  
+
   describe '#expires?' do
     it 'should be false if there is no expires_at' do
       OAuth2::AccessToken.new(client, token).should_not be_expires
     end
-    
+
     it 'should be true if there is an expires_at' do
       OAuth2::AccessToken.new(client, token, 'abaca', 600).should be_expires
     end
   end
-  
+
   describe '#expires_at' do
     before do
       @now = Time.now
       Time.stub!(:now).and_return(@now)
     end
-    
+
     subject{ OAuth2::AccessToken.new(client, token, 'abaca', 600)}
-    
+
     it 'should be a time representation of #expires_in' do
       subject.expires_at.should == (@now + 600)
     end
   end
-end
+end

data/spec/oauth2/client_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OAuth2::Client do
   subject do
-    cli = OAuth2::Client.new('abc','def', :site => 'https://api.example.com')
+    cli = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com')
     cli.connection.build do |b|
       b.adapter :test do |stub|
         stub.get('/success')      { |env| [200, {'Content-Type' => 'text/awesome'}, 'yay'] }
@@ -13,13 +13,13 @@ describe OAuth2::Client do
     end
     cli
   end
-  
+
   describe '#initialize' do
     it 'should assign id and secret' do
       subject.id.should == 'abc'
       subject.secret.should == 'def'
     end
-    
+
     it 'should assign site from the options hash' do
       subject.site.should == 'https://api.example.com'
     end
@@ -28,18 +28,18 @@ describe OAuth2::Client do
       subject.connection.host.should == 'api.example.com'
     end
   end
-  
+
   %w(authorize access_token).each do |path_type|
     describe "##{path_type}_url" do
       it "should default to a path of /oauth/#{path_type}" do
         subject.send("#{path_type}_url").should == "https://api.example.com/oauth/#{path_type}"
       end
-    
+
       it "should be settable via the :#{path_type}_path option" do
         subject.options[:"#{path_type}_path"] = '/oauth/custom'
         subject.send("#{path_type}_url").should == 'https://api.example.com/oauth/custom'
       end
-    
+
       it "should be settable via the :#{path_type}_url option" do
         subject.options[:"#{path_type}_url"] = 'https://abc.com/authorize'
         subject.send("#{path_type}_url").should == 'https://abc.com/authorize'
@@ -67,31 +67,32 @@ describe OAuth2::Client do
   it '#web_server should instantiate a WebServer strategy with this client' do
     subject.web_server.should be_kind_of(OAuth2::Strategy::WebServer)
   end
-  
+
   context 'with JSON parsing' do
     before do
       subject.json = true
     end
-    
+
     describe '#request' do
       it 'should return a response hash' do
-        response = subject.request(:get, '/json', {}, {})
-        response.should be_kind_of(ResponseHash)
+        response = subject.request(:get, '/json')
+        puts response.inspect
+        response.should be_kind_of(OAuth2::ResponseHash)
         response['abc'].should == 'def'
       end
-      
+
       it 'should only try to decode application/json' do
         subject.request(:get, '/success').should == 'yay'
       end
     end
-    
+
     it 'should set json? based on the :parse_json option' do
-      OAuth2::Client.new('abc','def', :site => 'http://example.com', :parse_json => true).should be_json
-      OAuth2::Client.new('abc','def', :site => 'http://example.com', :parse_json => false).should_not be_json
+      OAuth2::Client.new('abc', 'def', :site => 'http://example.com', :parse_json => true).should be_json
+      OAuth2::Client.new('abc', 'def', :site => 'http://example.com', :parse_json => false).should_not be_json
     end
-    
+
     after do
       subject.json = false
     end
   end
-end
+end

data/spec/oauth2/strategy/base_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe OAuth2::Strategy::Base do
   it 'should initialize with a Client' do
-    lambda{ OAuth2::Strategy::Base.new(OAuth2::Client.new('abc','def')) }.should_not raise_error
+    lambda{ OAuth2::Strategy::Base.new(OAuth2::Client.new('abc', 'def')) }.should_not raise_error
   end
-end
+end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe OAuth2::Strategy::WebServer do
   let(:client) do
-    cli = OAuth2::Client.new('abc','def', :site => 'http://api.example.com')
+    cli = OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com')
     cli.connection.build do |b|
       b.adapter :test do |stub|
-        stub.post('/oauth/access_token') do |env| 
+        stub.post('/oauth/access_token') do |env|
           case @mode
             when "formencoded"
               [200, {}, 'expires_in=600&access_token=salmon&refresh_token=trout']
@@ -23,11 +23,11 @@ describe OAuth2::Strategy::WebServer do
     it 'should include the client_id' do
       subject.authorize_url.should be_include('client_id=abc')
     end
-    
+
     it 'should include the type' do
       subject.authorize_url.should be_include('type=web_server')
     end
-    
+
     it 'should include passed in options' do
       cb = 'http://myserver.local/oauth/callback'
       subject.authorize_url(:redirect_uri => cb).should be_include("redirect_uri=#{Rack::Utils.escape(cb)}")
@@ -52,14 +52,14 @@ describe OAuth2::Strategy::WebServer do
       it 'returns AccessToken with #refresh_token' do
         @access.refresh_token.should == 'trout'
       end
-      
+
       it 'returns AccessToken with #expires_in' do
         @access.expires_in.should == 600
       end
-      
+
       it 'returns AccessToken with #expires_at' do
         @access.expires_at.should be_kind_of(Time)
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -2,11 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'oauth2'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
 Faraday.default_adapter = :test
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth2
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 13
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -05:00
+date: 2010-10-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -51,21 +51,66 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json_pure
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 4
+        - 6
+        version: 1.4.6
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id006
 description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.
 email: michael@intridea.com
 executables: []
@@ -78,24 +123,25 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/oauth2.rb
 - lib/oauth2/access_token.rb
 - lib/oauth2/client.rb
-- lib/oauth2/response_hash.rb
-- lib/oauth2/response_string.rb
+- lib/oauth2/response_object.rb
 - lib/oauth2/strategy/base.rb
 - lib/oauth2/strategy/web_server.rb
+- lib/oauth2/version.rb
 - oauth2.gemspec
 - spec/oauth2/access_token_spec.rb
 - spec/oauth2/client_spec.rb
 - spec/oauth2/strategy/base_spec.rb
 - spec/oauth2/strategy/web_server_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - specs.watchr
 has_rdoc: true
@@ -121,10 +167,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 

data/VERSION

@@ -1 +0,0 @@
-0.0.13

data/lib/oauth2/response_hash.rb

@@ -1,13 +0,0 @@
-class ResponseHash < Hash
-  def initialize(response)
-    self.response = response
-    
-    body = MultiJson.decode(response.body)
-    body.keys.each{|k| self[k] = body[k]}
-  end
-  
-  attr_accessor :response
-  
-  def status; response.status end
-  def headers; response.headers end
-end

data/lib/oauth2/response_string.rb

@@ -1,15 +0,0 @@
-# This special String class is returned from HTTP requests
-# and contains the original full response along with convenience
-# methods for accessing the HTTP status code and headers. It
-# is returned from all access token requests.
-class ResponseString < String
-  def initialize(response)
-    super(response.body)
-    self.response = response
-  end
-    
-  attr_accessor :response
-  
-  def status; response.status end
-  def headers; response.headers end
-end