applying PR: stffn#197

Use references with includes to make sure the query doesn't fail

Author: dgm

lib/declarative_authorization/obligation_scope.rb

@@ -57,10 +57,13 @@ def scope
         self
       elsif Rails.version < "4"
         # for Rails < 4: use scoped method
-        self.klass.scoped(@finder_options)
+        self.klass.scoped(finder_options)
       else
         # TODO Refactor this.  There is certainly a better way.
-        self.klass.joins(@finder_options[:joins]).includes(@finder_options[:include]).where(@finder_options[:conditions])
+        self.klass.joins(finder_options[:joins]).
+          includes(finder_options[:include]).
+          references(finder_options[:include]).
+          where(finder_options[:conditions])
       end
     end
 

test/model_test.rb

@@ -186,11 +186,7 @@ def test_multiple_deep_ored_belongs_to
                       :test_another_model_id => test_model_2.id
 
     user = MockUser.new(:test_role, :id => test_attr_1)
-    if Rails.version >= '4'
-      assert_equal 1, TestAttr.with_permissions_to(:read, :user => user).references(:test_attrs, :test_attrs_test_models, :test_attrs_test_models_2).length
-    else
-      assert_equal 1, TestAttr.with_permissions_to(:read, :user => user).length
-    end
+    assert_equal 1, TestAttr.with_permissions_to(:read, :user => user).length
 
     TestAttr.delete_all
     TestModel.delete_all
@@ -1210,11 +1206,7 @@ def test_with_anded_if_permitted_to
     assert Authorization::Engine.instance.permit?(:read, :object => test_model_1.test_attrs.first, :user => user_with_both_roles)
     assert Authorization::Engine.instance.permit?(:read, :object => test_model_for_second_role.test_attrs.first, :user => user_with_both_roles)
     #p Authorization::Engine.instance.obligations(:read, :user => user_with_both_roles, :context => :test_attrs)
-    if Rails.version >= '4'
-      assert_equal 2, TestAttr.with_permissions_to(:read, :user => user_with_both_roles).references(:test_attrs, :test_models).length
-    else
-      assert_equal 1, TestAttr.with_permissions_to(:read, :user => user).length
-    end
+    assert_equal 1, TestAttr.with_permissions_to(:read, :user => user).length
 
     TestModel.delete_all
     TestAttr.delete_all
@@ -1475,11 +1467,7 @@ def test_with_ored_rules_and_reoccuring_tables
     test_attr_2.test_model.test_attrs.create!
 
     user = MockUser.new(:test_role, :test_attr => test_attr_2.test_model.test_attrs.last)
-    if Rails.version >= '4'
-      assert_equal 2, TestAttr.with_permissions_to(:read, :user => user).references(:test_attrs, :test_models, :test_models_test_attrs, :test_attrs_test_models).length
-    else
-      assert_equal 2, TestAttr.with_permissions_to(:read, :user => user).length
-    end
+    assert_equal 2, TestAttr.with_permissions_to(:read, :user => user).length
     TestModel.delete_all
     TestAttr.delete_all
   end
@@ -1516,11 +1504,7 @@ def test_with_many_ored_rules_and_reoccuring_tables
 
     user = MockUser.new(:test_role, :test_model => country.test_models.first)
 
-    if Rails.version >= '4'
-      assert_equal 2, TestAttr.with_permissions_to(:read, :user => user).references(:test_attrs, :test_models, :test_models_countries).length
-    else
-      assert_equal 2, TestAttr.with_permissions_to(:read, :user => user).length
-    end
+    assert_equal 2, TestAttr.with_permissions_to(:read, :user => user).length
     TestModel.delete_all
     TestAttr.delete_all
   end
@@ -1933,11 +1917,7 @@ def test_multiple_roles_with_has_many_through
     user = MockUser.new(:test_role_1, :test_role_2,
         :test_attr_through_id => test_model_1.test_attr_throughs.first.id,
         :test_attr_through_2_id => test_model_2.test_attr_throughs.first.id)
-    if Rails.version >= '4'
-      assert_equal 2, TestModel.with_permissions_to(:read, :user => user).references(:test_models, :test_attr_throughs).length
-    else
-      assert_equal 2, TestModel.with_permissions_to(:read, :user => user).length
-    end
+    assert_equal 2, TestModel.with_permissions_to(:read, :user => user).length
     TestModel.delete_all
     TestAttr.delete_all
     TestAttrThrough.delete_all