muck-oauth 0.1.3 → 0.2.4

data/README.rdoc

@@ -14,6 +14,41 @@ Add the following to environment.rb
 
 Add the following to your user model:
   acts_as_muck_oauth_user
+
+== Configuration
+Add the following to global_config.yml. Be sure to get keys from each service that you want to interact with.
+
+  # Oauth
+  # Twitter api access: http://www.twitter.com/apps 
+  twitter_oauth_key: ''
+  twitter_oauth_secret: ''
+
+  # Google api access: http://code.google.com/apis/accounts/docs/RegistrationForWebAppsAuto.html#register
+  google_oauth_key: ""
+  google_oauth_secret: ""
+
+  # Yahoo api access: http://developer.yahoo.com/flickr/
+  yahoo_oauth_key: ""
+  yahoo_oauth_secret: ""
+
+  # Flick api access: http://www.flickr.com/services/apps/create/apply
+  # flickr_oauth_key: 
+  # flickr_oauth_secret: 
+  
+  # Linked In api access: https://www.linkedin.com/secure/developer
+  # linkedin_oauth_key: ""
+  # linkedin_oauth_secret: ""
+  linkedin_oauth_key: ""
+  linkedin_oauth_secret: ""
+
+  # Friendfeed api access: https://friendfeed.com/account/login?next=%2Fapi%2Fregister
+  # Production
+  friendfeed_oauth_key: ''
+  friendfeed_oauth_secret: ''  
+  # Test
+  friendfeed_oauth_key: ''
+  friendfeed_oauth_secret: ''
+
   
 == Usage
 Add configuration for services to:
@@ -56,4 +91,9 @@ None yet
 Flickr
 None yet
 
+== Tips and Help
+If you get an error like this:
+  uninitialized constant User::TwitterToken
+it means you need to setup your global_config.yml with the values specified above.
+
 Copyright (c) 2009 Tatemae.com. See LICENSE for details.

data/Rakefile

@@ -14,16 +14,19 @@ begin
     gem.description = %Q{A simple wrapper for the oauth and oauth-plugin gems so that it is faster to include oauth in muck based applications.}
     gem.email = "justin@tatemae.com"
     gem.homepage = "http://github.com/tatemae/muck-oauth"
+    gem.rubyforge_project = "muck-oauth"
     gem.authors = ["Justin Ball"]
-    gem.add_dependency "oauth"
-    gem.add_dependency "oauth-plugin"
-    gem.add_dependency "twitter"
-    gem.add_dependency "portablecontacts"
+    gem.add_dependency "oauth", '>= 0.3.6'
+    gem.add_dependency "oauth-plugin", '~> 0.3.14'
+    gem.add_dependency "twitter", '~> 0.9.5'
+    gem.add_dependency "portablecontacts", '>= 0.1.0'
     gem.add_dependency "agree2"
     gem.add_dependency "fireeagle"
-    gem.add_dependency "linkedin"
+    gem.add_dependency "linkedin", '~> 0.1.2'
+    gem.add_dependency "overlord"
     gem.add_dependency "muck-engine"
     gem.add_dependency "muck-users"
+    gem.add_development_dependency "babelphish"
     gem.add_development_dependency "shoulda"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.4

data/app/controllers/oauth_consumers_controller.rb

@@ -2,11 +2,17 @@ require 'oauth/controllers/consumer_controller'
 class OauthConsumersController < ApplicationController
   include Oauth::Controllers::ConsumerController
   
-  layout :choose_layout
-  
   def index
   end
   
+  def show
+    if @token
+      render 'oauth_consumers/show', :layout => false
+    else
+      super
+    end
+  end
+
   protected
   
     # Change this to decide where you want to redirect user to after callback is finished.
@@ -17,8 +23,4 @@ class OauthConsumersController < ApplicationController
       redirect_back_or_default('/')
     end
   
-    def choose_layout
-      'popup'
-    end
-  
 end

data/app/helpers/muck_oauth_helper.rb

@@ -1,5 +1,38 @@
 module MuckOauthHelper
   
+  # Generates a javascript array of emails from gmail.  Values will be
+  # put into a variable named 'gmail_contacts'
+  def gmail_contacts_for_auto_complete(user, ignore_cache = false)
+    return unless user.google
+    contacts = gmail_contacts(user, ignore_cache).collect do |contact|
+      contact["emails"].collect{ |email| "'#{email['value']}'" }
+    end.flatten
+    "var gmail_contacts = [#{contacts.join(',')}];"
+  end
+  
+  def gmail_contacts_as_array(user, ignore_cache = false)
+    if user.google
+      contacts = []
+      gmail_contacts(user, ignore_cache).each do |contact|
+        name = contact['name']['formatted'] rescue ''
+        contact["emails"].each do |email|
+          email_record = [name, email['value']]
+          contacts << email_record unless contacts.include?(email_record)
+        end
+      end
+      contacts
+    end
+  end
+  
+  def gmail_contacts(user, ignore_cache = false)
+    if @user_gmail_contacts && @user_gmail_contacts[user] && !ignore_cache
+      @user_gmail_contacts[user]
+    else
+      @user_gmail_contacts ||= {}
+      @user_gmail_contacts[user] = user.google.portable_contacts.all
+    end
+  end
+  
   # Renders fancybox javascript for oauth services
   def oauth_fancybox_scripts
     render :partial => 'oauth_consumers/oauth_fancybox_scripts'

data/app/views/oauth_consumers/_oauth_fancybox_scripts.html.erb

@@ -1,10 +1,10 @@
 <% content_for :javascript do -%>
 jQuery(document).ready(function() {
   jQuery('a.oauthfancybox').fancybox({
-      'hideOnContentClick': true,
+      'hideOnContentClick': false,
       'overlayShow': true,
-      'frameWidth': 800,
-      'frameHeight': 600
+      'frameWidth': 400,
+      'frameHeight': 300
   });
 });
 <% end -%>

data/app/views/oauth_consumers/show.html.erb

@@ -1,5 +1,7 @@
-<h1><%=translate('muck.oauth.you_are_already_connected_to', :service => params[:id].humanize) %></h1>
-<% form_tag oauth_consumer_path(params[:id]),:method=>:delete do %>
-  <%=translate('muck.oauth.disconnect_or_reconnect', :disconnect => submit_tag(translate('muck.oauth.disconnect')),
-                                                     :reconnect => submit_tag(translate('muck.oauth.reconnect'))) %>
-<% end %>
+<div id="oauth-service-info">
+  <h1><%=translate('muck.oauth.you_are_already_connected_to', :service => params[:id].humanize) %></h1>
+  <% form_tag oauth_consumer_path(params[:id]),:method=>:delete do %>
+    <%=translate('muck.oauth.disconnect_or_reconnect', :disconnect => submit_tag(translate('muck.oauth.disconnect')),
+                                                       :reconnect => submit_tag(translate('muck.oauth.reconnect'))) %>
+  <% end %>
+</div>

data/config/initializers/oauth_consumers.rb

@@ -6,17 +6,27 @@
 credentials = {}
 credentials[:twitter]   = { :key => GlobalConfig.twitter_oauth_key, 
                             :secret => GlobalConfig.twitter_oauth_secret } if GlobalConfig.twitter_oauth_key
-credentials[:google]    = { :scope => "https://mail.google.com/mail/feed/atom/", # see http://code.google.com/apis/gdata/faq.html#AuthScopes
+                            
+                            # see http://code.google.com/apis/gdata/faq.html#AuthScopes 
+credentials[:google]    = { :scope => ["https://mail.google.com/mail/feed/atom/", 
+                                       "https://www.google.com/calendar/feeds/",
+                                       "https://www.google.com/m8/feeds/",
+                                       "http://www-opensocial.googleusercontent.com/api/people"].join(' '),
                             :key => GlobalConfig.google_oauth_key, 
                             :secret => GlobalConfig.google_oauth_secret } if GlobalConfig.google_oauth_key
+
 credentials[:yahoo]     = { :key => GlobalConfig.yahoo_oauth_key, 
                             :secret => GlobalConfig.yahoo_oauth_secret } if GlobalConfig.yahoo_oauth_key
+
 credentials[:flickr]    = { :key => GlobalConfig.flickr_oauth_key, 
                             :secret => GlobalConfig.flickr_oauth_secret } if GlobalConfig.flickr_oauth_key
+
 credentials[:linkedin]  = { :key => GlobalConfig.linkedin_oauth_key, 
                             :secret => GlobalConfig.linkedin_oauth_secret } if GlobalConfig.linkedin_oauth_key
+
 credentials[:fireeagle] = { :key => GlobalConfig.fireeagle_oauth_key,
                             :secret => GlobalConfig.fireeagle_oauth_secret } if GlobalConfig.fireeagle_oauth_key
+
 credentials[:friendfeed] = { :key => GlobalConfig.friendfeed_oauth_key,
                              :secret => GlobalConfig.friendfeed_oauth_secret } if GlobalConfig.friendfeed_oauth_key
                              

data/lib/active_record/acts/muck_oauth_user.rb

@@ -19,18 +19,18 @@ module ActiveRecord
         # After adding this method to a user you will be able to call methods against these services ie:
         # user.linked_in.client.profile
         def acts_as_muck_oauth_user
-          
+
           has_many :client_applications
-          has_many :tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
-                    
-          has_one  :twitter, :class_name => "TwitterToken", :dependent => :destroy
-          has_one  :google, :class_name => "GoogleToken", :dependent => :destroy
-          has_one  :linked_in, :class_name => "LinkedinToken", :dependent => :destroy
-          has_one  :yahoo, :class_name => "YahooToken", :dependent => :destroy
-          has_one  :fire_eagle, :class_name => "FireeagleToken", :dependent => :destroy
-          has_one  :flickr, :class_name => "FlickrToken", :dependent => :destroy
-          has_one  :friend_feed, :class_name => "FriendfeedToken", :dependent => :destroy
-          
+          has_many :tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application], :dependent => :destroy
+
+          has_one  :twitter, :class_name => "TwitterToken"
+          has_one  :google, :class_name => "GoogleToken"
+          has_one  :linked_in, :class_name => "LinkedinToken"
+          has_one  :yahoo, :class_name => "YahooToken"
+          has_one  :fire_eagle, :class_name => "FireeagleToken"
+          has_one  :flickr, :class_name => "FlickrToken"
+          has_one  :friend_feed, :class_name => "FriendfeedToken"
+
           include ActiveRecord::Acts::MuckOauthUser::InstanceMethods
           extend ActiveRecord::Acts::MuckOauthUser::SingletonMethods
         end

data/lib/muck_oauth.rb

@@ -1,6 +1,12 @@
+require 'muck_oauth/services/friendfeed_token'
+require 'muck_oauth/services/google_token'
+require 'muck_oauth/services/linkedin_token'
+require 'muck_oauth/services/yahoo_token'
+require 'muck_oauth/exceptions'
 
 ActionController::Base.send :helper, MuckOauthHelper
 
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckOauthUser }
+ActiveRecord::Base.class_eval { include MuckOauth::Exceptions }
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]

data/lib/muck_oauth/exceptions.rb

@@ -0,0 +1,5 @@
+module MuckOauth
+  module Exceptions
+    class HTTPResultError < StandardError; end
+  end
+end

data/{app/models → lib/muck_oauth/services}/friendfeed_token.rb

@@ -3,7 +3,7 @@ class FriendfeedToken < ConsumerToken
     :site => "https://friendfeed.com", 
     :request_token_path => "/account/oauth/request_token", 
     :authorize_path => "/account/oauth/authorize", 
-    :access_token_path => "/accounts/account/oauth/access_token", 
+    :access_token_path => "/account/oauth/access_token", 
   } 
   
   def self.consumer 
@@ -18,4 +18,8 @@ class FriendfeedToken < ConsumerToken
     consumer.get_request_token({ :oauth_callback => callback_url })
   end
   
-end
+  def client
+    raise 'Implement client for friend feed.'
+  end
+  
+end

data/lib/muck_oauth/services/google_token.rb

@@ -0,0 +1,71 @@
+require 'portablecontacts'
+
+class GoogleToken < ConsumerToken
+  
+  GOOGLE_SETTINGS={
+    :site=>"https://www.google.com", 
+    :request_token_path => "/accounts/OAuthGetRequestToken",
+    :authorize_path => "/accounts/OAuthAuthorizeToken",
+    :access_token_path => "/accounts/OAuthGetAccessToken",
+  }
+  
+  def self.consumer
+    @consumer||=create_consumer
+  end 
+  
+  def self.create_consumer(options={})
+    OAuth::Consumer.new credentials[:key], credentials[:secret], GOOGLE_SETTINGS.merge(options)
+  end
+    
+  def self.get_request_token(callback_url, scope=nil)
+    consumer.get_request_token({:oauth_callback=>callback_url}, :scope=>scope||credentials[:scope]||"http://www-opensocial.googleusercontent.com/api/people")
+  end
+  
+  def portable_contacts
+    @portable_contacts||= PortableContacts::Client.new "http://www-opensocial.googleusercontent.com/api/people", client
+  end
+  
+  # Gets and parses contacts from google into objects.
+  # limit: Maximum number of contacts to retrieve
+  def contacts(limit = 10000)
+    convert_google_contacts_json_to_users(load_contacts(limit))
+  end
+
+  # Loads contacts using Google api and OAuth token.
+  def load_contacts(limit = 10000)
+    get("http://www.google.com/m8/feeds/contacts/default/full?max-results=#{limit}")
+  end
+  
+  # Converts json returned from google into a feed object
+  def convert_google_contacts_json_to_users(json)
+    if json['feed'] && json['feed']['entry']
+      json['feed']['entry'].collect do |entry|
+        emails = entry['gd$email'].collect { |gd| gd['address'] } if entry['gd$email']
+        phones = entry['gd$phoneNumber'].collect { |gd| gd['t'] } if entry['gd$phoneNumber']
+        if entry['gd$name']
+          first_name = entry['gd$name']['gd$givenName'] if entry['gd$name']['gd$givenName']
+          last_name = entry['gd$name']['gd$familyName'] if entry['gd$name']['gd$familyName']
+        end
+        OpenStruct.new( { :emails => emails,
+                          :phones => phones,
+                          :first_name => first_name,
+                          :last_name => last_name } )
+      end
+    end
+  end
+  
+  # Loads a user's groups using Google api and OAuth token.
+  def load_groups(limit = 10000)
+    get("http://www.google.com/m8/feeds/groups/default/full?max-results=#{limit}")
+  end
+  
+  def get(path)
+    response = self.client.get(path + "&alt=json&v=3.0")
+    if response.code == '200'
+      JSON.parse(response.body)
+    else
+      raise MuckOauth::Exceptions::HTTPResultError, I18n.t('muck.oauth.http_result_error', :error => response.to_s)
+    end
+  end
+  
+end

data/{app/models → lib/muck_oauth/services}/linkedin_token.rb

@@ -22,7 +22,7 @@ class LinkedinToken < ConsumerToken
   
   def client
     unless @client
-      @client = LinkedIn::Client.new(LinkedInToken.consumer.key, LinkedInToken.consumer.secret)
+      @client = ::LinkedIn::Client.new(LinkedinToken.consumer.key, LinkedinToken.consumer.secret)
       @client.authorize_from_access(token, secret)
     end 
     @client

data/lib/muck_oauth/services/plaxo_token.rb

@@ -0,0 +1,2 @@
+# https://www.plaxo.com/api/portablecontacts
+# https://www.plaxo.com/pdata/testClient

data/{app/models → lib/muck_oauth/services}/yahoo_token.rb

@@ -1,10 +1,10 @@
 # This was taken from an older version of the oauth-plugin gem.
 class YahooToken < ConsumerToken
   YAHOO_SETTINGS={
-    :site => "https://www.yahoo.com", 
-    :request_token_url => "https://api.login.yahoo.com/oauth/v2/get_request_token",
-    :authorize_url => "https://api.login.yahoo.com/oauth/v2/request_auth",
-    :access_token_url => "https://api.login.yahoo.com/oauth/v2/get_token"
+    :site => "https://api.login.yahoo.com",
+    :request_token_url => "/oauth/v2/get_request_token",
+    :authorize_url => "/oauth/v2/request_auth",
+    :access_token_url => "/oauth/v2/get_token"
   }
   
   def self.consumer
@@ -81,17 +81,17 @@ end
 # The only change below is that it strips the response.body. Once Yahoo fixes this I will remove this whole section.
 module OAuth
   class Consumer
-    
+
     def token_request(http_method, path, token = nil, request_options = {}, *arguments)
       response = request(http_method, path, token, request_options, *arguments)
- 
+
       case response.code.to_i
- 
+
       when (200..299)
         # symbolize keys
         # TODO this could be considered unexpected behavior; symbols or not?
         # TODO this also drops subsequent values from multi-valued keys
-        
+
         CGI.parse(response.body.strip).inject({}) do |h,(k,v)|
           h[k.to_sym] = v.first
           h[k]        = v.first

data/lib/muck_oauth/tasks.rb

@@ -12,14 +12,14 @@ module MuckOauth
     def define
       
       namespace :muck do
-        namespace :oauth do
+        namespace :sync do
           desc "Sync required files from muck oauth."
-          task :sync do
+          task :oauth do
             path = File.join(File.dirname(__FILE__), *%w[.. ..])
             system "rsync -ruv #{path}/db ."
             #system "rsync -ruv #{path}/public ."
-            if !File.exists('./config/oauth_consumers.rb')
-              system "rsync -ruv #{path}/config/initializers/oauth_consumers.rb ./config/oauth_consumers.rb"
+            if !File.exists?('./config/initializers/oauth_consumers.rb')
+              system "rsync -ruv #{path}/config/initializers/oauth_consumers.rb ./config/initializers/oauth_consumers.rb"
             end
           end
         end

data/locales/ar.yml

@@ -13,6 +13,7 @@ ar:
       back: خلف
       back_label: خلف
       callback_label: "رد رابط *"
+      connect_to_account_title: "الاتصال حسابك {{service}}"
       consume_key: "الاستهلاكية الرئيسية :"
       consume_secret: "المستهلك السري :"
       delete: حذف
@@ -23,6 +24,7 @@ ar:
       edit: عدل
       edit_application: "عدل طلبك"
       edit_label: عدل
+      http_result_error: "كانت هناك مشكلة مع الطلب الخاص بك {{error}}"
       issued: أصدر
       main_application_label: "* العنوان الرئيسي التطبيق"
       name_label: "الاسم *"

data/locales/bg.yml

@@ -13,6 +13,7 @@ bg:
       back: Отзад
       back_label: Отзад
       callback_label: "Callback URL *"
+      connect_to_account_title: "Свържете се към вашия {{service}} сметка"
       consume_key: "Ключ на потребителите:"
       consume_secret: "Тайната на потребителите:"
       delete: Изтривам
@@ -23,6 +24,7 @@ bg:
       edit: Редактиране
       edit_application: "Редактиране на вашата кандидатура"
       edit_label: Редактиране
+      http_result_error: "Имаше проблем с искане {{error}}"
       issued: Издава
       main_application_label: "Основното приложение URL *"
       name_label: "Име *"