multiauth 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/multiauth/views_helper.rb

@@ -1,9 +1,9 @@
 module Multiauth
   module ViewsHelper
-    def multiauth_box(url = nil)
+    def multiauth_box(resource_name, url = nil)
       url = session_path(resource_name) if !url
 
-      form_for(resource, :as => resource_name, :url => url, :html => {:id => "openid"}) do |f|
+      form_for(resource_name, :url => url, :html => {:id => "openid"}) do |f|
         %@<div id="nojsopenid">#{f.text_field(:identity_url, :id => "identity_url")}#{f.submit('Sign in')}</div>@+
         render(:partial => "multiauth/box")
       end
@@ -15,13 +15,18 @@ module Multiauth
     end
 
     def multiauth_providers
+      mapping = request.env["devise.mapping"]
       providers = Multiauth::PROVIDERS
-      if !devise_mapping.oauthable?
-        providers.delete("Facebook")
-        providers.delete("Github")
-      else
+      if mapping && mapping.oauthable?
         providers.delete("Facebook") if !resource_class.oauth_providers.include?(:facebook)
         providers.delete("Github") if !resource_class.oauth_providers.include?(:github)
+      else
+        providers.delete("Facebook")
+        providers.delete("Github")
+      end
+
+      if user_signed_in?
+        providers["Twitter"][:url] = '/users/connect/twitter'
       end
 
       providers

data/multiauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multiauth}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-09-19}
+  s.date = %q{2010-09-25}
   s.description = %q{multi authentication gem using devise & co}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 -05:00
+date: 2010-09-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency