multi_auth 0.0.3 → 0.0.4

data/app/controllers/application_controller.rb

@@ -3,7 +3,6 @@
 class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
   protect_from_forgery # See ActionController::RequestForgeryProtection for details
-  before_filter { |c| c.instance_eval { @topic_path = [] }; true }
 
   GetText.locale = "ja"
   init_gettext "multi_auth"

data/app/controllers/auth/open_id_controller.rb

@@ -20,7 +20,7 @@ class Auth::OpenIdController < ApplicationController
         @open_id_credential = OpenIdCredential.find_by_identity_url(identity_url)
         if @open_id_credential
           @open_id_credential.login!
-          session[:user_id] = @open_id_credential.user.id
+          session[:user_id] = @open_id_credential.user_id
           flash[:notice] = "ログインしました。"
           redirect_to(root_path)
         else

data/app/controllers/auth_controller.rb

@@ -4,6 +4,11 @@
 class AuthController < ApplicationController
   verify_method_post :only => [:logout]
 
+  # GET /auth/index
+  def index
+    # nop
+  end
+
   # GET /auth/logged_in
   def logged_in
     @return_path = params[:return_path]

data/app/views/auth/email/index.html.erb

@@ -62,7 +62,7 @@
 
 <div id="dialog">
   <h1>ログイン</h1>
-  <%- form_for(:login_form, @login_form, :url => {:action => "login"}) { |f| -%>
+  <%- form_for(:login_form, @login_form, :url => {:action => "login"}) do |f| -%>
     <table id="email-login">
       <tr>
         <th><%= f.label(:email) %></th>
@@ -79,8 +79,8 @@
         </td>
       </tr>
     </table>
-    <div style="text-align: center;"><%= submit_tag("ログイン") %></div>
-  <%- } -%>
+    <%= submit_tag("ログイン") %>
+  <%- end -%>
 </div>
 
 <%- unless production? -%>

data/app/views/auth/index.html.erb

@@ -0,0 +1,49 @@
+<%- @title = "ログイン" -%>
+<%- @enable_side_column = false -%>
+
+<div id="dialog">
+  <h1>OpenID によるログイン</h1>
+
+  <%- form_tag(:controller => 'auth/open_id', :action => "login") do -%>
+    <table>
+      <tr>
+        <th><%= label_tag(:openid_url, "OpenID") %></th>
+        <td>
+          <%= text_field_tag(:openid_url, "", :size => 30) %>
+        </td>
+      </tr>
+    </table>
+    <div><%= submit_tag("ログイン") %></div>
+  <%- end -%>
+
+  <hr />
+  
+  <h1>メールアドレスでログイン</h1>
+  <%- form_for(:login_form, @login_form, :url => { :controller => 'auth/email', :action => "login"}) do |f| -%>
+    <table id="email-login">
+      <tr>
+        <th><%= f.label(:email) %></th>
+        <td>
+          <%= f.text_field(:email, :size => 30) %>
+          <%= error_message_on(:login_form, :email) %>
+        </td>
+      </tr>
+      <tr>
+        <th><%= f.label(:password) %></th>
+        <td>
+          <%= f.password_field(:password, :size => 30) %>
+          <%= error_message_on(:login_form, :password) %>
+        </td>
+      </tr>
+    </table>
+    <%= submit_tag("ログイン") %>
+  <%- end -%>
+
+</div>
+
+<%- unless production? -%>
+  <div class="debug">
+    <%= error_messages_for(:login_form) %>
+  </div>
+<%- end -%>
+

data/app/views/auth/open_id/index.html.erb

@@ -6,7 +6,7 @@
   <h1>OpenID によるログイン</h1>
 
   <%- form_tag(:action => "login") do -%>
-    <table border="1">
+    <table>
       <tr>
         <th><%= label_tag(:openid_url, "OpenID") %></th>
         <td>

data/app/views/credentials/email/activation.html.erb

@@ -3,7 +3,7 @@
 
 <h1><%=h @title %></h1>
 
-<table border="1">
+<table>
   <tr>
     <th>メールアドレス</th>
     <td><%=h @email_credential.email %></td>

data/app/views/credentials/email/created.html.erb

@@ -1,8 +1,5 @@
 
 <%- @title = "仮登録完了" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << ["ログイン設定", url_for(:controller => "/credentials")] -%>
-<%- @topic_path << [@title] -%>
 
 <h1><%=h @title %></h1>
 

data/app/views/credentials/email/delete.html.erb

@@ -1,14 +1,11 @@
 
 <%- @title = "メールログイン情報の削除" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << ["ログイン設定", url_for(:controller => "/credentials")] -%>
-<%- @topic_path << [@title] -%>
 
 <h1><%=h @title %></h1>
 
 <div>削除します。よろしいですか？</div>
 
-<table border="1">
+<table>
   <tr>
     <th>メールアドレス</th>
     <td><%=h @email_credential.email %></td>

data/app/views/credentials/email/edit_password.html.erb

@@ -1,13 +1,10 @@
 
 <%- @title = "パスワードの変更" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << ["ログイン設定", url_for(:controller => "/credentials")] -%>
-<%- @topic_path << [@title] -%>
 
 <h1><%=h @title %></h1>
 
 <%- form_for(:edit_form, @edit_form, :url => {:action => "update_password"}) { |f| -%>
-  <table border="1">
+  <table>
     <tr>
       <th>メールアドレス</th>
       <td><%=h @email_credential.email %></td>

data/app/views/credentials/email/new.html.erb

@@ -1,13 +1,10 @@
 
 <%- @title = "メール認証情報の追加" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << ["ログイン設定", url_for(:controller => "/credentials")] -%>
-<%- @topic_path << [@title] -%>
 
 <h1><%=h @title %></h1>
 
 <%- form_for(:edit_form, @edit_form, :url => {:action => "create"}) { |f| -%>
-  <table border="1">
+  <table>
     <tr>
       <th><%= f.label(:email) %></th>
       <td>

data/app/views/credentials/index.html.erb

@@ -1,7 +1,5 @@
 
 <%- @title = "ログイン設定" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << [@title] -%>
 
 <h2>OpenID認証</h2>
 

data/app/views/credentials/open_id/delete.html.erb

@@ -1,20 +1,17 @@
-
-<%- @title = "OpenIDログイン情報の削除" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << ["ログイン設定", url_for(:controller => "/credentials")] -%>
-<%- @topic_path << [@title] -%>
-
-<h1><%=h @title %></h1>
-
-<div>削除します。よろしいですか？</div>
-
-<table border="1">
-  <tr>
-    <th>OpenID</th>
-    <td><%=h @open_id_credential.identity_url %></td>
-  </tr>
-</table>
-
-<%- form_tag(:action => "destroy") { -%>
-  <div><%= submit_tag("削除") %></div>
-<%- } -%>
+
+<%- @title = "OpenIDログイン情報の削除" -%>
+
+<h1><%=h @title %></h1>
+
+<div>削除します。よろしいですか？</div>
+
+<table>
+  <tr>
+    <th>OpenID</th>
+    <td><%=h @open_id_credential.identity_url %></td>
+  </tr>
+</table>
+
+<%- form_tag(:action => "destroy") { -%>
+  <div><%= submit_tag("削除") %></div>
+<%- } -%>

data/app/views/credentials/open_id/new.html.erb

@@ -1,13 +1,10 @@
 
 <%- @title = "OpenID認証情報の追加" -%>
-<%- @topic_path << ["トップ", root_path] -%>
-<%- @topic_path << ["ログイン設定", url_for(:controller => "/credentials")] -%>
-<%- @topic_path << [@title] -%>
 
 <h1><%=h @title %></h1>
 
 <%- form_for(:login_form, @login_form, :url => {:action => "create"}) { |f| -%>
-  <table border="1">
+  <table>
     <tr>
       <th><%= f.label(:openid_url) %></th>
       <td>

data/app/views/signup/email/activation.html.erb

@@ -11,7 +11,7 @@
   <div>アクティベート済み</div>
  <%- else -%>
   <div>未アクティベート</div>
-  <table border="1">
+  <table>
     <tr>
       <th>メールアドレス</th>
       <td><%=h @credential.email %></td>

data/app/views/signup/email/index.html.erb

@@ -6,7 +6,7 @@
 <%= render(:partial => "progress", :locals => {:step => 1}) %>
 
 <%- form_for(:signup_form, @signup_form, :url => {:action => "validate"}) { |f| -%>
-  <table border="1">
+  <table>
     <tr>
       <th><%= f.label(:email) %></th>
       <td>

data/app/views/signup/email/validated.html.erb

@@ -5,7 +5,7 @@
 
 <%= render(:partial => "progress", :locals => {:step => 2}) %>
 
-<table border="1">
+<table>
   <tr>
     <th>メールアドレス</th>
     <td><%=h @signup_form.email %></td>

data/app/views/signup/index.html.erb

@@ -11,7 +11,7 @@
     <h2>OpenIDで登録！</h2>
     <div>登録の流れ: OpenIDを入力 → OpenID認証 → 確認 → 登録完了！</div>
     <%- form_tag(:controller => "signup/open_id", :action => "authenticate") { -%>
-      <table border="1">
+      <table>
         <tr>
           <th><%= label_tag("openid_url", "OpenID URL") %></th>
           <td>
@@ -26,7 +26,7 @@
     <h2>メールアドレスで登録！</h2>
     <div>登録の流れ: メールアドレスとパスワードを入力 → 確認 → 確認メール受信 → 確認 → 登録完了！</div>
     <%- form_for(:signup_form, @signup_form, :url => {:controller => "signup/email", :action => "validate"}) { |f| -%>
-      <table border="1">
+      <table>
         <tr>
           <th><%= f.label(:email) %></th>
           <td>

data/app/views/signup/open_id/authenticated.html.erb

@@ -3,7 +3,7 @@
 
 <h1>認証完了</h1>
 
-<table border="1">
+<table>
   <tr>
     <th>OpenID</th>
     <td><%=h @identity_url %></td>

data/app/views/signup/open_id/index.html.erb

@@ -4,7 +4,7 @@
 <h1>サインアップ</h1>
 
 <%- form_tag(:action => "authenticate") { -%>
-  <table border="1">
+  <table>
     <tr>
       <th><%= label_tag("openid_url", "OpenID URL") %></th>
       <td>

data/lib/multi_auth/action_controller.rb

@@ -46,5 +46,3 @@ module MultiAuth
   end
 end
 
-ActionController::Base.__send__(:extend, MultiAuth::ActionController::ClassMethods)
-ActionController::Base.__send__(:include, MultiAuth::ActionController::InstanceMethods)

data/lib/multi_auth/active_record.rb

@@ -12,5 +12,3 @@ module MultiAuth
   end
 end
 
-ActiveRecord::Base.__send__(:extend, MultiAuth::ActiveRecord::ClassMethods)
-

data/rails/init.rb

@@ -28,3 +28,8 @@ config.action_mailer.raise_delivery_errors = true
 config.action_mailer.delivery_method = :smtp
 config.action_mailer.smtp_settings = YAML.load_file(Rails.root + "config/smtp.yml")
 
+config.to_prepare do
+  ActiveRecord::Base.__send__(:extend, MultiAuth::ActiveRecord::ClassMethods)
+  ActionController::Base.__send__(:extend, MultiAuth::ActionController::ClassMethods)
+  ActionController::Base.__send__(:include, MultiAuth::ActionController::InstanceMethods)
+end

data/test/functional/auth_controller_test.rb

@@ -5,11 +5,19 @@ class AuthControllerTest < ActionController::TestCase
   test "routes" do
     base = {:controller => "auth"}
 
+    assert_routing("/auth",            base.merge(:action => "index"))
     assert_routing("/auth/logged_in",  base.merge(:action => "logged_in"))
-    assert_routing("/auth/logout",          base.merge(:action => "logout"))
+    assert_routing("/auth/logout",     base.merge(:action => "logout"))
     assert_routing("/auth/logged_out", base.merge(:action => "logged_out"))
   end
 
+  test "GET index" do
+    get :index
+
+    assert_response(:success)
+    assert_template("index")
+  end
+
   test "GET logged_in" do
     return_path = "/return"
 

data/test/unit/multi_auth_public_assets_generator_test.rb

@@ -9,7 +9,7 @@ class MultiAuthPublicAssetsGeneratorTest < Test::Unit::TestCase
     @dest = File.expand_path(File.join(File.dirname(__FILE__), '../..', 'lib', 'generators'))
     FileUtils.ln_s(@src, @dest)
     FileUtils.mkdir_p(fake_rails_root)
-    @original_files = file_list
+    @original_files = Dir.glob(File.join(fake_rails_root, '**/*'))
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multi_auth
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - okkez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 +09:00
+date: 2009-12-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - app/views/credentials/email/created.html.erb
 - app/views/credentials/email/activation.html.erb
 - app/views/auth/logged_out.html.erb
+- app/views/auth/index.html.erb
 - app/views/auth/open_id/index.html.erb
 - app/views/auth/email/index.html.erb
 - app/views/auth/logged_in.html.erb