weibo_2 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGE1NGEyNjYyOTNmZjhkYjQzNWE3NjBiODkzM2NlYzA1ZTRkNTFlYg==
-  data.tar.gz: !binary |-
-    ZDdiODcxODI3M2ZhNjkxMmJkYTVhNmU0NzM4M2E0MjYzYzY0ZWUxNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODM1YzIyMDllMzkzNjlkZjIxOWE0YjRhZGY0ZGM5OWJmZjEwNzMwZjY1YjRl
-    MmVjYzQ5M2U2MDVjMTAzNmM2ZmY1ZTg5YWVhNTQwYWQ2NzAzN2FlNzU0NDcw
-    Zjg0ZjRlMWM1ZTk5MDVlYTQzZjZlODc3Yjc3NjA2MzJlYjI5Yzk=
-  data.tar.gz: !binary |-
-    NjAwZjVkZjM4N2RkZDM5YTg3ZmY2YzI5YzMyOTdiMjdlYmNlZGFhNDY3MmU5
-    MzRhMzZjYjJhZjJmNmY3OTc0ZDdkM2M3NTMzOWY5ZTlmYWU0YjEyZmFjZTZl
-    YzUzMWViY2NkNDdhYWM0MGM1NDk2YjNjOTI4Nzc4MzQ3YzkyODY=
+SHA1:
+  metadata.gz: 1b299aa2089651b433978bf94453b12d7d774195
+  data.tar.gz: 6d4e020781516c7f8fd8e35f2c4c9ddb81df011e
+SHA512:
+  metadata.gz: ef22e739cb358b42a7c485a1ef0af9f9ba0820529723c4dc9713b904c398f4f4741172dd89d6a5402b67150834c30b3cb1557a2bbfd4333a961bbab601d2c78a
+  data.tar.gz: 847c227c70be1d65873c94cd560ce7aa65e2840f1c2c1312013c6763902b9904e0cf1bb5c1192f1383e7f844d4bd8bb3a88a71fff6e2652da42d38407d359d6a

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+example/.sass-cache

data/README.md

@@ -2,7 +2,7 @@ Note: I got a lot of inspiration from [this gem](https://github.com/ballantyne/w
 
 # WeiboOAuth2
 
-WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 [API](http://open.weibo.com/wiki/API%E6%96%87%E6%A1%A3_V2), which is currently the latest version. Check out the link if you are interested in browsing the details. The output data format is Hashie::Mash, check out [here](https://github.com/intridea/hashie#mash). If you are not familiar with oauth2, I recommend that you read this [article](http://open.weibo.com/wiki/Oauth2).
+WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 [API](http://open.weibo.com/wiki/API%E6%96%87%E6%A1%A3_V2), which is currently the latest version. Check out the link if you are interested in browsing the details. The output data format is Hashie::Mash, check out [here](https://github.com/intridea/hashie#mash). If you are not familiar with oauth2, I recommend that you read this [article](http://open.weibo.com/wiki/%E6%8E%88%E6%9D%83%E6%9C%BA%E5%88%B6%E8%AF%B4%E6%98%8E).
 
 ## Requirements
 
@@ -20,9 +20,9 @@ $ gem install weibo_2
 
 ## Basic Usage
 
-The example written with sinatra in this directory shows how to ask for oauth2 permission, get the token and send status with picture. It should cover basic usage in all ruby apps. You can visit http://weibo-oauth2-example.herokuapp.com/ to see the demo.
+The example have been moved to [here](https://github.com/simsicon/weibo_2_example). It wiil be more convenient to update.
 
-update: Sorry, the api key I used for this demo is still in the process of auditing by weibo side, it's not available now for connecting. But you can apply your own api key, clone the example in this directory, then type
+The [example](https://github.com/simsicon/weibo_2_example) written with sinatra shows how to ask for oauth2 permission, get the token and send status with picture. It should cover basic usage in all ruby apps. You can run your own demo!
 
 ```bash
 $ KEY=change_this_to_your_key SECRET=change_this_to_your_secret REDIR_URI=change_this_to_your_redir_uri ruby example.rb
@@ -70,13 +70,16 @@ It should work.
     client.statuses.update(params[:status])
     ```
     
-    Upload a picture
+    Upload a picture.
         
     ```ruby
-    tmpfile = params[:file][:tempfile]
-    pic = File.open(tmpfile.path)
-    client.statuses.upload(params[:status], pic)
+    tmpfile = params[:file].delete(:tempfile)
+    File.open(tmpfile.path, 'rb'){|pic| client.statuses.upload(params[:status], pic, params[:file])}
     ```
+
+    pass params[:file] into upload method as options could help weibo_2 to build post body, useful options as:
+    *   filename, filename with extension of the uploading file, example 'pic.jpg'
+    *   type, mime type of the uploading file, example 'image/jpeg'
 ## Setting up SSL certificates
     
     This gem using [faraday](https://github.com/technoweenie/faraday) for connection, which supports ssl. According to [this article](https://github.com/technoweenie/faraday/wiki/Setting-up-SSL-certificates), you can do as following to support ssl connection.

data/lib/weibo_2/api/v2/base.rb

@@ -26,32 +26,47 @@ module WeiboOAuth2
         end
         
         protected
-        def self.mime_type(file)
+        def mime_type(file)
           case
-            when file =~ /\.jpg$/i then 'image/jpg'
+            when file =~ /\.jpeg$/i then 'image/jpeg'
+            when file =~ /\.jpg$/i then 'image/jpeg'
             when file =~ /\.gif$/i then 'image/gif'
             when file =~ /\.png$/i then 'image/png'
-            else 'application/octet-stream'
+            when file =~ /\.tiff$/i then 'image/tiff'
+            else 'image/jpeg'
           end
         end
+
+        def bin_encode(chunk)
+          chunk.force_encoding(Encoding::BINARY) if chunk.respond_to? :force_encoding
+        end
         
         CRLF = "\r\n"
-        def self.build_multipart_bodies(parts)
+        def build_multipart_bodies(parts, opts)
           boundary = Time.now.to_i.to_s(16)
-          body = ""
+
+          body = bin_encode('')
+
           parts.each do |key, value|
             esc_key = CGI.escape(key.to_s)
-            body << "--#{boundary}#{CRLF}"
+            body << bin_encode("--#{boundary}#{CRLF}")
             if value.respond_to?(:read)
-              body << "Content-Disposition: form-data; name=\"#{esc_key}\"; filename=\"#{File.basename(value.path)}\"#{CRLF}"
-              body << "Content-Type: #{mime_type(value.path)}#{CRLF*2}"
-              body << value.read
+              filename = opts.delete(:filename) || File.basename(value.path)
+              mime_type = opts.delete(:type) || mime_type(value.path)
+
+              body << bin_encode("Content-Disposition: form-data; name=\"#{esc_key}\"; filename=\"#{filename}\"#{CRLF}")
+              body << bin_encode("Content-Type: #{mime_type}#{CRLF*2}")
+              body << bin_encode(value.read)
             else
-              body << "Content-Disposition: form-data; name=\"#{esc_key}\"#{CRLF*2}#{value}"
+              body << bin_encode("Content-Disposition: form-data; name=\"#{esc_key}\"#{CRLF*2}#{value}")
             end
-            body << CRLF
-          end
-          body << "--#{boundary}--#{CRLF*2}"
+            body << bin_encode("Content-Transfer-Encoding: binary")
+            body << bin_encode(CRLF)
+
+          end 
+
+          body << bin_encode("--#{boundary}--#{CRLF*2}")
+
           {
             :body => body,
             :headers => {"Content-Type" => "multipart/form-data; boundary=#{boundary}"}

data/lib/weibo_2/api/v2/place.rb

@@ -98,7 +98,7 @@ module WeiboOAuth2
         end
         
         def pois_add_photo(poiid, status, pic, opt={})
-          multipart = Base.build_multipart_bodies({"poiid" => poiid, "status" => status, "pic" => pic}.merge(opt))
+          multipart = build_multipart_bodies({"poiid" => poiid, "status" => status, "pic" => pic}, opt)
           hashie post("place/pois/add_photo.json", :headers => multipart[:headers], :body => multipart[:body])
         end
         

data/lib/weibo_2/api/v2/statuses.rb

@@ -99,7 +99,7 @@ module WeiboOAuth2
         
   
         def upload(status, pic, opt={})
-          multipart = Base.build_multipart_bodies({"status" => status, "pic" => pic}.merge(opt))
+          multipart = build_multipart_bodies({"status" => status, "pic" => pic}, opt)
           hashie post("statuses/upload.json", :headers => multipart[:headers], :body => multipart[:body])
         end
         

data/lib/weibo_2/version.rb

@@ -3,7 +3,7 @@ module WeiboOAuth2
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 1 unless defined? MINOR
-    PATCH = 2 unless defined? PATCH
+    PATCH = 3 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - simsicon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,7 +80,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7
-description: ! "WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with
+description: "WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with
   sina weibo's v2 API, \n                         which is currently the latest version.
   The output data format is Hashie::Mash"
 email:
@@ -94,14 +94,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- example/.sass-cache/80b2331c862c6e430e0af18caf62d12d982610f0/screen.sassc
-- example/.sass-cache/faf9751221db0b5ce76d45351b9591c3bfc59441/screen.sassc
-- example/Gemfile
-- example/config.ru
-- example/example.rb
-- example/views/index.haml
-- example/views/layout.haml
-- example/views/screen.sass
 - lib/weibo_2.rb
 - lib/weibo_2/access_token.rb
 - lib/weibo_2/api/v2/account.rb
@@ -139,12 +131,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -155,3 +147,4 @@ specification_version: 4
 summary: A oauth2 gem for weibo
 test_files:
 - spec/client_spec.rb
+has_rdoc: 

data/example/Gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'sinatra'
-gem "haml"
-gem "sass"
-gem 'weibo_2'
-gem 'time-ago-in-words'

data/example/config.ru

@@ -1,2 +0,0 @@
-require './example.rb'
-run Sinatra::Application

data/example/example.rb

@@ -1,85 +0,0 @@
-# encoding: utf-8
-
-require 'weibo_2'
-require 'time-ago-in-words'
-
-%w(rubygems bundler).each { |dependency| require dependency }
-Bundler.setup
-%w(sinatra haml sass).each { |dependency| require dependency }
-enable :sessions
-
-WeiboOAuth2::Config.api_key = ENV['KEY']
-WeiboOAuth2::Config.api_secret = ENV['SECRET']
-WeiboOAuth2::Config.redirect_uri = ENV['REDIR_URI']
-
-get '/' do
-  client = WeiboOAuth2::Client.new
-  if session[:access_token] && !client.authorized?
-    token = client.get_token_from_hash({:access_token => session[:access_token], :expires_at => session[:expires_at]}) 
-    p "*" * 80 + "validated"
-    p token.inspect
-    p token.validated?
-    
-    unless token.validated?
-      reset_session
-      redirect '/connect'
-      return
-    end
-  end
-  if session[:uid]
-    @user = client.users.show_by_uid(session[:uid]) 
-    @statuses = client.statuses
-  end
-  haml :index
-end
-
-get '/connect' do
-  client = WeiboOAuth2::Client.new
-  redirect client.authorize_url
-end
-
-get '/callback' do
-  client = WeiboOAuth2::Client.new
-  access_token = client.auth_code.get_token(params[:code].to_s)
-  session[:uid] = access_token.params["uid"]
-  session[:access_token] = access_token.token
-  session[:expires_at] = access_token.expires_at
-  p "*" * 80 + "callback"
-  p access_token.inspect
-  @user = client.users.show_by_uid(session[:uid].to_i)
-  redirect '/'
-end
-
-get '/logout' do
-  reset_session
-  redirect '/'
-end 
-
-get '/screen.css' do
-  content_type 'text/css'
-  sass :screen
-end
-
-post '/update' do
-  client = WeiboOAuth2::Client.new
-  client.get_token_from_hash({:access_token => session[:access_token], :expires_at => session[:expires_at]}) 
-  statuses = client.statuses
-
-  unless params[:file] && (tmpfile = params[:file][:tempfile]) && (name = params[:file][:filename])
-    statuses.update(params[:status])
-  else
-    status = params[:status] || '图片'
-    pic = File.open(tmpfile.path)
-    statuses.upload(status, pic)
-  end
-
-  redirect '/'
-end
-
-helpers do 
-  def reset_session
-    session[:uid] = nil
-    session[:access_token] = nil
-    session[:expires_at] = nil
-  end
-end

data/example/views/index.haml

@@ -1,42 +0,0 @@
--if @user
-  %p
-    %h5
-      hello! you are 
-      =@user.screen_name
-      
-  %h3
-    make a weibo!
-  %form{:action => "/update", :method => "POST", :enctype => "multipart/form-data"}
-    %textarea{:id => 'status', :name => "status", :cols => "62", :rows => "5"}
-    %br
-    %input{:id => 'file', :name => 'file',  :type => 'file'}
-    %br
-    %input{:type => "submit", :value => "Send"}
-    
-  %br
-  %br
-  %br  
-  %h3
-    home timeline
-  .statuses
-    -@statuses.friends_timeline.statuses.each do |status|
-      .status
-        %p.text
-          =status.text
-          
-            
-        %br
-        -if status.bmiddle_pic
-          %img{:src => status.bmiddle_pic,  :alt => "", :class => 'pic'}
-          %br
-        .time_and_by
-          =Time.parse(status.created_at).ago_in_words
-          by
-          =status.user.screen_name
-          from
-          =status.source
-        %br
-        %br
-        %br
-        %br
-        

data/example/views/layout.haml

@@ -1,12 +0,0 @@
-!!!
-%html(xml:lang='en' lang='en' xmlns='http://www.w3.org/1999/xhtml')
-  %head
-    %meta(content='text/html;charset=UTF-8' http-equiv='content-type')
-    %title="weibo oauth2 api example"
-    %link{:href => "/screen.css", :rel =>"stylesheet", :type => "text/css", :media => "screen" }
-  %body
-    %h2="weibo oauth2 api example"
-    %a{:href => (session[:uid] ? "/logout" : "/connect")}=(session[:uid] ? "logout" : "connect")
-    = yield
-  %footer
-    %h6="http://github.com/simsicon/weibo_2"

data/example/views/screen.sass

@@ -1,13 +0,0 @@
-.statuses
-  background-color: #CECECE
-  padding: 20px
-  
-  .status
-    background-color: white
-    margin: 10px
-    padding: 20px
-    font-size: 12px
-    
-    .time_and_by
-      margin-top: 10px
-      color: #8F8F8F