weibo_2 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804567e4d657756fd85e6f1ee69d157af8a70c5d
-  data.tar.gz: 62c245c552dbaa0802162bf77442bcda0512bac7
+  metadata.gz: 82d0f89962c79e9e4c84446eca7fa8a721e73c50
+  data.tar.gz: 4514afd94a970bbddfd84058c3fe4a60b2dd946a
 SHA512:
-  metadata.gz: a2ab72bcc012887524bbdbf7f75ea27950b2f81891dd6860f45149e5aec11a35b1ae2474410a3c9e460ebb97a83b84aa2073fc8424bad12314c3a5fe065d6e5e
-  data.tar.gz: c0ffcc212443c76091d9c2e08865a145fb8418e5acbfcfdbbc3e6f144a88559da0d1898b098a20ef522c5f2662220ccfed03dc5681c7dc406714a79f27da80f6
+  metadata.gz: 6c3f8691b5320fda33446296ea059f60102ce8319c00211aa0089725ce5540f7f34e014ae7b1a8e7a69a37c284cbe891223c0a531d1607ec59e4b731ba24b5ae
+  data.tar.gz: 2e5dc929e50444b98b7a0b18233645d3aaf71335d1a17757f61c425155910173ef3163cd6406c437897f0067b7596270352017ae3feaa30edad6a796cfcb9003

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

@@ -17,7 +17,7 @@ module WeiboOAuth2
         end
         
         def hashie(response)
-          json_body = MultiJson.load(response.body)
+          json_body = MultiJson.decode(response.body)
           if json_body.is_a? Array
             Array.new(json_body.count){|i| Hashie::Mash.new(json_body[i])}
           else
@@ -76,4 +76,4 @@ module WeiboOAuth2
       end
     end
   end
-end
+end

data/lib/weibo_2/client.rb

@@ -2,7 +2,9 @@ require 'oauth2'
 
 module WeiboOAuth2
   class Client < OAuth2::Client
- 
+
+    attr_accessor :access_token
+    
     def initialize(client_id='', client_secret='', opts={}, &block)
       client_id = WeiboOAuth2::Config.api_key if client_id.empty?
       client_secret = WeiboOAuth2::Config.api_secret if client_secret.empty?
@@ -11,7 +13,21 @@ module WeiboOAuth2
       @options[:authorize_url] = '/oauth2/authorize'
       @options[:token_url] = '/oauth2/access_token'
     end
-    
+
+    def self.from_code(code, opts={}, &block)
+      client = self.new(opts, &block)
+      client.auth_code.get_token(code)
+
+      client
+    end
+
+    def self.from_hash(hash, opts={}, &block)
+      client = self.new(opts, &block)
+      client.get_token_from_hash(hash)
+
+      client
+    end    
+
     def authorize_url(params={})
       params[:client_id] = @id unless params[:client_id]
       params[:response_type] = 'code' unless params[:response_type]
@@ -93,6 +109,14 @@ module WeiboOAuth2
     def auth_code
       @auth_code ||= WeiboOAuth2::Strategy::AuthCode.new(self)
     end
+
+    def place
+      @place ||= WeiboOAuth2::Api::V2::Place.new(@access_token) if @access_token
+    end
+
+    def location
+      @location ||= WeiboOAuth2::Api::V2::Location.new(@access_token) if @access_token
+    end
     
   end 
 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 = 4 unless defined? PATCH
+    PATCH = 5 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/lib/weibo_2.rb

@@ -17,6 +17,8 @@ require "weibo_2/api/v2/search"
 require "weibo_2/api/v2/short_url"
 require "weibo_2/api/v2/suggestions"
 require "weibo_2/api/v2/remind"
+require "weibo_2/api/v2/place"
+require "weibo_2/api/v2/location"
 require "weibo_2/strategy/auth_code"
 
 

data/weibo_2.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/weibo_2/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["simsicon"]
   gem.email         = ["simsicon@gmail.com"]
-  gem.description   = %q{WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 API, 
+  gem.description   = %q{WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 API,
                          which is currently the latest version. The output data format is Hashie::Mash}
   gem.summary       = "A oauth2 gem for weibo"
   gem.homepage      = "http://github.com/simsicon/weibo_2"
@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.name          = "weibo_2"
   gem.require_paths = ["lib"]
   gem.version       = WeiboOAuth2::Version
-  
+
   gem.add_development_dependency "rspec", "~> 2.6"
-  
+
   gem.add_runtime_dependency 'oauth2', "~> 0.9.1"
   gem.add_runtime_dependency 'hashie', "~> 2.0.4"
-  gem.add_runtime_dependency 'multi_json'  , "~> 1.7.2"
+  gem.add_runtime_dependency 'multi_json'  , "~> 1"
   gem.add_runtime_dependency 'rest-client', "~> 1.6.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - simsicon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -80,9 +80,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7
-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"
+description: |-
+  WeioOAuth2 is a Ruby gem that provides a wrapper for interacting with sina weibo's v2 API,
+                           which is currently the latest version. The output data format is Hashie::Mash
 email:
 - simsicon@gmail.com
 executables: []