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

fix logic error for single cannot condition - it should return no records

Browse Source
This commit is contained in:
Yura Sokolov 2010-05-25 14:09:01 +04:00
parent ac19422a90
commit 5fd793090a
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cancan/ability.rb
View File

@ -234,12 +234,11 @@ module CanCan
true_cond = subject.send(:sanitize_sql, ['?=?', true, true]) true_cond = subject.send(:sanitize_sql, ['?=?', true, true])
false_cond = subject.send(:sanitize_sql, ['?=?', true, false]) false_cond = subject.send(:sanitize_sql, ['?=?', true, false])
conds.reverse.inject(nil) do |sql, action| conds.reverse.inject(false_cond) do |sql, action|
behavior, condition = action behavior, condition = action
if condition && condition != {} if condition && condition != {}
condition = subject.send(:sanitize_sql, condition) condition = subject.send(:sanitize_sql, condition)
case sql case sql
when nil then behavior ? condition : "not (#{condition})"
when true_cond when true_cond
behavior ? true_cond : "not (#{condition})" behavior ? true_cond : "not (#{condition})"
when false_cond when false_cond

30
spec/cancan/ability_spec.rb
View File

@ -239,20 +239,34 @@ describe CanCan::Ability do
@ability.sql_conditions(:read, SqlSanitizer).should == { :blocked => false, :user_id => 1 } @ability.sql_conditions(:read, SqlSanitizer).should == { :blocked => false, :user_id => 1 }
end end
it "should return `not (sql)` for single `cannot` definition" do it "should return `sql` for single `can` definition in front of default `cannot` condition" do
@ability.cannot :read, SqlSanitizer, :blocked => true, :user_id => 1
@ability.sql_conditions(:read, SqlSanitizer).should == 'not (blocked=true AND user_id=1)'
end
it "should return `sql` for single `can` definition in front of default cannot condition" do
@ability.cannot :read, SqlSanitizer @ability.cannot :read, SqlSanitizer
@ability.can :read, SqlSanitizer, :blocked => false, :user_id => 1 @ability.can :read, SqlSanitizer, :blocked => false, :user_id => 1
@ability.sql_conditions(:read, SqlSanitizer).should == 'blocked=false AND user_id=1' @ability.sql_conditions(:read, SqlSanitizer).should == 'blocked=false AND user_id=1'
end end
it "should return `not (sql)` for single `cannot` definition in front of default can condition" do it "should return `true condition` for single `can` definition in front of default `can` condition" do
@ability.can :read, SqlSanitizer
@ability.can :read, SqlSanitizer, :blocked => false, :user_id => 1
@ability.sql_conditions(:read, SqlSanitizer).should == 'true=true'
end
it "should return `false condition` for single `cannot` definition" do
@ability.cannot :read, SqlSanitizer, :blocked => true, :user_id => 1
@ability.sql_conditions(:read, SqlSanitizer).should == 'true=false'
end
it "should return `false condition` for single `cannot` definition in front of default `cannot` condition" do
@ability.cannot :read, SqlSanitizer
@ability.cannot :read, SqlSanitizer, :blocked => true, :user_id => 1
@ability.sql_conditions(:read, SqlSanitizer).should == 'true=false'
end
it "should return `not (sql)` for single `cannot` definition in front of default `can` condition" do
@ability.can :read, SqlSanitizer @ability.can :read, SqlSanitizer
@ability.cannot :read, SqlSanitizer, :blocked => true, :user_id => 1 @ability.cannot :read, SqlSanitizer, :blocked => true, :user_id => 1