will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing broken spec and minor improvements to tableized_conditions method

Browse Source
This commit is contained in:
Ryan Bates
2010-08-18 16:04:08 -07:00
parent 3d7742ea43
commit e893e12260
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/cancan/can_definition.rb
View File

@@ -34,21 +34,16 @@ module CanCan
end
end
def tableized_conditions(c=nil)
conditions = c || @conditions
if conditions
conditions.inject({}) do |tableized_conditions, (name, value)|
if value.kind_of? Hash
name = name.to_s.tableize.to_sym
value = tableized_conditions(value)
end
tableized_conditions[name] = value
tableized_conditions
end
end
end
def tableized_conditions(conditions = @conditions)
conditions.inject({}) do |result_hash, (name, value)|
if value.kind_of? Hash
name = name.to_s.tableize.to_sym
value = tableized_conditions(value)
end
result_hash[name] = value
result_hash
end
end
def only_block?
conditions_empty? && !@block.nil?