through_hierarchy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f01013ac5a0df1c24c2ca7202d6de47936dcff
-  data.tar.gz: 1c2e2a79defb580b6449e90535f6683725996497
+  metadata.gz: 4c298c3d82954bcbdb17927662423bff146aeabb
+  data.tar.gz: 4d14515633cf34b0fddb9d53fe6cfcc62466ddf0
 SHA512:
-  metadata.gz: 5026fbd509012ffd95864c8732fe08ca37dc398ea8ef36688f7d0cd76cdd42082aaae32b8022a02ae9725d5b98482cbacd22ef8ce150e3c8cfc4f561bfae1416
-  data.tar.gz: 8b246b81fedf869e249b66dc9074c0bb922264bd840914c36b27f7a3209c7c4868330d9f0b10c5c68c86f91d5dc1fc61fb0c8c83f0d12aa5e792b5d62ca3a0ca
+  metadata.gz: 6cedbd9ab437b3bab6e2ffb882679b07a053f028ee1452b5b0dca985a4abb63a91e2ebac478435c0b41e6b7eaaddbfb6a8c53cc0f6035200b9650cf458955129
+  data.tar.gz: abf0b810b772afc73d3bc7dd853f89a68f05ae2a61a6bdb5e0912eb95bf85a8260288da0b9c3f2d3d85ea682851e719420e76a92fa86254657effced0642aa59

data/lib/through_hierarchy/associations/has_one.rb

@@ -10,10 +10,7 @@ module ThroughHierarchy
       private
 
       def get_joins
-        arel = @associated.join_best_rank
-        result = @model.joins(arel.join_sources).order(arel.orders)
-        arel.constraints.each{|cc| result = result.where(cc)}
-        return result
+        @associated.join_best_rank
       end
 
     end

data/lib/through_hierarchy/associations/has_uniq.rb

@@ -22,10 +22,7 @@ module ThroughHierarchy
       end
 
       def get_joins
-        arel = @associated.join_best_rank(group_by: @uniq)
-        result = @model.joins(arel.join_sources).order(arel.orders)
-        arel.constraints.each{|cc| result = result.where(cc)}
-        return result
+        @associated.join_best_rank(group_by: @uniq)
       end
 
     end

data/lib/through_hierarchy/hierarchicals/hierarchical.rb

@@ -93,16 +93,22 @@ module ThroughHierarchy
       # Join @model to @source only on best hierarchy matches
       ### FASTER METHOD: join source to source alias on source.rank < alias.rank where alias does not exist
       # This performs OK.
+      # TODO: return arel once we know how to use the binds properly
       def join_best_rank(group_by: nil)
         better_rank = spawn(@source.alias("better_hierarchy"))
-        @model.joins(@hierarchy).arel.
+        join_condition_array = [
+          better_rank.filters,
+          better_rank.hierarchy_rank.lt(hierarchy_rank)
+        ]
+        join_condition_array << better_rank.source[group_by].eq(@source[group_by]) if group_by.present?
+        arel = @model.arel_table.
           join(@source).on(filters).
           join(better_rank.source, Arel::Nodes::OuterJoin).
-          on(
-            better_rank.filters.
-              and(better_rank.hierarchy_rank.lt(hierarchy_rank))
-          ).
+          on(and_conditions(join_condition_array)).
           where(better_rank.source[:id].eq(nil))
+        result = @model.joins(@hierarchy).joins(arel.join_sources).order(arel.orders)
+          arel.constraints.each{|cc| result = result.where(cc)}
+          return result
       end
 
       # # TODO: generate this dynamically based on existing columns and selects

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: through_hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Schwartz