baby_squeel 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '01931ce5553f1202e28f1698e03ac5edf72a0166'
-  data.tar.gz: 6c3a49f9b7a5cb8c9d72f280d05cf0e165ddf3fc
+  metadata.gz: 49777d549c657b766ebef88cb758b6883cbf4e2e
+  data.tar.gz: 5d4f4e51737e5b252ff0783303b7081cfd8b5d37
 SHA512:
-  metadata.gz: 335dd7d2f9e2f8f3d263339441069e68eca7a632b7296f4ed523f91be621ae727e8e63a8725c8f8b216db43a7a7d8b0f70b2fe407a861104885ae032d7ba88b5
-  data.tar.gz: d25f185e663890ecf277045612eb71206de192d4e79883046a2deaa981378987e872a9516cc654e910ffe5cfb45113bccf3d2880fde90e6129b8e784a9fa14f1
+  metadata.gz: 4bf0eea8486a351b13221d37040202906e83b92da78570e5ddae25944ddc82e4ae31acaa9302f3ecb4948677a99966f6a0b297049045f40dc195cd5b9a7a8699
+  data.tar.gz: 4d2a82db29d4613dc73a2079bd773bc1e75cf570f51375ab554e00a3c2ca28bd6f40d0c12402843e83986c6ca065de6ce3c0854c0958e36ebd3e741b99509143

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Nothing to see here.
 
+## [1.2.0] - 2017-10-20
+### Added
+- `reordering`, which is just a BabySqueel version of Active Record's `reorder`.
+- `on` expressions can now be given a block that will yield the current node (#77).
+
+## [1.1.5] - 2017-05-26
+### Fixed
+- Returning an empty hash from a `where.has {}` block would generate invalid SQL (#69).
+
 ## [1.1.4] - 2017-04-13
 ### Fixed
 - Nodes::Attribute#in and #not_in generate valid SQL when given ActiveRecord::NullRelations.
@@ -118,8 +127,10 @@ Nothing to see here.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.1.4...HEAD
-[1.1.3]: https://github.com/rzane/baby_squeel/compare/v1.1.3...v1.1.4
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/rzane/baby_squeel/compare/v1.1.5...v1.2.0
+[1.1.5]: https://github.com/rzane/baby_squeel/compare/v1.1.4...v1.1.5
+[1.1.4]: https://github.com/rzane/baby_squeel/compare/v1.1.3...v1.1.4
 [1.1.3]: https://github.com/rzane/baby_squeel/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/rzane/baby_squeel/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/rzane/baby_squeel/compare/v1.1.0...v1.1.1

data/README.md

@@ -172,9 +172,13 @@ Post.joining { author.outer.posts }
 # LEFT OUTER JOIN "authors" ON "authors"."id" = "posts"."author_id"
 # INNER JOIN "posts" "posts_authors" ON "posts_authors"."author_id" = "authors"."id"
 
-Post.joining { author.alias('a').on((author.id == author_id) | (author.name == title)) }
+Post.joining { author.on((author.id == author_id) | (author.name == title)) }
 # SELECT "posts".* FROM "posts"
-# INNER JOIN "authors" "a" ON ("authors"."id" = "posts"."author_id" OR "authors"."name" = "posts"."title")
+# INNER JOIN "authors" ON ("authors"."id" = "posts"."author_id" OR "authors"."name" = "posts"."title")
+
+Post.joining { |post| post.author.as('a').on { (id == post.author_id) | (name == post.title) } }
+# SELECT "posts".* FROM "posts"
+# INNER JOIN "authors" "a" ON ("a"."id" = "posts"."author_id" OR "a"."name" = "posts"."title")
 
 Picture.joining { imageable.of(Post) }
 # SELECT "pictures".* FROM "pictures"

data/lib/baby_squeel/active_record/base.rb

@@ -3,10 +3,19 @@ require 'baby_squeel/dsl'
 module BabySqueel
   module ActiveRecord
     module Base
-      delegate :joining, :joining!, :selecting, :ordering,
-               :grouping, :when_having, :plucking,
-               :averaging, :counting, :maximizing,
-               :minimizing, :summing, to: :all
+      delegate :joining,
+               :selecting,
+               :ordering,
+               :reordering,
+               :grouping,
+               :when_having,
+               :plucking,
+               :averaging,
+               :counting,
+               :maximizing,
+               :minimizing,
+               :summing,
+               to: :all
 
       # Define a sifter that can be used within DSL blocks.
       #

data/lib/baby_squeel/active_record/query_methods.rb

@@ -4,27 +4,32 @@ require 'baby_squeel/join_dependency/injector'
 module BabySqueel
   module ActiveRecord
     module QueryMethods
-      # Constructs Arel for ActiveRecord::Base#joins using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#joins using the DSL.
       def joining(&block)
         joins DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#select using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#select using the DSL.
       def selecting(&block)
         select DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#order using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#order using the DSL.
       def ordering(&block)
         order DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#group using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#reorder using the DSL.
+      def reordering(&block)
+        reorder DSL.evaluate(self, &block)
+      end
+
+      # Constructs Arel for ActiveRecord::QueryMethods#group using the DSL.
       def grouping(&block)
         group DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#having using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#having using the DSL.
       def when_having(&block)
         having DSL.evaluate(self, &block)
       end

data/lib/baby_squeel/association.rb

@@ -85,7 +85,7 @@ module BabySqueel
     def _arel(associations = [])
       if _on
         super
-      elsif _table.is_a? Arel::Nodes::TableAlias
+      elsif alias?
         raise AssociationAliasingError.new(_reflection.name, _table.right)
       elsif _reflection.polymorphic? && _polymorphic_klass.nil?
         raise PolymorphicNotSpecifiedError.new(_reflection.name)

data/lib/baby_squeel/compat.rb

@@ -8,6 +8,46 @@ module BabySqueel
       ::ActiveRecord::Relation.prepend QueryMethods
     end
 
+    class KeyPath
+      def self.evaluate(&block)
+        if block.arity.zero?
+          unwrap new.instance_eval(&block)
+        else
+          unwrap yield(new)
+        end
+      end
+
+      def self.unwrap(path)
+        if path.kind_of? self
+          path.value
+        elsif path.respond_to? :map
+          path.map(&method(:unwrap))
+        else
+          []
+        end
+      end
+
+      def initialize(*path)
+        @path = path
+      end
+
+      def value
+        @path.reverse.reduce({}) do |acc, name|
+          { name => acc }
+        end
+      end
+
+      private
+
+      def respond_to_missing?(*)
+        true
+      end
+
+      def method_missing(name, *)
+        self.class.new(*@path, name)
+      end
+    end
+
     module DSL
       # An alias for BabySqueel::DSL#sql
       def `(str)
@@ -36,6 +76,33 @@ module BabySqueel
         end
       end
 
+      # Overrides ActiveRecord::QueryMethods#includes
+      def includes(*args, &block)
+        if block_given? && args.empty?
+          super KeyPath.evaluate(&block)
+        else
+          super
+        end
+      end
+
+      # Overrides ActiveRecord::QueryMethods#eager_load
+      def eager_load(*args, &block)
+        if block_given? && args.empty?
+          super KeyPath.evaluate(&block)
+        else
+          super
+        end
+      end
+
+      # Overrides ActiveRecord::QueryMethods#preload
+      def preload(*args, &block)
+        if block_given? && args.empty?
+          super KeyPath.evaluate(&block)
+        else
+          super
+        end
+      end
+
       # Heads up, Array#select conflicts with
       # ActiveRecord::QueryMethods#select. So, if arity
       # is given to the block, we'll use Array#select.
@@ -61,6 +128,14 @@ module BabySqueel
         end
       end
 
+      def reorder(*args, &block)
+        if block_given? && args.empty?
+          reordering(&block)
+        else
+          super
+        end
+      end
+
       # Overrides ActiveRecord::QueryMethods#group
       def group(*args, &block)
         if block_given? && args.empty?

data/lib/baby_squeel/dsl.rb

@@ -85,16 +85,6 @@ module BabySqueel
       sql _scope.connection.quote(value)
     end
 
-    # Evaluates a DSL block. If arity is given, this method
-    # `yield` itself, rather than `instance_eval`.
-    def evaluate(&block)
-      if block.arity.zero?
-        instance_eval(&block)
-      else
-        yield(self)
-      end
-    end
-
     private
 
     def resolver

data/lib/baby_squeel/nodes/attribute.rb

@@ -26,7 +26,7 @@ module BabySqueel
       end
 
       def _arel
-        if @parent.kind_of? BabySqueel::Association
+        if @parent.kind_of?(BabySqueel::Association) && !@parent.alias?
           @parent.find_alias[@name]
         else
           super

data/lib/baby_squeel/nodes/node.rb

@@ -7,6 +7,11 @@ module BabySqueel
     # In the future, these proxy classes should be more specific and only
     # include necessary/applicable modules.
     class Node < Proxy
+      def initialize(node)
+        super
+        node.extend Arel::Math
+      end
+
       extend Operators::ArelAliasing
       include Operators::Comparison
       include Operators::Equality

data/lib/baby_squeel/table.rb

@@ -20,6 +20,10 @@ module BabySqueel
       @_join ||= Arel::Nodes::InnerJoin
     end
 
+    def as(alias_name)
+      self.alias(alias_name)
+    end
+
     # Alias a table. This is only possible when joining
     # an association explicitly.
     def alias(alias_name)
@@ -31,6 +35,10 @@ module BabySqueel
       self
     end
 
+    def alias?
+      _table.kind_of? Arel::Nodes::TableAlias
+    end
+
     # Instruct the table to be joined with a LEFT OUTER JOIN.
     def outer
       clone.outer!
@@ -52,15 +60,25 @@ module BabySqueel
     end
 
     # Specify an explicit join.
-    def on(node)
-      clone.on! node
+    def on(node = nil, &block)
+      clone.on!(node, &block)
     end
 
-    def on!(node) # :nodoc:
-      self._on = node
+    def on!(node = nil, &block) # :nodoc:
+      self._on = node || evaluate(&block)
       self
     end
 
+    # Evaluates a DSL block. If arity is given, this method
+    # `yield` itself, rather than `instance_eval`.
+    def evaluate(&block)
+      if block.arity.zero?
+        instance_eval(&block)
+      else
+        yield(self)
+      end
+    end
+
     # When referencing a joined table, the tables that
     # attributes reference can change (due to aliasing).
     # This method allows BabySqueel::Nodes::Attribute

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.1.5'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord