left_join 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c226ac4666aed1a80fcc689ace520632c2ea831f
-  data.tar.gz: 402f3e1674f93254b76a6c79bb01c4617899b96e
+  metadata.gz: cbd1e1087f2324c39141cdd48a47dd51e89b842c
+  data.tar.gz: 561a76881876900b8f5d71b0026d1c899724324c
 SHA512:
-  metadata.gz: acf5969fefa5c6a2a89ad968e45e6e860dd645582e361be7716ce543f5c0379ebde0620c0c3aa6f45d39994bc946ed2636c7d0360b571cdced988e5c4e62777f
-  data.tar.gz: 85e33528364c50b89d5c02ef42882d5111e69263bcecbe31b4625adeb8fcc5ab81021edd63dd2cdb698c54538b7eced80e8637b22ce6b27db467aa0fcae5c2f9
+  metadata.gz: 14c930afa5688b049a8c021e7d98d4b67f3132e8ed51834b4df83daf38934a6d52d2400f94ae0c98dc397bb45e4956facd7404b043e05df811ea0849ab887457
+  data.tar.gz: 62f3d176a8f5fbb308bd81317d559386c52dffdd61dee2510c100f409a81935e5698cf689042e150f2d47c50d47ba4570bf7f67b9289e57e4de08a21eecc0174

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   gem 'rspec', '~> 3.3.0'
   gem 'rdoc', '~> 3.12'
   gem 'bundler', '~> 1.0'
-  gem 'jeweler', '~> 2.0.1'
+  gem 'jeweler', '~> 2.1.0'
   gem 'simplecov', '>= 0'
   gem 'sqlite3'
   gem 'activerecord'

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
     builder (3.2.2)
     descendants_tracker (0.0.4)
@@ -23,19 +23,18 @@ GEM
     docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.4)
-      addressable (~> 2.3)
+    git (1.3.0)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
       oauth2
-    hashie (3.4.2)
-    highline (1.7.7)
+    hashie (3.4.4)
+    highline (1.7.8)
     i18n (0.7.0)
-    jeweler (2.0.1)
+    jeweler (2.1.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -44,23 +43,24 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
+      semver
     json (1.8.3)
     jwt (1.5.1)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
-    multi_json (1.11.2)
+    mini_portile2 (2.0.0)
+    minitest (5.9.0)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     rack (1.6.4)
-    rake (10.4.2)
+    rake (11.1.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (3.3.0)
@@ -76,12 +76,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    simplecov (0.10.0)
+    semver (1.0.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -92,11 +93,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   bundler (~> 1.0)
-  jeweler (~> 2.0.1)
+  jeweler (~> 2.1.0)
   rdoc (~> 3.12)
   rspec (~> 3.3.0)
   simplecov
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.12.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/left_join.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: left_join 0.1.0 ruby lib
+# stub: left_join 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "left_join"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Diego Aguir Selzlein"]
-  s.date = "2015-10-09"
+  s.date = "2016-05-18"
   s.description = "This gem helps doing LEFT JOIN's between ActiveRecord associations"
   s.email = "diegoselzlein@gmail.com"
   s.extra_rdoc_files = [
@@ -30,13 +30,12 @@ Gem::Specification.new do |s|
     "left_join.gemspec",
     "lib/left_join.rb",
     "lib/left_join/adapters/active_record_adapter.rb",
-    "lib/left_join/node.rb",
     "spec/left_join_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/nerde/left_join"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5.1"
+  s.rubygems_version = "2.5.1"
   s.summary = "LEFT JOIN with ActiveRecord"
 
   if s.respond_to? :specification_version then
@@ -46,7 +45,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 3.3.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
@@ -54,7 +53,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 3.3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
@@ -63,7 +62,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 3.3.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])

data/lib/left_join.rb

@@ -1,23 +1,4 @@
 module LeftJoin
-  autoload :Node, 'left_join/node'
-
-  def self.parse_to_nodes(arguments, context)
-    [].tap do |result|
-      case arguments
-      when Hash
-        arguments.each do |key, value|
-          result.concat parse_to_nodes(key, context)
-          result.concat parse_to_nodes(value, context.left_join_subcontext(key))
-        end
-      when Array
-        arguments.each do |value|
-          result.concat parse_to_nodes(value, context)
-        end
-      else
-        result << context.node_for_left_join(arguments)
-      end
-    end
-  end
 end
 
 require 'left_join/adapters/active_record_adapter'

data/lib/left_join/adapters/active_record_adapter.rb

@@ -12,32 +12,10 @@ module LeftJoin
       #
       #     Book.left_join(category: :master_category)
       def left_join(*columns)
-        LeftJoin.parse_to_nodes(columns, self).inject(all) do |acc, association|
-          table = association.active_record.arel_table
-          join_table = association.klass.arel_table
-          foreign_key = association.foreign_key
-          primary_key = association.association_primary_key.to_sym
-          unless association.belongs_to?
-            foreign_key, primary_key = primary_key, foreign_key
-          end
-
-          arel_join = table.join(join_table, Arel::Nodes::OuterJoin) \
-                      .on(table[foreign_key].eq(join_table[primary_key]))
-          acc.joins(arel_join.join_sources)
-        end
-      end
-
-      def node_for_left_join(key)
-        reflect_on_association(key) ||
-          fail("#{self} has no association: #{key}.")
-      end
-
-      def left_join_subcontext(key)
-        node_for_left_join(key).klass
+        joins(ActiveRecord::Associations::JoinDependency.new(self, columns, []))
       end
     end
 
     ActiveRecord::Base.extend ActiveRecordAdapter if defined?(ActiveRecord)
   end
 end
-

data/spec/left_join_spec.rb

@@ -11,40 +11,33 @@ end
 class Book < ActiveRecord::Base
   belongs_to :author
   belongs_to :category
+  has_many :tags, as: :taggable
+end
+
+class Tag < ActiveRecord::Base
+  belongs_to :taggable, polymorphic: true
 end
 
 describe 'LeftJoin' do
   it 'generates a LEFT OUTER JOIN SQL' do
     expect(Book.left_join(:category).to_sql).to eq(
       "SELECT \"books\".* FROM \"books\" LEFT OUTER JOIN \"categories\" ON "\
-      "\"books\".\"category_id\" = \"categories\".\"id\"")
+      "\"categories\".\"id\" = \"books\".\"category_id\"")
   end
 
   it 'works with nested associations' do
     expect(Category.left_join(books: :author).to_sql).to eq(
       "SELECT \"categories\".* FROM \"categories\" "\
       "LEFT OUTER JOIN \"books\" ON "\
-      "\"categories\".\"id\" = \"books\".\"category_id\" "\
+      "\"books\".\"category_id\" = \"categories\".\"id\" "\
       "LEFT OUTER JOIN \"authors\" ON "\
-      "\"books\".\"author_id\" = \"authors\".\"id\"")
-  end
-
-  it 'parses single argument to nodes' do
-    expect(LeftJoin.parse_to_nodes(:category, Book)).to eq [
-      Book.reflect_on_association(:category)]
-  end
-
-  it 'parses array argument to nodes' do
-    expect(LeftJoin.parse_to_nodes([:category, :author], Book)).to eq [
-      Book.reflect_on_association(:category),
-      Book.reflect_on_association(:author)
-    ]
+      "\"authors\".\"id\" = \"books\".\"author_id\"")
   end
 
-  it 'parses hash argument to nodes' do
-    expect(LeftJoin.parse_to_nodes({ books: :author }, Category)).to eq [
-      Category.reflect_on_association(:books),
-      Book.reflect_on_association(:author)
-    ]
+  it 'works with polymorphic associations' do
+    expect(Book.left_join(:tags).to_sql).to eq(
+      "SELECT \"books\".* FROM \"books\" LEFT OUTER JOIN \"tags\" ON "\
+      "\"tags\".\"taggable_id\" = \"books\".\"id\" AND "\
+      "\"tags\".\"taggable_type\" = 'Book'")
   end
 end

data/spec/spec_helper.rb

@@ -43,6 +43,11 @@ RSpec.configure do |config|
       create_table :categories do |t|
         t.string :name
       end
+
+      create_table :tags do |t|
+        t.string :name
+        t.belongs_to :taggable, polymorphic: true
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: left_join
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Diego Aguir Selzlein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,6 @@ files:
 - left_join.gemspec
 - lib/left_join.rb
 - lib/left_join/adapters/active_record_adapter.rb
-- lib/left_join/node.rb
 - spec/left_join_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/nerde/left_join
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: LEFT JOIN with ActiveRecord

data/lib/left_join/node.rb

@@ -1 +0,0 @@
-LeftJoin::Node = Struct.new(:key, :context)