multiauth 0.1.3 → 0.2.0

data/Gemfile

@@ -1,8 +1,5 @@
 source 'http://rubygems.org'
 
 gem 'rails', '>=3.0.0'
-gem 'devise', :git => 'http://github.com/plataformatec/devise.git'
-gem 'devise_openid_authenticatable', :git => "http://github.com/nbudin/devise_openid_authenticatable.git"
-gem 'devise-twitter', '0.1.1'
-gem 'oauth2', '0.0.13'
+gem 'omniauth', "0.1.1"
 

data/Gemfile.lock

@@ -1,19 +1,3 @@
-GIT
-  remote: http://github.com/nbudin/devise_openid_authenticatable.git
-  revision: b827771918439cc9a82cdd7e68d5e3c7da898f8a
-  specs:
-    devise_openid_authenticatable (1.0.0.alpha7)
-      devise (>= 1.0.6)
-      rack-openid (>= 1.2.0)
-
-GIT
-  remote: http://github.com/plataformatec/devise.git
-  revision: ef3480004c8511d09c0047b8406dd3cf7f828e01
-  specs:
-    devise (1.2.rc)
-      bcrypt-ruby (~> 2.1.2)
-      warden (~> 1.0.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -47,11 +31,7 @@ GEM
     addressable (2.2.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    bcrypt-ruby (2.1.2)
     builder (2.1.2)
-    devise-twitter (0.1.1)
-      devise (>= 1.1.0)
-      warden_oauth (~> 0.1.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     faraday (0.4.6)
@@ -64,17 +44,47 @@ GEM
       treetop (>= 1.4.5)
     mime-types (1.16)
     multi_json (0.0.4)
+    net-ldap (0.1.1)
+    nokogiri (1.4.3.1)
+    oa-basic (0.1.1)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.1.1)
+      rest-client (~> 1.6.0)
+    oa-core (0.1.1)
+      rack (~> 1.1)
+    oa-enterprise (0.1.1)
+      net-ldap (~> 0.1.1)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.1.1)
+      rubyntlm (~> 0.1.1)
+    oa-oauth (0.1.1)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.1.1)
+      oauth (~> 0.4.0)
+      oauth2 (~> 0.0.10)
+    oa-openid (0.1.1)
+      oa-core (= 0.1.1)
+      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)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-openid (1.2.0)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
+    rack-openid (1.1.2)
+      rack (>= 0.4)
+      ruby-openid (>= 2.0.3)
     rack-test (0.5.6)
       rack (>= 1.0)
     rails (3.0.0)
@@ -91,23 +101,20 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
     ruby-openid (2.1.8)
-    thor (0.14.2)
+    ruby-openid-apps-discovery (1.2.0)
+      ruby-openid (>= 2.1.7)
+    rubyntlm (0.1.1)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
-    warden (1.0.0)
-      rack (>= 1.0.0)
-    warden_oauth (0.1.1)
-      oauth
-      warden (>= 0.8.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  devise!
-  devise-twitter (= 0.1.1)
-  devise_openid_authenticatable!
-  oauth2 (= 0.0.13)
+  omniauth (= 0.1.1)
   rails (>= 3.0.0)

data/Rakefile

@@ -13,9 +13,7 @@ begin
     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 'devise_openid_authenticatable', '1.0.0.alpha7'
-    gem.add_dependency 'devise-twitter', '0.1.1'
-    gem.add_dependency 'oauth2', '0.0.13'
+    gem.add_dependency "omniauth", "0.1.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/generators/templates/multiauth.js

@@ -44,9 +44,9 @@ function openidCarouselEffect() {
 
 
 jQuery(function ($) {
-  var $form = $("form#openid");
-  var $identity_url = $form.find("input#identity_url");
-  var $input_area = $form.find("#openid_inputarea");
+  var $form = $("#openid_btns");
+
+  var $input_area = $("#openid_inputarea");
   var $input_username = $input_area.find("input#openid_username");
 
   $form.find("#nojsopenid").hide();
@@ -70,19 +70,13 @@ jQuery(function ($) {
       return false;
     }
 
-    if(a.attr("data-real") == "false") {
-      $identity_url.val(a.attr("href"));
-      $form.submit();
-      return false;
-    }
-
     return true;
   });
 
-  $form.find("#openid_inputarea_submit").click(function() {
+  $("#openid_inputarea_submit").click(function() {
     var v = $input_username.val();
     if(v) {
-      $identity_url.val($input_username.attr("data-provider").replace("{user_name}",v ));
+      window.location = $input_username.attr("data-provider").replace("{user_name}",v );
     }
   });
 

data/lib/multiauth/views_helper.rb

@@ -1,12 +1,7 @@
 module Multiauth
   module ViewsHelper
-    def multiauth_box(resource_name, url = nil)
-      url = session_path(resource_name) if !url
-
-      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
+    def multiauth_box
+      render(:partial => "multiauth/box")
     end
 
     def multiauth_assets
@@ -15,21 +10,7 @@ module Multiauth
     end
 
     def multiauth_providers
-      mapping = request.env["devise.mapping"]
-      providers = Multiauth::PROVIDERS
-      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
+      Multiauth::PROVIDERS
     end
   end
 end

data/lib/multiauth.rb

@@ -4,61 +4,61 @@ require 'multiauth/views_helper'
 module Multiauth
   PROVIDERS = {
     'Google' => {
-      :url => 'https://www.google.com/accounts/o8/id'
+      :url => '/auth/open_id?openid_url=https://www.google.com/accounts/o8/id'
     },
     'Twitter' => {
-      :url => '/users/sign_in/twitter',
+      :url => '/auth/twitter',
       :real => true
     },
     'Facebook' => {
-      :url => lambda { oauth_authorize_url(resource_name, :facebook) },
+      :url => '/auth/facebook',
       :real => true
     },
     'Yahoo' => {
-      :url => 'http://yahoo.com/'
+      :url => '/auth/open_id?openid_url=http://yahoo.com/'
     },
     'AOL' => {
-      :url => 'http://openid.aol.com/{user_name}'
+      :url => '/auth/open_id?openid_url=http://openid.aol.com/{user_name}'
     },
     'MySpace' => {
-      :url => 'http://www.myspace.com/{user_name}'
+      :url => '/auth/open_id?openid_url=http://www.myspace.com/{user_name}'
     },
     'Github' => {
-      :url => lambda { oauth_authorize_url(resource_name, :github) },
+      :url => '/auth/github',
       :real => true
     },
     'MyOpenID' => {
-      :url => 'http://{user_name}.myopenid.com/'
+      :url => '/auth/open_id?openid_url=http://{user_name}.myopenid.com/'
     },
     'Wordpress' => {
-      :url => 'http://{user_name}.wordpress.com/'
+      :url => '/auth/open_id?openid_url=http://{user_name}.wordpress.com/'
     },
     'Blogger' => {
-      :url => 'http://{user_name}.blogspot.com/'
+      :url => '/auth/open_id?openid_url=http://{user_name}.blogspot.com/'
     },
     'Flickr' => {
-      :url => 'http://flickr.com/{user_name}/'
+      :url => '/auth/open_id?openid_url=http://flickr.com/{user_name}/'
     },
     'Launchpad' => {
-      :url => 'https://launchpad.net/~{user_name}'
+      :url => '/auth/open_id?openid_url=https://launchpad.net/~{user_name}'
     },
     'Vidoop' => {
-      :url => 'http://{user_name}.myvidoop.com/'
+      :url => '/auth/open_id?openid_url=http://{user_name}.myvidoop.com/'
     },
     'ClaimID' => {
-      :url => 'http://claimid.com/{user_name}'
+      :url => '/auth/open_id?openid_url=http://claimid.com/{user_name}'
     },
     'Technorati' => {
-      :url => 'http://technorati.com/people/technorati/{user_name}/'
+      :url => '/auth/open_id?openid_url=http://technorati.com/people/technorati/{user_name}/'
     },
     'Verisign' => {
-      :url => 'http://{user_name}.pip.verisignlabs.com/'
+      :url => '/auth/open_id?openid_url=http://{user_name}.pip.verisignlabs.com/'
     },
     'LiveJournal' => {
-      :url => 'http://{user_name}.livejournal.com'
+      :url => '/auth/open_id?openid_url=http://{user_name}.livejournal.com'
     },
     'OpenID' => {
-      :url => '{user_name}'
+      :url => '/auth/open_id'
     }
   }
 end

data/multiauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multiauth}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   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-26}
+  s.date = %q{2010-10-05}
   s.description = %q{multi authentication gem using devise & co}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
@@ -60,22 +60,16 @@ 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<devise_openid_authenticatable>, ["= 1.0.0.alpha7"])
-      s.add_runtime_dependency(%q<devise-twitter>, ["= 0.1.1"])
-      s.add_runtime_dependency(%q<oauth2>, ["= 0.0.13"])
+      s.add_runtime_dependency(%q<omniauth>, ["= 0.1.1"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<rails>, ["= 3.0.0"])
-      s.add_dependency(%q<devise_openid_authenticatable>, ["= 1.0.0.alpha7"])
-      s.add_dependency(%q<devise-twitter>, ["= 0.1.1"])
-      s.add_dependency(%q<oauth2>, ["= 0.0.13"])
+      s.add_dependency(%q<omniauth>, ["= 0.1.1"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<rails>, ["= 3.0.0"])
-    s.add_dependency(%q<devise_openid_authenticatable>, ["= 1.0.0.alpha7"])
-    s.add_dependency(%q<devise-twitter>, ["= 0.1.1"])
-    s.add_dependency(%q<oauth2>, ["= 0.0.13"])
+    s.add_dependency(%q<omniauth>, ["= 0.1.1"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 -05:00
+date: 2010-10-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,25 +48,9 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: devise_openid_authenticatable
+  name: omniauth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - alpha7
-        version: 1.0.0.alpha7
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: devise-twitter
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -77,22 +61,7 @@ dependencies:
         - 1
         version: 0.1.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: oauth2
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 13
-        version: 0.0.13
-  type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 description: multi authentication gem using devise & co
 email: krawek@gmail.com
 executables: []