omniauth-xiaonei 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,9 +1,37 @@
-= Omniauth-renren
+= Omniauth-xiaonei
 
 Omniauth strategy for renren[http://www.renren.com]
 
 = Usage
 
+    gem install omniauth-xiaonei
+
+具体用法请参照Omniauth和example文件夹下的client_side.rb：
+
+    gem install sinatra --no-rdoc --no-ri
+    ruby -rubygems client_side.rb
+
+如果出现"forbidden"等问题，有可能是因为Omniauth-oauth2 1.1.0的bug，可以这样解决：
+
+    # 在Gemfile中加入这一行
+    gem "omniauth-oauth2", :git => "git://github.com/lastomato/omniauth-oauth2.git"
+    # 然后运行
+    bundle install
+
+    # 或者安装 1.0.2版本的Omniauth-oauth2
+    gem install --version "1.0.2" omniauth-oauth2
+
+在config/initializers/omniauth.rb中，可以传入:fields参数，其值为字符串，作用是在认证结束阶段返回用户资料时指定返回的具体内容。
+可以参见人人的文档：http://wiki.dev.renren.com/wiki/Users.getInfo
+
+下面是可以选的值：
+
+"uid,name,sex,star,zidou,vip,birthday,tinyurl,headurl,mainurl,hometown_location,work_history,university_history"
+
+如果不填，那么默认的值为："uid,name,tinyurl,headhurl,zidou,star"
+
+参数的具体含义请参照人人的文档（如上所示）。
+
 Please refer to Omniauth[https://github.com/intridea/omniauth/] for usage
 
 = Thanks

data/example/client_side.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+require "sinatra"
+require "omniauth-xiaonei"
+require "multi_json"
+
+use Rack::Session::Cookie
+
+# set your api_key and api_secret here
+use OmniAuth::Builder do
+  provider :xiaonei, API_KEY, API_SECRET
+end
+
+# sending request
+get "/" do 
+  redirect "/auth/xiaonei"
+end
+
+# callback phase
+get "/auth/:provider/callback" do
+  content_type "application/json"
+  begin
+    MultiJson.encode(request.env)
+  rescue Exception => e
+  end
+end
+
+# in case of failure
+get "/auth/failure" do
+  content_type "application/json"
+  MultiJson.encode(request.env)
+end

data/lib/omniauth-xiaonei.rb

@@ -0,0 +1,2 @@
+require "omniauth/xiaonei"
+

data/lib/omniauth/strategies/{renren.rb → xiaonei.rb}

@@ -1,74 +1,74 @@
-require "faraday"
-require "digest/md5"
-require "omniauth/strategies/oauth2"
-
-module OmniAuth
-  module Strategies
-    class Renren < OmniAuth::Strategies::OAuth2
-      option :name, "renren"
-
-      option :client_options, {
-        :site => "https://graph.renren.com"
-      }
-
-      option :token_params, {
-        :grant_type => "authorization_code"
-      }
-
-      #option :api_url, "http://api.renren.com/restserver.do"
-
-      def request_phase
-        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(authorize_params))
-      end
-
-      def raw_info
-        opts = {
-          :method => "users.getInfo",
-          :v      => "1.0",
-          :format => "JSON",
-          :access_token => access_token.token
-        }.merge!(fields)
-        conn = Faraday.new(:url => "http://api.renren.com") do |faraday|
-          faraday.request  :url_encoded
-          faraday.response :logger
-          faraday.adapter  Faraday.default_adapter
-        end
-        @raw_info ||= parse(conn.post("/restserver.do", append_sig(opts)).body).first || {}
-      end
-
-      uid {
-        raw_info[:uid.to_s]
-      }
-
-      info {
-        (options[:fields] || "name,email_hash,tinyurl,headurl,zidou,star").split(",").inject({}) { |t,v| t[v.to_sym] = raw_info[v];t }
-      }
-
-      extra {
-        hash = {}
-        hash["raw_info"] = raw_info unless skip_info?
-        prune! hash
-      }
-
-      private
-        def append_sig(opts = {})
-          opts.merge!({ :sig => Digest::MD5.hexdigest(opts.inject([]) { |t, v| t << v.join("=") }.sort.join + options.client_secret) })
-        end
-
-        def fields
-          options[:fields] ? { :fields => options[:fields] } : {}
-        end
-
-        def prune!(hash)
-          hash.delete_if do |_, value|
-            prune!(value) if value.is_a?(Hash)
-            value.nil? || (value.respond_to?(:empty?) && value.empty?)
-          end
-        end
-
-        def parse(content)
-          lambda { |body| MultiJson.respond_to?(:adapter) ? MultiJson.load(body) : MultiJson.decode(body) rescue body }.call(content)
-        end
-    end
-  end
+require "faraday"
+require "digest/md5"
+require "omniauth/strategies/oauth2"
+
+module OmniAuth
+  module Strategies
+    class Xiaonei < OmniAuth::Strategies::OAuth2
+      option :name, "xiaonei"
+
+      option :client_options, {
+        :site => "https://graph.renren.com"
+      }
+
+      option :token_params, {
+        :grant_type => "authorization_code"
+      }
+
+      #option :api_url, "http://api.renren.com/restserver.do"
+
+      def request_phase
+        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(authorize_params))
+      end
+
+      def raw_info
+        opts = {
+          :method => "users.getInfo",
+          :v      => "1.0",
+          :format => "JSON",
+          :access_token => access_token.token
+        }.merge!(fields)
+        conn = Faraday.new(:url => "http://api.renren.com") do |faraday|
+          faraday.request  :url_encoded
+          faraday.response :logger
+          faraday.adapter  Faraday.default_adapter
+        end
+        @raw_info ||= parse(conn.post("/restserver.do", append_sig(opts)).body).first || {}
+      end
+
+      uid {
+        raw_info[:uid.to_s]
+      }
+
+      info {
+        (options[:fields] || "name,email_hash,tinyurl,headurl,zidou,star").split(",").inject({}) { |t,v| t[v.to_sym] = raw_info[v];t }
+      }
+
+      extra {
+        hash = {}
+        hash["raw_info"] = raw_info unless skip_info?
+        prune! hash
+      }
+
+      private
+        def append_sig(opts = {})
+          opts.merge!({ :sig => Digest::MD5.hexdigest(opts.inject([]) { |t, v| t << v.join("=") }.sort.join + options.client_secret) })
+        end
+
+        def fields
+          options[:fields] ? { :fields => options[:fields] } : {}
+        end
+
+        def prune!(hash)
+          hash.delete_if do |_, value|
+            prune!(value) if value.is_a?(Hash)
+            value.nil? || (value.respond_to?(:empty?) && value.empty?)
+          end
+        end
+
+        def parse(content)
+          lambda { |body| MultiJson.respond_to?(:adapter) ? MultiJson.load(body) : MultiJson.decode(body) rescue body }.call(content)
+        end
+    end
+  end
 end

data/lib/omniauth/xiaonei.rb

@@ -0,0 +1,2 @@
+require "omniauth/strategies/xiaonei"
+require "omniauth/xiaonei/version"

data/lib/omniauth/xiaonei/version.rb

@@ -0,0 +1,5 @@
+module Omniauth
+  module Xiaonei
+    VERSION = "0.0.3"
+  end
+end

data/omniauth-renren.gemspec

@@ -1,17 +1,17 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "omniauth/renren/version"
+require "omniauth/xiaonei/version"
 
 Gem::Specification.new do |s|
   s.name        = "omniauth-xiaonei"
-  s.version     = Omniauth::Renren::VERSION
+  s.version     = Omniauth::Xiaonei::VERSION
   s.authors     = ["Jie Fan"]
   s.email       = ["ustc.flyingfox@gmail.com"]
   s.homepage    = "https://github.com/lastomato/omniauth-xiaonei"
-  s.summary     = %q{Omniauth strategy for Renren}
-  s.description = %q{Omniauth strategy for Renren}
+  s.summary     = %q{ Omniauth strategy for Renren (Previous Xiaonei) }
+  s.description = %q{ Omniauth strategy for Renren }
 
-  s.rubyforge_project = "omniauth-renren"
+  s.rubyforge_project = "omniauth-xiaonei"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-xiaonei
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Omniauth strategy for Renren
+description: ! ' Omniauth strategy for Renren '
 email:
 - ustc.flyingfox@gmail.com
 executables: []
@@ -54,10 +54,11 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- lib/omniauth-renren.rb
-- lib/omniauth/renren.rb
-- lib/omniauth/renren/version.rb
-- lib/omniauth/strategies/renren.rb
+- example/client_side.rb
+- lib/omniauth-xiaonei.rb
+- lib/omniauth/strategies/xiaonei.rb
+- lib/omniauth/xiaonei.rb
+- lib/omniauth/xiaonei/version.rb
 - omniauth-renren.gemspec
 homepage: https://github.com/lastomato/omniauth-xiaonei
 licenses: []
@@ -78,9 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: omniauth-renren
+rubyforge_project: omniauth-xiaonei
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Omniauth strategy for Renren
+summary: Omniauth strategy for Renren (Previous Xiaonei)
 test_files: []

data/lib/omniauth-renren.rb

@@ -1,2 +0,0 @@
-require "omniauth/renren"
-

data/lib/omniauth/renren.rb

@@ -1,2 +0,0 @@
-require "omniauth/strategies/renren"
-require "omniauth/renren/version"

data/lib/omniauth/renren/version.rb

@@ -1,5 +0,0 @@
-module Omniauth
-  module Renren
-    VERSION = "0.0.2"
-  end
-end