cancancan 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60da1f3c13774c65e5c622667c2a1472fffa0dbf
-  data.tar.gz: 1e3f6fd8446e2560579d313980a7633efe8e8af1
+  metadata.gz: 59a95c6a9629c67f5004699cdbb205108d814ad5
+  data.tar.gz: 4f9cd96fcf1d2a3519b07605619240403b6b33eb
 SHA512:
-  metadata.gz: f717a5d3e6c98cb11aad2e1fd38ccfa4d7848d1181f031d0c2e988200f77bda96df6997b9d5c18b8b62d50c0b0ebf0d0c8177b8b6b596443875b52c895820e65
-  data.tar.gz: 504adef485e28df04ba9decd2902f38963886e9fe7e047125c15d8505b02fc0bb3f978d99f2306e154be3b8cb64dd1ad4ffdd7e8f0172950817841a67160f31b
+  metadata.gz: da1ce9db915cc5305d31d88c0c8f437088ceeab1f2b744a3a258923d59b6da743dd86a643a39c4602afe313c13cb39f1361d220144086a05913c41f5398428ed
+  data.tar.gz: 09c524f8d9928aa7029a9814fae9d45dcd8bf27ecf52f756cbafd02a716bc599f0ab12b4a3fdb37a71aa7ab5893b734b313989f1450a5d3792b77c9abdf7890a

data/CHANGELOG.rdoc

@@ -2,6 +2,10 @@ Develop
 
 Unreleased
 
+1.13.1 (Oct 8th, 2015)
+
+* Fix #merge with empty Ability (jhawthorn)
+
 1.13.0 (Oct 7th, 2015)
 
 * Significantly improve rule lookup time (amarshall)

data/lib/cancan/ability.rb

@@ -285,7 +285,9 @@ module CanCan
 
     # Must be protected as an ability can merge with other abilities.
     # This means that an ability must expose their rules with another ability.
-    attr_reader :rules
+    def rules
+      @rules ||= []
+    end
 
     private
 
@@ -338,9 +340,8 @@ module CanCan
     end
 
     def add_rule(rule)
-      @rules ||= []
-      @rules << rule
-      add_rule_to_index(rule, @rules.size - 1)
+      rules << rule
+      add_rule_to_index(rule, rules.size - 1)
     end
 
     def add_rule_to_index(rule, position)

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end

data/spec/cancan/ability_spec.rb

@@ -510,5 +510,12 @@ describe CanCan::Ability do
       expect(@ability.can?(:use, :search)).to be(true)
       expect(@ability.send(:rules).size).to eq(2)
     end
+
+    it "can add an empty ability" do
+      (another_ability = double).extend(CanCan::Ability)
+
+      @ability.merge(another_ability)
+      expect(@ability.send(:rules).size).to eq(0)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Bryan Rite