lib/goldberg/controller.rb lib/goldberg/filters.rb lib/goldberg/helper.rb lib/goldberg/migration.rb lib/goldberg/migrator.rb lib/goldberg/model.rb lib/goldberg/routes.rb @@ -1,6 +1,6 @@ module Goldberg class AuthController < ApplicationController - include GoldbergController + include Goldberg::Controller def self.set_user(session, user_id = nil) find_user_id = user_id || session[:goldberg][:user_id] @@ -53,6 +53,7 @@ module Goldberg respond_to do |wants| wants.html do if session[:pending_request] + logger.info "Pending request: #{session[:pending_request].inspect}" pending = session[:pending_request] session[:pending_request] = nil redirect_to pending app/controllers/goldberg/auth_controller.rb @@ -1,6 +1,6 @@ module Goldberg class ContentPagesController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], app/controllers/goldberg/content_pages_controller.rb @@ -1,6 +1,6 @@ module Goldberg class ControllerActionsController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], app/controllers/goldberg/controller_actions_controller.rb @@ -1,6 +1,6 @@ module Goldberg class MenuItemsController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update, app/controllers/goldberg/menu_items_controller.rb @@ -1,6 +1,6 @@ module Goldberg class PermissionsController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], app/controllers/goldberg/permissions_controller.rb @@ -1,6 +1,6 @@ module Goldberg class RolesController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], app/controllers/goldberg/roles_controller.rb @@ -1,6 +1,6 @@ module Goldberg class RolesPermissionsController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], app/controllers/goldberg/roles_permissions_controller.rb @@ -1,6 +1,6 @@ module Goldberg class SiteControllersController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], app/controllers/goldberg/site_controllers_controller.rb @@ -1,6 +1,6 @@ module Goldberg class SystemSettingsController < ApplicationController - include GoldbergController + include Goldberg::Controller def index list app/controllers/goldberg/system_settings_controller.rb @@ -2,7 +2,7 @@ require 'digest/sha1' module Goldberg class UsersController < ApplicationController - include GoldbergController + include Goldberg::Controller # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => :post, :only => [ :destroy, :create, :update ], @@ -13,25 +13,16 @@ module Goldberg @delegate_reg = false true # proceed... end - before_filter :foreign, :only => [:new, :delegate_register, - :create, :delegate_create, - :edit, :delegate_edit, - :update, :delegate_update] - before_filter :enable_self_reg, :only => [:self_show, :self_register, :self_create, - :self_edit, :self_update, - :confirm_registration, - :confirm_registration_submit] - before_filter :enable_delegate_reg, :only => [:delegate_list, :delegate_show, - :delegate_register, :delegate_create, - :delegate_edit, :delegate_update, - :delegate_destroy] - def registration_request - key = Digest::SHA1.hexdigest(self.object_id.to_s + rand.to_s) - # confirm = UserMailer.create_confirmation_request('Fred Bloggs', 'david@localhost', key) - UserMailer.deliver_confirmation_request('Fred Bloggs', 'david@localhost', key) - - render :nothing => true - end + before_filter :foreign, + :only => [:new, :delegate_register, :create, :delegate_create, + :edit, :delegate_edit, :update, :delegate_update] + before_filter :enable_self_reg, + :only => [:self_show, :self_register, :self_create, :self_edit, + :self_update, :confirm_registration, :confirm_registration_submit] + before_filter :enable_delegate_reg, + :only => [:delegate_list, :delegate_show, :delegate_register, + :delegate_create, :delegate_edit, :delegate_update, + :delegate_destroy] def list if @delegate_reg @@ -190,7 +181,8 @@ module Goldberg else if @user.update_attributes(params[:user]) flash.now[:notice] = 'User was successfully updated.' - redirect_to :action => 'show', :id => @user + redirect_to :action => (@self_reg ? 'self_show' : 'show'), + :id => @user else render :action => 'edit' end app/controllers/goldberg/users_controller.rb @@ -4,7 +4,7 @@ begin require 'redcloth' rescue nil end module Goldberg class ContentPage < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model belongs_to :permission validates_presence_of :name, :title, :permission_id @@ -80,6 +80,11 @@ module Goldberg def url return "/#{self.name}" end + + def fullname + "#{ERB::Util.html_escape(self.name)}" << + (self.title ? " -- #{ERB::Util.html_escape(self.title)}" : '') + end def content=(new_content) write_attribute(:content, new_content) app/models/goldberg/content_page.rb @@ -1,6 +1,6 @@ module Goldberg class ControllerAction < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model belongs_to :site_controller belongs_to :permission app/models/goldberg/controller_action.rb @@ -1,6 +1,6 @@ module Goldberg class MenuItem < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model validates_presence_of :name, :label validates_uniqueness_of :name app/models/goldberg/menu_item.rb @@ -1,6 +1,6 @@ module Goldberg class Permission < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model has_many :content_pages has_many :site_controllers app/models/goldberg/permission.rb @@ -3,7 +3,7 @@ require "goldberg/menu" module Goldberg class Role < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model has_many :users app/models/goldberg/role.rb @@ -1,6 +1,6 @@ module Goldberg class RolesPermission < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model validates_presence_of :role_id, :permission_id app/models/goldberg/roles_permission.rb @@ -1,9 +1,9 @@ module Goldberg class SiteController < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model belongs_to :permission - has_many :controller_actions, :order => 'name' + has_many :controller_actions, :order => 'name', :dependent => :destroy validates_presence_of :name, :permission_id validates_uniqueness_of :name app/models/goldberg/site_controller.rb @@ -1,7 +1,7 @@ module Goldberg class SystemSettings < ActiveRecord::Base set_table_name 'system_settings' - include GoldbergModel + include Goldberg::Model attr_accessor :public_role, :default_markup_style attr_accessor :site_default_page, :not_found_page, :permission_denied_page, app/models/goldberg/system_settings.rb @@ -2,22 +2,25 @@ require 'digest/sha1' module Goldberg class User < ActiveRecord::Base - include GoldbergModel + include Goldberg::Model belongs_to :role - validates_presence_of :name, :role_id + validates_presence_of :name, :role_id, :password validates_uniqueness_of :name attr_accessor :clear_password attr_accessor :confirm_password - - def before_save - if self.clear_password # Only update the password if it has been changed + + def before_validation + if self.clear_password # Only update password if changed self.password_salt = self.object_id.to_s + rand.to_s self.password = Digest::SHA1.hexdigest(self.password_salt + self.clear_password) end + end + + def before_save if self.self_reg_confirmation_required self.set_confirmation_key end app/models/goldberg/user.rb @@ -13,7 +13,7 @@ <td><%= collection_select 'menu_item', 'controller_action_id', @actions, :id, :fullname %></td> <td>OR <%= collection_select 'menu_item', 'content_page_id', - @pages, :id, :name %></td> + @pages, :id, :fullname %></td> </tr> <% if @can_change_parent -%> app/views/goldberg/menu_items/_form.rhtml @@ -1,5 +1,5 @@ class InitialSetup < ActiveRecord::Migration - include GoldbergMigration + include Goldberg::Migration def self.up create_table "#{prefix}permissions", :force => false do |t| db/migrate/001_initial_setup.rb @@ -1,5 +1,5 @@ class MenuRestItemsUsersCachedContentPages < ActiveRecord::Migration - include GoldbergMigration + include Goldberg::Migration def self.up # Add URL to use for Actions, to better support REST db/migrate/002_menu_rest_items_users_cached_content_pages.rb @@ -1,5 +1,5 @@ class SelfRegistration < ActiveRecord::Migration - include GoldbergMigration + include Goldberg::Migration def self.up # Add fields to SystemSettings to support self registration db/migrate/003_self_registration.rb @@ -1,5 +1,5 @@ class ColumnFixes < ActiveRecord::Migration - include GoldbergMigration + include Goldberg::Migration def self.up # Remove defaults from many compulsory columns, and drop obsolete db/migrate/004_column_fixes.rb @@ -45,10 +45,10 @@ module Goldberg end # Load Goldberg's bootstrap data puts "Loading fixtures from '#{fixture_path}'..." - klasses ||= GoldbergMigration.goldberg_classes + klasses ||= Goldberg::Migration.goldberg_classes klasses.each do |klass| klass.delete_all - GoldbergMigration.load_for_class(klass, fixture_path) + Goldberg::Migration.load_for_class(klass, fixture_path) end puts "Done loading fixtures." else lib/goldberg/test_helper.rb @@ -2,7 +2,7 @@ namespace :goldberg do desc "Dump standard Goldberg tables to files in db/" task :dump_bootstrap => :environment do - GoldbergMigration.dump_bootstrap + Goldberg::Migration.dump_bootstrap end desc "Migrate Goldberg" @@ -13,7 +13,7 @@ namespace :goldberg do desc "Load standard Goldberg tables from files in db/" task :load_bootstrap => :migrate do - GoldbergMigration.load_bootstrap + Goldberg::Migration.load_bootstrap end desc "Install Goldberg" @@ -22,6 +22,10 @@ namespace :goldberg do FileTest.exists?(index) and File.delete(index) end + desc "Upgrade Goldberg" + task :upgrade => :migrate do + end + desc "Flush cached data out of sessions and Roles" task :flush => :environment do puts "Deleting any Rails session files" tasks/goldberg_tasks.rake @@ -7,6 +7,12 @@ class Goldberg::ContentPagesController; def rescue_action(e) raise e end; end class ContentPagesControllerTest < Test::Unit::TestCase include Goldberg::TestHelper + + def setup + @controller = Goldberg::ContentPagesController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end def test_get_public_page get :view, :page_name => ['home'] test/functional/content_pages_controller_test.rb @@ -86,9 +86,7 @@ class SecurityTest < ActionController::IntegrationTest assert_redirected_to_login form_login('admin', 'admin') - assert_equal({ 'controller' => 'goldberg/users', - 'action' => 'list' }, - response.redirected_to) + assert_match /goldberg\/users\/list/, response.redirected_to end # User should be redirected to the session expired page if they test/integration/security_test.rb @@ -23,8 +23,10 @@ class UserTest < Test::Unit::TestCase user_1 = Goldberg::User.new(:name => name_1) user_1.role = @role + user_1.clear_password = 'fred' user_2 = Goldberg::User.new(:name => name_2) user_2.role = @role + user_2.clear_password = 'fred' assert(user_1.save) assert(user_2.save) @@ -39,6 +41,7 @@ class UserTest < Test::Unit::TestCase def test_password_updated_on_save_when_clear_password_set user = Goldberg::User.new(:name => 'name') user.role = @role + user.clear_password = 'fred' assert(user.save) saved_password = user.password @@ -67,7 +70,7 @@ class UserTest < Test::Unit::TestCase user = Goldberg::User.new(:name => 'name') user.role = @role - assert(user.save) + assert(!user.save) user.clear_password = new_pass assert_equal(new_pass, user.clear_password) test/unit/user_test.rb lib/goldberg_controller.rb lib/goldberg_filters.rb lib/goldberg_helper.rb lib/goldberg_migration.rb lib/goldberg_migrator.rb lib/goldberg_model.rb lib/goldberg_routes.rb test/fixtures/content_pages.yml test/fixtures/controller_actions.yml test/fixtures/markup_styles.yml test/fixtures/menu_items.yml test/fixtures/permissions.yml test/fixtures/roles.yml test/fixtures/roles_permissions.yml test/fixtures/site_controllers.yml test/fixtures/users.yml test/unit/markup_style_test.rb 15f8ecb74b21c17623818513ffc9ede0142c2351 Dave Nelson urbanus@240gl.org http://github.com/urbanus/goldberg/commit/9bffcf9eb84d5d2994e7cd3802c2320651783f91 9bffcf9eb84d5d2994e7cd3802c2320651783f91 2008-01-05T04:02:37-08:00 2008-01-05T04:02:37-08:00 Re-arranged Goldberg's standard libraries into the Goldberg:: namespace. Removed the test fixtures directory: this has been obsoleted by Goldberg's bootstrap-based test fixtures. Addressed outstanding bugs. Updated the gemspec for the 0.2.2 release. 70699b0abdcc06a0a179e466d102427ea07886ed Dave Nelson urbanus@240gl.org