xoauth 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff36db4fe2bd2c912ff958062f467afccd84cd8
-  data.tar.gz: 2c101b864a19b76e600f7daea968c60b5e0ac1f1
+  metadata.gz: a716f73ea3176bb4780244190b31e8d1df2be885
+  data.tar.gz: 964292a77efdb330133bf38fb36ce20ec90aeba5
 SHA512:
-  metadata.gz: 3484f1c7bef635ab0281791228b833c85b4dbdeae9c528b14d3e332f4da290a7f3df60b9389fe9590e587dd667240915f7231bbb82604b2a91d2cb33752f19ac
-  data.tar.gz: da580e963aeee725068c8aff2ab3e2355e8883f2ea844a30927f69be99b9885f9a3e9897be184057242339be74a526ff2b92e7c3559f367cc51cfa8f96f9660a
+  metadata.gz: 92f7ea7e579ef9cea6bfcebfcaad37b2b63388d4a2ca56ccdf6ec05670a40327d32ab02b504da0d889d39ceb5437cd25c74c5116d7a5dc3b696ac14fc08efcf5
+  data.tar.gz: c8e367a6ac675f5cd4e88a9163ec843f77819c449db189f90e2250388a5517bd7eb16ee87cd6b11c948872ca45be84e01cdc85f367306a48a8ac09b12a7912e6

data/README.md

@@ -1,13 +1,13 @@
 # Oauth
 
-TODO: Write a gem description
+Chinese Social network (weibo/qq/weixin currently) authentication with mongoid.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'oauth'
+gem 'xoauth', :require => 'oauth'
 ```
 
 And then execute:
@@ -16,15 +16,40 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install oauth
+    $ gem install xoauth
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+class User
+  include Mongoid::Document
+  include Mongoid::Xoauth
+
+  xoauth weibo: {'appid'=> '1112', 'secret'=> '123dffd'}
+end
+```
+
+Then we can use the following methods:
+
+```ruby
+  # get the found user or nil
+  User.find_by_oauth_uid(uid, Oauth::Weibo)
+  
+  # authorize url
+  Oauth::Weibo.authorize_url
+  
+  # detail of code: {access_token, uid, created_at, expires_in}
+  # can be used to initialize Oauth::Weibo
+  Oauth::Weibo.detail_of_code(code)
+
+  # fetch the detail infomation of the oauth client
+  Oauth::Weibo#fetch_info!
+
+```
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/oauth/fork )
+1. Fork it ( https://github.com/Slacken/xoauth/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/mongoid/xoauth.rb

@@ -15,14 +15,26 @@ module Mongoid
         # config oauths
         params.each_pair{|key, param| Oauth::Configure[key.to_s] = param}
       end
-    end
 
-    def find_by_oauth_uid(uid, klass)
-      where('oauths.uid' => uid.to_s, 'oauths._type' => klass.to_s).first
+      def find_by_oauth(oauth)
+        where('oauths.uid' => oauth.uid, 'oauths._type' => oauth.class.to_s).first
+      end
     end
 
     def oauth(klass)
       self.oauths.find_by(_type: klass.to_s) # "Oauth::#{name.to_s.capitalize}"
     end
+
+    def refresh_oauth(oauth)
+      auth = self.oauth(oauth.class)
+      if auth.access_token == oauth.access_token
+        # check expires_in
+      else
+        %w{access_token created_at expires_in refresh_token}.each do |key|
+          auth[key] = oauth[key]
+        end
+      end
+      auth
+    end
   end
 end

data/lib/oauth/info.rb

@@ -1,7 +1,7 @@
 module Oauth
   class Info
     include Mongoid::Document
-    belongs_to :oauth, class_name: 'Oauth::Provider', inverse_of: :info
+    has_one :oauth, class_name: 'Oauth::Provider', inverse_of: :info
 
     field :data, type: Hash, default: {}
   end

data/lib/oauth/provider/qq.rb

@@ -5,6 +5,16 @@ module Oauth
       api_access('get_user_info')
     end
 
+    def basic_info
+      info && {
+        "name" => info.data["name"],
+        "avatar" => info.data["avatar_hd"] || info.data["avatar_large"],
+        "gender" => info.data["gender"],
+        "location" => info.data["location"],
+        "description" => info.data["description"]
+      }
+    end
+
     def api_access(api, http_params = {}, http_method = 'get')
       url = 'https://graph.qq.com/user/' + api
       http_params.merge!({"access_token" => access_token, "openid"=> uid, "oauth_consumer_key" => Configure['qq']['appid']})
@@ -24,14 +34,14 @@ module Oauth
         end
       end
 
-      def authorize_url
+      def authorize_url(params = {})
         get_params = {
           response_type: 'code',
           client_id: Configure['qq']['appid'],
           redirect_uri: Configure['qq']['callback'],
           state: 1,
           scope: 'get_user_info,get_info,do_like'
-        }
+        }.merge(params)
         "https://graph.qq.com/oauth2.0/authorize?#{URI.encode_www_form(get_params)}"
       end
 
@@ -46,7 +56,6 @@ module Oauth
         response = getJSON('https://graph.qq.com/oauth2.0/token', get_params)
         if response # access_token=xxx&expires_in=7776000&refresh_token=xxx
           detail = Hash[response.split('&').map{|q| q.split('=')}]
-          detail["created_at"] = Time.now
           detail['uid'] = openid(detail["access_token"])
           if detail['uid']
             detail

data/lib/oauth/provider/weibo.rb

@@ -1,9 +1,8 @@
 module Oauth
   class Weibo < Provider
 
-    def follow(uid = nil)
-      uid = Configure['weibo']['official'] if uid.nil?
-      api_access('friendships/create', {'uid'=> uid}, 'post')
+    def follow(uid)
+      api_access('friendships/create', {'uid' => uid}, 'post')
     end
 
     def publish(content)
@@ -14,6 +13,16 @@ module Oauth
       api_access('users/show',{'uid' => uid})
     end
 
+    def basic_info
+      info && {
+        "name" => info.data["name"],
+        "avatar" => info.data["avatar_hd"] || info.data["avatar_large"],
+        "gender" => info.data["gender"],
+        "location" => info.data["location"],
+        "description" => info.data["description"]
+      }
+    end
+
     def api_access(api, http_params, http_method = 'get')
       return nil if expired? # expired
       url = 'https://api.weibo.com/2/' + api + '.json'
@@ -39,13 +48,13 @@ module Oauth
         end
       end
 
-      def authorize_url
+      def authorize_url(params = {})
         get_params = {
           'client_id' => Configure['weibo']['appid'],
           'redirect_uri' => Configure['weibo']['callback'],
           'response_type' => 'code',
           'display' => 'default' # for different divice, default|mobile|wap|client|apponweibo
-        }
+        }.merge(params)
         "https://api.weibo.com/oauth2/authorize?#{URI.encode_www_form(get_params)}";
       end
 
@@ -59,10 +68,7 @@ module Oauth
           'redirect_uri' => Configure['weibo']['callback']
         }
         response = postJSON(url,post_params)
-        if response
-          response["created_at"] = Time.now
-          response.delete('remind_in')
-        end
+        response.delete('remind_in') if response
         response
       end
     end

data/lib/oauth/provider.rb

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'net/https'
 require 'uri'
 require 'json'
 
@@ -8,21 +7,17 @@ module Oauth
     include Mongoid::Document
     field :access_token
     field :uid, type: String
-    field :created_at, type: Time
+    field :created_at, type: Time, default: ->{ Time.now }
     field :expires_in, type: Integer
     field :refresh_token
 
     embedded_in :oauthable, polymorphic: true, inverse_of: :oauth
-    has_one :info, class_name: 'Oauth::Info', inverse_of: :oauth
+    belongs_to :info, class_name: 'Oauth::Info', inverse_of: :oauth
 
     def fetch_info!
       return nil if expired?
       info = fetch_info
-      if info
-        self.info = Info.new(data: info)
-        self.save
-      end
-      self.info
+      info && self.info = Oauth::Info.create(data: info)
     end
 
     def expired?
@@ -40,13 +35,12 @@ module Oauth
 
       def request(url, request_params, method = 'get', format = nil)
         uri = URI(url)
-        klass = (uri.scheme == 'https' ? Net::HTTPS : Net::HTTP)
         begin
           if method == 'get'
             uri.query = (uri.query.nil? ? '' : (uri.query + "&")) + URI.encode_www_form(request_params)
-            response = klass.get_response(uri)
+            response = Net::HTTP.get_response(uri)
           else
-            response = klass.post_form(uri, request_params)
+            response = Net::HTTP.post_form(uri, request_params)
           end
         rescue Exception => e
           puts e.message

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module Oauth
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/oauth.rb

@@ -7,4 +7,5 @@ end
 
 require "oauth/version"
 require "oauth/provider"
+require "oauth/info"
 require "oauth/configure"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xoauth
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - binz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler