muck-auth 3.1.0 → 3.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 Tatemae.com
+Copyright (c) 2009-2011 Tatemae.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,5 +1,42 @@
 = muck-auth
 This gem wraps the omniauth gem to make it simple to authenticate with multiple services.
 
+== Installation
 
-Copyright (c) 2009-2010 Tatemae.com. See LICENSE for details.
+Add muck-auth to your Gemfile:
+  gem 'muck-auth'
+
+
+After installing muck-auth be sure to sync the gem:
+
+  rake muck:sync:auth
+  
+or to sync everything from the muck framework:
+
+  rake muck:sync
+  
+== Configuration
+Add services by including the proper credentials in secrets.yml:
+
+  auth_credentials:
+    twitter: # Twitter api access: http://www.twitter.com/apps 
+      key: '{get a key}'
+      secret: '{it comes with a secret}'
+    
+=== OAuth Services
+Here's a list of common oauth services. For a complete list of all available services please consult the omniauth documentation as the available services are constantly changing:
+https://github.com/intridea/omniauth
+
+  Twitter:    http://www.twitter.com/apps 
+  Google:     http://code.google.com/apis/accounts/docs/RegistrationForWebAppsAuto.html#register
+  Yahoo:      http://developer.yahoo.com/flickr/
+  Flick:      http://www.flickr.com/services/apps/create/apply
+  Linked In:  https://www.linkedin.com/secure/developer
+  Friendfeed: https://friendfeed.com/account/login?next=%2Fapi%2Fregister  
+  
+== Usage
+Render a full list of all services with links to authorize the service and icons:
+  <%= render :partial => 'authentications/available_services', :locals => { :include_icons => true } %>
+
+
+Copyright (c) 2009-2011 Tatemae.com. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.2.0

data/app/controllers/muck/authentications_controller.rb

@@ -15,7 +15,8 @@ class Muck::AuthenticationsController < ApplicationController
     @omniauth = request.env["omniauth.auth"]
     # Associated the account with the user
     if current_user
-      current_user.authentications.create!(:provider => @omniauth['provider'], :uid => @omniauth['uid'], :raw_auth => @omniauth.to_json)
+      current_user.authentications.create!(:provider => @omniauth['provider'], :uid => @omniauth['uid'], :raw_auth => @omniauth.to_json, 
+                                           :token => @omniauth['credentials']['token'], :secret => @omniauth['credentials']['secret'] )
       flash[:notice] = t('muck.auth.authentication_success')
       redirect_to authentications_url
     # Try to log the user in via the service

data/app/helpers/muck_auth_helper.rb

@@ -1,10 +1,35 @@
 module MuckAuthHelper
+    
+  def auth_list(include_icons)
+    list = ''
+    Secrets.auth_credentials.keys.each do |auth|
+      list << %Q{<li class="#{auth_css_class(auth)} auth_service service-link" #{auth_icon_back(auth, include_icons)} title="#{auth_title(auth)}">#{auth_link(auth)}</li>}
+    end
+    list.html_safe
+  end
+  
+  def auth_icon_back(auth, include_icons = true)
+    if include_icons
+      icon = service_icon_background(auth)
+    else
+      icon = ''
+    end
+  end
+  
+  def auth_link(auth)
+    link_to(auth.titleize, "/auth/#{auth}")
+  end
+  
+  def auth_name(auth)
+    auth.titleize
+  end
   
-  # add code to help generate links like this:
-  # /auth/twitter
+  def auth_title(auth)
+    translate('muck.auth.connect_to_account_title', :service => auth.to_s.humanize)
+  end
   
-  def auth_service_name(service)
-    service.titleize
+  def auth_css_class(auth)
+    auth.to_s.parameterize
   end
   
 end

data/app/views/authentications/_available_services.html.erb

@@ -1,12 +1,8 @@
 <div id="auth_available_services" class="auth-services">
-  <% unless authentications.empty? %>
+  <% unless Secrets.auth_credentials.empty? %>
     <h3><%=translate('muck.auth.you_can_connect_to_the_following_services') %></h3>
-    <ul <%='class="icon-list"' if include_icons%>>
-      <% authentications.each do |authentication| -%>
-        <li class="<%=authentication.to_s.parameterize%> auth_service service-link" <%= service_icon_background(authentication) if include_icons%> title="<%=translate('muck.auth.connect_to_account_title', :service => authentication.to_s.humanize) %>">
-          <%= link_to auth_service_name(authentication), "/auth/#{authentication}" %>
-        </li>
-      <% end -%>
+    <ul <%='class="icon-list"'.html_safe if include_icons%>>
+      <%= auth_list(include_icons) %>
     </ul>
   <% end %>
 </div>

data/app/views/authentications/_current_services.html.erb

@@ -6,7 +6,7 @@
     <ul <%='class="icon-list"' if include_icons%>>
       <% authentications.each do |authentication| -%>
         <li class="<%=token.class.service_name.to_s.parameterize%> oauth_service service-link" <%= service_icon_background(token.class.service_name) if include_icons %>>
-          <%= link_to auth_service_name(authentication.provider), oauth_consumer_path(token.class.service_name), :class => 'authfancybox' %>
+          <%= link_to auth_name(authentication.provider), oauth_consumer_path(token.class.service_name), :class => 'authfancybox' %>
           <%= link_to "X", authentication, :confirm => 'Are you sure you want to remove this authentication option?', :method => :delete, :class => "remove" %>
         </li>
       <% end -%>

data/db/migrate/20110216045051_create_authentications.rb

@@ -0,0 +1,21 @@
+class CreateAuthentications < ActiveRecord::Migration
+  def self.up
+    create_table :authentications do |t|
+      t.integer :authenticatable_id
+      t.string :authenticatable_type
+      t.string :provider
+      t.string :uid
+      t.string :name
+      t.string :nickname
+      t.string :token
+      t.string :secret
+      t.text :raw_auth
+      t.timestamps
+    end
+    add_index :authentications, [:authenticatable_id, :authenticatable_type], :name => 'authenticatable'
+  end
+
+  def self.down
+    drop_table :authentications
+  end
+end

data/lib/muck-auth/config.rb

@@ -12,11 +12,6 @@ module MuckAuth
 
   class Configuration
     
-    attr_accessor :auth_credentials
-    
-    def initialize
-      self.auth_credentials = {}
-    end
-    
   end
+  
 end

data/lib/muck-auth/engine.rb

@@ -2,7 +2,7 @@ require 'rails'
 require 'omniauth/oauth'
 require 'muck-auth'
 
-module MuckProfiles
+module MuckAuth
   class Engine < ::Rails::Engine
     
     def muck_name
@@ -22,12 +22,12 @@ module MuckProfiles
     end
 
     initializer "muck_auth.add_middleware" do |app|
-      raise MuckAuth::Exceptions::InvalidConfiguration, "Please provide a valid configuration for Muck Auth." if MuckAuth.configuration.auth_credentials.blank?
-      MuckAuth.configuration.auth_credentials.each_key do |key|
-        app.middleware.use OmniAuth::Builder do
-          provider key, MuckAuth.configuration.auth_credentials[key]['key'], MuckAuth.configuration.auth_credentials[key]['secret']
+      raise MuckAuth::Exceptions::InvalidConfiguration, "Please provide a valid configuration for Muck Auth." if Secrets.auth_credentials.blank?
+      Secrets.auth_credentials.each_key do |key|
+        Rails.application.config.middleware.use OmniAuth::Builder do
+          provider key, Secrets.auth_credentials[key]['key'], Secrets.auth_credentials[key]['secret']
         end  
-      end
+      end      
     end
        
   end

data/lib/muck-auth/models/authentication.rb

@@ -5,21 +5,23 @@ module MuckAuth
       extend ActiveSupport::Concern
     
       included do
-        belongs_to :user
+        belongs_to :authenticatable, :polymorphic => true        
       end
       
       module ClassMethods
+        
         def all_services
           services = []
-          MuckAuth.configuration.auth_credentials.each_key{ |s| services << s }
+          Secrets.auth_credentials.each_key{ |s| services << s }
           services
         end
+        
         def unused_services(current_authentications)
           all_services.find_all{ |s| !current_authentications.any?{ |c| c.provider == s } }
         end
+        
       end
     
     end 
   end
-end
-
+end

data/lib/muck-auth/models/user.rb

@@ -5,7 +5,7 @@ module MuckAuth
       extend ActiveSupport::Concern
     
       included do
-        has_many :authentications
+        has_many :authentications, :as => :authenticatable, :dependent => :destroy
         accepts_nested_attributes_for :authentications, :allow_destroy => true
       end
       

data/muck-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-auth}
-  s.version = "3.1.0"
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2010-11-17}
+  s.date = %q{2011-02-16}
   s.description = %q{A simple wrapper for the omniauth gem so that it is faster to include oauth in muck based applications.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "app/views/authentications/signup.html.erb",
     "config/locales/en.yml",
     "config/routes.rb",
+    "db/migrate/20110216045051_create_authentications.rb",
     "lib/muck-auth.rb",
     "lib/muck-auth/config.rb",
     "lib/muck-auth/engine.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-auth
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: false
   segments: 
   - 3
-  - 1
+  - 2
   - 0
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -07:00
+date: 2011-02-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - app/views/authentications/signup.html.erb
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/20110216045051_create_authentications.rb
 - lib/muck-auth.rb
 - lib/muck-auth/config.rb
 - lib/muck-auth/engine.rb