orkut 0.0.0.8 → 0.0.0.9

data/lib/orkut/authenticatable.rb

@@ -4,12 +4,21 @@ module Orkut
     # Credentials hash
     #
     # @return [Hash]
-    def credentials
+    def credentials_v1
       {
         :consumer_key => consumer_key,
         :consumer_secret => consumer_secret,
         :token => oauth_token,
-        :token_secret => oauth_token_secret,
+        :token_secret => oauth_token_secret
+      }
+    end
+
+    def credentials
+      {
+        :refresh_token => refresh_token,
+        :access_token => access_token,
+        :expires_in => expires_in,
+        :issued_at => issued_at
       }
     end
 
@@ -17,7 +26,7 @@ module Orkut
     #
     # @return [Boolean]
     def authenticated?
-      credentials.values.all?
+      credentials.values.all? and credentials_v1.values.all?
     end
 
   end

data/lib/orkut/client/comments.rb

@@ -1,10 +1,20 @@
 require 'orkut/client/base'
+require 'orkut/constants/fields'
+require 'orkut/constants/group'
+require 'orkut/constants/internal_constants'
+require 'orkut/constants/method_names'
+require 'orkut/constants/params'
+require 'multi_json'
 
 module Orkut
   class Client
     module Comments 
       include Base
       # TODO implements features
+
+      def get_comments(options={})
+
+      end
     end
   end
 end

data/lib/orkut/client/messages.rb

@@ -21,7 +21,7 @@ module Orkut
           Orkut::Constants::Fields::ID     => request_id.to_s+'-'+Orkut::Constants::MethodNames::CREATE_ACTIVITIES,
           Orkut::Constants::Fields::METHOD => Orkut::Constants::MethodNames::CREATE_ACTIVITIES
         }]
-        MultiJson.decode(post(nil, params.to_s, default_headers).body)
+        MultiJson.decode(post_v1(nil, params.to_s, default_headers).body)
       end
       
       def post_scrap(options={})
@@ -38,7 +38,7 @@ module Orkut
           Orkut::Constants::Fields::ID     => request_id.to_s+'-'+Orkut::Constants::MethodNames::MESSAGES_CREATE,
           Orkut::Constants::Fields::METHOD => Orkut::Constants::MethodNames::MESSAGES_CREATE
         }]
-        MultiJson.decode(post(nil, params.to_s, default_headers).body)
+        MultiJson.decode(post_v1(nil, params.to_s, default_headers).body)
       end
     end
   end

data/lib/orkut/client/people.rb

@@ -23,7 +23,30 @@ module Orkut
           Orkut::Constants::Fields::ID     => request_id.to_s+'-'+Orkut::Constants::MethodNames::PEOPLE_GET,
           Orkut::Constants::Fields::METHOD => Orkut::Constants::MethodNames::PEOPLE_GET
         }]
-        MultiJson.decode(post(nil, params.to_s, default_headers).body)
+        MultiJson.decode(post_v1(nil, params.to_s, default_headers).body)
+      end
+
+      def get_person_full_profile(options={})
+        params = [{
+          Orkut::Constants::Fields::PARAMS => {
+            Orkut::Constants::Fields::FIELDS => [
+                Orkut::Constants::Fields::NAME,
+                Orkut::Constants::Fields::THUMBNAIL_URL,
+                Orkut::Constants::Fields::PROFILE_URL,
+                Orkut::Constants::Fields::STATUS,
+                Orkut::Constants::Fields::EMAILS,
+                Orkut::Constants::Fields::GENDER,
+                Orkut::Constants::Fields::PHONE_NUMBERS,
+                Orkut::Constants::Fields::BIRTHDAY,
+                Orkut::Constants::Fields::CURRENT_LOCATION
+            ],
+            Orkut::Constants::Fields::GROUP_ID => Orkut::Constants::Group::SELF,
+            Orkut::Constants::Fields::USER_ID => (options[:user_id] || Orkut::Constants::InternalConstants::USERID_ME)
+          },
+          Orkut::Constants::Fields::ID     => request_id.to_s+'-'+Orkut::Constants::MethodNames::PEOPLE_GET,
+          Orkut::Constants::Fields::METHOD => Orkut::Constants::MethodNames::PEOPLE_GET
+        }]
+        MultiJson.decode(post_v1(nil, params.to_s, default_headers).body)
       end
       
     end

data/lib/orkut/client/timelines.rb

@@ -1,4 +1,6 @@
 require 'orkut/client/base'
+require 'orkut/constants/action'
+require 'orkut/constants/collection'
 require 'orkut/constants/fields'
 require 'orkut/constants/group'
 require 'orkut/constants/internal_constants'
@@ -24,16 +26,10 @@ module Orkut
           Orkut::Constants::Fields::ID     => request_id.to_s+'-'+Orkut::Constants::MethodNames::ACTIVITIES_GET,
           Orkut::Constants::Fields::METHOD => Orkut::Constants::MethodNames::ACTIVITIES_GET
         }]
-        teste = "[{\"params\":{"
         unless options[:updated_before].blank?
           params.first[Orkut::Constants::Fields::PARAMS][Orkut::Constants::Fields::UPDATED_BEFORE] = format_datetime(options[:updated_before])
-          teste += "\"updatedBefore\":\""+format_datetime(options[:updated_before])+"\","
         end
-        teste += "\"groupId\":\"@all\",\"userId\":\"@me\",\"count\":40,\"coalesce\":true,\"startIndex\":0},\"id\":\"0-activities.get\",\"method\":\"activities.get\"}]\""
-        puts '*********************************************************************************************************'
-        puts teste
-        puts '*********************************************************************************************************'
-        MultiJson.decode(post(nil, params.to_s, default_headers).body)
+        MultiJson.decode(post_v1(nil, params.to_s, default_headers).body)
       end
       
       def scraps_timeline(options={})
@@ -49,7 +45,16 @@ module Orkut
           Orkut::Constants::Fields::ID     => request_id.to_s+'-'+Orkut::Constants::MethodNames::MESSAGES_GET,
           Orkut::Constants::Fields::METHOD => Orkut::Constants::MethodNames::MESSAGES_GET
         }]
-        MultiJson.decode(post(nil, params.to_s, default_headers).body)
+        MultiJson.decode(post_v1(nil, params.to_s, default_headers).body)
+      end
+      
+      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
+        }
+        execute(Orkut::Constants::Fields::ACTIVITIES, Orkut::Constants::Action::LIST, params)
       end
     end
   end

data/lib/orkut/config.rb

@@ -16,7 +16,16 @@ module Orkut
       :consumer_key,
       :consumer_secret,
       :oauth_token,
-      :oauth_token_secret].freeze
+      :oauth_token_secret,
+      :client_id,
+      :client_secret,
+      :scope,
+      :redirect_uri,
+      :refresh_token,
+      :access_token,
+      :expires_in,
+      :issued_at,
+      :code].freeze
 
     DEFAULT_SITE = 'https://www.google.com'.freeze
     
@@ -48,6 +57,24 @@ module Orkut
     # The value sent in the 'User-Agent' header if none is set
     DEFAULT_USER_AGENT = "Orkut Ruby Gem #{Orkut::Version}".freeze
 
+    DEFAULT_CLIENT_ID = nil
+
+    DEFAULT_CLIENT_SECRET = nil
+
+    DEFAULT_SCOPE = 'https://www.googleapis.com/auth/orkut'.freeze
+
+    DEFAULT_REDIRECT_URI = ''
+
+    DEFAULT_REFRESH_TOKEN = nil
+
+    DEFAULT_ACCESS_TOKEN = nil
+
+    DEFAULT_EXPIRES_IN = nil
+
+    DEFAULT_ISSUED_AT = nil
+
+    DEFAULT_CODE = nil
+
     attr_accessor *VALID_OPTIONS_KEYS
 
     # When this module is extended, set all configuration options to their default values
@@ -82,6 +109,15 @@ module Orkut
       self.oauth_token        = DEFAULT_OAUTH_TOKEN
       self.oauth_token_secret = DEFAULT_OAUTH_TOKEN_SECRET
       self.user_agent         = DEFAULT_USER_AGENT
+      self.client_id          = DEFAULT_CLIENT_ID
+      self.client_secret      = DEFAULT_CLIENT_SECRET
+      self.scope              = DEFAULT_SCOPE
+      self.redirect_uri       = DEFAULT_REDIRECT_URI
+      self.refresh_token      = DEFAULT_REFRESH_TOKEN
+      self.access_token       = DEFAULT_ACCESS_TOKEN
+      self.expires_in         = DEFAULT_EXPIRES_IN
+      self.issued_at          = DEFAULT_ISSUED_AT
+      self.code               = DEFAULT_CODE
       self
     end
 

data/lib/orkut/connection.rb

@@ -1,10 +1,11 @@
 require 'omniauth/oauth'
+require 'google/api_client'
 
 module Orkut
   module Connection
   private
 
-    def connection(options={})
+    def connection_v1(options={})
       access_token = nil
       if authenticated?
         client_options = {
@@ -22,6 +23,41 @@ module Orkut
       end
       access_token
     end
+
+    def connection(options={})
+      access_token = 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
+
+        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
+        end
+      end
+      access_token
+    end
+
+    def authorization_uri(options={})
+      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
+
+      orkut = client.discovered_api('orkut', 'v2')
+
+      client.authorization.authorization_uri.to_s
+    end
     
   end
 end

data/lib/orkut/constants/action.rb

@@ -0,0 +1,7 @@
+module Orkut
+  module Constants
+    module Action
+      LIST = 'list'
+    end
+  end
+end

data/lib/orkut/constants/collection.rb

@@ -0,0 +1,9 @@
+module Orkut
+  module Constants
+    module Collection
+      ALL    = 'all'
+      SCRAPS = 'scraps'
+      STREAM = 'stream'
+    end
+  end
+end

data/lib/orkut/constants/fields.rb

@@ -13,7 +13,10 @@ module Orkut
         ACCESSOR_TYPE = 'accessorType'
       end
       
+      ACTIVITIES = 'activities'
       ACTIVITY = 'activity'
+      ACTIVITY_ID = 'activityId'
+      ALT = 'alt'
       BIRTHDAY = 'birthday'
       COUNTRY = 'country'
       CURRENT_LOCATION = 'currentLocation'
@@ -32,6 +35,7 @@ module Orkut
 
       BODY = 'body'
       COALESCE = 'coalesce'
+      COLLECTION = 'collection'
       COMMENTS = 'comments'
       COUNT = 'count'
       CREATED = 'created'
@@ -41,6 +45,7 @@ module Orkut
       # The list of entries in an ACL
       ENTRIES = 'entries'
       ERROR_TYPE = 'errorType'
+      FIELDS = 'fields'
       FROM_USER_ID = 'fromUserId'
       FROM_USER_PROFILE = 'fromUserProfile'
       GENDER = 'gender'

data/lib/orkut/constants/group.rb

@@ -9,5 +9,11 @@ module Orkut
       # User guid only
       SELF           = '@self'
     end
+
+    module Collection
+      ALL    = 'all'
+      SCRAPS = 'scraps'
+      STREAM = 'stream'
+    end
   end
 end

data/lib/orkut/constants/internal_constants.rb

@@ -6,6 +6,7 @@ module Orkut
       JSON_CONTENT_TYPE = 'application/json'
       USERID_ME = '@me'
       USERID_VIEWER = '@viewer'
+      USERID_ME_SIMPLE = 'me'
 
       module Values
         ALBUMS = 'albums'

data/lib/orkut/constants/params.rb

@@ -22,7 +22,7 @@ module Orkut
       CAPTCHA_URL       = 'captchaUrl'
       COMMENT           = 'comment'
       COMMENT_ID        = 'commentId'
-      FIELDS            = 'fields'
+      JSON              = 'json'
       LAST_KEY          = 'lastKey'
       MEDIA_ITEM        = 'mediaItem'
       MEDIA_ITEM_ID     = 'mediaItemId'

data/lib/orkut/request.rb

@@ -1,3 +1,4 @@
+require 'orkut/error'
 module Orkut
   # Defines HTTP request methods
   module Request
@@ -7,16 +8,16 @@ module Orkut
     #   @response = @token.get('/people')
     #   @response = @token.get('/people', { 'Accept'=>'application/xml' })
     #
-    def get(path = nil, headers = {})
-      connection.get(verify_path(path), headers)
+    def get_v1(path = nil, headers = {})
+      connection_v1.get(verify_path(path), headers)
     end
 
     # Make a regular HEAD request using AccessToken
     #
     #   @response = @token.head('/people')
     #
-    def head(path = nil, headers = {})
-      connection.head(verify_path(path), headers)
+    def head_v1(path = nil, headers = {})
+      connection_v1.head(verify_path(path), headers)
     end
 
     # Make a regular POST request using AccessToken
@@ -27,8 +28,8 @@ module Orkut
     #   @response = @token.post('/people', nil, {'Accept' => 'application/xml' })
     #   @response = @token.post('/people', @person.to_xml, { 'Accept'=>'application/xml', 'Content-Type' => 'application/xml' })
     #
-    def post(path = nil, body = '', headers = {})
-     connection.post(verify_path(path), body, headers)
+    def post_v1(path = nil, body = '', headers = {})
+     connection_v1.post(verify_path(path), body, headers)
     end
 
     # Make a regular PUT request using AccessToken
@@ -39,8 +40,8 @@ module Orkut
     #   @response = @token.put('/people/123', nil, { 'Accept' => 'application/xml' })
     #   @response = @token.put('/people/123', @person.to_xml, { 'Accept' => 'application/xml', 'Content-Type' => 'application/xml' })
     #
-    def put(path = nil, body = '', headers = {})
-      connection.put(verify_path(path), body, headers)
+    def put_v1(path = nil, body = '', headers = {})
+      connection_v1.put(verify_path(path), body, headers)
     end
 
     # Make a regular DELETE request using AccessToken
@@ -48,8 +49,17 @@ module Orkut
     #   @response = @token.delete('/people/123')
     #   @response = @token.delete('/people/123', { 'Accept' => 'application/xml' })
     #
-    def delete(path = nil, headers = {})
-      connection.delete(verify_path(path), headers)
+    def delete_v1(path = nil, headers = {})
+      connection_v1.delete(verify_path(path), headers)
+    end
+
+    def execute(entity, action, body = {})
+      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?
+      orkut = connection.discovered_api('orkut', 'v2')
+      response = connection.execute(orkut.try(entity.to_sym).try(action.to_sym), body)
+      #status, headers, body = response
+      response
     end
     
     def verify_path(path)

data/lib/orkut/version.rb

@@ -14,7 +14,7 @@ module Orkut
     end
 
     def self.pre
-      8 #nil
+      9 #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.8
+  version: 0.0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &20224440 !ruby/object:Gem::Requirement
+  requirement: &15983140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *20224440
+  version_requirements: *15983140
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &20223820 !ruby/object:Gem::Requirement
+  requirement: &15982540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20223820
+  version_requirements: *15982540
 description: A Ruby wrapper for the Orkut REST/RPC API.
 email:
 - contato@umanni.com
@@ -62,7 +62,9 @@ files:
 - lib/orkut/client/videos.rb
 - lib/orkut/config.rb
 - lib/orkut/connection.rb
+- lib/orkut/constants/action.rb
 - lib/orkut/constants/activity_type.rb
+- lib/orkut/constants/collection.rb
 - lib/orkut/constants/fields.rb
 - lib/orkut/constants/group.rb
 - lib/orkut/constants/internal_constants.rb