joiner 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b97b89bc7c04f7a25d72b8436841e8f7fbfe24
-  data.tar.gz: bab0b551d64f5c25b48f0202e2e0e5149e96d8fc
+  metadata.gz: 7249d05e24afee39fbb2547085068230f6b1d62b
+  data.tar.gz: 941f72f5d80c3a6c0b8b88684f7a35b77e7461ee
 SHA512:
-  metadata.gz: 8a70f902aab2443b347718b8f3d71dff01bad841df1655cd4a4aaae048464468528bcf0f442a182cb00045caf0d2ef5dbea11b6c63d60ca96517ff4f304e22d3
-  data.tar.gz: 5c9b0c43094294bd7e4b6bb788525742994828018c741b3ed663a0ae95384232c38d485f49429816ea1516f3e4baa8bf858fb137a8229b82792b7f788ad8115d
+  metadata.gz: 0fd9651d510164f7e5843589678ba62d3f214c67dca6309e4711f71cd8b4200b3e105cd780fdfab14d3a4240d4354fcd95b6568b101d710757da1d093e96600a
+  data.tar.gz: ff41eaace4916f013c03e7407a65709543251908daab4f3203f723282a9c38c50a35b9767a9b074bb6f7f336bb1042cf30542d8ee179cd08ca868a23228b66fe

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

data/joiner.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'joiner'
-  spec.version       = '0.3.3'
+  spec.version       = '0.3.4'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = %q{Builds ActiveRecord joins from association paths}

data/lib/joiner.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Joiner
   class AssociationNotFound < StandardError
   end

data/lib/joiner/joins.rb

@@ -1,103 +1,57 @@
+require 'active_record'
+require 'active_support/ordered_hash'
+
 class Joiner::Joins
-  JoinDependency = ::ActiveRecord::Associations::JoinDependency
+  JoinDependency  = ActiveRecord::Associations::JoinDependency
+  JoinAssociation = JoinDependency::JoinAssociation
 
-  attr_reader :model
-  attr_writer :join_association_class
+  attr_reader   :model
+  attr_accessor :join_association_class
 
   def initialize(model)
     @model       = model
-    @base        = JoinDependency.new model, [], []
-    @joins_cache = ActiveSupport::OrderedHash.new
+    @joins_cache = Set.new
   end
 
   def add_join_to(path)
-    @joins_cache[path] ||= build_join(path)
+    return if path.empty?
+
+    joins_cache.add path_as_hash(path)
   end
 
   def alias_for(path)
     return model.table_name if path.empty?
-    add_join_to(path).aliased_table_name
-  end
 
-  def join_association_class
-    @join_association_class || JoinDependency::JoinAssociation
+    add_join_to path
+    join_association_for(path).tables.first.name
   end
 
   def join_values
-    @base
-  end
-
-  private
+    switch_join_dependency join_association_class
+    result = JoinDependency.new model, joins_cache.to_a, []
+    switch_join_dependency JoinAssociation
 
-  def build_join(path)
-    if join = find_join(path)
-      return join
-    end
-
-    base_node, short_path = relative_path(path)
-
-    join = build_join_association(short_path, base_node.base_klass)
-    base_node.children << join
-    construct_tables! base_node, join
-
-    find_join(path)
+    result
   end
 
-  def build_join_association(path, base_class)
-    return nil if path.empty?
-
-    step = path.first
-    reflection = find_reflection(step, base_class)
-    reflection.check_validity!
-
-    join_association_class.new reflection,
-      [build_join_association(path[1..-1], reflection.klass)].compact
-  end
-
-  def find_join(path, base = nil)
-    base ||= @base.join_root
-
-    return base if path.empty?
-
-    if next_step = base.children.detect{ |c| c.reflection.name == path.first }
-      find_join path[1..-1], next_step
-    end
-  end
+  private
 
-  def relative_path(path)
-    short_path = []
-    test_path = path.dup
+  attr_reader :joins_cache
 
-    while test_path.size > 1
-      short_path << test_path.pop
-      node = find_join(test_path)
-      return [node, short_path] if node
+  def join_association_for(path)
+    path.inject(join_values.join_root) do |node, piece|
+      node.children.detect { |child| child.reflection.name == piece }
     end
-
-    [@base.join_root, path]
   end
 
-  def find_reflection(name, klass)
-    klass._reflect_on_association(name)
+  def path_as_hash(path)
+    path[0..-2].reverse.inject(path.last) { |key, item| {item => key} }
   end
 
-  def table_aliases_for(parent, node)
-    node.reflection.chain.map { |reflection|
-      @base.alias_tracker.aliased_table_for(
-        reflection.table_name,
-        table_alias_for(reflection, parent, reflection != node.reflection)
-      )
-    }
-  end
-
-  def construct_tables!(parent, node)
-    node.tables = table_aliases_for(parent, node)
-    node.children.each { |child| construct_tables! node, child }
-  end
+  def switch_join_dependency(klass)
+    return unless join_association_class
 
-  def table_alias_for(reflection, parent, join)
-    name = "#{reflection.plural_name}_#{parent.table_name}"
-    name << "_join" if join
-    name
+    JoinDependency.send :remove_const, :JoinAssociation
+    JoinDependency.const_set :JoinAssociation, klass
   end
 end

data/spec/acceptance/joiner_spec.rb

@@ -63,4 +63,15 @@ describe 'Joiner' do
     expect(joiner.alias_for([:comments])).to eq('comments')
     expect(joiner.alias_for([:user, :comments])).to eq('comments_users')
   end
+
+  it 'handles simple and deep chains' do
+    joiner = Joiner::Joins.new Article
+    joiner.add_join_to [:comments]
+    joiner.add_join_to [:comments, :user, :articles]
+
+    expect(joiner.alias_for([:comments])).to eq('comments')
+    expect(joiner.alias_for([:comments, :user, :articles])).to eq(
+      'articles_users'
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joiner
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,7 +105,6 @@ files:
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
-- spec/joiner/joins_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/pat/joiner
 licenses:
@@ -140,5 +139,4 @@ test_files:
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
-- spec/joiner/joins_spec.rb
 - spec/spec_helper.rb

data/spec/joiner/joins_spec.rb

@@ -1,83 +0,0 @@
-require 'spec_helper'
-
-describe Joiner::Joins do
-  JoinDependency = ::ActiveRecord::Associations::JoinDependency
-
-  subject { Joiner::Joins.new Article }
-
-  describe '#add_join_to' do
-    it "adds just one join for a stack with a single association" do
-      JoinDependency::JoinAssociation.should_receive(:new).
-        with(Article.reflections[:user], []).once.and_call_original
-
-      subject.add_join_to([:user])
-    end
-
-    it "does not duplicate joins when given the same stack twice" do
-      JoinDependency::JoinAssociation.should_receive(:new).once.and_call_original
-
-      subject.add_join_to([:user])
-      subject.add_join_to([:user])
-    end
-
-    context 'when joins are nested' do
-      it "adds two joins for a stack with two associations" do
-        JoinDependency::JoinAssociation.should_receive(:new).
-          with(Article.reflections[:user], kind_of(Array)).once.and_call_original
-        JoinDependency::JoinAssociation.should_receive(:new).
-          with(User.reflections[:comments], kind_of(Array)).once.and_call_original
-
-        subject.add_join_to([:user, :comments])
-      end
-
-      it "extends upon existing joins when given stacks where parts are already mapped" do
-        JoinDependency::JoinAssociation.should_receive(:new).twice.and_call_original
-
-        join1 = subject.add_join_to([:user])
-        join2 = subject.add_join_to([:user, :comments])
-
-        join1.children.should include(join2)
-      end
-    end
-  end
-
-  describe '#alias_for' do
-    it "returns the model's table name when no stack is given" do
-      subject.alias_for([]).should == 'articles'
-    end
-
-    it "gets join association using #add_join_to" do
-      subject.should_receive(:add_join_to).with([:user]).and_call_original
-      subject.alias_for([:user])
-    end
-
-    it "returns the aliased table name for the join" do
-      subject.alias_for([:user]).should == 'users'
-    end
-
-    it "does not duplicate joins when given the same stack twice" do
-      JoinDependency::JoinAssociation.should_receive(:new).once.and_call_original
-
-      subject.alias_for([:user])
-      subject.alias_for([:user])
-    end
-
-    context 'when joins are nested' do
-      it "returns the sub join's aliased table name" do
-        subject.alias_for([:user, :comments]).should == 'comments'
-      end
-    end
-  end
-
-  describe '#join_values' do
-    it "returns JoinDependency with all joins that have been created" do
-      join1 = subject.add_join_to([:user])
-      join2 = subject.add_join_to([:comments])
-      join3 = subject.add_join_to([:comments, :user])
-
-      join_values = subject.join_values
-      join_values.should be_a JoinDependency
-      join_values.join_root.children.should == [join1, join2]
-    end
-  end
-end