multiauth 0.2.3 → 0.2.5

data/Gemfile

@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
 
 gem 'rails', '>=3.0.0'
-gem 'omniauth', "0.1.1"
+gem 'omniauth', "~> 0.1.3"
 

data/Gemfile.lock

@@ -46,38 +46,38 @@ GEM
     multi_json (0.0.4)
     net-ldap (0.1.1)
     nokogiri (1.4.3.1)
-    oa-basic (0.1.1)
+    oa-basic (0.1.3)
       multi_json (~> 0.0.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.1.1)
+      oa-core (= 0.1.3)
       rest-client (~> 1.6.0)
-    oa-core (0.1.1)
+    oa-core (0.1.3)
       rack (~> 1.1)
-    oa-enterprise (0.1.1)
+    oa-enterprise (0.1.3)
       net-ldap (~> 0.1.1)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.1.1)
+      oa-core (= 0.1.3)
       rubyntlm (~> 0.1.1)
-    oa-oauth (0.1.1)
+    oa-oauth (0.1.3)
       multi_json (~> 0.0.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.1.1)
+      oa-core (= 0.1.3)
       oauth (~> 0.4.0)
       oauth2 (~> 0.0.10)
-    oa-openid (0.1.1)
-      oa-core (= 0.1.1)
+    oa-openid (0.1.3)
+      oa-core (= 0.1.3)
       rack-openid (~> 1.1.1)
       ruby-openid-apps-discovery
     oauth (0.4.3)
     oauth2 (0.0.13)
       faraday (~> 0.4.1)
       multi_json (>= 0.0.4)
-    omniauth (0.1.1)
-      oa-basic (= 0.1.1)
-      oa-core (= 0.1.1)
-      oa-enterprise (= 0.1.1)
-      oa-oauth (= 0.1.1)
-      oa-openid (= 0.1.1)
+    omniauth (0.1.3)
+      oa-basic (= 0.1.3)
+      oa-core (= 0.1.3)
+      oa-enterprise (= 0.1.3)
+      oa-oauth (= 0.1.3)
+      oa-openid (= 0.1.3)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -116,5 +116,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  omniauth (= 0.1.1)
+  omniauth (~> 0.1.3)
   rails (>= 3.0.0)

data/Rakefile

@@ -12,8 +12,8 @@ begin
     gem.authors = ["David A. Cuadrado"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_dependency "rails", "3.0.0"
-    gem.add_dependency "omniauth", "0.1.1"
+    gem.add_dependency "rails", ">= 3.0.0"
+    gem.add_dependency "omniauth", "~> 0.1.3"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

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

@@ -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/sessions/new.html.erb

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

data/lib/generators/templates/README

@@ -55,14 +55,5 @@ 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.css

@@ -67,6 +67,12 @@
 .Launchpad { background-position: 0px  -814px; }
 .LiveJournal { background-position: 0px  -861px; }
 .Vidoop { background-position: 0px  -908px; }
+.Gowalla { background-position: 0px  -951px; }
+.Ldap { background-position: 0px  -999px; }
+.ThirtySevenSignals { background-position: 0px  -1047px; }
+.Foursquare { background-position: 0px  -1195px; }
+.Identica { background-position: 0px -1143px; }
+
 
 .OpenID.oselected { background-position: -300px 0; }
 .Verisign.oselected { background-position: -300px -48px; }
@@ -88,6 +94,12 @@
 .Launchpad.oselected { background-position: -300px  -814px; }
 .LiveJournal.oselected { background-position: -300px  -861px; }
 .Vidoop.oselected { background-position: -300px  -908px; }
+.Gowalla.oselected { background-position:-300px  -951px; }
+.Ldap.oselected { background-position: -300px  -999px; }
+.ThirtySevenSignals.oselected { background-position: -300px  -1047px; }
+.Foursquare.oselected { background-position: -300px  -1195px; }
+.Identica.oselected { background-position: -300px -1143px; }
+
 
 .OpenID:hover { background-position: -150px 0; }
 .Verisign:hover { background-position: -150px -48px; }
@@ -109,6 +121,11 @@
 .Launchpad:hover { background-position: -150px  -814px; }
 .LiveJournal:hover { background-position: -150px  -861px; }
 .Vidoop:hover { background-position: -150px  -908px; }
+.Gowalla:hover { background-position: -150px  -951px; }
+.Ldap:hover { background-position: -150px  -999px; }
+.ThirtySevenSignals:hover { background-position: -150px  -1047px; }
+.Foursquare:hover { background-position: -150px  -1195px; }
+.Identica:hover { background-position: -150px -1143px; }
 
 a.openid_large_btn:focus {
   outline: none;

data/lib/generators/templates/multiauth.js

@@ -58,7 +58,7 @@ jQuery(function ($) {
     return false;
   });
 
-  $(".openid_btn").click(function(e){
+  $form.find(".openid_btn").click(function(e){
     var a = $(this);
 
     if(a.attr("href").match("{user_name}")) {
@@ -81,16 +81,4 @@ 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/views_helper.rb

@@ -1,11 +1,7 @@
 module Multiauth
   module ViewsHelper
     def multiauth_box
-      render "multiauth/box"
-    end
-
-    def multiauth_menu(title = "Sign In")
-      render "multiauth/menu", :title => title
+      render(:partial => "multiauth/box")
     end
 
     def multiauth_assets
@@ -14,14 +10,7 @@ module Multiauth
     end
 
     def 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>@
+      Multiauth.providers || []
     end
   end
 end

data/multiauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multiauth}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   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-07}
+  s.date = %q{2010-10-14}
   s.description = %q{multi authentication gem using devise & co}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ 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",
@@ -65,17 +64,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<rails>, ["= 3.0.0"])
-      s.add_runtime_dependency(%q<omniauth>, ["= 0.1.1"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<omniauth>, ["~> 0.1.3"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<rails>, ["= 3.0.0"])
-      s.add_dependency(%q<omniauth>, ["= 0.1.1"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<omniauth>, ["~> 0.1.3"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<rails>, ["= 3.0.0"])
-    s.add_dependency(%q<omniauth>, ["= 0.1.1"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<omniauth>, ["~> 0.1.3"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -05:00
+date: 2010-10-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -53,13 +53,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id003
 description: multi authentication gem using devise & co
@@ -82,7 +82,6 @@ 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

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

@@ -1,17 +0,0 @@
-<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>