joiner 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7249d05e24afee39fbb2547085068230f6b1d62b
-  data.tar.gz: 941f72f5d80c3a6c0b8b88684f7a35b77e7461ee
+SHA256:
+  metadata.gz: 2c51cc06024d77670209708823110edc631757a07f79c6631fac84329dba5670
+  data.tar.gz: 7f6f23f6052291f3fa67782f10ca86345d0755f1c2cb410af45506a3952895dd
 SHA512:
-  metadata.gz: 0fd9651d510164f7e5843589678ba62d3f214c67dca6309e4711f71cd8b4200b3e105cd780fdfab14d3a4240d4354fcd95b6568b101d710757da1d093e96600a
-  data.tar.gz: ff41eaace4916f013c03e7407a65709543251908daab4f3203f723282a9c38c50a35b9767a9b074bb6f7f336bb1042cf30542d8ee179cd08ca868a23228b66fe
+  metadata.gz: 5370c3e5b27a66c573e904b70313c28274998c3d47801b166bf4801c3bb053907bad854b13533cb258a545b7cb330e22ba0ca1f84f1937591fcb9c908cb28370
+  data.tar.gz: 410f9e1c16727d3ec73c685bbe634e16c93182f63295ac7e117418d663b6d3160e2088515996d683de95634f74b2fa43fcd32698bbb5312accc09b0c32fe5443

data/README.md

@@ -2,14 +2,14 @@
 
 This gem, abstracted out from [Thinking Sphinx](http://pat.github.io/thinking-sphinx), turns a bunch of association trees from the perspective of a single model and builds a bunch of OUTER JOINs that can be passed into ActiveRecord::Relation's `join` method. You can also find out the generated table aliases for each join, in case you're referring to columns from those joins at some other point.
 
-If this gem is used by anyone other than myself/Thinking Sphinx, I'll be surprised. My reason for pulling it out is so I can more cleanly support Rails' changing approaches to join generation (see v3.1-4.0 compared to v4.1).
+If this gem is used by anyone other than myself/Thinking Sphinx, I'll be surprised. My reason for pulling it out is so I can more cleanly support Rails' changing approaches to join generation (see v3.1-v4.0 compared to v4.1-v5.1 compared to v5.2).
 
 ## Installation
 
 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.3.4
+gem install joiner --version 0.4.0
 ```
 
 ## Usage
@@ -49,6 +49,8 @@ path.model      #=> Comment
 
 ## Contributing
 
+Please note that this project now has a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/0/0/). By participating in this project you agree to abide by its terms.
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
@@ -57,4 +59,4 @@ path.model      #=> Comment
 
 ## Licence
 
-Copyright (c) 2013, Joiner is developed and maintained by [Pat Allan](http://freelancing-gods.com), and is released under the open MIT 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.

data/joiner.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'joiner'
-  spec.version       = '0.3.4'
+  spec.version       = '0.4.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', '>= 4.1.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.2.beta1'
 
-  spec.add_development_dependency 'combustion',  '~> 0.5.1'
-  spec.add_development_dependency 'rails',       '>= 4.1.2'
-  spec.add_development_dependency 'rspec-rails', '~> 2.14.1'
+  spec.add_development_dependency 'combustion',  '~> 0.8'
+  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.rb

@@ -1,9 +1,11 @@
 require 'set'
+require 'active_record'
 
 module Joiner
   class AssociationNotFound < StandardError
   end
 end
 
+require 'joiner/join_dependency'
 require 'joiner/joins'
 require 'joiner/path'

data/lib/joiner/join_dependency.rb

@@ -0,0 +1,7 @@
+class Joiner::JoinDependency < ActiveRecord::Associations::JoinDependency
+  def join_association_for(path)
+    path.inject(join_root) do |node, piece|
+      node.children.detect { |child| child.reflection.name == piece }
+    end
+  end
+end

data/lib/joiner/joins.rb

@@ -2,11 +2,7 @@ require 'active_record'
 require 'active_support/ordered_hash'
 
 class Joiner::Joins
-  JoinDependency  = ActiveRecord::Associations::JoinDependency
-  JoinAssociation = JoinDependency::JoinAssociation
-
-  attr_reader   :model
-  attr_accessor :join_association_class
+  attr_reader :model
 
   def initialize(model)
     @model       = model
@@ -23,35 +19,28 @@ class Joiner::Joins
     return model.table_name if path.empty?
 
     add_join_to path
-    join_association_for(path).tables.first.name
+    join_values.join_association_for(path).tables.first.name
   end
 
   def join_values
-    switch_join_dependency join_association_class
-    result = JoinDependency.new model, joins_cache.to_a, []
-    switch_join_dependency JoinAssociation
-
-    result
+    Joiner::JoinDependency.new model, table, joins_cache.to_a, alias_tracker
   end
 
   private
 
   attr_reader :joins_cache
 
-  def join_association_for(path)
-    path.inject(join_values.join_root) do |node, piece|
-      node.children.detect { |child| child.reflection.name == piece }
-    end
+  def alias_tracker
+    ActiveRecord::Associations::AliasTracker.create(
+      model.connection, table.name, []
+    )
   end
 
   def path_as_hash(path)
     path[0..-2].reverse.inject(path.last) { |key, item| {item => key} }
   end
 
-  def switch_join_dependency(klass)
-    return unless join_association_class
-
-    JoinDependency.send :remove_const, :JoinAssociation
-    JoinDependency.const_set :JoinAssociation, klass
+  def table
+    @table ||= model.arel_table
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joiner
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.2.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.2.beta1
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - joiner.gemspec
 - lib/joiner.rb
+- lib/joiner/join_dependency.rb
 - lib/joiner/joins.rb
 - lib/joiner/path.rb
 - spec/acceptance/joiner_spec.rb
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Builds ActiveRecord joins from association paths