baby_squeel 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 394545743835687d87f67feb11e76e787cebc34a
-  data.tar.gz: 4a3f636a36f4e83a889e3948ea6acf35f235b402
+  metadata.gz: dccc30465ef9e1b82eed32a0e96c17a5a7fc4e45
+  data.tar.gz: 9a89635d8f91cdd04f6015141de2ab04dda6c224
 SHA512:
-  metadata.gz: ba300fa29631298a8143a580ab34bb66298b022aa9e32d0204f4855e23a464090c3ba0032f1c63152bd3de90a46f12f2ed609234b735de41cce50cd841a512e6
-  data.tar.gz: 6e565e66b5e8dd456f4a388f5b1e0b903ddcc2f1baaee86aed0ca0c295238a66d9a0d16f31cd6f9ce4e4679700354b2c98782284e418d2c981d7db88fab864fc
+  metadata.gz: 7c07d0fdbb62c82a2e24575d31c46c7f2e4f6acb87c637d57204c357e1507e682b89f5d996b69ea69580279d9e0afea0fc22c20d3d720bc945c78bccee6ea397
+  data.tar.gz: 82203055a8712beed7bef9651f45863d187ca5518dc0012e1d8ef29cb3c4266ceeeca5835f6fded0498c6130de01a44c47d24526ce5a7b9a0e35b65b9d637459

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## [1.0.0] - 2016-9-9
+## [Unreleased]
+
+*Nothing yet.*
+
+## [1.0.1] - 2016-11-07
+### Added
+- Add DSL#_ for wrapping expressions in Arel::Node::Grouping. Thanks to [@odedniv].
+
+### Fixed
+- Use strings for attribute names like Rails does. Symbols were preventing things like `unscope` from working. Thanks to [@chewi].
+- `where.has {}` will now accept `nil`.
+- Arel::Nodes::Function did not previously include Arel::Math, so now you can do math operations on the result of SQL functions.
+- Arel::Nodes::Binary did not previously include Arel::AliasPredication. Binary nodes can now be aliased using `as`.
+
+## [1.0.0] - 2016-09-09
 ### Added
 - Polyamorous. Unfortunately, this *does* monkey-patch Active Record internals, but there just isn't any other reliable way to generate outer joins. Baby Squeel, itself, will still keep monkey patching to an absolute minimum.
 - Within DSL blocks, you can use `exists` and `not_exists` with Active Record relations. For example: `Post.where.has { exists Post.where(title: 'Fun') }`.`
@@ -67,9 +81,14 @@
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v0.3.1...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.0.1...HEAD
+[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
 [0.3.0]: https://github.com/rzane/baby_squeel/compare/v0.2.2...v0.3.0
 [0.2.2]: https://github.com/rzane/baby_squeel/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/rzane/baby_squeel/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/rzane/baby_squeel/compare/v0.1.0...v0.2.0
+
+[@chewi]: https://github.com/chewi
+[@odedniv]: https://github.com/odedniv

data/README.md

@@ -246,7 +246,7 @@ Post.select('1 as one').ordering { sql('one').desc }
 Post.selecting { title.op('||', quoted('diddly')) }
 
 # Functions
-Post.select { func('coalesce', id, 1) }
+Post.selecting { func('coalesce', id, 1) }
 ```
 
 ## Sifters

data/lib/baby_squeel/active_record/where_chain.rb

@@ -5,7 +5,8 @@ module BabySqueel
     module WhereChain
       # Constructs Arel for ActiveRecord::Base#where using the DSL.
       def has(&block)
-        @scope.where! DSL.evaluate(@scope, &block)
+        arel = DSL.evaluate(@scope, &block)
+        @scope.where!(arel) unless arel.nil?
         @scope
       end
     end

data/lib/baby_squeel/dsl.rb

@@ -24,6 +24,24 @@ module BabySqueel
       end
     end
 
+    # Create a Grouping node. This allows you to set balanced
+    # pairs of parentheses around your SQL.
+    #
+    # ==== Arguments
+    #
+    # * +expr+ - The expression to group.
+    #
+    # ==== Example
+    #     Post.where.has{_([summary, description]).in(...)}
+    #     #=> SELECT "posts".* FROM "posts" WHERE ("posts"."summary", "posts"."description") IN (...)"
+    #     Post.select{[id, _(Comment.where.has{post_id == posts.id}.selecting{COUNT(id)})]}.as('comment_count')}
+    #     #=> SELECT "posts"."id", (SELECT COUNT("comments"."id") FROM "comments" WHERE "comments.post_id" = "posts"."id") AS "comment_count" FROM "posts"
+    #
+    def _(expr)
+      expr = Arel.sql(expr.to_sql) if expr.is_a? ::ActiveRecord::Relation
+      Nodes.wrap Arel::Nodes::Grouping.new(expr)
+    end
+
     # Create a SQL function. See Arel::Nodes::NamedFunction.
     #
     # ==== Arguments
@@ -32,7 +50,7 @@ module BabySqueel
     # * +args+ - The arguments to be passed to the SQL function.
     #
     # ==== Example
-    #     Post.select { func('coalesce', id, 1) }
+    #     Post.selecting { func('coalesce', id, 1) }
     #     #=> SELECT COALESCE("posts"."id", 1) FROM "posts"
     #
     def func(name, *args)

data/lib/baby_squeel/nodes.rb

@@ -2,6 +2,7 @@ require 'baby_squeel/nodes/node'
 require 'baby_squeel/nodes/attribute'
 require 'baby_squeel/nodes/function'
 require 'baby_squeel/nodes/grouping'
+require 'baby_squeel/nodes/binary'
 
 module BabySqueel
   module Nodes
@@ -14,6 +15,8 @@ module BabySqueel
           Grouping.new(arel)
         when Arel::Nodes::Function
           Function.new(arel)
+        when Arel::Nodes::Binary
+          Binary.new(arel)
         when Arel::Nodes::Node, Arel::Nodes::SqlLiteral
           Node.new(arel)
         else

data/lib/baby_squeel/nodes/attribute.rb

@@ -5,8 +5,8 @@ module BabySqueel
     class Attribute < Node
       def initialize(parent, name)
         @parent = parent
-        @name = name
-        super(parent._table[name])
+        @name = name.to_s
+        super(parent._table[@name])
       end
 
       def in(rel)

data/lib/baby_squeel/nodes/binary.rb

@@ -0,0 +1,12 @@
+require 'baby_squeel/nodes/node'
+
+module BabySqueel
+  module Nodes
+    class Binary < Node
+      def initialize(node)
+        super
+        node.extend Arel::AliasPredication
+      end
+    end
+  end
+end

data/lib/baby_squeel/nodes/function.rb

@@ -6,6 +6,7 @@ module BabySqueel
     class Function < Node
       def initialize(node)
         super
+        node.extend Arel::Math
         node.extend Arel::OrderPredications
       end
     end

data/lib/baby_squeel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - lib/baby_squeel/join_expression.rb
 - lib/baby_squeel/nodes.rb
 - lib/baby_squeel/nodes/attribute.rb
+- lib/baby_squeel/nodes/binary.rb
 - lib/baby_squeel/nodes/function.rb
 - lib/baby_squeel/nodes/grouping.rb
 - lib/baby_squeel/nodes/node.rb