oauth_china 0.4.0 → 0.5.0

data/README.md

@@ -1,106 +1,107 @@
 #简介
 
-    通过OAuth方式同步用户消息到微博平台（支持豆瓣，新浪微薄，腾讯微博，搜狐微博，网易微博）
-    和omini-auth的区别：omini-auth是专门提供oauth授权和获取用户信息的gem(比如用新浪微博帐号登陆这种需求)
-    oauth_china是一个方便的同步信息到其他微博平台的gem（用来做像follow5.com或http://fanfou.com/settings/sync这样需求）
+* 通过OAuth方式同步用户消息到微博平台（支持豆瓣，新浪微薄，腾讯微博，搜狐微博，网易微博）
+* 和omini-auth的区别：omini-auth是专门提供oauth授权和获取用户信息的gem(比如用新浪微博帐号登陆这种需求)
+* oauth_china是一个方便的同步信息到其他微博平台的gem（用来做像follow5.com或http://fanfou.com/settings/sync这样需求）
     
-    
-
 #安装
 
-    gem install oauth_china
+``````
+gem install oauth_china
+``````
 
 #使用
 
 * 在Gemfile里添加:
 
-    gem 'oauth'
-    gem 'oauth_china'
+``````
+gem 'oauth'
+gem 'oauth_china'
+``````
 
 *  添加配置文件
 
-        配置文件路径：
-        config/oauth/douban.yml
-        config/oauth/sina.yml
-        config/oauth/qq.yml
-        config/oauth/sohu.yml
-        config/oauth/netease.yml
-
-        配置文件格式：
-        development:
-          key:    "you api key"
-          secret: "your secret"
-          url:    "http://yoursite.com"
-          callback: "http://localhost:3000/your_callback_url"
-        production:
-          key:    "you api key"
-          secret: "your secret"
-          url:    "http://yoursite.com"
-          callback: "http://localhost:3000/your_callback_url"
+``````
+config/oauth/douban.yml
+config/oauth/sina.yml
+config/oauth/qq.yml
+config/oauth/sohu.yml
+config/oauth/netease.yml
+``````
+
+*  配置文件格式：
+        
+``````yaml
+development:
+      key:    "you api key"
+      secret: "your secret"
+      url:    "http://yoursite.com"
+      callback: "http://localhost:3000/your_callback_url"
+production:
+      key:    "you api key"
+      secret: "your secret"
+      url:    "http://yoursite.com"
+      callback: "http://localhost:3000/your_callback_url"
+``````
 
 *  演示
 
-            #config/oauth/sina.yml
-            development:
-                  key:    "you api key"
-                  secret: "your secret"
-                  url:    "http://yoursite.com"
-                  callback: "http://localhost:3000/syncs/sina/callback"
-                production:
-                  key:    "you api key"
-                  secret: "your secret"
-                  url:    "http://yoursite.com"
-                  callback: "http://localhost:3000/syncs/sina/callback"
-
-
-            #config/routes.rb
-            match "syncs/:type/new" => "syncs#new", :as => :sync_new
-            match "syncs/:type/callback" => "syncs#callback", :as => :sync_callback
-
-            #app/controllers/syncs_controller.rb
-            # encoding: UTF-8
-            class SyncsController < ApplicationController
-
-              before_filter :login_required
-
-              def new
-                client = OauthChina::Sina.new
-                authorize_url = client.authorize_url
-                Rails.cache.write(build_oauth_token_key(client.name, client.oauth_token), client.dump)
-                redirect_to authorize_url
-              end
-
-              def callback
-                client = OauthChina::Sina.load(Rails.cache.read(build_oauth_token_key(params[:type], params[:oauth_token])))
-                client.authorize(:oauth_verifier => params[:oauth_verifier])
-
-                results = client.dump
-
-                if results[:access_token] && results[:access_token_secret]
-                  #在这里把access token and access token secret存到db
-                  #下次使用的时候:
-                  #client = OauthChina::Sina.load(:access_token => "xx", :access_token_secret => "xxx")
-                  #client.add_status("同步到新浪微薄..")
-                  flash[:notice] = "授权成功！"
-                else
-                  flash[:notice] = "授权失败!"
-                end
-                redirect_to account_syncs_path
-              end
-
-              private
-              def build_oauth_token_key(name, oauth_token)
-                [name, oauth_token].join("_")
-              end
-
-            end
+``````ruby
+#config/routes.rb
+match "syncs/:type/new" => "syncs#new", :as => :sync_new
+match "syncs/:type/callback" => "syncs#callback", :as => :sync_callback
+
+# encoding: UTF-8
+class SyncsController < ApplicationController
+
+  def new
+    client = OauthChina::Sina.new
+    authorize_url = client.authorize_url
+    Rails.cache.write(build_oauth_token_key(client.name, client.oauth_token), client.dump)
+    redirect_to authorize_url
+  end
+
+  def callback
+    client = OauthChina::Sina.load(Rails.cache.read(build_oauth_token_key(params[:type], params[:oauth_token])))
+    client.authorize(:oauth_verifier => params[:oauth_verifier])
+
+    results = client.dump
+
+    if results[:access_token] && results[:access_token_secret]
+      #在这里把access token and access token secret存到db
+      #下次使用的时候:
+      #client = OauthChina::Sina.load(:access_token => "xx", :access_token_secret => "xxx")
+      #client.add_status("同步到新浪微薄..")
+      flash[:notice] = "授权成功！"
+    else
+      flash[:notice] = "授权失败!"
+    end
+    redirect_to root_path
+  end
+
+  private
+  def build_oauth_token_key(name, oauth_token)
+    [name, oauth_token].join("_")
+  end
+end
+``````
 
 *  注意
 
-       系统时间要正确设置。否则会出现timstamps refused错误
+系统时间要正确设置。否则会出现timstamps refused错误
 
 #API文档
 
-    腾讯微博API文档：http://open.t.qq.com/resource.php?i=1,1
-    新浪微博API文档：http://open.t.sina.com.cn/wiki/index.php/API%E6%96%87%E6%A1%A3
-    豆瓣微博API文档：http://www.douban.com/service/apidoc/reference/
+* 腾讯微博API文档：http://open.t.qq.com/resource.php?i=1,1
+* 新浪微博API文档：http://open.t.sina.com.cn/wiki/index.php/API%E6%96%87%E6%A1%A3
+* 豆瓣微博API文档：http://www.douban.com/service/apidoc/reference/
+
+#License
+  This program is free softwareyou can redistribute it and /or modify
+  it under the terms of the GNU General Public License as published by 
+  the Free Software Foundataioneither version 2 of the License,or (at 
+  your option) any later version.
+
+  You should have read the GNU General Public License before start "RTFSC".
+
+  If not,see <http://www.gnu.org/licenses/>

data/lib/oauth_china/multipart.rb

@@ -12,7 +12,11 @@ module OauthChina
       def to_multipart
         #return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"\r\n\r\n#{v}\r\n"
         # Don't escape mine...
-        return "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n#{v}\r\n"
+        if "".respond_to?(:force_encoding)
+          return "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n#{v}\r\n".force_encoding("ASCII-8BIT")
+        else
+          return "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n#{v}\r\n"
+        end
       end
     end
 
@@ -53,7 +57,7 @@ module OauthChina
             fp.push(Param.new(k,v))
           end
         }
-        body = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("") + "--" + BOUNDARY + "--rn"
+        body = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("") + "--" + BOUNDARY + "--\r\n"
         return body, ContentType
       end
 

data/lib/oauth_china/strategies/qq.rb

@@ -37,17 +37,14 @@ module OauthChina
       self.post("http://open.t.qq.com/api/t/add", options)
     end
 
-    #TODO
+    
     def upload_image(content, image_path, options = {})
-      add_status(content, options)
+      options = options.merge!(:content => content, :pic => File.open(image_path, "rb")).to_options
+      self.consumer.options[:site] = "http://open.t.qq.com/api/t/add_pic"
+      self.consumer.uri("http://open.t.qq.com/api/t/add_pic")
+      upload("http://open.t.qq.com/api/t/add_pic", options)
     end
 
-    #    def upload_image(content, image_path, options = {})
-    #      options = options.merge!(:content => content, :pic => File.open(image_path, "rb")).to_options
-    #
-    #      upload("http://open.t.qq.com/api/t/add_pic", options)
-    #    end
-
 
   end
 end

data/lib/oauth_china/version.rb

@@ -1,3 +1,3 @@
 module OauthChina
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth_china
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Hooopo
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 +08:00
+date: 2012-06-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,12 +40,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
-description: "\xE6\x96\xB0\xE6\xB5\xAA\xEF\xBC\x8C\xE8\xB1\x86\xE7\x93\xA3\xEF\xBC\x8C\xE8\x85\xBE\xE8\xAE\xAF\xE7\xAD\x89\xE5\x9B\xBD\xE5\x86\x85\xE5\xBE\xAE\xE8\x96\x84OAuth\xE8\xAE\xA4\xE8\xAF\x81"
+description: !binary |
+  5paw5rWq77yM6LGG55Oj77yM6IW+6K6v562J5Zu95YaF5b6u6JaET0F1dGjo
+  rqTor4E=
+
 email: 
 - hoooopo@gmail.com
 executables: []
@@ -81,6 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -89,15 +96,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: oauth_china
-rubygems_version: 1.3.7
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
-summary: "\xE6\x96\xB0\xE6\xB5\xAA\xEF\xBC\x8C\xE8\xB1\x86\xE7\x93\xA3\xEF\xBC\x8C\xE8\x85\xBE\xE8\xAE\xAF\xE7\xAD\x89\xE5\x9B\xBD\xE5\x86\x85\xE5\xBE\xAE\xE8\x96\x84OAuth\xE8\xAE\xA4\xE8\xAF\x81"
+summary: !binary |
+  5paw5rWq77yM6LGG55Oj77yM6IW+6K6v562J5Zu95YaF5b6u6JaET0F1dGjo
+  rqTor4E=
+
 test_files: []