baby_squeel 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7011dd272658bb35f29c2fee9bef07432c6fd6b8
-  data.tar.gz: 987fcf1f4682154eefb19e8aeb9e2671f48d04ea
+  metadata.gz: d7d31d8ac2c6564c5116b4fcfb2175c7747e1689
+  data.tar.gz: a1882420d085c5d2e071434ae8da6d28951ad3f9
 SHA512:
-  metadata.gz: 9f1b3d6e1f178ab428df6b1c23d7672ba2c53fa0f14814cf72c60c294e1236ba01240f875a3c5bbdde21d25976da72403786325f274bcd28020b0dfbaf474c41
-  data.tar.gz: 72efcf684fe78d5918914384d9f315b173adafa53af5044ce053c4b8ddb11a86067121c87997efd4254550d01064b825c68d5378b327e424dd6763bdc22e0c57
+  metadata.gz: 3fdc066c0f04ebe17744c95cbc4499a492c993ca23d06fc6b11b41077d7d2a45591504f7a831b4fdf1e21aa16c640b6847a1bbf58e7fc3b1b232e0366209b0d9
+  data.tar.gz: dac5d32acfb013e580aa4e51433a6b1e2bafe17288001feb09295f1da2b26e93a61486598c8884707e687ee591c024ac7ad82091b5a1833ed239f2ee009cfb42

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Nothing yet.
 
+## [0.3.1] - 2016-08-02
+### Added
+- Ported backticks and #my from Squeel
+
+### Changed
+- DSL#sql now returns a node wrapped in a BabySqueel proxy.
+
 ## [0.3.0] - 2016-06-26
 ### Added
 - Added Squeel compatibility mode that allows `select`, `order`, `joins`, `group`, `where`, and `having` to accept DSL blocks.
@@ -45,7 +52,8 @@ Nothing yet.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v0.3.0...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v0.3.1...HEAD
+[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

data/README.md

@@ -228,6 +228,19 @@ Post.joining {
 }
 ```
 
+##### Helpers
+
+```ruby
+# SQL Literals
+Post.select('1 as one').ordering { sql('one').desc }
+
+# Quoting
+Post.selecting { title.op('||', quoted('diddly')) }
+
+# Functions
+Post.select { func('coalesce', id, 1) }
+```
+
 ## Sifters
 
 Sifters are like little snippets of conditions that can take arguments.

data/lib/baby_squeel/compat.rb

@@ -1,10 +1,27 @@
 module BabySqueel
   module Compat
     def self.enable!
+      BabySqueel::DSL.prepend BabySqueel::Compat::DSL
       ::ActiveRecord::Base.singleton_class.prepend QueryMethods
       ::ActiveRecord::Relation.prepend QueryMethods
     end
 
+    module DSL
+      def `(str)
+        sql(str)
+      end
+
+      def my(&block)
+        @caller.instance_eval(&block)
+      end
+
+      # Remember the original binding of the block
+      def evaluate(&block)
+        @caller = block.binding.eval('self')
+        super
+      end
+    end
+
     module QueryMethods
       def joins(*args, &block)
         if block_given? && args.empty?
@@ -56,7 +73,7 @@ module BabySqueel
 
       def where(*args, &block)
         if block_given? && args.empty?
-          super DSL.evaluate(self, &block)
+          where.has(&block)
         else
           super
         end

data/lib/baby_squeel/dsl.rb

@@ -50,7 +50,7 @@ module BabySqueel
 
     # See Arel::sql
     def sql(value)
-      ::Arel.sql value
+      Nodes.wrap ::Arel.sql(value)
     end
 
     # Quotes a string and marks it as SQL

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A tiny squeel implementation without all of the evil.