weibo_2 0.0.7 → 0.0.8

data/README.md

@@ -77,4 +77,29 @@ It should work.
     pic = File.open(tmpfile.path)
     client.statuses.upload(params[:status], pic)
     ```
+## 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.
+
+    ### Ubuntu
+
+    To locate your SSL certificate folder, type `openssl version -a`. Append `/certs` to the OPENSSLDIR listed, here it would be `/usr/lib/ssl/certs`.
+
+    ```ruby
+        client = WeiboOAuth2::Client.new(YOUR_KEY, YOUR_SECRET, :ssl => {:ca_path => "/usr/lib/ssl/certs"})
+        # or as below if you have set WeiboOAuth2::Config.api_key and WeiboOAuth2::Config.api_secret already
+        # client = WeiboOAuth2::Client.new('', '', :ssl => {:ca_path => "/usr/lib/ssl/certs"})
+    ```
+
+    ### On Heroku, Fedora, CentOS
+
+    ```ruby
+        client = WeiboOAuth2::Client.new(YOUR_KEY, YOUR_SECRET, :ssl => {:ca_file => '/usr/lib/ssl/certs/ca-certificates.crt'})
+        # or as below if you have set WeiboOAuth2::Config.api_key and WeiboOAuth2::Config.api_secret already
+        # client = WeiboOAuth2::Client.new('', '', :ssl => {:ca_file => '/usr/lib/ssl/certs/ca-certificates.crt'})
+    ```
+
+    For Fedora and CentOS, use the path and file `/etc/pki/tls/certs/ca-bundle.crt` instead, or find your system path with `openssl version -a`.
+
+
         

data/example/example.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'weibo_2'
 require 'time-ago-in-words'
 
@@ -10,18 +12,17 @@ WeiboOAuth2::Config.api_key = ENV['KEY']
 WeiboOAuth2::Config.api_secret = ENV['SECRET']
 WeiboOAuth2::Config.redirect_uri = ENV['REDIR_URI']
 
-client = WeiboOAuth2::Client.new
-
 get '/' do
-  puts '* ' * 80
-  puts session.inspect
-  puts !client.authorized?
+  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]}) 
-    puts token.inspect
-    if token.validated?
+    p "*" * 80 + "validated"
+    p token.inspect
+    p token.validated?
+    
+    unless token.validated?
       reset_session
-      redirect 'connect'
+      redirect '/connect'
       return
     end
   end
@@ -33,14 +34,18 @@ get '/' do
 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
@@ -56,13 +61,16 @@ get '/screen.css' do
 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(params[:status], pic)
+    statuses.upload(status, pic)
   end
 
   redirect '/'

data/example/views/layout.haml

@@ -7,4 +7,6 @@
   %body
     %h2="weibo oauth2 api example"
     %a{:href => (session[:uid] ? "/logout" : "/connect")}=(session[:uid] ? "logout" : "connect")
-    = yield
+    = yield
+  %footer
+    %h6="http://github.com/simsicon/weibo_2"

data/lib/weibo_2/access_token.rb

@@ -4,5 +4,17 @@ module WeiboOAuth2
     def validated?
       !!@expires_at && !expired?
     end
+
+    def expired?
+      expires? && (expires_at < self.time_convertion(Time.now, '+08:00').to_i)
+    end
+    
+
+    #Convert Time from a time zone to another time zone
+    #'+08:00' or '-08:00'
+    #return Time
+    def self.time_convertion(time, time_zone)
+      time.getutc.getlocal(time_zone)
+    end  
   end
 end

data/lib/weibo_2/client.rb

@@ -30,8 +30,8 @@ module WeiboOAuth2
     end
     
     def get_token_from_hash(hash)
-      access_token = hash.delete('access_token') || hash.delete(:access_token)
-      opts = {:expires_at => hash["expires"] ||hash[:expires],
+      access_token = hash.delete(:access_token) || hash.delete('access_token')
+      opts = {:expires_at => (hash.delete(:expires_at) || hash.delete('expires_at')),
               :header_format => "OAuth2 %s",
               :param_name => "access_token"}
 

data/lib/weibo_2/version.rb

@@ -1,3 +1,19 @@
 module WeiboOAuth2
-  VERSION = "0.0.7"
+  
+  class Version
+    MAJOR = 0 unless defined? MAJOR
+    MINOR = 0 unless defined? MINOR
+    PATCH = 8 unless defined? PATCH
+    PRE = nil unless defined? PRE
+
+    class << self
+
+      # @return [String]
+      def to_s
+        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+      end
+
+    end
+
+  end
 end

data/spec/client_spec.rb

@@ -0,0 +1,44 @@
+require 'weibo_2'
+
+WeiboOAuth2::Config.api_key = 'abc'
+WeiboOAuth2::Config.api_secret = 'def'
+WeiboOAuth2::Config.redirect_uri = 'https://example.com/callback'
+
+describe WeiboOAuth2::Client do
+  it 'should assign id and secret from config' do
+    subject.id.should == 'abc'
+    subject.secret.should == 'def'
+  end
+
+  it 'should assign site from default' do
+    subject.site.should == 'https://api.weibo.com/2/'
+  end
+
+  it 'should get authorize_url' do
+    authorize_url = 'https://api.weibo.com/oauth2/authorize?client_id=abc&response_type=code&redirect_uri=https%3A%2F%2Fexample.com%2Fcallback'
+    subject.authorize_url.should == authorize_url
+  end
+
+  it 'should leave Faraday::Connection#ssl unset' do
+    subject.connection.ssl.should == {}
+  end
+
+  it "defaults raise_errors to true" do
+    subject.options[:raise_errors].should be_true
+  end
+
+  it "allows true/false for raise_errors option" do
+    client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :raise_errors => false)
+    client.options[:raise_errors].should be_false
+    client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :raise_errors => true)
+    client.options[:raise_errors].should be_true
+  end
+
+  it "allows get/post for access_token_method option" do
+    client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :access_token_method => :get)
+    client.options[:access_token_method].should == :get
+    client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :access_token_method => :post)
+    client.options[:access_token_method].should == :post
+  end
+  
+end

data/weibo_2.gemspec

@@ -13,7 +13,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "weibo_2"
   gem.require_paths = ["lib"]
-  gem.version       = WeiboOAuth2::VERSION
+  gem.version       = WeiboOAuth2::Version
+  
+  gem.add_development_dependency "rspec", "~> 2.6"
   
   gem.add_runtime_dependency 'oauth2', "~> 0.8.0"
   gem.add_runtime_dependency 'hashie', "~> 1.2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +137,7 @@ files:
 - lib/weibo_2/oauth.rb
 - lib/weibo_2/strategy/auth_code.rb
 - lib/weibo_2/version.rb
+- spec/client_spec.rb
 - weibo_2.gemspec
 homepage: ''
 licenses: []
@@ -146,5 +163,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A oauth2 gem for weibo
-test_files: []
+test_files:
+- spec/client_spec.rb
 has_rdoc: