From 04b523eea4bf8fed8f42df93fd488f6340274d09 Mon Sep 17 00:00:00 2001 From: Ryan Bates Date: Tue, 31 Aug 2010 15:46:26 -0700 Subject: [PATCH] releasing version 1.3.4 --- CHANGELOG.rdoc | 5 +++++ cancan.gemspec | 2 +- spec/cancan/ability_spec.rb | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index b181a97..284bab7 100644 --- a/CHANGELOG.rdoc +++ b/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 diff --git a/cancan.gemspec b/cancan.gemspec index 31c39ef..8dbb135 100644 --- a/cancan.gemspec +++ b/cancan.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "cancan" - s.version = "1.3.3" + s.version = "1.3.4" s.author = "Ryan Bates" s.email = "ryan@railscasts.com" s.homepage = "http://github.com/ryanb/cancan" diff --git a/spec/cancan/ability_spec.rb b/spec/cancan/ability_spec.rb index efe199e..51ea9b7 100644 --- a/spec/cancan/ability_spec.rb +++ b/spec/cancan/ability_spec.rb @@ -249,8 +249,8 @@ describe CanCan::Ability do 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, [2, 3, 5]).should be_true + @ability.can?(:read, [1, 3, 5]).should be_false @ability.can?(:read, Array).should be_true end