app/controllers/admin/authentication_providers_controller.rb app/helpers/authentication_providers_helper.rb app/models/authentication/authentication_provider.rb app/models/authentication/clickpass_provider.rb app/models/authentication/known_provider.rb app/models/authentication/one_click_provider.rb app/models/authentication/open_id_provider.rb app/models/authentication/password_provider.rb app/models/authentication/windows_live_id_provider.rb app/views/admin/authentication_providers/edit.html.erb app/views/admin/authentication_providers/index.html.erb app/views/admin/authentication_providers/new.html.erb app/views/admin/authentication_providers/show.html.erb db/migrate/20081110184646_create_admin_authentication_providers.rb spec/controllers/admin/authentication_providers_controller_spec.rb spec/controllers/admin/authentication_providers_routing_spec.rb spec/fixtures/admin/admin_authentication_providers.yml spec/helpers/authentication_providers_helper_spec.rb spec/models/admin/authentication_provider_spec.rb spec/spec_helpers/authentication_provider_spec_helper.rb spec/views/admin/authentication_providers/edit.html.erb_spec.rb spec/views/admin/authentication_providers/index.html.erb_spec.rb spec/views/admin/authentication_providers/new.html.erb_spec.rb spec/views/admin/authentication_providers/show.html.erb_spec.rb @@ -3,4 +3,5 @@ log/*.log tmp/**/* .DS_Store doc/api -doc/app \ No newline at end of file +doc/app +db/user_schema.txt .gitignore @@ -13,7 +13,7 @@ class UserSessionsController < ApplicationController @user_session = UserSession.new(params[:user_session]) if @user_session.save flash[:notice] = "Login successful!" - redirect_back_or_default user_url + redirect_back_or_default root_url else render :action => :new end @@ -21,8 +21,8 @@ class UserSessionsController < ApplicationController def destroy @user_session.destroy - flash[:notice] = "Logout successful!" - redirect_back_or_default new_user_session_url + flash[:notice] = 'Logout successful!' + redirect_back_or_default login_url end end app/controllers/user_sessions_controller.rb @@ -1,3 +1,5 @@ class User < ActiveRecord::Base + acts_as_authentic + end app/models/user.rb @@ -16,6 +16,10 @@ require 'yaml' # script/generate executes environment.rb but hasn't required yam APP_CONFIG = YAML.load(config_file)[RAILS_ENV] Rails::Initializer.run do |config| + + # Modify load_paths to find models in subdirectories + Dir.glob("#{RAILS_ROOT}/app/models/*[^.rb]").each{|dir| config.load_paths << dir } + # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. config/environment.rb @@ -1,5 +1,5 @@ ActionController::Routing::Routes.draw do |map| - + map.logout '/logout', :controller => 'user_sessions', :action => 'destroy' map.login '/login', :controller => 'user_sessions', :action => 'new' map.signup '/signup', :controller => 'users', :action => 'new' @@ -7,6 +7,13 @@ ActionController::Routing::Routes.draw do |map| map.resources :users map.resource :user_session + # ================== + # = Administration = + # ================== + map.namespace :admin do |admin| + admin.resources :authentication_providers + end + map.root :controller => 'pages' end config/routes.rb @@ -9,7 +9,20 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081106212028) do +ActiveRecord::Schema.define(:version => 20081110184646) do + + create_table "authentication_providers", :force => true do |t| + t.string "name", :default => "", :null => false + t.string "type", :default => "AuthenticationProvider", :null => false + t.string "label" + t.string "logo" + t.string "button" + t.text "description" + t.boolean "active", :default => true, :null => false + t.integer "display_sequence" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "users", :force => true do |t| t.string "screen_name", :limit => 50 db/schema.rb @@ -19,7 +19,7 @@ authentication_providers_010: logo: "" id: "28" description: "" - type: windowsliveid + type: WindowsLiveIdProvider label: Windows Live Id created_at: 2008-03-31 16:03:29 active: "1" @@ -31,7 +31,7 @@ authentication_providers_001: logo: openid.jpg id: "19" description: E.g. http://claimid.com/[OpenID Name] - type: OpenId + type: OpenIdProvider label: OpenID URL created_at: 2008-03-31 16:03:28 active: "1" @@ -43,7 +43,7 @@ authentication_providers_002: logo: magnolia.jpg id: "20" description: "" - type: Password + type: PasswordProvider label: Ma.gnolia Sign-in created_at: 2008-03-31 16:03:28 active: "1" @@ -55,7 +55,7 @@ authentication_providers_003: logo: yahoo.jpg id: "21" description: Click below to sign in with your Yahoo account. - type: OneClick + type: OneClickProvider label: Yahoo created_at: 2008-03-31 16:03:29 active: "1" @@ -67,7 +67,7 @@ authentication_providers_004: logo: facebook.jpg id: "22" description: Click below to sign in with your Facebook account. Facebook will authenticate you for Ma.gnolia without revealing your password. - type: OneClick + type: OneClickProvider label: "" created_at: 2008-03-31 16:03:29 active: "1" @@ -79,7 +79,7 @@ authentication_providers_005: logo: clickpass.jpg id: "23" description: Click below to sign in with Clickpass. - type: Clickpass + type: ClickpassProvider label: "" created_at: 2008-03-31 16:03:29 active: "1" @@ -91,7 +91,7 @@ authentication_providers_006: logo: wordpress.jpg id: "24" description: E.g. http://[your blog].wordpress.com - type: OpenId + type: OpenIdProvider label: WordPress Blog URL created_at: 2008-03-31 16:03:29 active: "1" db/system_data/authentication_providers.yml @@ -50,7 +50,7 @@ describe UserSessionsController do it "should re-render the 'new' template" do UserSession.should_receive(:find).and_return(nil) mock_user_session.should_receive(:save).and_return(false) - UserSession.should_receive(:new).with({'these' => 'params'}).and_return(mock_user_session) + UserSession.stub!(:new).and_return(mock_user_session(:save => false)) post :create, :user_session => {} response.should render_template('new') end spec/controllers/user_sessions_controller_spec.rb log/development.log log/test.log d391e3171c3f771f25a1d3fb9c226ac78979cd09 Jesse Clark jesse@jesseclark.com http://github.com/magnolia/magnolia/commit/491b0b6d3f86d3730f3a783eab84024df0d43c15 491b0b6d3f86d3730f3a783eab84024df0d43c15 2008-11-10T17:20:13-08:00 2008-11-10T17:20:13-08:00 Added AuthenticationProviders. Scaffolded for admin section. 7853fa232359b918e3077730c8c87d6f6091242c Jesse Clark jesse@jesseclark.com