cancancan-squeel 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0d8f0d270a3449f4c1373eb89857cc047553ea
-  data.tar.gz: ddc057b7c68e47e087dbed2b707005ccf581b6f7
+  metadata.gz: ddabab1d0f04888b81d5c827d646d41536c0f9aa
+  data.tar.gz: b08111a152203b18f750eae54a419e5f3ded83da
 SHA512:
-  metadata.gz: 0756bbd6699c2eea5eee163425bcc389180028edfcad1b0c839e19bcfea821f0644987083d77069e3235e8db4d103143cb8125d1a5b897a360b669438f89a72d
-  data.tar.gz: 0db5510c60e8cfe778e6e6cd709ae95fd63ba47467c1b4f0a374561d749fc3a2dcd281530ef5f23020ca604dffaccce0968bc9bda86e7a839f8472fb174fb105
+  metadata.gz: 3716f52cf0f433d0d22ee33b5404f855553c577de72047809f9bce582eed96ebd22f844584b08f728d8170096503d3434d9af6e452f8daa603ebcf77ccc0e5cc
+  data.tar.gz: 8eceb192ffbf08af18ea5e159476777697ab983428162965a1a388baf045fd253df34b67e57aa7824d413da5b090343753606bb8cafdfde3a55cdf3ad2bf4ef6

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
     - '**/Rakefile'
   Exclude:
    - 'vendor/bundle/**/*'
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.1
 
 Metrics/LineLength:
   Max: 100

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## master
+
+### bug fixes
+
+ - Allow querying nested unloaded associations using a database query.
+   [@lowjoel](https://github.com/lowjoel)
+
 ## 0.1.3
 
 ### enhancements

data/lib/cancancan/squeel/squeel_adapter.rb

@@ -52,11 +52,14 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
   def self.matches_relation?(subject, name, value)
     relation = subject.public_send(name)
     klass = subject.class.reflect_on_association(name).klass
+    join_list = nil
 
-    relation.where do
-      expression, = CanCanCan::Squeel::ExpressionBuilder.build(self, klass, :==, value)
+    scope = relation.where do
+      expression, join_list = CanCanCan::Squeel::ExpressionBuilder.build(self, klass, :==, value)
       expression
-    end.any?
+    end
+
+    add_joins_to_scope(scope, join_list, :inner).any?
   end
   private_class_method :matches_relation?
 
@@ -65,6 +68,25 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
     relation.distinct
   end
 
+  # Builds a relation, outer joined on the provided associations.
+  #
+  # @param [ActiveRecord::Relation] scope The current scope to add the joins to.
+  # @param [Array<Array<Symbol>>] joins The set of associations to outer join with.
+  # @param [Symbol] join_type The type of join; defaults to outer joins.
+  # @return [ActiveRecord::Relation] The built relation.
+  def self.add_joins_to_scope(scope, joins, join_type = :outer)
+    joins.reduce(scope) do |result, join|
+      result.joins do
+        join.reduce(self) do |relation, association|
+          relation = relation.__send__(association)
+          relation = relation.__send__(join_type) unless join_type == :inner
+          relation
+        end
+      end
+    end
+  end
+  private_class_method :add_joins_to_scope
+
   private
 
   # Builds a relation that expresses the set of provided rules.
@@ -82,19 +104,9 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
     add_joins_to_scope(scope, join_list)
   end
 
-  # Builds a relation, outer joined on the provided associations.
-  #
-  # @param [ActiveRecord::Relation] scope The current scope to add the joins to.
-  # @param [Array<Array<Symbol>>] joins The set of associations to outer join with.
-  # @return [ActiveRecord::Relation] The built relation.
-  def add_joins_to_scope(scope, joins)
-    joins.reduce(scope) do |result, join|
-      result.joins do
-        join.reduce(self) do |relation, association|
-          relation.__send__(association).outer
-        end
-      end
-    end
+  # @see CanCanCan::Squeel::SqueelAdapter.add_joins_to_scope
+  def add_joins_to_scope(*args)
+    self.class.send(:add_joins_to_scope, *args)
   end
 
   # This builds Squeel expression for each rule, and combines the expression with those to the left

data/lib/cancancan/squeel/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-module CanCanCan; end
-module CanCanCan::Squeel
-  VERSION = '0.1.3'
-end
+# frozen_string_literal: true
+module CanCanCan; end
+module CanCanCan::Squeel
+  VERSION = '0.1.4'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-squeel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joel Low
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler