oauth2 0.0.11 → 0.0.12

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/intridea/oauth2"
     gem.authors = ["Michael Bleigh"]
     gem.add_dependency 'faraday', '~> 0.4.1'
-    gem.add_dependency 'faraday-middleware'
     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

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/oauth2/client.rb

@@ -28,6 +28,7 @@ module OAuth2
     # <tt>:authorize_url</tt> :: Specify a full URL of the authorization endpoint.
     # <tt>:access_token_path</tt> :: Specify the path to the access token endpoint.
     # <tt>:access_token_url</tt> :: Specify the full URL of the access token endpoint.
+    # <tt>:parse_json</tt> :: If true, <tt>application/json</tt> responses will be automatically parsed.
     def initialize(client_id, client_secret, opts = {})
       adapter         = opts.delete(:adapter)
       self.id         = client_id
@@ -63,7 +64,7 @@ module OAuth2
       end
       case resp.status
         when 200...201 
-          if json? && resp.headers['Content-Type'] == 'application/json'
+          if json? && resp.headers['Content-Type'].include?('application/json')
             ResponseHash.new(resp)
           else
             ResponseString.new(resp)

data/oauth2.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth2}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
@@ -59,18 +59,15 @@ Gem::Specification.new do |s|
 
     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<faraday-middleware>, [">= 0"])
       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<faraday-middleware>, [">= 0"])
       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<faraday-middleware>, [">= 0"])
     s.add_dependency(%q<multi_json>, [">= 0.0.4"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end

data/spec/oauth2/client_spec.rb

@@ -8,7 +8,7 @@ describe OAuth2::Client do
         stub.get('/success')      { |env| [200, {'Content-Type' => 'text/awesome'}, 'yay'] }
         stub.get('/unauthorized') { |env| [401, {}, '']    }
         stub.get('/error')        { |env| [500, {}, '']    }
-        stub.get('/json')         { |env| [200, {'Content-Type' => 'application/json'}, '{"abc":"def"}']}
+        stub.get('/json')         { |env| [200, {'Content-Type' => 'application/json; charset=utf8'}, '{"abc":"def"}']}
       end
     end
     cli

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth2
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -34,24 +34,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: faraday-middleware
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +49,11 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,7 +65,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 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: []