arel-helpers 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1755b481c031e17e42b6d16db9576749b1fafe58aca6e2b3e4e7a5438e3a8097
-  data.tar.gz: 161e0bb3c3470f174916eea68c9d07b4c42e53619144869243272a18fa237cd9
+  metadata.gz: 6cab403f3acf62a83acc4dcf8b254154cf1062f1bea41f7ef5aff764a5cb0af9
+  data.tar.gz: 1eff1af177f5a04a6bdbbced27a3ac84352f6a79a0ec2866c6613064c65c1593
 SHA512:
-  metadata.gz: 8864112e0ef6b3d84d6c74b8db83cb87c851bd3b78a73f3655e6d0d833ee218bf41dccd48afaa7e7f94f4f0d918204b7546ad84dad4850e14568ccbc166aa861
-  data.tar.gz: b7f7d30277375ebc148dbffda0c3b7023ec397cea3135d76666398fd9dde00b62790e0c77349712ff13e33feeba5d200c0e351905f8cfbaa8cae15f6fa3f8300
+  metadata.gz: 8a2af67c4bc80ff0d7ec6d95e9c3cb1ac2c56e102e06b70d74e64df045487949ca1a85485dfd14228945ee02ce5ed936bb60bbf38d6b0567283199c278a7d7c4
+  data.tar.gz: 14319395dc4944e535be843970fa964923fd1f2cb78fcc15581befd2f1a89ee177e178863fca80233d2c9d780fd9cf6e0bc52498f718afb0b9191ce7d2aad3d5

data/lib/arel-helpers/join_association.rb

@@ -18,7 +18,9 @@ module ArelHelpers
       # This method encapsulates that functionality and yields an intermediate object for chaining.
       # It also allows you to use an outer join instead of the default inner via the join_type arg.
       def join_association(table, association, join_type = Arel::Nodes::InnerJoin, options = {}, &block)
-        if ActiveRecord::VERSION::STRING >= '5.0.0'
+        if ActiveRecord::VERSION::STRING >= '5.2.0'
+          join_association_5_2(table, association, join_type, options, &block)
+        elsif ActiveRecord::VERSION::STRING >= '5.0.0'
           join_association_5_0(table, association, join_type, options, &block)
         elsif ActiveRecord::VERSION::STRING >= '4.2.0'
           join_association_4_2(table, association, join_type, options, &block)
@@ -151,6 +153,35 @@ module ArelHelpers
         join_strings.join(' ')
       end
 
+      def join_association_5_2(table, association, join_type, options = {})
+        aliases = options.fetch(:aliases, [])
+        associations = association.is_a?(Array) ? association : [association]
+
+        alias_tracker = ActiveRecord::Associations::AliasTracker.create(
+          table.connection, table.name, {}
+        )
+
+        join_dependency = ActiveRecord::Associations::JoinDependency.new(
+          table, table.arel_table, associations, alias_tracker
+        )
+
+        constraints = join_dependency.join_constraints([], join_type)
+
+        constraints.map do |join|
+          right = if block_given?
+            yield join.left.name.to_sym, join.right
+          else
+            join.right
+          end
+
+          if found_alias = find_alias(join.left.name, aliases)
+            join.left.table_alias = found_alias.name
+          end
+
+          join_type.new(join.left, right)
+        end
+      end
+
       private
 
       def to_sql(node, table, binds)

data/lib/arel-helpers/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ArelHelpers
-  VERSION = '2.6.1'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-helpers
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Useful tools to help construct database queries with ActiveRecord and Arel.