joiner 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a7e71eaef54a09627a9d72231ab9fe99c966736a7c7bffbedcd110bcbcef4a
-  data.tar.gz: 8aed7b7b5081bf0c564ea7e81f6a2d229f4e5e0b45b4ce3aae89d15e19879d39
+  metadata.gz: 50d83b6e1af0b5ef8c29fbbaabbb56a8c33ed99acbf57f507d13bcff673d92b2
+  data.tar.gz: 62adfb53520243ff108e85f68c61ca121cf28f1e6344fac539aa36c725efe0c1
 SHA512:
-  metadata.gz: 00b8286b10577f26e2999601cfb4cf5c73b213ef452fa8608ccbbb1b5d33cb27b0505b08fac73a90d951dc18f7f9636be1c2fb58e39ac073aa0fbed73298e516
-  data.tar.gz: 944cf099ea7df456ecfe2f52a21a624bef9e74154d524425e845312a626b4be5d72b264467a2fd38be4fdefd14097a88a1ee0fd40d1ba0009506664892c63b3b
+  metadata.gz: f96a6e7b1165be044ae4fba8dd71f9950f6635cbac352d7aa9d0aea9f7ead03d8bc0928f4fa69422539e4945976207394efc86704556c5fe44b8bcbda9ac2106
+  data.tar.gz: fa5f47d42b4d823581706dc5644b1b7b0ff4b47232f4216667c9526065e01fa13d1d1f46424e815f6df4bfc42b5659a56dc4831e5af1928ca3151d63bd0a7b5f

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: "bundle exec rspec"

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 dist: xenial
 sudo: false
 rvm:
-- 2.5.5
-- 2.6.3
+- 2.5.8
+- 2.6.6
 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.5.0
+gem install joiner --version 0.6.0
 ```
 
 ## Usage
@@ -17,7 +17,7 @@ gem install joiner --version 0.5.0
 First, create a join collection, based on an ActiveRecord model:
 
 ```ruby
-joiner = Joiner::Joins.new user
+joiner = Joiner::Joins.new User
 ```
 
 Then you can add joins for a given association path. For example, if User has many articles, and articles have many comments:
@@ -59,4 +59,4 @@ Please note that this project now has a [Contributor Code of Conduct](http://con
 
 ## 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.
+Copyright (c) 2013-2020, 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.5.0'
+  spec.version       = '0.6.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', '>= 6.0.0.rc2'
+  spec.add_runtime_dependency 'activerecord', '>= 6.1.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 'rails',       '>= 6.1.0'
+  spec.add_development_dependency 'rspec-rails', '~> 4'
   spec.add_development_dependency 'sqlite3',     '~> 1.4'
 end

data/lib/joiner.rb

@@ -6,6 +6,8 @@ module Joiner
   end
 end
 
+require 'joiner/alias_tracker'
+require 'joiner/join_aliaser'
 require 'joiner/join_dependency'
 require 'joiner/joins'
 require 'joiner/path'

data/lib/joiner/alias_tracker.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/string/conversions"
+
+# This code is taken straight from Rails, prior to v6.1.0.
+# I'm maintaining a copy here to save myself having to work through aliasing
+# logic myself - there's a good chance I don't need all of thiis, but it'll do
+# to get this gem working with Rails 6.1.
+
+class Joiner::AliasTracker # :nodoc:
+  def self.create(connection, initial_table, joins, aliases = nil)
+    if joins.empty?
+      aliases ||= Hash.new(0)
+    elsif aliases
+      default_proc = aliases.default_proc || proc { 0 }
+      aliases.default_proc = proc { |h, k|
+        h[k] = initial_count_for(connection, k, joins) + default_proc.call(h, k)
+      }
+    else
+      aliases = Hash.new { |h, k|
+        h[k] = initial_count_for(connection, k, joins)
+      }
+    end
+    aliases[initial_table] = 1
+    new(connection, aliases)
+  end
+
+  def self.initial_count_for(connection, name, table_joins)
+    quoted_name = nil
+
+    counts = table_joins.map do |join|
+      if join.is_a?(Arel::Nodes::StringJoin)
+        # quoted_name should be case ignored as some database adapters (Oracle) return quoted name in uppercase
+        quoted_name ||= connection.quote_table_name(name)
+
+        # Table names + table aliases
+        join.left.scan(
+          /JOIN(?:\s+\w+)?\s+(?:\S+\s+)?(?:#{quoted_name}|#{name})\sON/i
+        ).size
+      elsif join.is_a?(Arel::Nodes::Join)
+        join.left.name == name ? 1 : 0
+      else
+        raise ArgumentError, "joins list should be initialized by list of Arel::Nodes::Join"
+      end
+    end
+
+    counts.sum
+  end
+
+  # table_joins is an array of arel joins which might conflict with the aliases we assign here
+  def initialize(connection, aliases)
+    @aliases    = aliases
+    @connection = connection
+  end
+
+  def aliased_table_for(table_name, aliased_name, type_caster)
+    if aliases[table_name].zero?
+      # If it's zero, we can have our table_name
+      aliases[table_name] = 1
+      Arel::Table.new(table_name, type_caster: type_caster)
+    else
+      # Otherwise, we need to use an alias
+      aliased_name = @connection.table_alias_for(aliased_name)
+
+      # Update the count
+      aliases[aliased_name] += 1
+
+      table_alias = if aliases[aliased_name] > 1
+        "#{truncate(aliased_name)}_#{aliases[aliased_name]}"
+      else
+        aliased_name
+      end
+      Arel::Table.new(table_name, type_caster: type_caster).alias(table_alias)
+    end
+  end
+
+  attr_reader :aliases
+
+  private
+
+  def truncate(name)
+    name.slice(0, @connection.table_alias_length - 2)
+  end
+end

data/lib/joiner/join_aliaser.rb

@@ -0,0 +1,41 @@
+# The core logic of this class is old Rails behaviour, replicated here because
+# their own alias logic has evolved, but I haven't yet found a way to make use
+# of it - and besides, this is only used to generate Thinking Sphinx's
+# configuration rarely - not in any web requests, so performance issues are less
+# critical here.
+
+class Joiner::JoinAliaser
+  def self.call(join_root, alias_tracker)
+    new(join_root, alias_tracker).call
+  end
+
+  def initialize(join_root, alias_tracker)
+    @join_root = join_root
+    @alias_tracker = alias_tracker
+  end
+
+  def call
+    join_root.each_children do |parent, child|
+      child.table = table_aliases_for(parent, child).first
+    end
+  end
+
+  private
+
+  attr_reader :join_root, :alias_tracker
+
+  def table_aliases_for(parent, node)
+    node.reflection.chain.map { |reflection|
+      alias_tracker.aliased_table_for(
+        reflection.table_name,
+        table_alias_for(reflection, parent, reflection != node.reflection),
+        reflection.klass.type_caster
+      )
+    }
+  end
+
+  def table_alias_for(reflection, parent, join)
+    name = reflection.alias_candidate(parent.table_name)
+    join ? "#{name}_join" : name
+  end
+end

data/lib/joiner/join_dependency.rb

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

data/lib/joiner/joins.rb

@@ -2,8 +2,6 @@ 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)
@@ -21,7 +19,7 @@ class Joiner::Joins
     return model.table_name if path.empty?
 
     add_join_to path
-    association_for(path).tables.first.name
+    association_for(path).table.name
   end
 
   def join_values
@@ -35,7 +33,7 @@ class Joiner::Joins
   attr_reader :joins_cache
 
   def alias_tracker
-    ActiveRecord::Associations::AliasTracker.create(
+    Joiner::AliasTracker.create(
       model.connection, table.name, []
     )
   end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 
 require 'combustion'
 
-Combustion.initialize! :all
+Combustion.initialize! :active_record
 
 require 'rspec/rails'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joiner
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -96,6 +97,8 @@ files:
 - Rakefile
 - joiner.gemspec
 - lib/joiner.rb
+- lib/joiner/alias_tracker.rb
+- lib/joiner/join_aliaser.rb
 - lib/joiner/join_dependency.rb
 - lib/joiner/joins.rb
 - lib/joiner/path.rb
@@ -112,7 +115,7 @@ homepage: https://github.com/pat/joiner
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Builds ActiveRecord joins from association paths
 test_files: