Navigation

← Previous Changeset
Next Changeset →

Changeset 293

Timestamp:

03/01/06 13:29:53 (3 years ago)

Author:

lazyatom

Message:

Update UserEngine? to use wrapped table names, added migration to change users_roles table to roles_users

Files:

user_engine/trunk/CHANGELOG (added)
user_engine/trunk/db/migrate/004_rename_users_roles_table_to_roles_users_or_equivalent.rb (added)
user_engine/trunk/lib/user_engine.rb (modified) (4 diffs)
user_engine/trunk/lib/user_engine/authorized_user.rb (modified) (3 diffs)
user_engine/trunk/test/fixtures/roles_users.yml (moved) (moved from user_engine/trunk/test/fixtures/users_roles.yml)
user_engine/trunk/test/functional/permission_controller_test.rb (modified) (1 diff)
user_engine/trunk/test/functional/role_controller_test.rb (modified) (1 diff)
user_engine/trunk/test/functional/user_controller_test.rb (modified) (1 diff)
user_engine/trunk/test/test_helper.rb (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

user_engine/trunk/lib/user_engine.rb

r279	r293
45	45	# Join tables for users <-> roles, and roles <-> permissions
46	46
47		config :user_role_table, "#{config(:r~~aw_r~~ole_table)}_#{LoginEngine.config(:user_table)}"
	47	config :user_role_table, "#{config(:role_table)}_#{LoginEngine.config(:user_table)}"
48	48	config :permission_role_table, "#{config(:raw_permission_table)}_#{config(:raw_role_table)}"
49	49
…	…
103	103
104	104	if @warning != nil
105		~~RAILS_DEFAULT_LOGGER~~.warn @warning
	105	Engines.logger.warn @warning
106	106	puts @warning
107	107	end
…	…
188	188
189	189	if !user?
190		~~RAILS_DEFAULT_LOGGER~~.debug "checking guest authorisation for #{controller}/#{action}"
	190	Engines.logger.debug "checking guest authorisation for #{controller}/#{action}"
191	191	if User.guest_user_authorized?(controller, action)
192	192	yield block if block != nil
…	…
194	194	end
195	195	else
196		~~RAILS_DEFAULT_LOGGER~~.debug "checking user:#{session[:user].id} authorisation for #{controller}/#{action}"
	196	Engines.logger.debug "checking user:#{session[:user].id} authorisation for #{controller}/#{action}"
197	197	if current_user.authorized?(controller, action)
198	198	yield block if block != nil

user_engine/trunk/lib/user_engine/authorized_user.rb

r279	r293
45	45	base.extend(ClassMethods)
46	46	base.class_eval {
47		has_and_belongs_to_many :roles, :join_table => ~~UserEngine.config(:user_role_table~~)
	47	has_and_belongs_to_many :roles, :join_table => wrapped_table_name(UserEngine.config(:user_role_table))
48	48
49	49	# ensure that all users recieve the 'user' role
…	…
68	68	def guest_user_authorized?(controller, action="index")
69	69	query = <<-EOS
70		SELECT DISTINCT #{UserEngine.config(:permission_table)}.*
71		FROM #{UserEngine.config(:permission_table)}, #{UserEngine.config(:role_table)},
72		#{UserEngine.config(:permission_role_table)}
73		WHERE #{UserEngine.config(:role_table)}.name = :role
74		AND #{UserEngine.config(:role_table)}.id = #{UserEngine.config(:permission_role_table)}.role_id
75		AND #{UserEngine.config(:permission_role_table)}.permission_id = #{UserEngine.config(:permission_table)}.id
76		AND #{UserEngine.config(:permission_table)}.controller = :controller
77		AND #{UserEngine.config(:permission_table)}.action = :action
	70	SELECT DISTINCT #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.*
	71	FROM #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))},
	72	#{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))},
	73	#{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))}
	74	WHERE #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))}.name = :role
	75	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))}.id = #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))}.role_id
	76	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))}.permission_id = #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.id
	77	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.controller = :controller
	78	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.action = :action
78	79	EOS
79	80
…	…
95	96
96	97	query = <<-EOS
97		SELECT DISTINCT #{UserEngine.config(:permission_table)}.*
98		FROM #{UserEngine.config(:permission_table)}, #{UserEngine.config(:role_table)},
99		#{UserEngine.config(:permission_role_table)}, #{UserEngine.config(:user_role_table)},
100		#{LoginEngine.config(:user_table)}
101		WHERE #{LoginEngine.config(:user_table)}.id = :person
102		AND #{LoginEngine.config(:user_table)}.id = #{UserEngine.config(:user_role_table)}.user_id
103		AND #{UserEngine.config(:user_role_table)}.role_id = #{UserEngine.config(:role_table)}.id
104		AND #{UserEngine.config(:role_table)}.id = #{UserEngine.config(:permission_role_table)}.role_id
105		AND #{UserEngine.config(:permission_role_table)}.permission_id = #{UserEngine.config(:permission_table)}.id
106		AND #{UserEngine.config(:permission_table)}.controller = :controller
107		AND #{UserEngine.config(:permission_table)}.action = :action
	98	SELECT DISTINCT #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.*
	99	FROM #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))},
	100	#{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))},
	101	#{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))},
	102	#{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table))},
	103	#{ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table))}
	104	WHERE #{ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table))}.id = :person
	105	AND #{ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table))}.id = #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table))}.user_id
	106	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table))}.role_id = #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))}.id
	107	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))}.id = #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))}.role_id
	108	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))}.permission_id = #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.id
	109	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.controller = :controller
	110	AND #{ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))}.action = :action
108	111	EOS
109	112

user_engine/trunk/test/functional/permission_controller_test.rb

r150	r293
12	12	class PermissionControllerTest < Test::Unit::TestCase
13	13
14		fixture :permissions, :table_name => UserEngine.config(:permission_table), :class_name => 'Permission'
	14	fixture :permissions, :class_name => 'Permission',
	15	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))
15	16
16	17	def setup

user_engine/trunk/test/functional/role_controller_test.rb

r150	r293
12	12	class RoleControllerTest < Test::Unit::TestCase
13	13
14		fixture :users, :table_name => LoginEngine.config(:user_table), :class_name => 'User'
15		fixture :users_roles, :table_name => UserEngine.config(:user_role_table)
16		fixture :roles, :table_name => UserEngine.config(:role_table), :class_name => 'Role'
17		fixture :permissions_roles, :table_name => UserEngine.config(:permission_role_table)
18		fixture :permissions, :table_name => UserEngine.config(:permission_table), :class_name => 'Permission'
	14	fixture :users, :class_name => 'User',
	15	:table_name => ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table))
	16	fixture :roles_users, :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table))
	17	fixture :roles, :class_name => 'Role',
	18	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))
	19	fixture :permissions_roles,
	20	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))
	21	fixture :permissions, :class_name => 'Permission',
	22	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))
19	23
20	24	def setup

user_engine/trunk/test/functional/user_controller_test.rb

r154	r293
7	7	class UserControllerTest < Test::Unit::TestCase
8	8
9		fixture :users, :table_name => LoginEngine.config(:user_table), :class_name => 'User'
10		fixture :users_roles, :table_name => UserEngine.config(:user_role_table)
11		fixture :roles, :table_name => UserEngine.config(:role_table), :class_name => 'Role'
12		fixture :permissions_roles, :table_name => UserEngine.config(:permission_role_table)
13		fixture :permissions, :table_name => UserEngine.config(:permission_table), :class_name => 'Permission'
	9	fixture :users, :class_name => 'User',
	10	:table_name => ActiveRecord::Base.wrapped_table_name(LoginEngine.config(:user_table))
	11	fixture :roles_users, :table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:user_role_table))
	12	fixture :roles, :class_name => 'Role',
	13	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:role_table))
	14	fixture :permissions_roles,
	15	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_role_table))
	16	fixture :permissions, :class_name => 'Permission',
	17	:table_name => ActiveRecord::Base.wrapped_table_name(UserEngine.config(:permission_table))
14	18
15	19	def setup

user_engine/trunk/test/test_helper.rb

r154	r293
10	10	config :permission_table, "permissions", :force
11	11
12		config :user_role_table, "~~users_#{config(:role_table)}~~", :force
	12	config :user_role_table, "#{config(:role_table)}_users", :force
13	13	config :permission_role_table, "#{config(:permission_table)}_#{config(:role_table)}", :force
14	14
…	…
25	25	module LoginEngine
26	26	config :salt, "test-salt", :force
	27	config :default_home => {:controller => 'user', :action => 'home'}, :force => true
27	28	end
28	29

Navigation

Changeset 293

Legend:

user_engine/trunk/lib/user_engine.rb

user_engine/trunk/lib/user_engine/authorized_user.rb

user_engine/trunk/test/functional/permission_controller_test.rb

user_engine/trunk/test/functional/role_controller_test.rb

user_engine/trunk/test/functional/user_controller_test.rb

user_engine/trunk/test/test_helper.rb

Download in other formats: