oauth2 0.0.9 → 0.0.10

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.0.10 (June 19)
+
+* Handle ActiveSupport JSON case where incompatible string does not raise an error. (via Flameeyes)
+* Depend on latest version of MultiJSON.
+
 == 0.0.9 (June 18)
 
 * Support a JSON token response with swappable JSON parser via MultiJSON.

data/Rakefile

@@ -11,30 +11,34 @@ begin
     gem.homepage = "http://github.com/intridea/oauth2"
     gem.authors = ["Michael Bleigh"]
     gem.add_dependency 'faraday', '~> 0.4.1'
-    gem.add_dependency 'multi_json'
+    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"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-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 :spec => :check_dependencies
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
 
-task :default => :spec
+  task :default => :spec
+rescue LoadError
+  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
+end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/oauth2/strategy/web_server.rb

@@ -13,7 +13,14 @@ module OAuth2
       # endpoints.
       def get_access_token(code, options = {})
         response = @client.request(:post, @client.access_token_url, access_token_params(code, options))
-        params   = MultiJson.decode(response) rescue Rack::Utils.parse_query(response)
+
+        params   = MultiJson.decode(response) rescue nil
+        # the ActiveSupport JSON parser won't cause an exception when
+        # given a formencoded string, so make sure that it was
+        # actually parsed in an Hash. This covers even the case where
+        # it caused an exception since it'll still be nil.
+        params   = Rack::Utils.parse_query(response) unless params.is_a? Hash
+
         access   = params['access_token']
         refresh  = params['refresh_token']
         expires_in = params['expires_in']

data/oauth2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth2}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-06-18}
+  s.date = %q{2010-06-19}
   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 = [
@@ -58,16 +58,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<faraday>, ["~> 0.4.1"])
-      s.add_runtime_dependency(%q<multi_json>, [">= 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<multi_json>, [">= 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<multi_json>, [">= 0"])
+    s.add_dependency(%q<multi_json>, [">= 0.0.4"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -34,8 +34,8 @@ describe OAuth2::Strategy::WebServer do
     end
   end
 
-  describe "#get_access_token" do
-    %w(json formencoded).each do |mode|
+  %w(json formencoded).each do |mode|
+    describe "#get_access_token (#{mode})" do
       before do
         @mode = mode
         @access = subject.get_access_token('sushi')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-06-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency