multiauth 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/app/controllers/multiauth/sessions_controller.rb

@@ -12,7 +12,7 @@ module Multiauth
       end
 
       if logged_in?
-        redirect_to root_path
+        redirect_to session[:return_to] ? session[:return_to] : root_path
       else
         render 'new'
       end

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

@@ -4,7 +4,7 @@
       <a href="#" id="prev">prev</a>
       <a href="#" id="next">next</a>
     </div>
-    Choose your account provider
+    <%=  title || "Choose your account provider" %>
     <div class="clear"></div>
     <div id="slides">
       <ul class="list">
@@ -14,7 +14,7 @@
             <% providers.each_slice(3) do |column| %>
               <div class="column">
                 <% column.each do |provider, config| %>
-                  <a id="btn_<%= count+=1 %>" class="<%= provider %> openid_btn <%= config[:class] %>" title="<%= provider %>" href="/auth/<%= config["openid"] ? "open_id?openid_url=#{config["openid"]}" : "#{provider.downcase}" %>"></a>
+                  <a id="btn_<%= count+=1 %>" class="<%= provider %> openid_btn <%= config["class"] %>" title="<%= provider %>" href="/auth/<%= config["openid"] ? "open_id?openid_url=#{config["openid"]}" : "#{provider.downcase}" %>"></a>
                 <% end %>
               </div>
             <% end %>

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

@@ -0,0 +1,17 @@
+<div id="multiauth-menu">
+  <h2>
+    <a href="#"><%= title %></a>
+  </h2>
+  <div class="menu-container">
+      <% count = 0 %>
+      <% multiauth_providers.each_slice(5) do |providers| %>
+        <div class="rows">
+          <% providers.each do |provider, config| %>
+            <div class="item" style="float: left; width: 19.5%;">
+              <a id="btn_<%= count+=1 %>" class="<%= provider %> openid_btn <%= config["class"] %>" title="<%= provider %>" href="/auth/<%= config["openid"] ? "open_id?openid_url=#{config["openid"]}" : "#{provider.downcase}" %>"></a>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
+  </div>
+</div>

data/app/views/multiauth/sessions/new.html.erb

@@ -1,2 +1,7 @@
 <%= multiauth_assets %>
-<%= multiauth_box %>
+<% if logged_in? %>
+  <%= multiauth_menu("Connect Your Account") %>
+<% else %>
+  <%= multiauth_box %>
+<% end %>
+

data/lib/generators/templates/README

@@ -55,5 +55,14 @@ you can override them using the following routes:
   match "/login" => "multiauth/sessions#new", :as => :new_session
   match "/logout" => "multiauth/sessions#destroy", :method => :get, :as => :destroy_session
 
+you can override the default view creating the file:
+  app/views/multiauth/sessions/new.html.haml
+
+to render the auth providers as a dropdown menu use:
+  <%= multiauth_menu("connect your account") %>
+
+you can render single links as follows:
+  <%= multiauth_link("Google") %>
+
 
 ===============================================================================

data/lib/generators/templates/multiauth.js

@@ -58,7 +58,7 @@ jQuery(function ($) {
     return false;
   });
 
-  $form.find(".openid_btn").click(function(e){
+  $(".openid_btn").click(function(e){
     var a = $(this);
 
     if(a.attr("href").match("{user_name}")) {
@@ -81,4 +81,16 @@ jQuery(function ($) {
   });
 
   openidCarouselEffect();
+
+  var intervalId = null;
+  $("#multiauth-menu").hover(function(){
+    if(intervalId)
+      clearTimeout(intervalId);
+    $(this).addClass("hovering");
+  }, function() {
+    var e = $(this);
+    intervalId = setTimeout(function() {
+      e.removeClass("hovering");
+    }, 1000)
+  })
 });

data/lib/multiauth/rails.rb

@@ -31,7 +31,7 @@ module Multiauth
             next if config["token"].blank?
 
             puts ">> Setting up #{provider} provider"
-            provider provider.downcase.to_sym, config["id"], config["token"]
+            provider provider.underscore.to_sym, config["id"], config["token"]
           end
         end
       else

data/lib/multiauth/views_helper.rb

@@ -1,7 +1,11 @@
 module Multiauth
   module ViewsHelper
-    def multiauth_box
-      render(:partial => "multiauth/box")
+    def multiauth_box(title = nil)
+      render "multiauth/box", :title => title
+    end
+
+    def multiauth_menu(title = "Sign In")
+      render "multiauth/menu", :title => title
     end
 
     def multiauth_assets
@@ -10,7 +14,14 @@ module Multiauth
     end
 
     def multiauth_providers
-      Multiauth.providers || []
+      Multiauth.providers || {}
+    end
+
+    def multiauth_link(provider, text = "", cssclass = nil)
+      config = multiauth_providers[provider]
+      css_class ||= "#{provider} openid_btn #{config["class"]}"
+
+      %@<a class="#{css_class}" title="#{provider}" href="/auth/#{config["openid"] ? "open_id?openid_url=#{config["openid"]}" : "#{provider.downcase}"}">#{text}</a>@
     end
   end
 end

data/multiauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multiauth}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2010-10-16}
   s.description = %q{multi authentication gem using devise & co}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "app/controllers/multiauth/sessions_controller.rb",
      "app/views/multiauth/_box.html.erb",
+     "app/views/multiauth/_menu.html.erb",
      "app/views/multiauth/sessions/new.html.erb",
      "lib/generators/multiauth/multiauth_generator.rb",
      "lib/generators/templates/README",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -05:00
+date: 2010-10-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - VERSION
 - app/controllers/multiauth/sessions_controller.rb
 - app/views/multiauth/_box.html.erb
+- app/views/multiauth/_menu.html.erb
 - app/views/multiauth/sessions/new.html.erb
 - lib/generators/multiauth/multiauth_generator.rb
 - lib/generators/templates/README