oauth_china 0.1.0 → 0.1.1

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.swp
 .bundle
 Gemfile.lock
 pkg/*

data/lib/oauth_china/multipart.rb

@@ -0,0 +1,73 @@
+module Multipart
+  # From: http://deftcode.com/code/flickr_upload/multipartpost.rb
+  # Helper class to prepare an HTTP POST request with a file upload
+  # Mostly taken from
+  # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/113774
+  # WAS:
+  # Anything that's broken and wrong probably the fault of Bill Stilwell
+  # (bill@marginalia.org)
+  # NOW:
+  # Everything wrong is due to keith@oreilly.com
+  require 'rubygems'
+  require 'mime/types'
+  require 'net/http'
+  require 'cgi'
+
+  class Param
+    attr_accessor :k, :v
+    def initialize(k, v)
+      @k = k
+      @v = v
+    end
+
+    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"
+    end
+  end
+
+  class FileParam
+    attr_accessor :k, :filename, :content
+    def initialize(k, filename, content)
+      @k = k
+      @filename = filename
+      @content = content
+    end
+
+    def to_multipart
+      #return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"; filename=\"#{filename}\"\r\n" + "Content-Transfer-Encoding: binary\r\n" + "Content-Type: #{MIME::Types.type_for(@filename)}\r\n\r\n" + content + "\r\n "
+      # Don't escape mine
+      return "Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{filename}\"\r\n" + "Content-Transfer-Encoding: binary\r\n" + "Content-Type: #{MIME::Types.type_for(@filename)}\r\n\r\n" + content + "\r\n"
+    end
+  end
+  class MultipartPost
+
+    BOUNDARY = 'tarsiers-rule0000'
+    ContentType = "multipart/form-data; boundary=" + BOUNDARY
+
+    def set_form_data(req, params)
+      body, content_type = prepare_query(params)
+      req["Content-Type"] = content_type
+      req.body = body
+      req["Content-Length"] = body.bytesize
+      req
+    end
+
+    def prepare_query(params)
+      fp = []
+      params.each {|k,v|
+        if v.respond_to?(:read)
+          fp.push(FileParam.new(k, v.path, v.read))
+          v.close
+        else
+          fp.push(Param.new(k,v))
+        end
+      }
+      body = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("") + "--" + BOUNDARY + "--rn"
+      return body, ContentType
+    end
+
+
+  end  
+end

data/lib/oauth_china/strategies/douban.rb

@@ -39,6 +39,11 @@ module OauthChina
         XML
     end
 
+    #TODO
+    def upload_image(content, image_path, options = {})
+      add_status(content, options)
+    end
+
     protected
     def destroy_access_key
       response = delete("/access_token/#{access_token.token}")

data/lib/oauth_china/strategies/netease.rb

@@ -30,5 +30,11 @@ module OauthChina
       options.merge!(:status => content)
       self.post("http://api.t.163.com/statuses/update.json", options)
     end
+
+    #TODO
+    def upload_image(content, image_path, options = {})
+      add_status(content, options)
+    end
+
   end
 end

data/lib/oauth_china/strategies/qq.rb

@@ -36,5 +36,44 @@ module OauthChina
       options.merge!(:content => content)
       self.post("http://open.t.qq.com/api/t/add", options)
     end
+
+    #TODO
+    #还未实现
+    def upload_image(content, image_path, options = {})
+      add_status(content, 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
+    #
+    #    def upload(url, options)
+    #      url  = URI.parse(url)
+    #      http = Net::HTTP.new(url.host, url.port)
+    #      req  = Net::HTTP::Post.new(url.request_uri)
+    #      req  = sign_without_pic_field(req, self.access_token, options)
+    #      req  = set_multipart_field(req, options)
+    #
+    #      http.request(req)
+    #
+    #    end
+    #
+    #    def sign_without_pic_field(req, access_token, options)
+    #      req.set_form_data(params_without_pic_field(options))
+    #      self.consumer.sign!(req, access_token)
+    #      req
+    #    end
+    #
+    #    def set_multipart_field(req, params)
+    #      multipart_post = MultipartPost.new
+    #      multipart_post.set_form_data(req, params)
+    #    end
+    #
+    #    def params_without_pic_field(options)
+    #      options.except(:pic)
+    #    end
+
   end
 end

data/lib/oauth_china/strategies/sina.rb

@@ -28,5 +28,42 @@ module OauthChina
       options.merge!(:status => content)
       self.post("http://api.t.sina.com.cn/statuses/update.json", options)
     end
+
+
+    def upload_image(content, image_path, options = {})
+      options = options.merge!(:status => content, :pic => File.open(image_path, "rb")).to_options
+      upload("http://api.t.sina.com.cn/statuses/upload.json", options)
+    end
+
+    #NOTICE：
+    #各个微博字段名可能不统一
+    def upload(url, options)
+      url  = URI.parse(url)
+      http = Net::HTTP.new(url.host, url.port)
+      
+      req  = Net::HTTP::Post.new(url.request_uri)
+      req  = sign_without_pic_field(req, self.access_token, options)
+      req  = set_multipart_field(req, options)
+      
+      http.request(req)
+    end
+
+    #图片不参与签名
+    def sign_without_pic_field(req, access_token, options)
+      req.set_form_data(params_without_pic_field(options))
+      self.consumer.sign!(req, access_token)
+      req
+    end
+
+    #mutipart编码：http://www.ietf.org/rfc/rfc1867.txt
+    def set_multipart_field(req, params)
+      multipart_post = MultipartPost.new
+      multipart_post.set_form_data(req, params)
+    end
+
+    def params_without_pic_field(options)
+      options.except(:pic)
+    end
+
   end
 end

data/lib/oauth_china/strategies/sohu.rb

@@ -30,5 +30,11 @@ module OauthChina
       options.merge!(:status => content)
       self.post("http://api.t.sohu.com/statuses/update.json", options)
     end
+
+    #TODO
+    def upload_image(content, image_path, options = {})
+      add_status(content, options)
+    end
+    
   end
 end

data/lib/oauth_china/version.rb

@@ -1,3 +1,3 @@
 module OauthChina
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/oauth_china.rb

@@ -1,10 +1,13 @@
 require 'rubygems'
 require 'oauth'
+require File.expand_path(File.join(File.dirname(__FILE__), "oauth_china/multipart")) 
 
 module OauthChina
 
   class OAuth
 
+    include Multipart
+
     CONFIG = {}
 
     attr_accessor  :request_token, :access_token, :consumer_options
@@ -77,4 +80,4 @@ module OauthChina
   autoload :Qq,             'oauth_china/strategies/qq'
   autoload :Sohu,           'oauth_china/strategies/sohu'
   autoload :Netease,        'oauth_china/strategies/netease'
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth_china
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 25
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Hooopo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 +08:00
+date: 2011-05-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - README.md
 - Rakefile
 - lib/oauth_china.rb
+- lib/oauth_china/multipart.rb
 - lib/oauth_china/strategies/douban.rb
 - lib/oauth_china/strategies/netease.rb
 - lib/oauth_china/strategies/qq.rb
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oauth_china
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: !binary |