cancan 1.6.3 → 1.6.4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+1.6.4 (March 29, 2011)
+
+* Fixed mongoid 'or' error - see issue #322
+
+
 1.6.3 (March 25, 2011)
 
 * Make sure ActiveRecord::Relation is defined before checking conditions against it so Rails 2 is supported again - see issue #312

data/lib/cancan/model_adapters/mongoid_adapter.rb

@@ -20,7 +20,9 @@ module CanCan
           @model_class.where(:_id => {'$exists' => false, '$type' => 7}) # return no records in Mongoid
         else
           @rules.inject(@model_class.all) do |records, rule|
-            if rule.base_behavior
+            if rule.conditions.empty?
+              records
+            elsif rule.base_behavior
               records.or(rule.conditions)
             else
               records.excludes(rule.conditions)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cancan
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Ryan Bates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency