weibo_2 0.0.1 → 0.0.2

data/example/Gemfile

@@ -3,4 +3,4 @@ source :rubygems
 gem 'sinatra'
 gem "haml"
 gem "sass"
-gem 'weibo_2', :path => '../'
+gem 'weibo_2'

data/example/config.ru

@@ -1,2 +1,2 @@
-require 'example'
+require './example.rb'
 run Sinatra::Application

data/example/example.rb

@@ -5,7 +5,11 @@ Bundler.setup
 %w(sinatra haml sass).each { |dependency| require dependency }
 enable :sessions
 
-client = WeiboOAuth2::Client.new('1317413087', '79c39d8c66a93bd15f16ed0e999532f9')
+WeiboOAuth2::Config.api_key = ENV['KEY']
+WeiboOAuth2::Config.api_secret = ENV['SECRET']
+WeiboOAuth2::Config.redirect_uri = ENV['REDIR_URI']
+
+client = WeiboOAuth2::Client.new
 
 get '/' do
   if session[:access_token] && !client.authorized?
@@ -18,13 +22,11 @@ get '/' do
 end
 
 get '/connect' do
-  
-  url = client.authorize_url(:redirect_uri => 'http://127.0.0.1:4567/callback')
-  redirect url
+  redirect client.authorize_url
 end
 
 get '/callback' do
-  access_token = client.auth_code.get_token(params[:code].to_s, :redirect_uri => 'http://127.0.0.1:4567/callback')
+  access_token = client.auth_code.get_token(params[:code].to_s)
   session[:uid] = access_token.params["uid"]
   session[:access_token] = access_token.token
   session[:expires_at] = access_token.expires_at

data/lib/weibo_2/client.rb

@@ -3,7 +3,9 @@ require 'oauth2'
 module WeiboOAuth2
   class Client < OAuth2::Client
  
-    def initialize(client_id, client_secret, opts={}, &block)
+    def initialize(client_id='', client_secret='', opts={}, &block)
+      client_id = WeiboOAuth2::Config.api_key if client_id.empty?
+      client_secret = WeiboOAuth2::Config.api_secret if client_secret.empty?
       super
       @site = "https://api.weibo.com/2/"
       @options[:authorize_url] = '/oauth2/authorize'
@@ -13,6 +15,7 @@ module WeiboOAuth2
     def authorize_url(params=nil)
       params[:client_id] = @id unless params[:client_id]
       params[:response_type] = 'code' unless params[:response_type]
+      params[:redirect_uri] = WeiboOAuth2::Config.redirect_uri unless params[:redirect_uri]
       super
     end
     

data/lib/weibo_2/config.rb

@@ -0,0 +1,29 @@
+module WeiboOAuth2
+  module Config
+    
+    def self.api_key=(val)
+      @@api_key = val
+    end
+    
+    def self.api_key
+      @@api_key
+    end
+    
+    def self.api_secret=(val)
+      @@api_secret = val
+    end
+    
+    def self.api_secret
+      @@api_secret
+    end
+    
+    def self.redirect_uri=(val)
+      @@redirect_uri = val
+    end
+    
+    def self.redirect_uri
+      @@redirect_uri
+    end
+
+  end
+end

data/lib/weibo_2/strategy/auth_code.rb

@@ -2,7 +2,9 @@ module WeiboOAuth2
   module Strategy
     class AuthCode < OAuth2::Strategy::AuthCode
       def get_token(code, params={}, opts={})
-        params = {'grant_type' => 'authorization_code', 'code' => code}.merge(client_params).merge(params)
+        params = {'grant_type' => 'authorization_code', 
+                  'code' => code, 
+                  'redirect_uri' => WeiboOAuth2::Config.redirect_uri.to_s}.merge(client_params).merge(params)
         @client.get_and_restore_token(params, opts)
       end
     end

data/lib/weibo_2/version.rb

@@ -1,3 +1,3 @@
 module WeiboOAuth2
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -88,6 +88,7 @@ files:
 - README.md
 - Rakefile
 - example/.sass-cache/80b2331c862c6e430e0af18caf62d12d982610f0/screen.sassc
+- example/.sass-cache/faf9751221db0b5ce76d45351b9591c3bfc59441/screen.sassc
 - example/Gemfile
 - example/config.ru
 - example/example.rb
@@ -115,6 +116,7 @@ files:
 - lib/weibo_2/api/v2/users.rb
 - lib/weibo_2/base.rb
 - lib/weibo_2/client.rb
+- lib/weibo_2/config.rb
 - lib/weibo_2/oauth.rb
 - lib/weibo_2/strategy/auth_code.rb
 - lib/weibo_2/version.rb