treeify 0.01 → 0.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8cd6bfe466cc8caa03a566b068156ba7c8b2d8
-  data.tar.gz: 06cbbeb6e8496666055e2b5228a8591fe3b7685e
+  metadata.gz: 4c05d601b25f5e493f430b1ae5354410f237ae90
+  data.tar.gz: 28c555a605c4b17e542127398ea4feee6da00216
 SHA512:
-  metadata.gz: 8fd7385eb192d70599ef492336d68570ea80a3afce23dd2825a013c9856e1cfaf2e5e77237902d3ecf620ced7ced0573530a831060cefa8b52d530b727870289
-  data.tar.gz: 7a9ac3a7aebbb572d4be5fc53e21e020fc212a697634e2bb53627f42193e4b480172fb0de65072b39c0a9d59f8e7c2e15554ba47226e1fd417d9166b5c2ec5ef
+  metadata.gz: eabf4eca128f87d7c3034021e40ddbb9ba752ee826be1a73a53552079a4dbac4516cd2df0cc60c96688f4de0030fe7002f1e3abd2b7211e17cf78d4bc318e786
+  data.tar.gz: f2653463b3f9d161136447b3f827ff9105a0cb90e1cde341defe34c93028214323791c8ec272c87cd9e771e6c45b9e0d75e5c08a94fafc1ab262a86386f77208

data/lib/treeify.rb

@@ -6,42 +6,57 @@ require "active_support/core_ext/class/attribute"
 module Treeify
   extend ActiveSupport::Concern 
 
+  included do
+    class_attribute :cols
+    scope :roots, -> { where(parent_id: nil) }
+    scope :tree_for, ->(instance) { where("#{table_name}.id IN (#{tree_sql_for(instance)})").order("#{table_name}.id") }
+    scope :tree_for_ancestors, ->(instance) { where("#{table_name}.id IN (#{tree_sql_for_ancestors(instance)})").order("#{table_name}.id") }
+  end
+
   module ClassMethods
-    mattr_accessor :table_name
-    mattr_accessor :cols
 
     def config(hash = {})
       # apparently columns is a reserved word in rails
       self.cols       = hash[:cols]
-      self.table_name = hash[:table_name]
     end
 
-    def query 
-      "WITH RECURSIVE cte (id, #{self.cols.join(',')}, path, parent_id, depth)  AS (
+    def tree_sql(instance)
+      "WITH RECURSIVE cte (id, path)  AS (
          SELECT  id,
-          #{self.cols.join(',')}
-           array[id] AS path,
-           parent_id,
-           1 AS depth
-         FROM    #{self.table_name}
-         WHERE   parent_id IS NULL
+           array[id] AS path
+         FROM    #{table_name}
+         WHERE   id = #{instance.id}
 
          UNION ALL
 
-         SELECT  #{self.table_name}.id,
-            #{self.cols.map{ |c| self.table_name << '.' << c }.join(',')},
-            #{self.table_name}.author,
-            cte.path || #{self.table_name}.id,
-            #{self.table_name}.parent_id,
-            cte.depth + 1 AS depth
-         FROM    #{self.table_name}
-         JOIN cte ON #{self.table_name}.parent_id = cte.id
-       )
-       SELECT id, #{self.cols.join(',')}, path, depth FROM cte
-       ORDER BY path;"
+         SELECT  #{table_name}.id,
+            cte.path || #{table_name}.id
+         FROM    #{table_name}
+         JOIN cte ON #{table_name}.parent_id = cte.id
+       )"
     end
+
+    def tree_sql_for(instance)
+      "#{tree_sql(instance)}
+       SELECT id FROM cte
+       ORDER BY path"
+    end
+
+    def tree_sql_for_ancestors(instance)
+      "#{tree_sql(instance)}
+      SELECT cte.id FROM cte WHERE cte.id != #{instance.id}"
+    end
+  end
+        
+  def descendents
+    self_and_descendents - [self]
+  end
+
+  def ancestors
+    self.class.tree_for_ancestors(self)
   end
 
-  module InstanceMethods
+  def self_and_descendents
+    self.class.tree_for(self)
   end
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treeify
 version: !ruby/object:Gem::Version
-  version: '0.01'
+  version: '0.02'
 platform: ruby
 authors:
 - Devin Austin