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
Show Stats 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
end end
def tableized_conditions(c=nil) def tableized_conditions(conditions = @conditions)
conditions = c || @conditions conditions.inject({}) do |result_hash, (name, value)|
if conditions if value.kind_of? Hash
conditions.inject({}) do |tableized_conditions, (name, value)| name = name.to_s.tableize.to_sym
if value.kind_of? Hash value = tableized_conditions(value)
name = name.to_s.tableize.to_sym end
value = tableized_conditions(value) result_hash[name] = value
end result_hash
tableized_conditions[name] = value end
tableized_conditions end
end
end
end
def only_block? def only_block?
conditions_empty? && !@block.nil? conditions_empty? && !@block.nil?

4
spec/cancan/active_record_additions_spec.rb
View File

@ -31,8 +31,8 @@ describe CanCan::ActiveRecordAdditions do
@ability.can :read, @model_class, :too => {:car => 1, :far => {:bar => 1}} @ability.can :read, @model_class, :too => {:car => 1, :far => {:bar => 1}}
condition_variants = [ condition_variants = [
'(toos.far.bar=1 AND toos.car=1) OR (foos.bar=1)', # faked sql sanitizer is stupid ;-) '(toos.fars.bar=1 AND toos.car=1) OR (foos.bar=1)', # faked sql sanitizer is stupid ;-)
'(toos.car=1 AND toos.far.bar=1) OR (foos.bar=1)' '(toos.car=1 AND toos.fars.bar=1) OR (foos.bar=1)'
] ]
joins_variants = [ joins_variants = [
[:foo, {:too => [:far]}], [:foo, {:too => [:far]}],

2
spec/cancan/can_definition_spec.rb
View File

@ -30,11 +30,13 @@ describe CanCan::CanDefinition do
@conditions[:foo] = {:bar => {1 => 2}} @conditions[:foo] = {:bar => {1 => 2}}
@can.associations_hash.should == {:foo => {:bar => {}}} @can.associations_hash.should == {:foo => {:bar => {}}}
end end
it "should tableize correctly for absurdly complex permissions" do it "should tableize correctly for absurdly complex permissions" do
@conditions[:unit] = {:property=>{:landlord=>{:weasle_id=>560}}} @conditions[:unit] = {:property=>{:landlord=>{:weasle_id=>560}}}
@conditions[:test] = 1 @conditions[:test] = 1
@can.tableized_conditions.should == {:units => {:properties => {:landlords=>{:weasle_id=>560}}}, :test => 1} @can.tableized_conditions.should == {:units => {:properties => {:landlords=>{:weasle_id=>560}}}, :test => 1}
end end
it "should tableize correctly for complex permissions" do it "should tableize correctly for complex permissions" do
@conditions[:unit] = {:property=>{:landlord_id=>560}} @conditions[:unit] = {:property=>{:landlord_id=>560}}
@conditions[:test] = 1 @conditions[:test] = 1