joiner 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2957665feb464601c460d97d553e3aac9b4c00229dd971585842e41b03a0ce15
-  data.tar.gz: e4af3be0d65da1f2f03875ff541c68dc854411d1f80fe2509bc237ce64c39e92
+  metadata.gz: 543a8c9e2753e70cbf20bfa1339d9fb694dbddbe7acdaa221dcd61eed414eba3
+  data.tar.gz: 4e6c0ee07f07efe8fd4c7c0d690240e1204975b5c17d66e468c7cf46b6b6d4a1
 SHA512:
-  metadata.gz: 1114b267101aa3bb1b5486bf35d518cd684119b7b8ba412cdb2f66d0ac1056f1c34b4f2e262a2a0b58610c9dbe855180336a318f1f606a80cadfdefc073ae9d5
-  data.tar.gz: fbfd4b013dfc3fc73be7295d8392e58e78a229c57809616ebfdc3f6f92932eccbd5a8b45f5787ee68dc5f4488eea2b09d8a3662ead2149ee98b1c7a729eb35a5
+  metadata.gz: e65737d1f81fb60fca11d8c5360f25a03f652c516e42481ca9ebbf88df1006408b06d527f43511f16d1f71e1f4ce62332fe8ef6aa47bc6d8946dd1a74320a55a
+  data.tar.gz: 468e756f7560b6dce83e95b59d8dc852e2c87f96436512755101cb63e1bb597061a62f41a56c553cedd698bb33065624a04f729cef02ae3b9c68f7aed056308a

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.1
+gem install joiner --version 0.4.2
 ```
 
 ## Usage

data/joiner.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'joiner'
-  spec.version       = '0.4.1'
+  spec.version       = '0.4.2'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = %q{Builds ActiveRecord joins from association paths}
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activerecord', '>= 5.2.beta1'
 
   spec.add_development_dependency 'combustion',  '~> 0.8'
-  spec.add_development_dependency 'rails',       '>= 5.2.1'
+  spec.add_development_dependency 'rails',       '>= 5.2.0'
   spec.add_development_dependency 'rspec-rails', '~> 3'
   spec.add_development_dependency 'sqlite3',     '~> 1.3.8'
 end

data/lib/joiner/join_dependency.rb

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

data/lib/joiner/joins.rb

@@ -19,11 +19,17 @@ class Joiner::Joins
     return model.table_name if path.empty?
 
     add_join_to path
-    join_values.join_association_for(path, alias_tracker).tables.first.name
+    association_for(path).tables.first.name
   end
 
   def join_values
-    Joiner::JoinDependency.new model, table, joins_cache.to_a
+    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
   end
 
   private
@@ -36,6 +42,16 @@ 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
+  end
+
   def path_as_hash(path)
     path[0..-2].reverse.inject(path.last) { |key, item| {item => key} }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joiner
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement