multi_auth 0.0.1 → 0.0.2

data/README

@@ -1,13 +1,17 @@
 MultiAuth
 =========
 
-This engine provides basic login functionality for your Rails applications.
+This engine provides basic signup/login functionality for your Rails applications.
 
 Install
 =======
 
   $ sudo gem install okkez-multi_auth
 
+or
+
+  $ sudo gem install multi_auth
+
 Setup
 =====
 
@@ -15,14 +19,29 @@ Setup
 
 Create migrations for open_id_authentication.
 
-  $ rake multi_auth:copy:all
+  $ ruby script/generate multi_auth_migration create_multi_auth_tables
 
-Copy migrations, stylesheets and images from multi_auth plugin.
+Create migrations for multi_auth.
 
   $ rake db:migrate
 
 You must have a model 'User'. User model has any columns which you want to add.
 
+Ex.
+
+  class User < ActiveRecord::Base
+    multi_auth
+  end
+
+You can use MultiAuthHelper, see below.
+
+Ex.
+
+  module ApplicationHelper
+    include MultiAuthHelper
+  end
+
+
 Customize
 =========
 

data/app/controllers/signup/email_controller.rb

@@ -45,7 +45,7 @@ class Signup::EmailController < ApplicationController
   def create
     @signup_form = EditFormClass.new(session[:signup_form])
 
-    @user = User.new
+    @user = MultiAuth.user_model_class.new
     @credential = @user.email_credentials.build
     @credential.attributes = @signup_form.to_email_credential_hash
 

data/app/controllers/signup/open_id_controller.rb

@@ -42,7 +42,7 @@ class Signup::OpenIdController < ApplicationController
   def create
     @identity_url = session[:identity_url]
 
-    @user = User.new
+    @user = MultiAuth.user_model_class.new
     @credential = @user.open_id_credentials.build
     @credential.identity_url = @identity_url
 

data/app/models/{user.rb → dummy_user.rb}

@@ -12,13 +12,14 @@
 #
 
 # ユーザ
-class User < ActiveRecord::Base
+class DummyUser < ActiveRecord::Base
+  untranslate_all
+  set_table_name 'users'
   NicknameMaximumLength = 40
   TokenLength  = 20
   TokenPattern = TokenUtil.create_token_regexp(TokenLength)
 
-  has_many :open_id_credentials
-  has_many :email_credentials
+  multi_auth
 
   validates_presence_of :user_token
   validates_length_of :nickname, :maximum => NicknameMaximumLength, :allow_nil => true

data/app/models/email_credential.rb

@@ -22,7 +22,7 @@ class EmailCredential < ActiveRecord::Base
   HashedPasswordPattern = /\A([0-9a-f]{8}):([0-9a-f]{64})\z/
   MaximumRecordsPerUser = 10
 
-  belongs_to :user
+  belongs_to :user, :class_name => MultiAuth.user_model, :foreign_key => 'user_id'
 
   validates_presence_of :email
   validates_presence_of :activation_token

data/app/models/open_id_credential.rb

@@ -15,7 +15,7 @@
 class OpenIdCredential < ActiveRecord::Base
   MaximumRecordsPerUser = 10
 
-  belongs_to :user
+  belongs_to :user, :class_name => MultiAuth.user_model, :foreign_key => 'user_id'
 
   validates_presence_of :identity_url
   validates_length_of :identity_url, :maximum => 200, :allow_nil => true

data/generators/multi_auth_migration/USAGE

@@ -0,0 +1,5 @@
+Description:
+    Sets up MultiAuth in your Rails project. 
+
+Examples:
+    `./script/generate mutli_auth`

data/generators/multi_auth_migration/multi_auth_migration_generator.rb

@@ -0,0 +1,12 @@
+
+class MultiAuthMigrationGenerator < Rails::Generator::NamedBase
+  def initialize(runtime_args, runtime_options = { })
+    super
+  end
+
+  def manifest
+    record do |m|
+      m.migration_template('migration.rb', 'db/migrate')
+    end
+  end
+end

data/generators/multi_auth_migration/templates/migration.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :open_id_credentials do |t|
+      t.datetime :created_at,   :null => false
+      t.integer  :user_id,      :null => false
+      t.string   :identity_url, :null => false, :limit => 200
+      t.datetime :loggedin_at,  :null => true
+    end
+
+    add_index :open_id_credentials, :user_id
+    add_index :open_id_credentials, :identity_url, :unique => true
+
+    create_table :email_credentials do |t|
+      t.datetime :created_at,       :null => false
+      t.string   :activation_token, :null => false, :limit => 40
+      t.integer  :user_id,          :null => false
+      t.string   :email,            :null => false, :limit => 200
+      t.string   :hashed_password,  :null => false, :limit => 8 + 1 + 64
+      t.datetime :activated_at,     :null => true
+      t.datetime :loggedin_at,      :null => true
+    end
+
+    add_index :email_credentials, :created_at
+    add_index :email_credentials, :activation_token, :unique => true
+    add_index :email_credentials, :user_id
+    add_index :email_credentials, :email, :unique => true
+    add_index :email_credentials, :activated_at
+  end
+
+  def self.down
+    drop_table :open_id_credentials
+    drop_table :email_credentials
+  end
+end

data/generators/multi_auth_style_sheet/multi_auth_style_sheet_generator.rb

@@ -0,0 +1,13 @@
+
+class MultiAuthStyleSheetGenerator < Rails::Generator::Base
+  def initialize(runtime_args, runtime_options = { })
+    super
+  end
+
+  def manifest
+    record do |m|
+      m.directory('public/stylesheets')
+      m.file('style.css', 'public/stylesheets/multi_auth.css')
+    end
+  end
+end

data/generators/multi_auth_style_sheet/templates/style.css

@@ -0,0 +1,502 @@
+
+/* generic */
+
+*
+{
+    margin: 0;
+    padding: 0;
+}
+
+body
+{
+    width: 100%;
+    background-color: #F0F0F0;
+}
+
+a
+{
+    color: #0066CC;
+    text-decoration: none;
+}
+
+a:hover
+{
+    text-decoration: underline;
+}
+
+a img
+{
+    border-width: 0;
+}
+
+/* head */
+
+#head-outer
+{
+    position: relative;
+    width: 100%;
+    min-width: 700px;
+    height: 120px;
+    background-color: #000000;
+    background-image: url(/images/logo-back.png);
+    background-repeat: repeat-x;
+}
+
+#head-inner
+{
+}
+
+#head-logo
+{
+    position: relative;
+    width: 350px;
+}
+#head-logo img
+{
+    display: block;
+}
+
+#head-navi
+{
+    position: absolute;
+    top: 95px;
+    right: 10px;
+    font-size: 13px;
+    line-height: 20px;
+    color: #CCCCCC;
+}
+#head-navi a
+{
+    color: #99CCFF;
+}
+
+#head-ad
+{
+    position: absolute;
+    width: 470px;
+    height: 62px;
+    top: 25px;
+    right: 20px;
+}
+
+/* body */
+
+#body-outer-with-background,
+#body-outer-without-background
+{
+    position: relative;
+    width: 100%;
+    min-width: 700px;
+}
+
+#body-outer-with-background
+{
+    background-image: url(../images/side-column-back.png);
+    background-repeat: repeat-y;
+    background-position: right;
+}
+
+#body-inner
+{
+}
+
+#content-outer
+{
+}
+
+#content-inner
+{
+    padding: 10px;
+}
+
+#content-column-outer
+{
+    margin: 0px 200px 0px 0px;
+}
+
+#content-column-inner
+{
+    padding: 10px;
+}
+
+#side-column-outer
+{
+    width: 200px;
+    min-height: 400px;
+}
+
+#side-column-inner
+{
+    padding: 10px;
+}
+
+/* foot */
+
+#foot-outer
+{
+    width: 100%;
+    min-width: 700px;
+    border-width: 1px 0px 0px 0px;
+    border-style: solid;
+    border-color: #D0D0D0;
+}
+
+#foot-inner
+{
+    padding: 20px;
+}
+
+#foot-powerd
+{
+    float: right;
+    font-size: 90%;
+    font-weight: bold;
+    color: #999999;
+}
+#foot-powerd a
+{
+    color: #333333;
+}
+
+#foot-github
+{
+    font-size: 95%;
+}
+
+#foot-services
+{
+    font-size: 90%;
+    color: #999999;
+}
+#foot-services a
+{
+    color: #333333;
+}
+
+/* topic path */
+
+#topic-path
+{
+    padding: 0.1em 0.4em;
+    background-color: #E0E0E0;
+    color: #999999;
+    font-size: 90%;
+}
+
+#topic-path a
+{
+}
+
+#topic-path em
+{
+    color: #666666;
+    font-weight: bold;
+    font-style: normal;
+}
+
+/* for debug */
+
+div.debug
+{
+    margin-top: 1em;
+    background-color: #FFF0F0;
+}
+
+/* table.list */
+
+table.list
+{
+    border-collapse: collapse;
+}
+
+table.list thead tr th
+{
+    padding: 0.4em;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #F0F0F0;
+    color: #CCCCCC;
+    background-color: #333333;
+}
+
+table.list tbody tr
+{
+    border-width: 1px;
+    border-style: solid;
+    border-color: #F0F0F0;
+}
+
+table.list tbody tr td
+{
+    padding: 0.2em 0.4em;
+    border-width: 0;
+}
+
+table.list tbody tr.even td
+{
+    background-color: #E0E0E0;
+}
+
+table.list tbody tr.odd td
+{
+    background-color: #D0D0D0;
+}
+
+/* table.energies */
+
+table.energies img
+{
+    vertical-align: text-top;
+}
+
+table.energies thead tr th
+{
+    font-size: 70%;
+}
+
+table.energies tbody tr td
+{
+    font-size: 80%;
+}
+
+table.energies tfoot td
+{
+    color: #999999;
+    text-align: right;
+}
+
+/* table.events */
+
+table.events img
+{
+    vertical-align: text-top;
+}
+
+table.events thead tr th
+{
+    font-size: 70%;
+}
+
+table.events tbody tr td
+{
+    font-size: 80%;
+}
+
+table.events tfoot td
+{
+    color: #999999;
+    text-align: right;
+}
+
+/* battery */
+
+div.battery-cell
+{
+    margin: 0;
+    padding: 4px 7px 4px 5px;
+    width: 100px;
+    height: 13px;
+    background-image: url(/images/battery/cell.png);
+    background-repeat: no-repeat;
+}
+
+div.battery-level
+{
+    margin: 0;
+    padding: 0;
+    width: 100px;
+    height: 13px;
+}
+
+div.battery-high,
+div.battery-middle,
+div.battery-low,
+div.battery-empty
+{
+    margin: 0;
+    padding: 0;
+    height: 13px;
+    background-repeat: repeat-x;
+}
+
+div.battery-high
+{
+    background-image: url(/images/battery/level-green.png);
+}
+
+div.battery-middle
+{
+    background-image: url(/images/battery/level-orange.png);
+}
+
+div.battery-low
+{
+    background-image: url(/images/battery/level-yellow.png);
+}
+
+div.battery-empty
+{
+    background-image: url(/images/battery/level-red.png);
+}
+
+/* signup-progress */
+/* FIXME: 別ファイルに分離 */
+
+ol#email-signup-progress
+{
+}
+
+ol#email-signup-progress li
+{
+    display: inline;
+    border-style: solid;
+    border-width: 1px;
+    border-color: black;
+}
+
+ol#email-signup-progress li.active
+{
+    font-weight: bold;
+}
+
+ol#email-signup-progress li.inactive
+{
+    font-weight: normal;
+}
+
+#dialog
+{
+    margin: 100px auto;
+    padding: 15px;
+    width: 500px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #CCCCCC;
+}
+#dialog h1
+{
+    margin: 0 0 0.4em 0;
+    color: #666666;
+    font-size: 130%;
+    font-weight: bold;
+}
+.message
+{
+    color: #999999;
+    font-size: 90%;
+}
+
+h1
+{
+    background-image: url(/images/h1-back.png);
+    background-repeat: repeat-x;
+    background-position: left center;
+}
+h1 span
+{
+    padding-right: 0.2em;
+    background-color: #F0F0F0;
+}
+
+h2
+{
+    background-image: url(/images/h1-back.png);
+    background-repeat: repeat-x;
+    background-position: left center;
+}
+h2 span
+{
+    padding-right: 0.2em;
+    background-color: #F0F0F0;
+}
+
+/* side-column */
+
+#side-column-inner h1
+{
+    margin-bottom: 8px;
+    color: #666666;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+#side-column-inner hr
+{
+    height: 1px;
+    margin: 8px 0px;
+    border: none;
+    background-color: #CCCCCC;
+}
+
+#signup-link
+{
+    font-size: 22px;
+    font-weight: bold;
+    text-align: center;
+}
+#signup-free
+{
+    margin-bottom: 10px;
+    font-size: 12px;
+    text-align: center;
+    color: #990000;
+}
+
+#openid-sites
+{
+    font-size: 12px;
+    line-height: 18px;
+}
+#openid-sites img
+{
+    vertical-align: text-bottom;
+}
+
+#side-column-inner form input.openid,
+#side-column-inner form input.openid-with-desc,
+#side-column-inner form input.email,
+#side-column-inner form input.email-with-desc,
+#side-column-inner form input.password,
+#side-column-inner form input.password-with-desc
+{
+    width: 160px; /* width:200 - (padding:20 + padding:18 + border:2)*/
+    height: 20px;
+    margin-bottom: 4px;
+    padding-left: 18px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #666666;
+    background-repeat: no-repeat;
+    background-position: 1px;
+}
+
+#side-column-inner form input.openid
+{
+    background-image: url(/images/icons/openid.png);
+}
+
+#side-column-inner form input.openid-with-desc
+{
+    background-image: url(/images/icons/openid-with-desc.png);
+}
+
+#side-column-inner form input.email
+{
+    background-image: url(/images/icons/fam/email.png);
+}
+
+#side-column-inner form input.email-with-desc
+{
+    background-image: url(/images/icons/fam/email-with-desc.png);
+}
+
+#side-column-inner form input.password
+{
+    background-image: url(/images/icons/fam/key.png);
+}
+
+#side-column-inner form input.password-with-desc
+{
+    background-image: url(/images/icons/fam/key-with-desc.png);
+}
+

data/lib/multi_auth/action_controller.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+module MultiAuth
+  module ActionController
+    module ClassMethods
+      def verify_method_post(options = {})
+        verify({
+                 :method => :post,
+                 :render => {:text => "Method Not Allowed", :status => 405},
+               }.merge(options))
+      end
+    end
+    module InstanceMethods
+      private
+
+      def authentication(user_id = session[:user_id])
+        @login_user = MultiAuth.user_model_class.find_by_id(user_id)
+        return true
+      end
+
+      def authentication_required
+        if @login_user
+          return true
+        else
+          set_error("ログインが必要です。")
+          redirect_to(root_path)
+          return false
+        end
+      end
+
+      def set_notice(message)
+        flash[:notice] = @flash_notice = message
+        flash[:error]  = @flash_error  = nil
+      end
+
+      def set_error(message)
+        flash[:notice] = @flash_notice = nil
+        flash[:error]  = @flash_error  = message
+      end
+
+      def set_error_now(message)
+        flash.now[:notice] = @flash_notice = nil
+        flash.now[:error]  = @flash_error  = message
+      end
+    end
+  end
+end
+
+ActionController::Base.__send__(:extend, MultiAuth::ActionController::ClassMethods)
+ActionController::Base.__send__(:include, MultiAuth::ActionController::InstanceMethods)

data/lib/multi_auth/active_record.rb

@@ -0,0 +1,16 @@
+
+module MultiAuth
+  module ActiveRecord
+    module ClassMethods
+      def multi_auth(options = { })
+        class_eval do
+          has_many :open_id_credentials, :foreign_key => 'user_id', :dependent => :destroy
+          has_many :email_credentials, :foreign_key => 'user_id', :dependent => :destroy
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.__send__(:extend, MultiAuth::ActiveRecord::ClassMethods)
+

data/lib/multi_auth.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-class MultiAuth
+module MultiAuth
 
   class << self
     attr_accessor_with_default :application_name, 'app'
@@ -9,56 +9,13 @@ class MultiAuth
     def setup
       yield self
     end
-
-    def self.user_model_class
-      @user_model.constantize
-    end
   end
 
-  module ClassMethods
-    def verify_method_post(options = {})
-      verify({
-               :method => :post,
-               :render => {:text => "Method Not Allowed", :status => 405},
-             }.merge(options))
-    end
-  end
-
-  module InstanceMethods
-
-    private
-
-    def authentication(user_id = session[:user_id])
-      @login_user = User.find_by_id(user_id)
-      return true
-    end
-
-    def authentication_required
-      if @login_user
-        return true
-      else
-        set_error("ログインが必要です。")
-        redirect_to(root_path)
-        return false
-      end
-    end
-
-    def set_notice(message)
-      flash[:notice] = @flash_notice = message
-      flash[:error]  = @flash_error  = nil
-    end
-
-    def set_error(message)
-      flash[:notice] = @flash_notice = nil
-      flash[:error]  = @flash_error  = message
-    end
-
-    def set_error_now(message)
-      flash.now[:notice] = @flash_notice = nil
-      flash.now[:error]  = @flash_error  = message
-    end
+  def self.user_model_class
+    user_model.constantize
   end
 end
 
-ActionController::Base.__send__(:extend, MultiAuth::ClassMethods)
-ActionController::Base.__send__(:include, MultiAuth::InstanceMethods)
+require 'multi_auth/action_controller'
+require 'multi_auth/active_record'
+

data/test/functional/signup/email_controller_test.rb

@@ -153,7 +153,7 @@ class Signup::EmailControllerTest < ActionController::TestCase
     @request.session[:signup_form] = @signup_form.attributes
 
     assert_difference("EmailCredential.count", +1) {
-      assert_difference("User.count", +1) {
+      assert_difference("#{MultiAuth.user_model}.count", +1) {
         post :create
       }
     }

data/test/test_helper.rb

@@ -41,6 +41,7 @@ class ActiveSupport::TestCase
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
   # -- they do not yet inherit this setting
+  set_fixture_class({ :users => DummyUser })
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
@@ -79,4 +80,5 @@ class ActiveSupport::TestCase
     assert_nil(assigns(:flash_notice))
     assert_not_nil(assigns(:flash_error))
   end
+
 end

data/test/unit/{user_test.rb → dummy_user_test.rb}

@@ -2,9 +2,9 @@
 
 require 'test_helper'
 
-class UserTest < ActiveSupport::TestCase
+class DummyUserTest < ActiveSupport::TestCase
   def setup
-    @klass = User
+    @klass = DummyUser
     @basic = @klass.new(
       :user_token => "0" * @klass::TokenLength,
       :nickname   => "nickname")

data/test/unit/notice_formatter_test.rb

@@ -128,13 +128,13 @@ class NoticeFormatterTest < ActiveSupport::TestCase
 
   test "format_part_of_user" do
     expected = {
-      "user:token"         => "0" * User::TokenLength,
-      "user:token:json"    => '"' + "0" * User::TokenLength + '"',
+      "user:token"         => "0" * MultiAuth.user_model_class::TokenLength,
+      "user:token:json"    => '"' + "0" * MultiAuth.user_model_class::TokenLength + '"',
       "user:nickname"      => "nickname",
       "user:nickname:json" => '"nickname"',
     }
-    user = User.new(
-      :user_token => "0" * User::TokenLength,
+    user = MultiAuth.user_model_class.new(
+      :user_token => "0" * MultiAuth.user_model_class::TokenLength,
       :nickname   => "nickname")
     assert_equal(expected, @module.format_part_of_user(user))
   end
@@ -146,7 +146,7 @@ class NoticeFormatterTest < ActiveSupport::TestCase
       "user:nickname"      => "-",
       "user:nickname:json" => "null",
     }
-    assert_equal(expected, @module.format_part_of_user(User.new))
+    assert_equal(expected, @module.format_part_of_user(MultiAuth.user_model_class.new))
     assert_equal(expected, @module.format_part_of_user(nil))
   end
 

data/test/unit/token_util_test.rb

@@ -19,19 +19,19 @@ class TokenUtilTest < ActiveSupport::TestCase
   end
 
   test "create_unique_token" do
-    assert_match(/\A[0-9a-f]{10}\z/, @mod.create_unique_token(User, :user_token, 10))
-    assert_match(/\A[0-9a-f]{20}\z/, @mod.create_unique_token(User, :user_token, 20))
-    assert_match(/\A[0-9a-f]{30}\z/, @mod.create_unique_token(User, :user_token, 30))
+    assert_match(/\A[0-9a-f]{10}\z/, @mod.create_unique_token(MultiAuth.user_model_class, :user_token, 10))
+    assert_match(/\A[0-9a-f]{20}\z/, @mod.create_unique_token(MultiAuth.user_model_class, :user_token, 20))
+    assert_match(/\A[0-9a-f]{30}\z/, @mod.create_unique_token(MultiAuth.user_model_class, :user_token, 30))
 
     srand(0)
     assert_not_equal(
-      @mod.create_unique_token(User, :user_token, 20),
-      @mod.create_unique_token(User, :user_token, 20))
+      @mod.create_unique_token(MultiAuth.user_model_class, :user_token, 20),
+      @mod.create_unique_token(MultiAuth.user_model_class, :user_token, 20))
   end
 
   test "create_unique_token, conflict" do
     [
-     [User,   :user_token],
+     [MultiAuth.user_model_class,   :user_token],
     ].each { |klass, column|
       exist_token  = klass.first[column]
       unique_token = "0" * exist_token.size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multi_auth
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - okkez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +09:00
+date: 2009-12-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,9 @@ files:
 - app/controllers/credentials_controller.rb
 - app/controllers/signup/email_controller.rb
 - app/controllers/signup/open_id_controller.rb
+- app/models/dummy_user.rb
 - app/models/email_credential_edit_form.rb
 - app/models/open_id_login_form.rb
-- app/models/user.rb
 - app/models/activation_mailer.rb
 - app/models/email_credential.rb
 - app/models/session.rb
@@ -105,6 +105,8 @@ files:
 - lib/multi_auth_helper.rb
 - lib/token_util.rb
 - lib/open_id_authentication/result.rb
+- lib/multi_auth/active_record.rb
+- lib/multi_auth/action_controller.rb
 - public/favicon.ico
 - public/422.html
 - public/503.html
@@ -153,6 +155,11 @@ files:
 - public/images/h1-back.png
 - public/robots.txt
 - rails/init.rb
+- generators/multi_auth_style_sheet/multi_auth_style_sheet_generator.rb
+- generators/multi_auth_style_sheet/templates/style.css
+- generators/multi_auth_migration/multi_auth_migration_generator.rb
+- generators/multi_auth_migration/USAGE
+- generators/multi_auth_migration/templates/migration.rb
 - test/unit/token_util_test.rb
 - test/unit/open_id_login_form_test.rb
 - test/unit/notice_formatter_test.rb
@@ -170,7 +177,7 @@ files:
 - test/unit/helpers/auth_helper_test.rb
 - test/unit/action_mailer_util_test.rb
 - test/unit/open_id_credential_test.rb
-- test/unit/user_test.rb
+- test/unit/dummy_user_test.rb
 - test/unit/activation_mailer_test.rb
 - test/unit/session_test.rb
 - test/unit/email_credential_test.rb