arel-helpers 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cab403f3acf62a83acc4dcf8b254154cf1062f1bea41f7ef5aff764a5cb0af9
-  data.tar.gz: 1eff1af177f5a04a6bdbbced27a3ac84352f6a79a0ec2866c6613064c65c1593
+  metadata.gz: e692ef35ca5dfd967971eeb47c87ef93b6ca21c142e03ecb29b608c1e8e533e0
+  data.tar.gz: 719115c3d5f7a9c86d89d6bc720e390906eac6a9d5b60d29c19bebe751aa8c5b
 SHA512:
-  metadata.gz: 8a2af67c4bc80ff0d7ec6d95e9c3cb1ac2c56e102e06b70d74e64df045487949ca1a85485dfd14228945ee02ce5ed936bb60bbf38d6b0567283199c278a7d7c4
-  data.tar.gz: 14319395dc4944e535be843970fa964923fd1f2cb78fcc15581befd2f1a89ee177e178863fca80233d2c9d780fd9cf6e0bc52498f718afb0b9191ce7d2aad3d5
+  metadata.gz: 946f6a173a8a3da761ad79b9a416cc7b7871ba0ce879ecd0cb32b2348199c65109df1f7ebee1ec438bdf3cf443d840282935e97d56eed009ac54a31b79cb9d83
+  data.tar.gz: 346d3fcbe5be8208734ca9a35f47870531524d008f8e67d307912eb3582d134b2b51c5a721ff31b5488efb519ade8c6c7830db509aa38450280e764147974527

data/lib/arel-helpers/join_association.rb

@@ -18,13 +18,15 @@ 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.2.0'
+        if version >= '5.2.1'
+          join_association_5_2_1(table, association, join_type, options, &block)
+        elsif version >= '5.2.0'
           join_association_5_2(table, association, join_type, options, &block)
-        elsif ActiveRecord::VERSION::STRING >= '5.0.0'
+        elsif version >= '5.0.0'
           join_association_5_0(table, association, join_type, options, &block)
-        elsif ActiveRecord::VERSION::STRING >= '4.2.0'
+        elsif version >= '4.2.0'
           join_association_4_2(table, association, join_type, options, &block)
-        elsif ActiveRecord::VERSION::STRING >= '4.1.0'
+        elsif version >= '4.1.0'
           join_association_4_1(table, association, join_type, options, &block)
         else
           join_association_3_1(table, association, join_type, options, &block)
@@ -33,6 +35,10 @@ module ArelHelpers
 
       private
 
+      def version
+        ActiveRecord::VERSION::STRING
+      end
+
       def join_association_3_1(table, association, join_type, options = {})
         aliases = options.fetch(:aliases, {})
         associations = association.is_a?(Array) ? association : [association]
@@ -182,6 +188,35 @@ module ArelHelpers
         end
       end
 
+      def join_association_5_2_1(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
+        )
+
+        constraints = join_dependency.join_constraints([], join_type, alias_tracker)
+
+        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.7.0'
+  VERSION = '2.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord