cancancan 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a9375725d7b71cd77d1b5b6e656b7f18b385100
-  data.tar.gz: 5a3f75a4ae4cafb42203a2da807a8356464721a0
+  metadata.gz: 72e7c59df453fdbf97f4f3f9daf1faa01f102af1
+  data.tar.gz: a939e62999f39b20089742ebf5d12e1d384cabc4
 SHA512:
-  metadata.gz: 2b8a66a63e8d26543bcf3c6ca51f3fc0ebfb521286ffa305edb4afad0f30753b494a9bb3545e3e89f2f51520cdd152e54f3f3d382239c26b9544a9b9cd367177
-  data.tar.gz: c902e442088933cd9291444c99c19a45340c3a6bef6c08b193d8065e197b5da3e138077db28d088b71f2bb9b17ac800e342c8cecfcb4871c9acf701cb8884f32
+  metadata.gz: 32a8944af1356a883b6bb9365afddce4d89a66a3fbf3c84d5351531091f7d7533644e48b44515303dc2c5a19a39399b91189fb19dfd73574206f7ca06adf30b9
+  data.tar.gz: 904cd58c86b3af22979dfe44cd802c44035e3a15c241efd0c35e65a8c3369bd88047e8731e180ad557fe820f19d113ff82a9f49644495a5b5e950f2e0b8a82e2

data/CHANGELOG.rdoc

@@ -1,6 +1,11 @@
 Develop
 
 
+1.9.2 (August 8th, 2014)
+
+* Fix cancancan#77, 78 - Fix an issue with associations for namespaced models. (jjp)
+
+
 1.9.1 (July 21st, 2014)
 
 * Fix cancancan#101 - Fixes an issue where overjealous use of references would cause issues with scopes when loading associations. (bryanrite)

data/lib/cancan/model_adapters/active_record_adapter.rb

@@ -32,7 +32,7 @@ module CanCan
         conditions.inject({}) do |result_hash, (name, value)|
           if value.kind_of? Hash
             value = value.dup
-            association_class = model_class.reflect_on_association(name).class_name.constantize
+            association_class = model_class.reflect_on_association(name).klass.name.constantize
             nested = value.inject({}) do |nested,(k,v)|
               if v.kind_of? Hash
                 value.delete(k)

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

data/spec/cancan/model_adapters/active_record_adapter_spec.rb

@@ -342,6 +342,45 @@ if defined? CanCan::ModelAdapters::ActiveRecordAdapter
       expect { @ability.can? :read, Article }.not_to raise_error
     end
 
+    context "with namespaced models" do
+      before :each do
+        ActiveRecord::Schema.define do
+          create_table( :table_xes ) do |t|
+            t.timestamps
+          end
+
+          create_table( :table_zs ) do |t|
+            t.integer :table_x_id
+            t.integer :user_id
+            t.timestamps
+          end
+        end
+
+        module Namespace
+        end
+
+        class Namespace::TableX < ActiveRecord::Base
+          has_many :table_zs
+        end
+
+        class Namespace::TableZ < ActiveRecord::Base
+          belongs_to :table_x
+          belongs_to :user
+        end
+      end
+
+      it "fetches all namespace::table_x when one is related by table_y" do
+        user = User.create!
+
+        ability = Ability.new(user)
+        ability.can :read, Namespace::TableX, :table_zs => { :user_id => user.id }
+
+        table_x = Namespace::TableX.create!
+        table_z = table_x.table_zs.create( :user => user )
+        expect(Namespace::TableX.accessible_by(ability)).to eq([table_x])
+      end
+    end
+
     context "when MetaWhere is defined" do
       before :each do
         pending "[Deprecated] MetaWhere support is being removed" unless defined? MetaWhere

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Bryan Rite
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler