cancan 1.3.3 → 1.3.4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+1.3.4 (August 31, 2010)
+
+* Don't stop at +cannot+ with hash conditions when checking class (thanks tamoya) - see issue #131
+
+
 1.3.3 (August 20, 2010)
 
 * Switching to Rspec namespace to remove deprecation warning in Rspec 2 - see issue #119

data/README.rdoc

@@ -135,7 +135,7 @@ In the controller +index+ action you may want to fetch only the records which th
 
   @articles = Article.accessible_by(current_ability)
 
-See {Fetching Records}[http://wiki.github.com/ryanb/cancan/fetching-records] for more information.
+This will only work when abilities are defined using hash conditions, not blocks. See {Fetching Records}[http://wiki.github.com/ryanb/cancan/fetching-records] for more information.
 
 
 == Additional Docs

data/lib/cancan/ability.rb

@@ -216,7 +216,7 @@ module CanCan
     def relevant_can_definitions_for_query(action, subject)
       relevant_can_definitions(action, subject).each do |can_definition|
         if can_definition.only_block?
-          raise Error, "Cannot determine SQL conditions or joins from block for #{action.inspect} #{subject.inspect}"
+          raise Error, "The accessible_by call cannot be used with a block 'can' definition. The SQL cannot be determined for #{action.inspect} #{subject.inspect}"
         end
       end
     end

data/lib/cancan/can_definition.rb

@@ -30,7 +30,7 @@ module CanCan
       elsif @conditions.kind_of?(Hash) && subject.class != Class
         matches_conditions_hash?(subject)
       else
-        true
+        @base_behavior
       end
     end
 

data/spec/cancan/ability_spec.rb

@@ -246,6 +246,14 @@ describe CanCan::Ability do
     @ability.can?(:read, [[4, 5, 6]]).should be_false
   end
 
+  it "should not stop at cannot definition when comparing class" do
+    @ability.can :read, Array
+    @ability.cannot :read, Array, :first => 1
+    @ability.can?(:read, [2, 3, 5]).should be_true
+    @ability.can?(:read, [1, 3, 5]).should be_false
+    @ability.can?(:read, Array).should be_true
+  end
+
   it "should has eated cheezburger" do
     lambda {
       @ability.can? :has, :cheezburger

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Ryan Bates
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []