orkut 0.0.0.10 → 0.0.0.11

data/lib/orkut/client/timelines.rb

@@ -50,9 +50,10 @@ module Orkut
       
       def home_timeline22(options={})
         params = {
-          Orkut::Constants::Fields::USER_ID    => Orkut::Constants::InternalConstants::USERID_ME_SIMPLE,
-          Orkut::Constants::Fields::COLLECTION => Orkut::Constants::Collection::STREAM,
-          Orkut::Constants::Fields::ALT        => Orkut::Constants::Params::JSON
+          Orkut::Constants::Fields::USER_ID      => Orkut::Constants::InternalConstants::USERID_ME_SIMPLE,
+          Orkut::Constants::Fields::COLLECTION   => Orkut::Constants::Collection::STREAM,
+          Orkut::Constants::Fields::ALT          => Orkut::Constants::Params::JSON,
+          Orkut::Constants::Fields::EXTRA_PARAMS => options
         }
         execute(Orkut::Constants::Fields::ACTIVITIES, Orkut::Constants::Action::LIST, params)
       end

data/lib/orkut/connection.rb

@@ -1,5 +1,6 @@
 require 'omniauth/oauth'
 require 'google/api_client'
+require 'orkut/error'
 
 module Orkut
   module Connection
@@ -17,6 +18,10 @@ module Orkut
       client.authorization.authorization_uri.to_s
     end
 
+    def get_connection_hash
+      return get_token_values(connection)
+    end
+
     private
 
       def connection_v1(options={})
@@ -39,7 +44,7 @@ module Orkut
       end
 
       def connection(options={})
-        access_token = nil
+        client = nil
         if authenticated?
           client = Google::APIClient.new
 
@@ -47,17 +52,49 @@ module Orkut
           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!
+
+          update_token_values(client.authorization)
+
           orkut = client.discovered_api('orkut', 'v2')
           unless client.authorization.access_token
-            r = Rack::Response.new
-            r.redirect(client.authorization.authorization_uri.to_s)
-            r.finish
+            raise(Orkut::Error, 'Invalid access token')
           end
         end
-        access_token
+        client
+      end
+
+      def update_token_values(object)
+        ::Orkut.configure do |config|
+          config.refresh_token = object.refresh_token
+          config.access_token = object.access_token
+          config.expires_in = object.expires_in
+          config.issued_at = Time.at(object.issued_at)
+        end
+      end
+
+      def get_token_values(object)
+        return {:refresh_token => object.refresh_token,
+                :access_token  => object.access_token,
+                :expires_in    => object.expires_in,
+                :issued_at     => Time.at(object.issued_at)
+        }
       end
   end
 end

data/lib/orkut/constants/fields.rb

@@ -45,6 +45,7 @@ module Orkut
       # The list of entries in an ACL
       ENTRIES = 'entries'
       ERROR_TYPE = 'errorType'
+      EXTRA_PARAMS = 'extraParams'
       FIELDS = 'fields'
       FROM_USER_ID = 'fromUserId'
       FROM_USER_PROFILE = 'fromUserProfile'

data/lib/orkut/request.rb

@@ -53,11 +53,14 @@ module Orkut
       connection_v1.delete(verify_path(path), headers)
     end
 
-    def execute(entity, action, body = {})
+    def execute(entity, action, params = {})
       raise(Orkut::Error, 'Parameters entity and action cannot be nil') if entity.blank? or action.blank?
-      raise(Orkut::Error, 'Parameter body cannot be nil or empty') if body.blank? or body.empty?
+      raise(Orkut::Error, 'Parameter body cannot be nil or empty') if params.blank? or params.empty?
+
+      extra = params.delete(Orkut::Constants::Fields::EXTRA_PARAMS)
+
       orkut = connection.discovered_api('orkut', 'v2')
-      response = connection.execute(orkut.try(entity.to_sym).try(action.to_sym), body)
+      response = connection(extra).execute(orkut.try(entity.to_sym).try(action.to_sym), params)
       #status, headers, body = response
       response
     end

data/lib/orkut/version.rb

@@ -14,7 +14,7 @@ module Orkut
     end
 
     def self.pre
-      10 #nil
+      11 #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.10
+  version: 0.0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &11806560 !ruby/object:Gem::Requirement
+  requirement: &12602060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *11806560
+  version_requirements: *12602060
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &11805160 !ruby/object:Gem::Requirement
+  requirement: &12601460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11805160
+  version_requirements: *12601460
 description: A Ruby wrapper for the Orkut REST/RPC API.
 email:
 - contato@umanni.com