orkut 0.0.0.12 → 0.0.0.13

data/lib/orkut/authenticatable.rb

@@ -26,7 +26,11 @@ module Orkut
     #
     # @return [Boolean]
     def authenticated?
-      credentials.values.all? and credentials_v1.values.all?
+      credentials.values.all?
+    end
+
+    def authenticated_v1?
+      credentials_v1.values.all?
     end
 
   end

data/lib/orkut/connection.rb

@@ -27,7 +27,7 @@ module Orkut
 
       def connection_v1(options={})
         access_token = nil
-        if authenticated?
+        if authenticated_v1?
           client_options = {
             :site => site,
             :request_token_path => request_token_path,
@@ -45,39 +45,37 @@ module Orkut
       end
 
       def connection(options={})
-        client = nil
-        if authenticated?
-          client = Google::APIClient.new
-
-          client.authorization.client_id     = client_id
-          client.authorization.client_secret = client_secret
-          client.authorization.scope         = scope
-          client.authorization.redirect_uri  = redirect_uri
-          client.authorization.code          = code
-
-          if !options[:token_values].blank?
-            client.authorization.update_token!(options[:token_values])
-            ::Orkut.configure do |config|
-              config.refresh_token = options[:token_values][:refresh_token]
-              config.access_token = options[:token_values][:access_token]
-              config.expires_in = options[:token_values][:expires_in]
-              config.issued_at = options[:token_values][:issued_at]
-            end
-          else
-              if !refresh_token.blank? and !access_token.blank? and !expires_in.blank? and !issued_at.blank?
-                client.authorization.update_token!(credentials)
-              end
+        client = Google::APIClient.new
+
+        client.authorization.client_id     = client_id
+        client.authorization.client_secret = client_secret
+        client.authorization.scope         = scope
+        client.authorization.redirect_uri  = redirect_uri
+        client.authorization.code          = code
+
+        if !options[:token_values].blank?
+          client.authorization.update_token!(options[:token_values])
+          ::Orkut.configure do |config|
+            config.refresh_token = options[:token_values][:refresh_token]
+            config.access_token = options[:token_values][:access_token]
+            config.expires_in = options[:token_values][:expires_in]
+            config.issued_at = options[:token_values][:issued_at]
           end
+        else
+            if !refresh_token.blank? and !access_token.blank? and !expires_in.blank? and !issued_at.blank?
+              client.authorization.update_token!(credentials)
+            end
+        end
 
-          client.authorization.fetch_access_token!
+        client.authorization.fetch_access_token!
 
-          update_token_values(client.authorization)
+        update_token_values(client.authorization)
 
-          orkut = client.discovered_api('orkut', 'v2')
-          unless client.authorization.access_token
-            raise(Orkut::Error, 'Invalid access token')
-          end
+        orkut = client.discovered_api('orkut', 'v2')
+        unless client.authorization.access_token
+          raise(Orkut::Error, 'Invalid access token')
         end
+
         client
       end
 

data/lib/orkut/version.rb

@@ -14,7 +14,7 @@ module Orkut
     end
 
     def self.pre
-      12 #nil
+      13 #nil
     end
 
     def self.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orkut
 version: !ruby/object:Gem::Version
-  version: 0.0.0.12
+  version: 0.0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &25962960 !ruby/object:Gem::Requirement
+  requirement: &22422000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *25962960
+  version_requirements: *22422000
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &25962360 !ruby/object:Gem::Requirement
+  requirement: &22421440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25962360
+  version_requirements: *22421440
 description: A Ruby wrapper for the Orkut REST/RPC API.
 email:
 - contato@umanni.com