weibo_2 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/lib/weibo_2/access_token.rb

@@ -2,7 +2,7 @@ module WeiboOAuth2
   class AccessToken < OAuth2::AccessToken
     
     def validated?
-      !!@expires_at && !expired?
+      !!expires_at && !expired?
     end
 
     def expired?

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

@@ -17,7 +17,7 @@ module WeiboOAuth2
         end
         
         def hashie(response)
-          json_body = JSON.parse(response.body)
+          json_body = MultiJson.load(response.body)
           if json_body.is_a? Array
             Array.new(json_body.count){|i| Hashie::Mash.new(json_body[i])}
           else
@@ -28,9 +28,9 @@ module WeiboOAuth2
         protected
         def self.mime_type(file)
           case
-            when file =~ /\.jpg/ then 'image/jpg'
-            when file =~ /\.gif$/ then 'image/gif'
-            when file =~ /\.png$/ then 'image/png'
+            when file =~ /\.jpg$/i then 'image/jpg'
+            when file =~ /\.gif$/i then 'image/gif'
+            when file =~ /\.png$/i then 'image/png'
             else 'application/octet-stream'
           end
         end

data/lib/weibo_2/client.rb

@@ -31,15 +31,11 @@ module WeiboOAuth2
     
     def get_token_from_hash(hash)
       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"}
-
-      @access_token = WeiboOAuth2::AccessToken.new(self, access_token, opts)
+      @access_token = WeiboOAuth2::AccessToken.new( self, access_token, hash.merge(:header_format => 'OAuth2 %s', :param_name => 'access_token') )
     end
     
     def authorized?
-      !!@access_token
+      @access_token && @access_token.validated?
     end
     
     def users
@@ -99,4 +95,4 @@ module WeiboOAuth2
     end
     
   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 = 1 unless defined? PATCH
+    PATCH = 2 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/weibo_2.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
   
   gem.add_development_dependency "rspec", "~> 2.6"
   
-  gem.add_runtime_dependency 'oauth2', "~> 0.8.0"
-  gem.add_runtime_dependency 'hashie', "~> 1.2.0"
-  gem.add_runtime_dependency 'json'  , "~> 1.7.3"
+  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 'rest-client', "~> 1.6.7"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: weibo_2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - simsicon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,55 +27,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -143,28 +132,26 @@ files:
 - weibo_2.gemspec
 homepage: http://github.com/simsicon/weibo_2
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A oauth2 gem for weibo
 test_files:
 - spec/client_spec.rb
-has_rdoc: