left_join 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd1e1087f2324c39141cdd48a47dd51e89b842c
-  data.tar.gz: 561a76881876900b8f5d71b0026d1c899724324c
+  metadata.gz: e425fcb4bc322481f4db996cfd74d53c15b10e62
+  data.tar.gz: 62d490da6a7d318c0d859825b01013c15ad1afec
 SHA512:
-  metadata.gz: 14c930afa5688b049a8c021e7d98d4b67f3132e8ed51834b4df83daf38934a6d52d2400f94ae0c98dc397bb45e4956facd7404b043e05df811ea0849ab887457
-  data.tar.gz: 62f3d176a8f5fbb308bd81317d559386c52dffdd61dee2510c100f409a81935e5698cf689042e150f2d47c50d47ba4570bf7f67b9289e57e4de08a21eecc0174
+  metadata.gz: 5241bce35f8074d8d8571e52ce092fbc097be75021829c346229d273bf6b3afe9102d762c20cd7c89f7e54ff3bfd83bedcb90740ced6532a8b10884a3cbbdb93
+  data.tar.gz: 3ba0feceb66694a94934171ba5dbd21fc6a8ce4427c614f8f402530d399cbbdbdf43bd27219244630401ed559ee3ab6a1ab3e2ffa8fc165d409ac7d4f9cb1543

data/.travis.yml

@@ -0,0 +1,23 @@
+rvm:
+  - 2.1
+  - 2.2
+  - 2.2.2
+  - jruby-1.7.22
+
+gemfile:
+  - gemfiles/3.2.22.5.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/5.0.gemfile
+
+matrix:
+  fast_finish: true
+  exclude:
+    - gemfile: gemfiles/5.0.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/5.0.gemfile
+      rvm: 2.2
+    - gemfile: gemfiles/5.0.gemfile
+      rvm: jruby-1.7.22
+
+script: "bundle exec rspec"

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rspec', '~> 3.3.0'
+  gem 'rspec', '~> 3.3'
   gem 'rdoc', '~> 3.12'
   gem 'bundler', '~> 1.0'
   gem 'jeweler', '~> 2.1.0'

data/Gemfile.lock

@@ -14,7 +14,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.3)
     builder (3.2.2)
     descendants_tracker (0.0.4)
@@ -24,58 +25,60 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.13.1)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
+      hashie (>= 1.2)
       multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.4.4)
+    hashie (3.4.6)
     highline (1.7.8)
     i18n (0.7.0)
-    jeweler (2.1.1)
+    jeweler (2.1.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
       rake
       rdoc
       semver
     json (1.8.3)
-    jwt (1.5.1)
-    mini_portile2 (2.0.0)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
-    multi_json (1.12.0)
-    multi_xml (0.5.5)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.1.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    rack (1.6.4)
-    rake (11.1.2)
+    public_suffix (2.0.4)
+    rack (2.0.1)
+    rake (12.0.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     semver (1.0.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -95,9 +98,9 @@ DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.1.0)
   rdoc (~> 3.12)
-  rspec (~> 3.3.0)
+  rspec (~> 3.3)
   simplecov
   sqlite3
 
 BUNDLED WITH
-   1.12.2
+   1.13.1

data/README.md

@@ -12,7 +12,7 @@ Book.left_join(:category)
 
 ## Why?
 
-See [this blog post](http://nerde.github.io/posts/a-better-left-join-with-active-record/)
+See [this blog post](http://nerde.github.io/posts/a-better-left-join-with-active-record)
 for details.
 
 ## Installation

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/gemfiles/3.2.22.5.gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'activerecord', '= 3.2.22.5'
+gem 'rspec'
+gem 'sqlite3', platform: [:ruby, :mswin, :mingw]
+gem 'jdbc-sqlite3', platform: :jruby
+gem 'activerecord-jdbc-adapter', platform: :jruby

data/gemfiles/4.0.gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'activerecord', '~> 4.0.0'
+gem 'rspec'
+gem 'sqlite3', platform: [:ruby, :mswin, :mingw]
+gem 'jdbc-sqlite3', platform: :jruby
+gem 'activerecord-jdbc-adapter', platform: :jruby

data/gemfiles/4.1.gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'activerecord', '~> 4.1.0'
+gem 'rspec'
+gem 'sqlite3', platform: [:ruby, :mswin, :mingw]
+gem 'jdbc-sqlite3', platform: :jruby
+gem 'activerecord-jdbc-adapter', platform: :jruby

data/gemfiles/5.0.gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'rspec'
+gem 'sqlite3', platform: [:ruby, :mswin, :mingw]
+gem 'jdbc-sqlite3', platform: :jruby
+gem 'activerecord-jdbc-adapter', platform: :jruby

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.2.0 ruby lib
+# stub: left_join 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "left_join"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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 = "2016-05-18"
+  s.date = "2016-12-22"
   s.description = "This gem helps doing LEFT JOIN's between ActiveRecord associations"
   s.email = "diegoselzlein@gmail.com"
   s.extra_rdoc_files = [
@@ -21,12 +21,17 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
+    "gemfiles/3.2.22.5.gemfile",
+    "gemfiles/4.0.gemfile",
+    "gemfiles/4.1.gemfile",
+    "gemfiles/5.0.gemfile",
     "left_join.gemspec",
     "lib/left_join.rb",
     "lib/left_join/adapters/active_record_adapter.rb",
@@ -42,7 +47,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 3.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.3"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.1.0"])
@@ -50,7 +55,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 3.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.3"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.1.0"])
@@ -59,7 +64,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 3.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.3"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.1.0"])

data/lib/left_join/adapters/active_record_adapter.rb

@@ -12,10 +12,22 @@ module LeftJoin
       #
       #     Book.left_join(category: :master_category)
       def left_join(*columns)
-        joins(ActiveRecord::Associations::JoinDependency.new(self, columns, []))
+        join_dependency = ActiveRecord::Associations::JoinDependency.new(self, columns, [])
+        if RAILS4_1_PLUS
+          joins(join_dependency)
+        else
+          join_dependency.join_associations.inject(self) do |result, association|
+            association.join_relation(result)
+          end
+        end
       end
+
+      alias_method :left_joins, :left_join
     end
 
-    ActiveRecord::Base.extend ActiveRecordAdapter if defined?(ActiveRecord)
+    if defined?(ActiveRecord)
+      ActiveRecord::Base.extend ActiveRecordAdapter
+      RAILS4_1_PLUS = ActiveRecord::VERSION::MAJOR > 4 || (4 == ActiveRecord::VERSION::MAJOR && ActiveRecord::VERSION::MINOR >= 1)
+    end
   end
 end

data/spec/left_join_spec.rb

@@ -25,6 +25,12 @@ describe 'LeftJoin' do
       "\"categories\".\"id\" = \"books\".\"category_id\"")
   end
 
+  it 'aliases left_join as left_joins' do
+    expect(Book.left_joins(:category).to_sql).to eq(
+      "SELECT \"books\".* FROM \"books\" LEFT OUTER JOIN \"categories\" ON "\
+      "\"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\" "\

data/spec/spec_helper.rb

@@ -1,19 +1,21 @@
-require 'simplecov'
+if ENV['COVERAGE']
+  require 'simplecov'
 
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
+  module SimpleCov::Configuration
+    def clean_filters
+      @filters = []
+    end
   end
-end
 
-SimpleCov.configure do
-  clean_filters
-  load_profile 'test_frameworks'
-end
+  SimpleCov.configure do
+    clean_filters
+    load_profile 'test_frameworks'
+  end
 
-ENV['COVERAGE'] && SimpleCov.start do
-  add_filter '/.rvm/'
-  add_filter '/.rbenv/'
+  SimpleCov.start do
+    add_filter '/.rvm/'
+    add_filter '/.rbenv/'
+  end
 end
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: left_join
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Diego Aguir Selzlein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -118,12 +118,17 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/3.2.22.5.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/5.0.gemfile
 - left_join.gemspec
 - lib/left_join.rb
 - lib/left_join/adapters/active_record_adapter.rb