Yura Sokolov 
							
						 
					 
					
						
						
						
						
							
						
						
							ac19422a90 
							
						 
					 
					
						
						
							
							add tests for merging conditions and joins  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-25 14:02:26 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yura Sokolov 
							
						 
					 
					
						
						
						
						
							
						
						
							9c0346b90b 
							
						 
					 
					
						
						
							
							can accept array for sql sanitizing in conditions  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-25 14:01:53 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yura Sokolov 
							
						 
					 
					
						
						
						
						
							
						
						
							b473d8827f 
							
						 
					 
					
						
						
							
							CanDefinition#only_block?  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-25 12:23:39 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yura Sokolov 
							
						 
					 
					
						
						
						
						
							
						
						
							bcab8d6369 
							
						 
					 
					
						
						
							
							fix error with single cannot condition  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-25 12:14:01 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yura Sokolov 
							
						 
					 
					
						
						
						
						
							
						
						
							dbc1538054 
							
						 
					 
					
						
						
							
							small refactoring: CanDefinition #definitive? #conditions_empty?  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-24 18:15:20 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yura Sokolov 
							
						 
					 
					
						
						
						
						
							
						
						
							46f03013f3 
							
						 
					 
					
						
						
							
							Merge remote branch 'upstream/master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	lib/cancan/ability.rb
	lib/cancan/active_record_additions.rb
	lib/cancan/can_definition.rb
	spec/cancan/ability_spec.rb 
						
						
							
						
					 
					
						2010-05-24 15:17:10 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							1ade44221a 
							
						 
					 
					
						
						
							
							load parent resources for collection actions such 'index'  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-21 15:22:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							2a3dd85a18 
							
						 
					 
					
						
						
							
							adding :name option to load_and_authorize_resource if it does not match controller -  closes   #65  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-21 14:20:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							dfd84a10ed 
							
						 
					 
					
						
						
							
							improving inline documentation  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-21 13:41:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Allison 
							
						 
					 
					
						
						
						
						
							
						
						
							7543eedd6a 
							
						 
					 
					
						
						
							
							fixing issue when using accessible_by with nil can conditions -  closes   #66  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-20 17:06:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Logan Raarup 
							
						 
					 
					
						
						
						
						
							
						
						
							605063b974 
							
						 
					 
					
						
						
							
							Make sure conditions on associations are pluralized  
						
						 
						
						
						
						
							
						
					 
					
						2010-05-21 07:31:29 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sokolov Yura 
							
						 
					 
					
						
						
						
						
							
						
						
							7d7d249182 
							
						 
					 
					
						
						
							
							passing throw matching rules with not matching conditions  
						
						 
						
						... 
						
						
						
						Main goal is to allow:
cannot :manage, :all
can :read, :all
can :manage, User, :id=>user.id
can :manage, User, :manager_id=>user.id
Signed-off-by: Sokolov Yura <funny.falcon@gmail.com> 
						
						
							
						
					 
					
						2010-05-16 22:13:02 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							06296b0a40 
							
						 
					 
					
						
						
							
							support has_many association or arrays in can conditions hash  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-22 17:39:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							e20081454f 
							
						 
					 
					
						
						
							
							adding joins clause to accessible_by when conditions are across associations  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-20 17:02:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							4da31c0709 
							
						 
					 
					
						
						
							
							can has cheezburger? (thanks Seivan)  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-20 14:24:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa6252df6 
							
						 
					 
					
						
						
							
							removing unused methods and a bit more refactoring  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-18 00:44:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbc8a68e0 
							
						 
					 
					
						
						
							
							refactoring much of Ability class into separate CanDefinition class  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-18 00:11:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							232ecd5b4b 
							
						 
					 
					
						
						
							
							releasing 1.1.1 which fixes behavior in Rails 3 by properly initializing ResourceAuthorization  
						
						 
						
						
						
						
							
  1.1.1
 
						
					 
					
						2010-04-17 14:01:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							e1652ea424 
							
						 
					 
					
						
						
							
							adding admin namespace wiki page link to readme  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-17 13:27:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							b9995c6147 
							
						 
					 
					
						
						
							
							minor changes to readme  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-17 12:37:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							ff8c11cfc5 
							
						 
					 
					
						
						
							
							releasing version 1.1, see wiki and changelog for details  
						
						 
						
						
						
						
							
  1.1
 
						
					 
					
						2010-04-17 12:06:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ba76b61b 
							
						 
					 
					
						
						
							
							supporting arrays, ranges, and nested hashes in ability conditions  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-17 11:54:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							283f58ee16 
							
						 
					 
					
						
						
							
							improving readme with links to wiki  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-17 11:45:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							f46696348e 
							
						 
					 
					
						
						
							
							allow access to classes when using hash conditions since you'll generally want to narrow it down with a database query  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-16 15:56:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							8903feee70 
							
						 
					 
					
						
						
							
							removing unauthorized! in favor of authorize! and including more information in AccessDenied exception -  closes   #40  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-16 14:54:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							ecf2818a9e 
							
						 
					 
					
						
						
							
							removing apparently unnecessary user attr_accessor in Ability  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-16 08:57:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							d9f3c8b0ae 
							
						 
					 
					
						
						
							
							renaming noun to subject internally  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-16 08:55:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							240c281061 
							
						 
					 
					
						
						
							
							renaming ActiveRecordAdditions#can method to accessible_by since it flows better and makes more sense  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 23:54:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							ef5900c5b1 
							
						 
					 
					
						
						
							
							adding caching to current_ability class method, if you're overriding this be sure to add caching there too  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 23:28:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							37f482e8d5 
							
						 
					 
					
						
						
							
							default ActiveRecordAdditions#can method action to :read and use 'scoped' if 'where' is not available  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 23:18:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							3c68a911d0 
							
						 
					 
					
						
						
							
							adding can method to Active Record for fetching records matching a specific ability, still needs documentation  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 17:04:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							baeef0b9dd 
							
						 
					 
					
						
						
							
							adding conditions behavior to Ability#can and fetch with Ability#conditions -  closes   #53  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 16:50:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							23a5888fe0 
							
						 
					 
					
						
						
							
							renaming :class option to :resource for load_and_authorize_resource which now supports a symbol for non models -  closes   #45  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 14:14:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a1695636 
							
						 
					 
					
						
						
							
							properly handle Admin::AbilitiesController in params[:controller] -  closes   #46  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 13:10:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							6e1e96c85a 
							
						 
					 
					
						
						
							
							allow additional arguments for be_able_to matcher, this requires Ruby 1.8.7 or higher to use matcher  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 12:04:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Chelimsky 
							
						 
					 
					
						
						
						
						
							
						
						
							cf49c5b9de 
							
						 
					 
					
						
						
							
							add be_able_to matcher  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-16 02:46:03 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Chelimsky 
							
						 
					 
					
						
						
						
						
							
						
						
							35c4864de4 
							
						 
					 
					
						
						
							
							simplify paths  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-16 02:46:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							510cf509ee 
							
						 
					 
					
						
						
							
							adding documentation for passing additional arguments to can?  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 11:28:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							69f7a65914 
							
						 
					 
					
						
						
							
							support additional arguments to can? which get passed to the block -  closes   #48  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-15 11:21:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							f027b2ebb3 
							
						 
					 
					
						
						
							
							use Dir globbing more efficiently in gemspec  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-05 08:22:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							5d4138f0b2 
							
						 
					 
					
						
						
							
							cleaning up gemspec  
						
						 
						
						
						
						
							
						
					 
					
						2010-04-02 15:25:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							3b9cdce09a 
							
						 
					 
					
						
						
							
							releasing v1.0.2  
						
						 
						
						
						
						
							
  1.0.2
 
						
					 
					
						2009-12-30 21:33:31 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							a13f78d6f9 
							
						 
					 
					
						
						
							
							listing additional resources at top of readme page (including metrics and tests)  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-30 20:29:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							41f67ad6d0 
							
						 
					 
					
						
						
							
							making spec the default rake task so it works at runcoderun.com  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-30 20:22:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							7d3b4cdbc2 
							
						 
					 
					
						
						
							
							Adding clear_aliased_actions to Ability which removes previously defined actions including defaults  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-30 18:01:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							f99d506050 
							
						 
					 
					
						
						
							
							Append aliased actions (don't overwrite them) -  closes   #20  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-30 17:49:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							ef22de689b 
							
						 
					 
					
						
						
							
							adding custom message argument to unauthorized! method -  closes   #18  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-15 10:53:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							67416532f4 
							
						 
					 
					
						
						
							
							adding Railscasts episode to documentation  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-14 09:42:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							f919ac53bb 
							
						 
					 
					
						
						
							
							releasing gem v1.0.1  
						
						 
						
						
						
						
							
  1.0.1
 
						
					 
					
						2009-12-14 08:37:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							021f33c9a0 
							
						 
					 
					
						
						
							
							Adding :class option to load_resource so one can customize which class to use for the model -  closes   #17  
						
						 
						
						
						
						
							
						
					 
					
						2009-12-14 08:31:49 -08:00