baby_squeel 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dccc30465ef9e1b82eed32a0e96c17a5a7fc4e45
-  data.tar.gz: 9a89635d8f91cdd04f6015141de2ab04dda6c224
+  metadata.gz: 5af60f5e34fa18ceb9ad797eecadbce54748f62a
+  data.tar.gz: d517b61dbeca8309c511f3aff60ca2d180f1c7fa
 SHA512:
-  metadata.gz: 7c07d0fdbb62c82a2e24575d31c46c7f2e4f6acb87c637d57204c357e1507e682b89f5d996b69ea69580279d9e0afea0fc22c20d3d720bc945c78bccee6ea397
-  data.tar.gz: 82203055a8712beed7bef9651f45863d187ca5518dc0012e1d8ef29cb3c4266ceeeca5835f6fded0498c6130de01a44c47d24526ce5a7b9a0e35b65b9d637459
+  metadata.gz: 440bd7a2c660302617fd8b67bcc7dfd9cfb919a3f16cb9dac76c23a467a3ad9935b77ed97d4c5847170d16315c19c9dbbed0a4ad4be0fa8f330abadbfd339503
+  data.tar.gz: 2693828aa10e64d7f724270d1be14fc47d72d8ab1c93169da703bef43395132ea51c2365b865d149c8b1c965592238d3982cee2b9a2be22370ce10a0a5185ed3

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 *Nothing yet.*
 
+## [1.0.2] - 2017-02-07
+### Added
+- `BabySqueel::Association` now has `#==` and `#!=`. This is only supported for Rails 5+. Example: `Post.where { author: Author.last }`.
+
+### Fixed
+- Incorrect alias detection caused by not tracking the full path to a join (#37).
+
 ## [1.0.1] - 2016-11-07
 ### Added
 - Add DSL#_ for wrapping expressions in Arel::Node::Grouping. Thanks to [@odedniv].
@@ -81,7 +88,8 @@
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.0.1...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.0.2...HEAD
+[1.0.2]: https://github.com/rzane/baby_squeel/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/rzane/baby_squeel/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/rzane/baby_squeel/compare/v0.3.1...v1.0.0
 [0.3.1]: https://github.com/rzane/baby_squeel/compare/v0.3.0...v0.3.1

data/lib/baby_squeel/association.rb

@@ -20,6 +20,14 @@ module BabySqueel
       end
     end
 
+    def ==(other)
+      Nodes.wrap build_where_clause(other).ast
+    end
+
+    def !=(other)
+      Nodes.wrap build_where_clause(other).invert.ast
+    end
+
     def of(klass)
       unless _reflection.polymorphic?
         raise PolymorphicSpecificationError.new(_reflection.name, klass)
@@ -51,8 +59,8 @@ module BabySqueel
     end
 
     # See BabySqueel::Table#find_alias.
-    def find_alias(association, associations = [])
-      @parent.find_alias(association, [self, *associations])
+    def find_alias(associations = [])
+      @parent.find_alias([self, *associations])
     end
 
     # Intelligently constructs Arel nodes. There are three outcomes:
@@ -85,5 +93,31 @@ module BabySqueel
         @parent._arel([self, *associations])
       end
     end
+
+    private
+
+    if ActiveRecord::VERSION::MAJOR >= 5
+      def build_where_clause(other)
+        if valid_where_clause?(other)
+          relation = @parent._scope.where(nil)
+          factory = relation.send(:where_clause_factory)
+          factory.build({ _reflection.name => other }, [])
+        else
+          raise AssociationComparisonError.new(_reflection.name, other)
+        end
+      end
+    else
+      def build_where_clause(_)
+        raise AssociationComparisonNotSupportedError.new(_reflection.name)
+      end
+    end
+
+    def valid_where_clause?(other)
+      if other.respond_to? :all?
+        other.all? { |o| valid_where_clause? o }
+      else
+        other.nil? || other.respond_to?(:model_name)
+      end
+    end
   end
 end

data/lib/baby_squeel/errors.rb

@@ -45,4 +45,20 @@ module BabySqueel
       super format(MESSAGE, association: association)
     end
   end
+
+  class AssociationComparisonError < StandardError # :nodoc:
+    def initialize(name, other)
+      super "You can't compare association '#{name}' to #{other}."
+    end
+  end
+
+  class AssociationComparisonNotSupportedError < StandardError # :nodoc:
+    MESSAGE =
+      "Querying association '%{name}' with '==' and '!=' " \
+      "is only supported for ActiveRecord >=5."
+
+    def initialize(name)
+      super format(MESSAGE, name: name)
+    end
+  end
 end

data/lib/baby_squeel/join_dependency/builder.rb

@@ -16,13 +16,29 @@ module BabySqueel
         @joins_values += values
       end
 
-      def to_join_dependency
+      def join_dependency
         ::ActiveRecord::Associations::JoinDependency.new(
           relation.model,
           association_joins,
           join_list
         )
       end
+      delegate :join_root, to: :join_dependency
+
+      def find_join_association(associations)
+        associations.inject(join_root) do |parent, assoc|
+          parent.children.find do |join_association|
+            join_association.reflection == assoc._reflection
+          end
+        end
+      end
+
+      # Find the alias of a BabySqueel::Association, by passing
+      # a list (in order of chaining) of associations and finding
+      # the respective JoinAssociation at each level.
+      def find_alias(associations)
+        find_join_association(associations).table
+      end
 
       private
 

data/lib/baby_squeel/join_dependency/injector.rb

@@ -3,17 +3,13 @@ module BabySqueel
     # This class allows BabySqueel to slip custom
     # joins_values into Active Record's JoinDependency
     class Injector < Array # :nodoc:
-      def initialize(joins)
-        @joins = joins
-      end
-
       # Active Record will call group_by on this object
       # in ActiveRecord::QueryMethods#build_joins. This
       # allows BabySqueel::JoinExpressions to be treated
       # like typical join hashes until Polyamorous can
       # deal with them.
-      def group_by(&block)
-        @joins.group_by do |join|
+      def group_by
+        super do |join|
           case join
           when BabySqueel::JoinExpression
             :association_join

data/lib/baby_squeel/join_expression.rb

@@ -1,6 +1,3 @@
-require 'baby_squeel/join_dependency/builder'
-require 'baby_squeel/join_dependency/finder'
-
 module BabySqueel
   # This is the thing that gets added to Active Record's joins_values.
   # By including Polyamorous::TreeNode, when this instance is found when

data/lib/baby_squeel/nodes/attribute.rb

@@ -19,8 +19,7 @@ module BabySqueel
 
       def _arel
         if @parent.kind_of? BabySqueel::Association
-          table = @parent.find_alias(@parent)
-          table ? table[@name] : super
+          @parent.find_alias[@name]
         else
           super
         end

data/lib/baby_squeel/table.rb

@@ -1,4 +1,5 @@
 require 'baby_squeel/join_expression'
+require 'baby_squeel/join_dependency/builder'
 
 module BabySqueel
   class Table
@@ -63,12 +64,10 @@ module BabySqueel
     # attributes reference can change (due to aliasing).
     # This method allows BabySqueel::Nodes::Attribute
     # instances to find what their alias will be.
-    def find_alias(association, associations = [])
+    def find_alias(associations = [])
       builder = JoinDependency::Builder.new(_scope.all)
-      builder.ensure_associated(_arel(associations))
-
-      finder = JoinDependency::Finder.new(builder.to_join_dependency)
-      finder.find_alias(association._reflection)
+      builder.ensure_associated _arel(associations)
+      builder.find_alias(associations)
     end
 
     # This method will be invoked by BabySqueel::Nodes::unwrap. When called,

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,7 +115,6 @@ files:
 - lib/baby_squeel/dsl.rb
 - lib/baby_squeel/errors.rb
 - lib/baby_squeel/join_dependency/builder.rb
-- lib/baby_squeel/join_dependency/finder.rb
 - lib/baby_squeel/join_dependency/injector.rb
 - lib/baby_squeel/join_expression.rb
 - lib/baby_squeel/nodes.rb
@@ -154,3 +153,4 @@ signing_key:
 specification_version: 4
 summary: A tiny squeel implementation without all of the evil.
 test_files: []
+has_rdoc: 

data/lib/baby_squeel/join_dependency/finder.rb

@@ -1,36 +0,0 @@
-module BabySqueel
-  module JoinDependency
-    class Finder # :nodoc:
-      attr_reader :join_dependency
-
-      def initialize(join_dependency)
-        @join_dependency = join_dependency
-      end
-
-      def find_alias(reflection)
-        join_association = find_association(reflection)
-        join_association.tables.first if join_association
-      end
-
-      private
-
-      def find(&block)
-        deeply_find(join_dependency.join_root, &block)
-      end
-
-      def find_association(reflection)
-        find { |assoc| assoc.reflection == reflection }
-      end
-
-      def deeply_find(root, &block)
-        root.children.each do |assoc|
-          found = assoc if yield assoc
-          found ||= deeply_find(assoc, &block)
-          return found if found
-        end
-
-        nil
-      end
-    end
-  end
-end