multiauth 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/app/views/multiauth/_box.html.erb

@@ -9,21 +9,21 @@
     <div id="slides">
       <ul class="list">
         <% count = 0 %>
-        <% Multiauth::PROVIDERS.each_slice(6) do |providers| %>
+        <% multiauth_providers.each_slice(6) do |providers| %>
           <li class="page">
             <% providers.each_slice(3) do |column| %>
               <div class="column">
-                <% column.each do |provider| %>
-                  <a id="btn_<%= count+=1 %>" class="<%= provider[:name] %> openid_btn" title="<%= provider[:name] %>" href="<%= provider[:url] %>" data-real="<%= provider[:real] || false %>"></a>
+                <% column.each do |provider, config| %>
+                  <a id="btn_<%= count+=1 %>" class="<%= provider %> openid_btn <%= config[:class] %>" title="<%= provider %>" href="<%= config[:url].kind_of?(Proc) ? instance_exec(&config[:url]) : config[:url] %>" data-real="<%= config[:real] || false %>"></a>
                 <% end %>
               </div>
             <% end %>
           </li>
         <% end %>
       </ul>
-      <div class="clear"></div>
     </div>
   </div>
+  <div class="clear"></div>
 </div>
 <div id="openid_inputarea">
   <span class="oidlabel">username</span>

data/lib/generators/templates/README

@@ -90,4 +90,11 @@ Some setup you must do manually if you haven't yet:
 
   3. configure your twitter, facebook and github keys
 
+You can config providers in an initializer, for example:
+
+  Multiauth::PROVIDERS.delete("Vidoop")
+  Multiauth::PROVIDERS.delete("Github")
+  Multiauth::PROVIDERS["Google"][:class] = "selected"
+
+
 ===============================================================================

data/lib/multiauth/views_helper.rb

@@ -13,6 +13,19 @@ module Multiauth
       javascript_include_tag('multiauth')+
       stylesheet_link_tag('multiauth')
     end
+
+    def multiauth_providers
+      providers = Multiauth::PROVIDERS
+      if !devise_mapping.oauthable?
+        providers.delete("Facebook")
+        providers.delete("Github")
+      else
+        providers.delete("Facebook") if !resource_class.oauth_providers.include?(:facebook)
+        providers.delete("Github") if !resource_class.oauth_providers.include?(:github)
+      end
+
+      providers
+    end
   end
 end
 

data/lib/multiauth.rb

@@ -2,82 +2,64 @@ require 'multiauth/rails'
 require 'multiauth/views_helper'
 
 module Multiauth
-  PROVIDERS = [
-    {
-      :name => 'Google',
+  PROVIDERS = {
+    'Google' => {
       :url => 'https://www.google.com/accounts/o8/id'
     },
-    {
-      :name => 'Yahoo',
+    'Yahoo' => {
       :url => 'http://yahoo.com/'
     },
-    {
-      :name => 'Twitter',
+    'Twitter' => {
       :url => '/users/sign_in/twitter',
       :real => true
     },
-    {
-      :name => 'Facebook',
-      :selector => '#facebook_signin', # FIXME
+    'Facebook' => {
+      :selector => lambda { oauth_authorize_url(resource_name, :facebook) },
       :real => true
     },
-    {
-      :name => 'Launchpad',
+    'Launchpad' => {
       :url => 'https://launchpad.net/~{user_name}'
     },
-    {
-      :name => 'Github',
-      :url => '#github_signin', # FIXME
+    'Github' => {
+      :url => lambda { oauth_authorize_url(resource_name, :github) },
       :real => true
     },
-    {
-      :name => 'AOL',
+    'AOL' => {
       :user_name_txt => 'screen:name',
       :url => 'http://openid.aol.com/{user_name}'
     },
-    {
-      :name => 'OpenID',
-      :user_name_txt => ':url'
+    'OpenID' => {
+      :url => '{user_name}'
     },
-    {
-      :name => 'MyOpenID',
+    'MyOpenID' => {
       :url => 'http://{user_name}.myopenid.com/'
     },
-    {
-      :name => 'Flickr',
+    'Flickr' => {
       :url => 'http://flickr.com/{user_name}/'
     },
-    {
-      :name => 'Vidoop',
+    'Vidoop' => {
       :url => 'http://{user_name}.myvidoop.com/'
     },
-    {
-      :name => 'ClaimID',
+    'ClaimID' => {
       :url => 'http://claimid.com/{user_name}'
     },
-    {
-      :name => 'Technorati',
+    'Technorati' => {
       :url => 'http://technorati.com/people/technorati/{user_name}/'
     },
-    {
-      :name => 'Wordpress',
+    'Wordpress' => {
       :url => 'http://{user_name}.wordpress.com/'
     },
-    {
-      :name => 'Blogger',
+    'Blogger' => {
       :url => 'http://{user_name}.blogspot.com/'
     },
-    {
-      :name => 'Verisign',
+    'Verisign' => {
       :url => 'http://{user_name}.pip.verisignlabs.com/'
     },
-    {
-      :name => 'LiveJournal',
+    'LiveJournal' => {
       :url => 'http://{user_name}.livejournal.com'
     },
-    {
-      :name => 'MySpace',
+    'MySpace' => {
       :url => 'http://www.myspace.com/{user_name}'
     }
-  ]
+  }
 end

data/multiauth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multiauth}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - David A. Cuadrado