rixi 0.3.7 → 0.3.8

data/Gemfile

@@ -12,6 +12,6 @@ group :development do
   gem "rcov", ">= 0"
 end
 
-gem "oauth2", ">= 0.5.0"
+gem "oauth2", ">= 0.5.1"
 gem "json"
 

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/rixi.rb

@@ -3,29 +3,6 @@ require 'cgi'
 require 'oauth2'
 require 'json'
 
-# monkey patch
-module OAuth2
-  class Client
-    def get_token(params)
-      opts = { :raise_errors => true, :parse => params.delete(:parse)}
-      if options[:token_method] == :post
-        opts[:body] = params
-        opts[:headers] =  { 'Content-Type' => 'application/x-www-form-urlencoded'}
-      else
-        opts[:params] = params
-      end
-      response = request(options[:token_method], token_url, opts)
-      raise Error.new(response) unless response.parsed.is_a?(Hash) && response.parsed['access_token']
-      
-      # OAuth2.0 draft v2-20 => v2-10(mixi)に変更
-      # AccessToken.from_hash(self, response.parsed) 
-      response = response.parsed
-      AccessToken.new(self, response.delete("access_token") || response.delete(:access_token), 
-                      {:mode => :header, :header_format => "OAuth %s"}.merge(response))                     
-    end
-  end
-end
-
 class Rixi
   class APIError < StandardError
     attr_reader :response    
@@ -80,7 +57,7 @@ class Rixi
 
   #自分自身を返す
   def get_token(code)
-    @token = @client.auth_code.get_token(code,{:redirect_uri => @redirect_uri})
+    @token = @client.auth_code.get_token(code, {:redirect_uri => @redirect_uri}, {:mode => :header, :header_format => "OAuth %s"})
     return self
   end
 

data/rixi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rixi}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ainame }]
-  s.date = %q{2011-08-27}
+  s.date = %q{2011-10-01}
   s.description = %q{Rixi is a simply library for mixi graph api in Ruby.}
   s.email = %q{ainame954@facebook.com}
   s.extra_rdoc_files = [
@@ -41,14 +41,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth2>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<oauth2>, [">= 0.5.1"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<oauth2>, [">= 0.5.0"])
+      s.add_dependency(%q<oauth2>, [">= 0.5.1"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<oauth2>, [">= 0.5.0"])
+    s.add_dependency(%q<oauth2>, [">= 0.5.1"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rixi
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-27 00:00:00.000000000Z
+date: 2011-10-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70144550873840 !ruby/object:Gem::Requirement
+  requirement: &70365960681220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70144550873840
+  version_requirements: *70365960681220
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70144550871820 !ruby/object:Gem::Requirement
+  requirement: &70365960661960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144550871820
+  version_requirements: *70365960661960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144550869720 !ruby/object:Gem::Requirement
+  requirement: &70365960661180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70144550869720
+  version_requirements: *70365960661180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70144550864880 !ruby/object:Gem::Requirement
+  requirement: &70365960660360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70144550864880
+  version_requirements: *70365960660360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70144550863920 !ruby/object:Gem::Requirement
+  requirement: &70365960659480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70144550863920
+  version_requirements: *70365960659480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70144550863020 !ruby/object:Gem::Requirement
+  requirement: &70365960658260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144550863020
+  version_requirements: *70365960658260
 description: Rixi is a simply library for mixi graph api in Ruby.
 email: ainame954@facebook.com
 executables: []
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1089382066686224207
+      hash: 228808117772205465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: