baby_squeel 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3569d1726ce4c979428cbc2fed31fe8103f16405
-  data.tar.gz: 7d60acb4736d2a7cdda1e921bcb32ac1b8597601
+  metadata.gz: 630e302720d471b1ea0e6f618ef01e8592c0b9ab
+  data.tar.gz: 621e74ac8ad305e143e856e1cee8a8c023b3ac9c
 SHA512:
-  metadata.gz: 81b72fb9e8b0f80dc8a0c5e52b215ed89e8f8801407ec2a60747f06171f35b9e6f8d0970c7009573092b17eaaa67ea8fabfa8dcf542b1aa0396b777df966bd4a
-  data.tar.gz: fdcbff4355e934d51d6f6e57e19fdbda28a93eac0acb3ea91b4fc1d1d7c9ed84ae06c75dcb500a72325577374df38c0969ebef9dbee45b08a7cd0845de27c374
+  metadata.gz: c91ddbf39dc8e7a153f9be6df8197ac7223d91d4bf003eb55049bb3c0d9f671e7aa4a810ddb122973e609f70e302db90011b1f82a9794133cd1d2f4f688d8d6c
+  data.tar.gz: e71c24fb4bf300ae9806e4664e07c0e07e07cf74997f1259b2e6068fcb304f5d171bea6db2095d1e44a1329fe019f4a381be5e9686c6b9ec33d60b70b7787118

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.2.4
 
 before_install: gem install bundler -v 1.11.2
-before_script: bundle exec rubocop
 after_script: bundle exec rake coveralls:push
 
 env:

data/Gemfile

@@ -15,4 +15,3 @@ group :test do
   gem 'simplecov'
 end
 
-gem 'rubocop', require: false

data/README.md

@@ -4,13 +4,13 @@
 [![Code Climate](https://codeclimate.com/github/rzane/baby_squeel/badges/gpa.svg)](https://codeclimate.com/github/rzane/baby_squeel)
 [![Coverage Status](https://coveralls.io/repos/github/rzane/baby_squeel/badge.svg?branch=master)](https://coveralls.io/github/rzane/baby_squeel?branch=master)
 
-![biddy piggy](http://static.thefrisky.com/uploads/2010/07/01/pig_in_boots_070110_m.jpg)
+<img align="right" src="http://static.thefrisky.com/uploads/2010/07/01/pig_in_boots_070110_m.jpg" alt="biddy piggy">
 
 Have you ever used the [squeel](https://github.com/activerecord-hackery/squeel) gem? It's a really nice way to build complex queries. However, squeel monkeypatches ActiveRecord internals, so it has a tendency to break every time a new ActiveRecord version comes out.
 
-For me, that's a deal breaker. BabySqueel provides a query DSL for ActiveRecord without all of the evil :heart:.
+For me, that's a deal breaker. BabySqueel provides a query DSL for ActiveRecord without all of the evil. :heart:
 
-It's also suprisingly uncomplicated. It's really just a layer of sugar on top of Arel.
+It's really just a layer of sugar on top of Arel.
 
 ## Installation
 
@@ -30,54 +30,58 @@ Or install it yourself as:
 
 ## Usage
 
-Okay, so we have a `Post` model:
+Okay, so we have some models:
 
 ```ruby
 class Post < ActiveRecord::Base
   belongs_to :author
+  has_many :comments
+end
+
+class Author < ActiveRecord::Base
+  has_many :posts
+  has_many :comments, through: :posts
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
 end
 ```
 
-#### Selects
+##### Selects
 
 ```ruby
 Post.selecting { (id + 5).as('id_plus_five') }
-# SELECT "posts"."id" + 5 AS id_plus_five FROM "posts"
+# SELECT ("posts"."id" + 5) AS id_plus_five FROM "posts"
 
 Post.selecting { id.sum }
 # SELECT SUM("posts"."id") FROM "posts"
 
 Post.joins(:author).selecting { [id, author.id] }
-# SELECT "posts"."id", "author"."id"
-# FROM "posts"
-# INNER JOIN "authors" ON "posts"."author_id" = "authors"."id"
+# SELECT "posts"."id", "authors"."id" FROM "posts"
+# INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
 ```
 
-#### Wheres
+##### Wheres
 
 ```ruby
 Post.where.has { title == 'My Post' }
-# SELECT "posts".* FROM "posts" WHERE "posts"."title" = 'My Post'
+# SELECT "posts".* FROM "posts"
+# WHERE "posts"."title" = 'My Post'
 
 Post.where.has { title =~ 'My P%' }
-# SELECT "posts".* FROM "posts" WHERE "posts"."title" LIKE 'My P%'
+# SELECT "posts".* FROM "posts"
+# WHERE ("posts"."title" LIKE 'My P%')
 
 Author.where.has { (name =~ 'Ray%') & (id < 5) | (name.lower =~ 'zane%') & (id > 100) }
 # SELECT "authors".* FROM "authors"
-# WHERE (
-#   "authors"."name" LIKE 'Ray%' AND "authors"."id" < 5 OR
-#   LOWER("authors"."name") LIKE 'zane%' AND "authors"."id" > 100
-# )
+# WHERE ("authors"."name" LIKE 'Ray%' AND "authors"."id" < 5 OR LOWER("authors"."name") LIKE 'zane%' AND "authors"."id" > 100)
 
 Post.joins(:author).where.has { author.name == 'Ray' }
 # SELECT "posts".* FROM "posts"
 # INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
 # WHERE "authors"."name" = 'Ray'
-```
-
-Here's the best part. Where conditions will always reference the correct table alias for a given association:
 
-```ruby
 Post.joins(author: :posts).where.has { author.posts.title =~ '%fun%' }
 # SELECT "posts".* FROM "posts"
 # INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
@@ -85,18 +89,20 @@ Post.joins(author: :posts).where.has { author.posts.title =~ '%fun%' }
 # WHERE ("posts_authors"."title" LIKE '%fun%')
 ```
 
-#### Orders
+##### Orders
 
 ```ruby
 Post.ordering { [id.desc, title.asc] }
-# SELECT "posts".* FROM "posts" ORDER BY "posts"."id" DESC, "posts"."title" ASC
+# SELECT "posts".* FROM "posts"
+# ORDER BY "posts"."id" DESC, "posts"."title" ASC
 
 Post.ordering { (id * 5).desc }
-# SELECT "posts".* FROM "posts" ORDER BY "posts"."id" * 5 DESC
+# SELECT "posts".* FROM "posts"
+# ORDER BY "posts"."id" * 5 DESC
 
 Post.select(:author_id).group(:author_id).ordering { id.count.desc }
-# SELECT "posts"."author_id"
-# FROM "posts" GROUP BY "posts"."author_id"
+# SELECT "posts"."author_id" FROM "posts"
+# GROUP BY "posts"."author_id"
 # ORDER BY COUNT("posts"."id") DESC
 
 Post.joins(:author).ordering { author.id.desc }
@@ -105,8 +111,7 @@ Post.joins(:author).ordering { author.id.desc }
 # ORDER BY "authors"."id" DESC
 ```
 
-
-#### Joins
+##### Joins
 
 ```ruby
 Post.joining { author }
@@ -121,17 +126,20 @@ Post.joining { [author.outer, comments] }
 Post.joining { author.comments }
 # SELECT "posts".* FROM "posts"
 # INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
-# INNER JOIN "comments" ON "comments"."author_id" = "authors"."id"
+# INNER JOIN "posts" "posts_authors_join" ON "posts_authors_join"."author_id" = "authors"."id"
+# INNER JOIN "comments" ON "comments"."post_id" = "posts_authors_join"."id"
 
 Post.joining { author.outer.comments.outer }
 # SELECT "posts".* FROM "posts"
-# INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
-# LEFT OUTER JOIN "comments" ON "comments"."author_id" = "authors"."id"
+# LEFT OUTER JOIN "authors" ON "authors"."id" = "posts"."author_id"
+# LEFT OUTER JOIN "posts" "posts_authors_join" ON "posts_authors_join"."author_id" = "authors"."id"
+# LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts_authors_join"."id"
 
 Post.joining { author.comments.outer }
 # SELECT "posts".* FROM "posts"
 # INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
-# LEFT OUTER JOIN "comments" ON "comments"."author_id" = "authors"."id"
+# LEFT OUTER JOIN "posts" "posts_authors_join" ON "posts_authors_join"."author_id" = "authors"."id"
+# LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts_authors_join"."id"
 
 Post.joining { author.outer.posts }
 # SELECT "posts".* FROM "posts"
@@ -140,19 +148,30 @@ Post.joining { author.outer.posts }
 
 Post.joining { author.alias('a').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" "a" ON ("authors"."id" = "posts"."author_id" OR "authors"."name" = "posts"."title")
 ```
 
-#### Functions
+##### Functions
 
 ```ruby
 Post.selecting { coalesce(author_id, 5).as('author_id_with_default') }
 # SELECT coalesce("posts"."author_id", 5) AS author_id_with_default FROM "posts"
 ```
 
+##### Subqueries
+
+```ruby
+Post.joins(:author).where.has {
+  author.id.in Author.select(:id).where(name: 'Ray')
+}
+# SELECT "posts".* FROM "posts"
+# INNER JOIN "authors" ON "authors"."id" = "posts"."author_id"
+# WHERE "authors"."id" IN (
+#   SELECT "authors"."id" FROM "authors"
+#   WHERE "authors"."name" = 'Ray'
+# )
+```
+
 ## Important Notes
 
 While inside one of BabySqueel's blocks, `self` will be something totally different. You won't have access to your instance variables or methods.
@@ -172,10 +191,6 @@ Post.where.has { |table| table.title == 'Test' }
 
 You can also run `bin/console` to open up a prompt where you'll have access to some models to experiment with.
 
-## Todo
-
-+ Subqueries
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/rzane/baby_squeel.

data/Rakefile

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'open3'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
@@ -7,26 +8,33 @@ Coveralls::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec)
 
-def run_version(version, cmd)
-  display = "AR=#{version} #{cmd}"
-  puts display
-
+def invoke(version, cmd)
   Bundler.with_clean_env do
-    system({ 'AR' => version }, cmd)
+    system({ 'AR' => version, 'SKIPCOV' => '1' }, cmd)
+  end
+end
+
+desc 'Run against a specific ActiveRecord version'
+task 'spec:version', [:version] do |_, args|
+  if args.version.nil? || args.version.empty?
+    abort 'No version given'
   end
 
-  abort "\nFAILED: #{display}" unless $?.success?
+  FileUtils.rm_rf 'Gemfile.lock'
+  invoke args.version, 'bundle install --quiet'
+  invoke args.version, 'bundle exec rspec -f progress' if $?.success?
+  $stderr.puts "#{args.version} failed." unless $?.success?
 end
 
 desc 'Run against all ActiveRecord versions'
 task 'spec:matrix' do
   travis = YAML.load_file '.travis.yml'
+  spec_task = Rake::Task['spec:version']
 
-  travis['env']['matrix'].reverse.each do |variable|
-    version = variable[/\=(.+)$/, 1]
-    rm_rf 'Gemfile.lock'
-    run_version version, 'bundle install > /dev/null'
-    run_version version, 'rake spec'
+  travis['env']['matrix'].each do |matrix|
+    spec_task.invoke matrix[/\=(.+)$/, 1]
+    spec_task.reenable
+    puts "\n\n"
   end
 end
 

data/lib/baby_squeel/nodes.rb

@@ -60,6 +60,7 @@ module BabySqueel
     # include necessary/applicable modules.
     class Generic < Proxy
       extend Operators::ArelAliasing
+      include Arel::AliasPredication
       include Arel::OrderPredications
       include Operators::Comparison
       include Operators::Equality
@@ -75,6 +76,14 @@ module BabySqueel
         super(parent._table[name])
       end
 
+      def in(rel)
+        if rel.is_a? ::ActiveRecord::Relation
+          ::Arel::Nodes::In.new(self, Arel.sql(rel.to_sql))
+        else
+          super
+        end
+      end
+
       def _arel
         parent_arel = @parent._arel
 

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -89,7 +89,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -127,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tiny squeel implementation without all of the evil.

data/.rubocop.yml

@@ -1,21 +0,0 @@
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Style/BlockDelimiters:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/SpecialGlobalVars:
-  Enabled: false
-
-Style/NilComparison:
-  Exclude:
-    - spec/**/*
-
-Metrics/LineLength:
-  Max: 100
-
-Metrics/AbcSize:
-  Enabled: false