acts_as_recursive_tree 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28e3f6eadbc8b37622ef525b25e654b13c0903f4053adb096f4f853f36ccc06
-  data.tar.gz: f2614872c77bf263526ac596bbb82438b75af1e49e393c6464e07515c5605288
+  metadata.gz: fa1a901a4881db96a5aff4515cb0fe5f5b52d8713c7277aa67b4c5e3ffba70d4
+  data.tar.gz: 5201f9c51c39a944b2fcb7e8abafe24d07722870f2545cf0cfb1116a46567238
 SHA512:
-  metadata.gz: 9a4ccf41395828283e882f8e88b6e9c8a7edea75995219840d2c6d07da69bbb8bb6f15aeec6cddf8a105f4f8ad15d3dfddad2bf7aaeead54074fffa28030bd68
-  data.tar.gz: c48904528902e0554d1a46dea5883afcc28473597f4df2493ccf1015e80967b2490cae5f41fb5dac9eb7925a2c9d00feeb9637b902366e3dc1be0d6dddc3c7ab
+  metadata.gz: '028d295a1d44a545798862a602448f635dd854bc63373d654ebaa217b41d8fded8327d6c10d0d64a566d7fd96beef3430261f66a135bdb1d7484cbcd25d3cae7'
+  data.tar.gz: 0a0746c45165e981ef5965bb751d5bfc88ac8ffdb07edc898799b4fa781a2f302d12c57b4ee2582e41c8b5c439d9c50b0019aa60f0b21a270f8388911dcc1939

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### Version 2.1.1
+- Enabled subselect query when using depth
+- new QueryOption query_strategy for forcing a specific strategy (:join, :subselect)
+
 ### Version 2.1.0
 - BUGFIX association self_and_siblings not working
 - BUGFIX primary_key of model is retrieved on first usage and not on setup

data/lib/acts_as_recursive_tree/builders/ancestors.rb

@@ -1,10 +1,7 @@
 module ActsAsRecursiveTree
   module Builders
     class Ancestors < RelationBuilder
-
-      def build_join_condition
-        travers_loc_table[parent_key].eq(base_table[primary_key])
-      end
+      self.traversal_strategy = ActsAsRecursiveTree::Builders::Strategy::Ancestor
 
       def get_query_options(_)
         opts = super

data/lib/acts_as_recursive_tree/builders/descendants.rb

@@ -1,9 +1,7 @@
 module ActsAsRecursiveTree
   module Builders
     class Descendants < RelationBuilder
-      def build_join_condition
-        base_table[parent_key].eq(travers_loc_table[primary_key])
-      end
+      self.traversal_strategy = ActsAsRecursiveTree::Builders::Strategy::Descendant
     end
   end
 end

data/lib/acts_as_recursive_tree/builders/relation_builder.rb

@@ -9,6 +9,8 @@ module ActsAsRecursiveTree
         new(klass, ids, exclude_ids: exclude_ids, &block).build
       end
 
+      class_attribute :traversal_strategy, instance_writer: false
+
       attr_reader :klass, :ids, :recursive_temp_table, :travers_loc_table, :without_ids
       mattr_reader(:random) { Random.new }
 
@@ -60,15 +62,10 @@ module ActsAsRecursiveTree
         relation.where(ids.apply_negated_to(base_table[primary_key]))
       end
 
-      def apply_depth(relation)
-        return relation unless depth_present?
-
-        relation.where(depth.apply_to(recursive_temp_table[depth_column]))
-      end
+      def apply_depth(select_manager)
+        return select_manager unless depth_present?
 
-      def apply_order(relation)
-        return relation unless ensure_ordering
-        relation.order(recursive_temp_table[depth_column].asc)
+        select_manager.where(depth.apply_to(travers_loc_table[depth_column]))
       end
 
       def create_select_manger(column = nil)
@@ -78,7 +75,9 @@ module ActsAsRecursiveTree
           Arel.star
         end
 
-        travers_loc_table.project(projections).with(:recursive, build_cte_table)
+        select_mgr = travers_loc_table.project(projections).with(:recursive, build_cte_table)
+
+        apply_depth(select_mgr)
       end
 
       def build_cte_table
@@ -101,7 +100,9 @@ module ActsAsRecursiveTree
       end
 
       def build_union_select
-        join_condition = apply_parent_type_column(build_join_condition)
+        join_condition = apply_parent_type_column(
+          traversal_strategy.build(self)
+        )
 
         select_manager = base_table.join(travers_loc_table).on(join_condition)
 
@@ -132,14 +133,6 @@ module ActsAsRecursiveTree
         return relation if condition.nil?
         relation.merge(condition)
       end
-
-      #
-      # U
-      #
-      def build_join_condition
-        raise 'not implemented'
-      end
-
     end
   end
 end

data/lib/acts_as_recursive_tree/builders/strategy.rb

@@ -9,6 +9,9 @@ module ActsAsRecursiveTree
       autoload :Join
       autoload :Subselect
 
+      autoload :Descendant
+      autoload :Ancestor
+
       #
       # Returns a Strategy appropriate for query_opts
       #
@@ -16,7 +19,7 @@ module ActsAsRecursiveTree
       #
       # @return a strategy class best suited for the opts
       def self.for_query_options(query_opts)
-        if query_opts.depth_present? || query_opts.ensure_ordering
+        if query_opts.ensure_ordering || query_opts.query_strategy == :join
           Join
         else
           Subselect

data/lib/acts_as_recursive_tree/builders/strategy/ancestor.rb

@@ -0,0 +1,17 @@
+module ActsAsRecursiveTree
+  module Builders
+    module Strategy
+      #
+      # Strategy for building ancestors relation
+      #
+      module Ancestor
+        #
+        # Builds the relation
+        #
+        def self.build(builder)
+          builder.travers_loc_table[builder.parent_key].eq(builder.base_table[builder.primary_key])
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_recursive_tree/builders/strategy/descendant.rb

@@ -0,0 +1,17 @@
+module ActsAsRecursiveTree
+  module Builders
+    module Strategy
+      #
+      # Strategy for building descendants relation
+      #
+      module Descendant
+        #
+        # Builds the relation
+        #
+        def self.build(builder)
+          builder.base_table[builder.parent_key].eq(builder.travers_loc_table[builder.primary_key])
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_recursive_tree/builders/strategy/join.rb

@@ -19,10 +19,14 @@ module ActsAsRecursiveTree
 
           relation = builder.klass.joins(final_select_mgr.join_sources)
 
-          relation = builder.apply_depth(relation)
-          relation = builder.apply_order(relation)
+          relation = apply_order(builder, relation)
           relation
         end
+
+        def self.apply_order(builder, relation)
+          return relation unless builder.ensure_ordering
+          relation.order(builder.recursive_temp_table[builder.depth_column].asc)
+        end
       end
     end
   end

data/lib/acts_as_recursive_tree/options/query_options.rb

@@ -2,8 +2,10 @@ module ActsAsRecursiveTree
   module Options
     class QueryOptions
 
+      STRATEGIES = %i[subselect, join].freeze
+
       attr_accessor :condition
-      attr_reader :ensure_ordering
+      attr_reader :ensure_ordering, :query_strategy
 
       def depth
         @depth ||= DepthCondition.new
@@ -16,6 +18,11 @@ module ActsAsRecursiveTree
       def depth_present?
         @depth.present?
       end
+
+      def query_strategy=(strategy)
+        raise "invalid strategy #{strategy} - only #{STRATEGIES} are allowed" unless STRATEGIES.include?(strategy)
+        @query_strategy = strategy
+      end
     end
   end
 end

data/lib/acts_as_recursive_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRecursiveTree
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,6 +128,8 @@ files:
 - lib/acts_as_recursive_tree/builders/leaves.rb
 - lib/acts_as_recursive_tree/builders/relation_builder.rb
 - lib/acts_as_recursive_tree/builders/strategy.rb
+- lib/acts_as_recursive_tree/builders/strategy/ancestor.rb
+- lib/acts_as_recursive_tree/builders/strategy/descendant.rb
 - lib/acts_as_recursive_tree/builders/strategy/join.rb
 - lib/acts_as_recursive_tree/builders/strategy/subselect.rb
 - lib/acts_as_recursive_tree/config.rb