joiner 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 543a8c9e2753e70cbf20bfa1339d9fb694dbddbe7acdaa221dcd61eed414eba3
-  data.tar.gz: 4e6c0ee07f07efe8fd4c7c0d690240e1204975b5c17d66e468c7cf46b6b6d4a1
+  metadata.gz: 76a7e71eaef54a09627a9d72231ab9fe99c966736a7c7bffbedcd110bcbcef4a
+  data.tar.gz: 8aed7b7b5081bf0c564ea7e81f6a2d229f4e5e0b45b4ce3aae89d15e19879d39
 SHA512:
-  metadata.gz: e65737d1f81fb60fca11d8c5360f25a03f652c516e42481ca9ebbf88df1006408b06d527f43511f16d1f71e1f4ce62332fe8ef6aa47bc6d8946dd1a74320a55a
-  data.tar.gz: 468e756f7560b6dce83e95b59d8dc852e2c87f96436512755101cb63e1bb597061a62f41a56c553cedd698bb33065624a04f729cef02ae3b9c68f7aed056308a
+  metadata.gz: 00b8286b10577f26e2999601cfb4cf5c73b213ef452fa8608ccbbb1b5d33cb27b0505b08fac73a90d951dc18f7f9636be1c2fb58e39ac073aa0fbed73298e516
+  data.tar.gz: 944cf099ea7df456ecfe2f52a21a624bef9e74154d524425e845312a626b4be5d72b264467a2fd38be4fdefd14097a88a1ee0fd40d1ba0009506664892c63b3b

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+dist: xenial
+sudo: false
+rvm:
+- 2.5.5
+- 2.6.3
+before_install:
+- gem update --system
+script: bundle exec rspec

data/README.md

@@ -9,7 +9,7 @@ If this gem is used by anyone other than myself/Thinking Sphinx, I'll be surpris
 It's a gem - so you can either install it yourself, or add it to the appropriate Gemfile or gemspec.
 
 ```term
-gem install joiner --version 0.4.2
+gem install joiner --version 0.5.0
 ```
 
 ## Usage
@@ -59,4 +59,4 @@ Please note that this project now has a [Contributor Code of Conduct](http://con
 
 ## Licence
 
-Copyright (c) 2013-2018, Joiner is developed and maintained by [Pat Allan](http://freelancing-gods.com), and is released under the open MIT Licence.
+Copyright (c) 2013-2019, Joiner is developed and maintained by [Pat Allan](http://freelancing-gods.com), and is released under the open MIT Licence.

data/joiner.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'joiner'
-  spec.version       = '0.4.2'
+  spec.version       = '0.5.0'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = %q{Builds ActiveRecord joins from association paths}
@@ -13,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '>= 5.2.beta1'
+  spec.add_runtime_dependency 'activerecord', '>= 6.0.0.rc2'
 
-  spec.add_development_dependency 'combustion',  '~> 0.8'
-  spec.add_development_dependency 'rails',       '>= 5.2.0'
+  spec.add_development_dependency 'combustion',  '~> 1.1'
+  spec.add_development_dependency 'rails',       '>= 6.0.0.rc2'
   spec.add_development_dependency 'rspec-rails', '~> 3'
-  spec.add_development_dependency 'sqlite3',     '~> 1.3.8'
+  spec.add_development_dependency 'sqlite3',     '~> 1.4'
 end

data/lib/joiner/join_dependency.rb

@@ -1,10 +1,7 @@
 class Joiner::JoinDependency < ActiveRecord::Associations::JoinDependency
   def join_association_for(path, alias_tracker = nil)
-    if alias_tracker
-      # ActiveRecord 5.2.1+
-      @alias_tracker = alias_tracker
-      construct_tables! join_root
-    end
+    @alias_tracker = alias_tracker
+    construct_tables! join_root
 
     path.inject(join_root) do |node, piece|
       node.children.detect { |child| child.reflection.name == piece }

data/lib/joiner/joins.rb

@@ -2,6 +2,8 @@ require 'active_record'
 require 'active_support/ordered_hash'
 
 class Joiner::Joins
+  ACTIVE_RECORD_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
+
   attr_reader :model
 
   def initialize(model)
@@ -23,13 +25,9 @@ class Joiner::Joins
   end
 
   def join_values
-    if Joiner::JoinDependency.instance_method(:initialize).arity == 3
-      # ActiveRecord 5.2.1+
-      Joiner::JoinDependency.new model, table, joins_cache.to_a
-    else
-      # ActiveRecord 5.2.0
-      Joiner::JoinDependency.new model, table, joins_cache.to_a, alias_tracker
-    end
+    Joiner::JoinDependency.new(
+      model, table, joins_cache.to_a, Arel::Nodes::OuterJoin
+    )
   end
 
   private
@@ -43,13 +41,7 @@ class Joiner::Joins
   end
 
   def association_for(path)
-    if Joiner::JoinDependency.instance_method(:initialize).arity == 3
-      # ActiveRecord 5.2.1+
-      join_values.join_association_for path, alias_tracker
-    else
-      # ActiveRecord 5.2.0
-      join_values.join_association_for path
-    end
+    join_values.join_association_for path, alias_tracker
   end
 
   def path_as_hash(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joiner
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.beta1
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.beta1
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '1.4'
 description: Builds ActiveRecord outer joins from association paths and provides references
   to table aliases.
 email:
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Builds ActiveRecord joins from association paths