Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #607 from Mixbook/master

Added support for value to be Enumerable
  • Loading branch information...
commit 6e8bc851bea475bf30b2eb71e8bbbe6fe79cbabf 2 parents aed37cd + 65bbf0e
@ryanb authored
Showing with 10 additions and 2 deletions.
  1. +1 −1  lib/cancan/rule.rb
  2. +9 −1 spec/cancan/ability_spec.rb
View
2  lib/cancan/rule.rb
@@ -111,7 +111,7 @@ def matches_conditions_hash?(subject, conditions = @conditions)
else
!attribute.nil? && matches_conditions_hash?(attribute, value)
end
- elsif value.kind_of?(Array) || value.kind_of?(Range)
+ elsif value.kind_of?(Enumerable)
value.include? attribute
else
attribute == value
View
10 spec/cancan/ability_spec.rb
@@ -249,7 +249,15 @@
@ability.can?(:read, 1..5).should be_true
@ability.can?(:read, 4..6).should be_false
end
-
+
+ it "should accept a set as a condition value" do
+ mock(object_with_foo_2 = Object.new).foo { 2 }
+ mock(object_with_foo_3 = Object.new).foo { 3 }
+ @ability.can :read, Object, :foo => [1, 2, 5].to_set
+ @ability.can?(:read, object_with_foo_2).should be_true
+ @ability.can?(:read, object_with_foo_3).should be_false
+ end
+
it "should not match subjects return nil for methods that must match nested a nested conditions hash" do
mock(object_with_foo = Object.new).foo { :bar }
@ability.can :read, Array, :first => { :foo => :bar }
Please sign in to comment.
Something went wrong with that request. Please try again.