oauth_china 0.1.1 → 0.2.0

data/lib/oauth_china/multipart.rb

@@ -1,73 +1,63 @@
-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
+module OauthChina
+  
+  module Multipart
+
+    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
 
-    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"
+    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
-  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
 
-  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/sina.rb

@@ -35,35 +35,7 @@ module OauthChina
       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

@@ -2,7 +2,6 @@ module OauthChina
   class Sohu < OauthChina::OAuth
 
     def initialize(*args)
-      #fuck sohu...!!
       #搜狐微博的OAUTH 只支持将OAuth的认证参数放在HTTP的头部中。而且不可以带realm参数
       self.consumer_options = {
         :site               => 'http://api.t.sohu.com',
@@ -31,9 +30,9 @@ module OauthChina
       self.post("http://api.t.sohu.com/statuses/update.json", options)
     end
 
-    #TODO
     def upload_image(content, image_path, options = {})
-      add_status(content, options)
+      options = options.merge!(:status => content, :pic => File.open(image_path, "rb")).to_options
+      upload("http://api.t.sohu.com/statuses/upload.json", options)
     end
     
   end

data/lib/oauth_china/upload.rb

@@ -0,0 +1,35 @@
+module OauthChina
+  module Upload
+   
+    #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 = Multipart::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/version.rb

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

data/lib/oauth_china.rb

@@ -1,12 +1,17 @@
 require 'rubygems'
 require 'oauth'
-require File.expand_path(File.join(File.dirname(__FILE__), "oauth_china/multipart")) 
+require 'mime/types'
+require 'net/http'
+require 'cgi'
+
+require File.expand_path(File.join(File.dirname(__FILE__), "oauth_china/multipart"))
+require File.expand_path(File.join(File.dirname(__FILE__), "oauth_china/upload"))
 
 module OauthChina
 
   class OAuth
 
-    include Multipart
+    include Upload
 
     CONFIG = {}
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth_china
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Hooopo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +08:00
+date: 2011-05-18 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/oauth_china/strategies/qq.rb
 - lib/oauth_china/strategies/sina.rb
 - lib/oauth_china/strategies/sohu.rb
+- lib/oauth_china/upload.rb
 - lib/oauth_china/version.rb
 - oauth_china.gemspec
 has_rdoc: true