muck-oauth 0.1.3 → 0.1.4

data/Rakefile

@@ -22,6 +22,7 @@ begin
     gem.add_dependency "agree2"
     gem.add_dependency "fireeagle"
     gem.add_dependency "linkedin"
+    gem.add_dependency "overlord"
     gem.add_dependency "muck-engine"
     gem.add_dependency "muck-users"
     gem.add_development_dependency "shoulda"

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.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/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/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/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/locales/en.yml

@@ -51,3 +51,4 @@ en:
       we_support_hmac_sha: We support hmac-sha1 (recommended) as well as plain text in ssl mode.
       consume_secret: "Consumer Secret:"
       request_disallowed: You have disallowed this request
+      http_result_error: "There was a problem with your request {{error}}"

data/muck-oauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-oauth}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-12-22}
+  s.date = %q{2009-12-24}
   s.description = %q{A simple wrapper for the oauth and oauth-plugin gems so that it is faster to include oauth in muck based applications.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -30,12 +30,9 @@ Gem::Specification.new do |s|
      "app/models/access_token.rb",
      "app/models/client_application.rb",
      "app/models/consumer_token.rb",
-     "app/models/friendfeed_token.rb",
-     "app/models/linkedin_token.rb",
      "app/models/oauth_nonce.rb",
      "app/models/oauth_token.rb",
      "app/models/request_token.rb",
-     "app/models/yahoo_token.rb",
      "app/views/oauth/authorize.html.erb",
      "app/views/oauth/authorize_failure.html.erb",
      "app/views/oauth/authorize_success.html.erb",
@@ -55,7 +52,12 @@ Gem::Specification.new do |s|
      "db/migrate/20091210172015_create_oauth_tables.rb",
      "lib/active_record/acts/muck_oauth_user.rb",
      "lib/muck_oauth.rb",
+     "lib/muck_oauth/exceptions.rb",
      "lib/muck_oauth/initialize_routes.rb",
+     "lib/muck_oauth/services/friendfeed_token.rb",
+     "lib/muck_oauth/services/google_token.rb",
+     "lib/muck_oauth/services/linkedin_token.rb",
+     "lib/muck_oauth/services/yahoo_token.rb",
      "lib/muck_oauth/tasks.rb",
      "locales/ar.yml",
      "locales/bg.yml",
@@ -1826,6 +1828,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<agree2>, [">= 0"])
       s.add_runtime_dependency(%q<fireeagle>, [">= 0"])
       s.add_runtime_dependency(%q<linkedin>, [">= 0"])
+      s.add_runtime_dependency(%q<overlord>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
       s.add_runtime_dependency(%q<muck-users>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -1837,6 +1840,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<agree2>, [">= 0"])
       s.add_dependency(%q<fireeagle>, [">= 0"])
       s.add_dependency(%q<linkedin>, [">= 0"])
+      s.add_dependency(%q<overlord>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<muck-users>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -1849,6 +1853,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<agree2>, [">= 0"])
     s.add_dependency(%q<fireeagle>, [">= 0"])
     s.add_dependency(%q<linkedin>, [">= 0"])
+    s.add_dependency(%q<overlord>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])
     s.add_dependency(%q<muck-users>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -07:00
+date: 2009-12-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: overlord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: muck-engine
   type: :runtime
@@ -135,12 +145,9 @@ files:
 - app/models/access_token.rb
 - app/models/client_application.rb
 - app/models/consumer_token.rb
-- app/models/friendfeed_token.rb
-- app/models/linkedin_token.rb
 - app/models/oauth_nonce.rb
 - app/models/oauth_token.rb
 - app/models/request_token.rb
-- app/models/yahoo_token.rb
 - app/views/oauth/authorize.html.erb
 - app/views/oauth/authorize_failure.html.erb
 - app/views/oauth/authorize_success.html.erb
@@ -160,7 +167,12 @@ files:
 - db/migrate/20091210172015_create_oauth_tables.rb
 - lib/active_record/acts/muck_oauth_user.rb
 - lib/muck_oauth.rb
+- lib/muck_oauth/exceptions.rb
 - lib/muck_oauth/initialize_routes.rb
+- lib/muck_oauth/services/friendfeed_token.rb
+- lib/muck_oauth/services/google_token.rb
+- lib/muck_oauth/services/linkedin_token.rb
+- lib/muck_oauth/services/yahoo_token.rb
 - lib/muck_oauth/tasks.rb
 - locales/ar.yml
 - locales/bg.yml