through_hierarchy 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74f01013ac5a0df1c24c2ca7202d6de47936dcff
-  data.tar.gz: 1c2e2a79defb580b6449e90535f6683725996497
+SHA256:
+  metadata.gz: ed01a12faf0874f494e1622e5b4810c8195438a0a962032cbb49383e2d86e513
+  data.tar.gz: 11213859736477129737b3b026f4c689b37086a900a950a8bd853d4d127198a5
 SHA512:
-  metadata.gz: 5026fbd509012ffd95864c8732fe08ca37dc398ea8ef36688f7d0cd76cdd42082aaae32b8022a02ae9725d5b98482cbacd22ef8ce150e3c8cfc4f561bfae1416
-  data.tar.gz: 8b246b81fedf869e249b66dc9074c0bb922264bd840914c36b27f7a3209c7c4868330d9f0b10c5c68c86f91d5dc1fc61fb0c8c83f0d12aa5e792b5d62ca3a0ca
+  metadata.gz: 6a7ab21447264d5170415108931fed9ef426b9bdb9302c92af2e0385231b41d3690b541453061aa35b319b5d3aae8fb6b08f3216b876f598324c517cc4b000a6
+  data.tar.gz: e044a87e25e344be7979ccc38e96a98ac7ba88aaac000ac78882aec2b087ff9a395d0b24d95fcae6e3fb7ecf247d7bb884463305ba59b35288bda29ba1ca09fa

data/lib/through_hierarchy.rb

@@ -6,6 +6,7 @@ require 'through_hierarchy/associations/has_one.rb'
 require 'through_hierarchy/associations/has_many.rb'
 require 'through_hierarchy/associations/has_uniq.rb'
 require 'through_hierarchy/exceptions.rb'
+require 'through_hierarchy/rails_utils.rb'
 require 'through_hierarchy/hierarchicals/hierarchical.rb'
 require 'through_hierarchy/hierarchicals/instance.rb'
 

data/lib/through_hierarchy/associations/association.rb

@@ -14,6 +14,7 @@ module ThroughHierarchy
 
       def find(instance)
         results = get_matches(instance)
+        results = results.create_with(associated_instance(instance).create_with)
         results = results.instance_exec(&@scope) if @scope.present?
         return results
       end

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/base.rb

@@ -6,11 +6,15 @@ module ThroughHierarchy
       class_attribute :hierarchical_associations
       self.hierarchical_associations = {}
       attr_reader :hierarchical_association_cache
-      after_initialize :reset_hierarchical_association_cache
+      after_initialize :clear_hierarchical_association_cache
     end
 
-    def reset_hierarchical_association_cache
-      @hierarchical_association_cache = {}
+    def clear_hierarchical_association_cache(name = nil)
+      if name.nil?
+        @hierarchical_association_cache = {}
+      else
+        @hierarchical_association_cache.delete(name)
+      end
     end
 
     module ClassMethods

data/lib/through_hierarchy/hierarchicals/hierarchical.rb

@@ -60,7 +60,7 @@ module ThroughHierarchy
         Arel.sql(
           "CASE `#{@source.name}`.`#{foreign_type_name}` " +
           hierarchy_models.map.with_index do |model, ii|
-            "WHEN #{model.sanitize(model.base_class.to_s)} THEN #{ii} "
+            "WHEN #{ThroughHierarchy::RailsUtils.sanitize_sql(model.base_class.to_s)} THEN #{ii} "
           end.join +
           "END"
         )
@@ -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
@@ -154,4 +160,4 @@ module ThroughHierarchy
 
     end
   end
-end
+end

data/lib/through_hierarchy/hierarchicals/instance.rb

@@ -12,7 +12,7 @@ module ThroughHierarchy
       end
 
       def filters
-        or_conditions(hierarchy_instances.map{|instance| filter(instance)})
+        or_conditions(hierarchy_instances.compact.map{|instance| filter(instance)})
       end
 
       def filter(instance)
@@ -20,6 +20,13 @@ module ThroughHierarchy
           and(foreign_key_column.eq(instance_key(instance)))
       end
 
+      def create_with
+        {
+          foreign_type_name => instance_type(@instance),
+          foreign_key_name => instance_key(@instance)
+        }
+      end
+
       def instance_type(instance)
         instance.class.base_class.to_s
       end

data/lib/through_hierarchy/rails_utils.rb

@@ -0,0 +1,17 @@
+module ThroughHierarchy
+  module RailsUtils
+    module_function
+
+    def sanitize_sql(string)
+      if rails_major_minor_version < 5.1
+        ActiveRecord::Base.sanitize(string)
+      else
+        ActiveRecord::Base.sanitize_sql_array(["?", string])
+      end
+    end
+
+    def rails_major_minor_version
+      Rails.version.split(".").first(2).join(".").to_f
+    end
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: through_hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Schwartz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-05-04 00:00:00.000000000 Z
@@ -27,11 +27,12 @@ files:
 - lib/through_hierarchy/hierarchicals/hierarchical.rb
 - lib/through_hierarchy/hierarchicals/instance.rb
 - lib/through_hierarchy/hierarchy.rb
+- lib/through_hierarchy/rails_utils.rb
 homepage: https://github.com/ozydingo/through_hierarchy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,9 +47,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Has Many Through Hierarchy
 test_files: []