cancancan 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59fd5f683924f32658036d91ec731a03dc2620f0
-  data.tar.gz: 80ada1d8d82e08dae4f39afa0f4fc6e0bba1a43b
+  metadata.gz: 2a9375725d7b71cd77d1b5b6e656b7f18b385100
+  data.tar.gz: 5a3f75a4ae4cafb42203a2da807a8356464721a0
 SHA512:
-  metadata.gz: f7854cb0fd225fc65ca36e2ae8b3d257e2509ebc092801a1802686bd2537dcb3c53f0e522f3d9a43b15ded9765a026c9d11c3588f4a4ff28bd752606fa01788c
-  data.tar.gz: e98f2b6d8defb75df838a82a5c0a28befdec610db7be82f119e70a922d953963fc7c268d014668ccf28c5fd54ccabbda9ca8d8bba4e175b587a36093f4da76b4
+  metadata.gz: 2b8a66a63e8d26543bcf3c6ca51f3fc0ebfb521286ffa305edb4afad0f30753b494a9bb3545e3e89f2f51520cdd152e54f3f3d382239c26b9544a9b9cd367177
+  data.tar.gz: c902e442088933cd9291444c99c19a45340c3a6bef6c08b193d8065e197b5da3e138077db28d088b71f2bb9b17ac800e342c8cecfcb4871c9acf701cb8884f32

data/CHANGELOG.rdoc

@@ -1,6 +1,11 @@
 Develop
 
 
+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)
+
+
 1.9.0 (July 20th, 2014)
 
 * Fix cancancan#59 - Parameters are automatically detected and santitized for all actions, not just create and update. (bryanrite)

data/lib/cancan/model_adapters/active_record_4_adapter.rb

@@ -12,9 +12,10 @@ module CanCan
       # look inside the where clause to decide to outer join tables
       # you're using in the where. Instead, `references()` is required
       # in addition to `includes()` to force the outer join.
-      #
       def build_relation(*where_conditions)
-        @model_class.where(*where_conditions).includes(joins).references(joins)
+        relation = @model_class.where(*where_conditions)
+        relation = relation.includes(joins).references(joins) if joins.present?
+        relation
       end
     end
   end

data/lib/cancan/version.rb

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

data/spec/cancan/model_adapters/active_record_4_adapter_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+if defined? CanCan::ModelAdapters::ActiveRecord4Adapter
+  describe CanCan::ModelAdapters::ActiveRecord4Adapter do
+    before :each do
+      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+      ActiveRecord::Migration.verbose = false
+      ActiveRecord::Schema.define do
+        create_table(:parents) do |t|
+          t.timestamps
+        end
+
+        create_table(:children) do |t|
+          t.timestamps
+          t.integer :parent_id
+        end
+      end
+
+      class Parent < ActiveRecord::Base
+        has_many :children, lambda { order(:id => :desc) }
+      end
+
+      class Child < ActiveRecord::Base
+        belongs_to :parent
+      end
+
+      (@ability = double).extend(CanCan::Ability)
+    end
+
+    it "respects scope on included associations" do
+      @ability.can :read, [Parent, Child]
+
+      parent = Parent.create!
+      child1 = Child.create!(:parent => parent, :created_at => 1.hours.ago)
+      child2 = Child.create!(:parent => parent, :created_at => 2.hours.ago)
+
+      expect(Parent.accessible_by(@ability).order(:created_at => :asc).includes(:children).first.children).to eq [child2, child1]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Bryan Rite
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - spec/cancan/exceptions_spec.rb
 - spec/cancan/inherited_resource_spec.rb
 - spec/cancan/matchers_spec.rb
+- spec/cancan/model_adapters/active_record_4_adapter_spec.rb
 - spec/cancan/model_adapters/active_record_adapter_spec.rb
 - spec/cancan/model_adapters/data_mapper_adapter_spec.rb
 - spec/cancan/model_adapters/default_adapter_spec.rb
@@ -174,6 +175,7 @@ test_files:
 - spec/cancan/exceptions_spec.rb
 - spec/cancan/inherited_resource_spec.rb
 - spec/cancan/matchers_spec.rb
+- spec/cancan/model_adapters/active_record_4_adapter_spec.rb
 - spec/cancan/model_adapters/active_record_adapter_spec.rb
 - spec/cancan/model_adapters/data_mapper_adapter_spec.rb
 - spec/cancan/model_adapters/default_adapter_spec.rb