okkez-multi_auth 0.0.4 → 0.0.5

data/README

@@ -1,7 +1,7 @@
 MultiAuth
 =========
 
-This engine provides basic signup/login functionality for your Rails applications.
+This engine provides basic signup/login functionalities for your Rails applications.
 
 Install
 =======
@@ -55,6 +55,20 @@ You can use default style sheet and icons.
   $ ruby script/generate multi_auth_public_assets
 
 
+Settings
+========
+
+You can config in RAILS_ROOT/config/initializers/*.rb
+
+Ex.
+
+  MultiAuth.setup do |s|
+    s.application_name = 'Your app name'
+    s.from_address = 'yourname@example.com'
+    s.user_model = 'YourUserModel'
+    s.session_times_out_in = 1.hour
+  end
+
 Customize
 =========
 

data/app/controllers/application_controller.rb

@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
   protect_from_forgery # See ActionController::RequestForgeryProtection for details
 
+  # multi_auth を使用するアプリケーションには影響しない
   GetText.locale = "ja"
   init_gettext "multi_auth"
 

data/app/controllers/auth/email_controller.rb

@@ -27,7 +27,7 @@ class Auth::EmailController < ApplicationController
       redirect_to(:controller => "/auth", :action => "logged_in")
     else
       @login_form.password = nil
-      set_error_now("メールアドレス、またはパスワードが違います。")
+      set_error_now(p_("MultiAuth", "The email address or the password is wrong."))
       render(:action => "index")
     end
   end

data/app/controllers/auth/open_id_controller.rb

@@ -21,10 +21,10 @@ class Auth::OpenIdController < ApplicationController
         if @open_id_credential
           @open_id_credential.login!
           session[:user_id] = @open_id_credential.user_id
-          flash[:notice] = "ログインしました。"
+          set_notice(p_("MultiAuth", "Logged in successfully."))
           redirect_to(root_path)
         else
-          flash[:notice] = "OpenID がまだ登録されていません。"
+          set_notice(p_("MultiAuth", "This OpenID has not been registered yet."))
           redirect_to(:controller => "signup/open_id", :action => "index")
         end
       else
@@ -36,7 +36,7 @@ class Auth::OpenIdController < ApplicationController
   private
 
   def failed_login(message)
-    flash[:error] = message
+    set_error(message)
     redirect_to(root_path)
   end
 

data/app/controllers/credentials/email_controller.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # メール認証情報コントローラ
 class Credentials::EmailController < ApplicationController
@@ -37,12 +38,12 @@ class Credentials::EmailController < ApplicationController
         :recipients     => @email_credential.email,
         :activation_url => @activation_url)
 
-      set_notice("メール認証情報を追加しました。")
+      set_notice(p_("MultiAuth", "Email authentication credential was successfully added."))
       redirect_to(:action => "created", :email_credential_id => @email_credential.id)
     else
       @edit_form.password              = nil
       @edit_form.password_confirmation = nil
-      set_error_now("入力内容を確認してください。")
+      set_error_now(p_("MultiAuth", "Please confirm your input."))
       render(:action => "new")
     end
   end
@@ -64,12 +65,12 @@ class Credentials::EmailController < ApplicationController
     @email_credential.attributes = @edit_form.to_email_credential_hash
 
     if @edit_form.valid? && @email_credential.save
-      set_notice("パスワードを変更しました。")
+      set_notice(p_("MultiAuth", "Password was changed."))
       redirect_to(:controller => "/credentials")
     else
       @edit_form.password              = nil
       @edit_form.password_confirmation = nil
-      set_error_now("入力内容を確認してください。")
+      set_error_now(p_("MultiAuth", "Please confirm your input."))
       render(:action => "edit_password")
     end
   end
@@ -83,7 +84,7 @@ class Credentials::EmailController < ApplicationController
   def destroy
     @email_credential.destroy
 
-    set_notice("メール認証情報を削除しました。")
+    set_notice(p_("MultiAuth", "Email authentication credential was successfully deleted."))
     redirect_to(:controller => "/credentials")
   end
 
@@ -117,7 +118,7 @@ class Credentials::EmailController < ApplicationController
     if @email_credential
       return true
     else
-      set_error("メール認証情報IDが正しくありません。")
+      set_error(p_("MultiAuth", "It is invalid email authentication credential."))
       redirect_to(root_path)
       return false
     end
@@ -127,7 +128,7 @@ class Credentials::EmailController < ApplicationController
     if @email_credential.user_id == @login_user.id
       return true
     else
-      set_error("メール認証情報IDが正しくありません。")
+      set_error(p_("MultiAuth", "It is invalid email authentication credential."))
       redirect_to(root_path)
       return false
     end
@@ -138,7 +139,7 @@ class Credentials::EmailController < ApplicationController
     if @email_credential
       return true
     else
-      set_error("アクティベーショントークンが正しくありません。")
+      set_error(p_("MultiAuth", "It is invalid activation token."))
       redirect_to(root_path)
       return false
     end
@@ -146,7 +147,7 @@ class Credentials::EmailController < ApplicationController
 
   def only_inactive_email_credential
     if @email_credential.activated?
-      set_error("既にアクティベーションされています。")
+      set_error(p_("MultiAuth", "This email authentication credential has been already activated."))
       redirect_to(root_path)
       return false
     else

data/app/controllers/credentials/open_id_controller.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # OpenID認証情報コントローラ
 class Credentials::OpenIdController < ApplicationController
@@ -18,7 +19,7 @@ class Credentials::OpenIdController < ApplicationController
     @login_form = OpenIdLoginForm.new(params[:login_form])
 
     if params[:open_id_complete].nil? && !@login_form.valid?
-      set_error_now("入力内容を確認してください。")
+      set_error_now(p_("MultiAuth", "Please confirm your input."))
       render(:action => "new")
       return
     end
@@ -33,9 +34,11 @@ class Credentials::OpenIdController < ApplicationController
         if @open_id_credential.new_record?
           @open_id_credential.save!
 
+          set_notice(p_("MultiAuth", "OpenID authentication credential was successfully added."))
           set_notice("OpenID認証情報を追加しました。")
           redirect_to(:controller => "/credentials", :action => "index")
         else
+          set_error_now(p_("MultiAuth", "This OpenID has been already registered."))
           set_error_now("既に使用されているOpenIDです。")
           render(:action => "new")
         end
@@ -55,6 +58,7 @@ class Credentials::OpenIdController < ApplicationController
   def destroy
     @open_id_credential.destroy
 
+    set_notice(p_("MultiAuth", "OpenID authentication credential was successfully deleted."))
     set_notice("OpenID認証情報を削除しました。")
     redirect_to(:controller => "/credentials")
   end
@@ -67,6 +71,7 @@ class Credentials::OpenIdController < ApplicationController
     if @open_id_credential
       return true
     else
+      set_error(p_("MultiAuth", "It is invalid OpenID authentication credential."))
       set_error("OpenID認証情報IDが正しくありません。")
       redirect_to(root_path)
       return false
@@ -77,6 +82,7 @@ class Credentials::OpenIdController < ApplicationController
     if @open_id_credential.user_id == @login_user.id
       return true
     else
+      set_error(p_("MultiAuth", "It is invalid OpenID authentication credential."))
       set_error("OpenID認証情報IDが正しくありません。")
       redirect_to(root_path)
       return false

data/app/controllers/signup/email_controller.rb

@@ -24,7 +24,7 @@ class Signup::EmailController < ApplicationController
     else
       @signup_form.password              = nil
       @signup_form.password_confirmation = nil
-      set_error_now("入力内容を確認してください。")
+      set_error_now(p_("MultiAuth", "Please confirm your input."))
       render(:action => "index")
     end
   end
@@ -36,7 +36,7 @@ class Signup::EmailController < ApplicationController
     if @signup_form.valid?
       render
     else
-      set_error_now("入力内容を確認してください。")
+      set_error_now(p_("MultiAuth", "Please confirm your input."))
       render(:action => "index")
     end
   end
@@ -64,7 +64,7 @@ class Signup::EmailController < ApplicationController
 
       redirect_to(:action => "created")
     else
-      set_error_now("入力内容を確認してください。")
+      set_error_now(p_("MultiAuth", "Please confirm your input."))
       render(:action => "index")
     end
   end
@@ -90,13 +90,13 @@ class Signup::EmailController < ApplicationController
     @credential = EmailCredential.find_by_activation_token(params[:activation_token])
 
     unless @credential
-      set_error("無効なアクティベーションキーです。")
+      set_error(p_("MultiAuth", "It is an invalid activation key."))
       redirect_to(root_path)
       return
     end
 
     if @credential.activated?
-      set_error("既に本登録されています。")
+      set_error(p_("MultiAuth", "This email address has been already registered."))
       redirect_to(root_path)
       return
     end

data/app/controllers/signup/open_id_controller.rb

@@ -22,7 +22,9 @@ class Signup::OpenIdController < ApplicationController
     authenticate_with_open_id(@openid_url) { |result, identity_url, sreg|
       if result.successful?
         if OpenIdCredential.exists?(:identity_url => identity_url)
-          failed["指定されたOpenIDは既に登録されているため、利用できません。"]
+          failed[p_("MultiAuth",
+                    "Because specified OpenID has already been registered, " +
+                    "it is not possible to use it. ")]
         else
           session[:identity_url] = identity_url
           redirect_to(:action => "authenticated")

data/app/models/activation_mailer.rb

@@ -14,7 +14,7 @@ class ActivationMailer < ActionMailer::Base
     raise(ArgumentError) unless options.empty?
 
     return {
-      :subject    => SubjectPrefix + "ユーザ登録",
+      :subject    => SubjectPrefix + p_("MultiAuth", "User registration"),
       :from       => FromAddress,
       :recipients => recipients,
       :body       => {:activation_url => activation_url},
@@ -27,7 +27,7 @@ class ActivationMailer < ActionMailer::Base
     raise(ArgumentError) unless options.empty?
 
     return {
-      :subject    => SubjectPrefix + "ユーザ登録完了",
+      :subject    => SubjectPrefix + p_("MultiAuth", "User registration completed"),
       :from       => FromAddress,
       :recipients => recipients,
       :body       => {},
@@ -41,7 +41,7 @@ class ActivationMailer < ActionMailer::Base
     raise(ArgumentError) unless options.empty?
 
     return {
-      :subject    => SubjectPrefix + "メールアドレス認証登録",
+      :subject    => SubjectPrefix + p_("MultiAuth", "Email address registration for authentication"),
       :from       => FromAddress,
       :recipients => recipients,
       :body       => {:activation_url => activation_url},
@@ -54,7 +54,7 @@ class ActivationMailer < ActionMailer::Base
     raise(ArgumentError) unless options.empty?
 
     return {
-      :subject    => SubjectPrefix + "メールアドレス認証登録完了",
+      :subject    => SubjectPrefix + p_("MultiAuth", "Email address registration for authentication completed"),
       :from       => FromAddress,
       :recipients => recipients,
       :body       => {},
@@ -68,7 +68,7 @@ class ActivationMailer < ActionMailer::Base
     raise(ArgumentError) unless options.empty?
 
     return {
-      :subject    => SubjectPrefix + "通知先メールアドレス登録",
+      :subject    => SubjectPrefix + p_("MultiAuth", "Email address registration for notification"),
       :from       => FromAddress,
       :recipients => recipients,
       :body       => {:activation_url => activation_url},
@@ -81,7 +81,7 @@ class ActivationMailer < ActionMailer::Base
     raise(ArgumentError) unless options.empty?
 
     return {
-      :subject    => SubjectPrefix + "通知先メールアドレス登録完了",
+      :subject    => SubjectPrefix + p_("MultiAuth", "Email address registration for notification completed"),
       :from       => FromAddress,
       :recipients => recipients,
       :body       => {},

data/app/models/email_credential.rb

@@ -16,6 +16,11 @@
 
 # メール認証情報
 class EmailCredential < ActiveRecord::Base
+
+  untranslate  :created_at, :user_id, :hashed_password
+
+  N_("EmailCredential|Activated on")
+
   EmailMaximumLength = 200
   TokenLength  = 20
   TokenPattern = TokenUtil.create_token_regexp(TokenLength)

data/app/models/open_id_credential.rb

@@ -13,6 +13,11 @@
 
 # OpenID認証情報
 class OpenIdCredential < ActiveRecord::Base
+
+  untranslate :created_at, :user_id
+
+  N_("OpenIdCredential|Activated on")
+
   MaximumRecordsPerUser = 10
 
   belongs_to :user, :class_name => MultiAuth.user_model, :foreign_key => 'user_id'

data/app/models/session.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # == Schema Information
 # Schema version: 20090529051529
 #
@@ -12,6 +13,9 @@
 
 # セッション
 class Session < ActiveRecord::Base
+
+  untranslate_all
+
   def self.cleanup(seconds)
     self.delete_all(["(sessions.updated_at < ?)", Time.now - seconds])
     return nil

data/app/views/activation_mailer/complete_for_credential.erb

@@ -1,4 +1,4 @@
-メールアドレス認証の登録が完了しました。
+<%=p_("MultiAuth", "The registration of the email address authentication was completed.") %>
 
 -- 
 <%= MultiAuth.application_name %>

data/app/views/activation_mailer/complete_for_notice.erb

@@ -1,4 +1,4 @@
-通知先メールアドレスの登録が完了しました。
+<%=p_("MultiAuth", "The email address registration was completed.") %>
 
 -- 
 <%= MultiAuth.application_name %>

data/app/views/activation_mailer/complete_for_signup.erb

@@ -1,4 +1,4 @@
-ユーザ登録が完了しました。
+<%=p_("MultiAuth", "The user registration was completed.") %>
 
 -- 
 <%= MultiAuth.application_name %>

data/app/views/activation_mailer/request_for_credential.erb

@@ -1,11 +1,11 @@
-メールアドレス認証を登録します。
-下記のURLへアクセスすることにより、登録が完了します。
+<%=p_("MultiAuth", "Email address for authentication will be registered.") %>
+<%=p_("MultiAuth", "Registration is completed by accessing following URL.") %>
 
 <%= @activation_url %>
 
-※ 携帯電話等でのアクセスに関して
-現時点では、Cookieに対応していない携帯電話等からは登録を行うことができません。
-お手数ではございますが、本メールをPC等に転送した上で、登録をお願いいたします。
+<%=p_("MultiAuth", "- For access with cellular phone etc.") %>
+<%=p_("MultiAuth", "It is not possible to register from the cellular phone etc. that do not correspond to Cookie now.") %>
+<%=p_("MultiAuth", "Please register after forwarding this mail to PC etc. though it is time.") %>
 
 -- 
 <%= MultiAuth.application_name %>

data/app/views/activation_mailer/request_for_notice.erb

@@ -1,11 +1,11 @@
-通知先メールアドレスを登録します。
-下記のURLへアクセスすることにより、登録が完了します。
+<%=p_("MultiAuth", "Email address for notification will be registered.") %>
+<%=p_("MultiAuth", "Registration is completed by accessing following URL.") %>
 
 <%= @activation_url %>
 
-※ 携帯電話等でのアクセスに関して
-現時点では、Cookieに対応していない携帯電話等からは登録を行うことができません。
-お手数ではございますが、本メールをPC等に転送した上で、登録をお願いいたします。
+<%=p_("MultiAuth", "- For access with cellular phone etc.") %>
+<%=p_("MultiAuth", "It is not possible to register from the cellular phone etc. that do not correspond to Cookie now.") %>
+<%=p_("MultiAuth", "Please register after forwarding this mail to PC etc. though it is time.") %>
 
 -- 
 <%= MultiAuth.application_name %>

data/app/views/activation_mailer/request_for_signup.erb

@@ -1,11 +1,11 @@
-<%= MultiAuth.application_name %>へのユーザ登録、ありがとうございます。
-下記のURLへアクセスすることにより、登録が完了します。
+<%=p_("MultiAuth", "Thank you for the user registration to %{app}." % { :app => MultiAuth.application_name }) %>
+<%=p_("MultiAuth", "Registration is completed by accessing following URL.") %>
 
 <%= @activation_url %>
 
-※ 携帯電話等でのアクセスに関して
-現時点では、Cookieに対応していない携帯電話等からは登録を行うことができません。
-お手数ではございますが、本メールをPC等に転送した上で、登録をお願いいたします。
+<%=p_("MultiAuth", "- For access with cellular phone etc.") %>
+<%=p_("MultiAuth", "It is not possible to register from the cellular phone etc. that do not correspond to Cookie now.") %>
+<%=p_("MultiAuth", "Please register after forwarding this mail to PC etc. though it is time.") %>
 
 -- 
 <%= MultiAuth.application_name %>

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

@@ -1,5 +1,5 @@
 
-<%- @title = "ログイン" -%>
+<%- @title = p_("MultiAuth", "Login") -%>
 <%- @enable_side_column = false -%>
 
 <%- additional_head { -%>
@@ -61,7 +61,7 @@
 <%- } -%>
 
 <div id="dialog">
-  <h1>ログイン</h1>
+  <h1><%=h p_("MultiAuth", "Login") %></h1>
   <%- form_for(:login_form, @login_form, :url => {:action => "login"}) do |f| -%>
     <table id="email-login">
       <tr>
@@ -79,7 +79,7 @@
         </td>
       </tr>
     </table>
-    <%= submit_tag("ログイン") %>
+    <%= submit_tag(p_("MultiAuth", "Login")) %>
   <%- end -%>
 </div>