treeify 0.03 → 0.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422fe3f0d572c4b67db08dd518122b2d0a04262f
-  data.tar.gz: bb8044d5cc0267c3f80ad7709f337bd04b826218
+  metadata.gz: 6e46207f75973096a118eccdbae623ae2ec680ae
+  data.tar.gz: 1fa74c1913e7981730e487b72dc57761286e9937
 SHA512:
-  metadata.gz: 7a88024c53a98ffd0ca89ac1d7ce643425ded66d3fda586b3655f94ab10367f82ea47c32bd8f6aac2726b46e60c461aa4ed120cacdf491cee3f83471077333be
-  data.tar.gz: bd3020aa3d4f182547acd64ba07cd91e54f587ad1fae9655b4dea19f938b85fd16d8ed76c0a70172b4abc884c6a2a78d49152f79c9cd699353186ca9442dcfb0
+  metadata.gz: 87e4847de85128b0bf240f3147a389900b1e4e4049bed54bbe7ed61f6f44a1be2cfabb0bcc8e334012f9a71f5c69a507f3bc3737b55ece9f2830226378d4417f
+  data.tar.gz: dc8c693c76af128d049cbcfb1b11838b39884e2969afa61d2737c7b885222d82d60e8f179b4c1627397bc532820d333dfbc8e2956d2fa7b90b036399929fc5ae

data/lib/treeify.rb

@@ -1,10 +1,15 @@
 require 'active_record'
+require 'pp'
 require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/class/attribute"
 
 module Treeify
-  extend ActiveSupport::Concern 
+  extend ActiveSupport::Concern
+
+  cattr_writer :cols do 
+    []
+  end
 
   included do
     has_many :children,
@@ -13,30 +18,61 @@ module Treeify
     belongs_to :parent,
                 class_name: self,
                 foreign_key: "parent_id"
+
     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") }
+    scope :tree_for, ->(instance) { self.find_by_sql self.tree_sql_for(instance) }
+    scope :tree_for_ancestors, ->(instance) { self.find_by_sql self.tree_sql_for_ancestors(instance) }
   end
 
   module ClassMethods
+    
+    def tree_config(hash = {})
+      self.cols = !hash[:cols].nil? == true ? hash[:cols] : []
+    end
+
+    def columns_joined(char=",")
+      self.cols ||= []
+      self.cols.join(char)
+    end
 
-    def config(hash = {})
-      # apparently columns is a reserved word in rails
-      self.cols       = hash[:cols]
+    def columns_with_table_name
+      self.cols ||= []
+      self.cols.map{|c| 
+        c = "#{table_name}.#{c}" 
+      }.join(",")
+    end
+
+    def has_config_defined_cols?
+      #return true if self.respond_to?("cols") && !self.cols.nil? 
+      if self.respond_to?("cols")
+        return !self.cols.empty? if !self.cols.nil?
+      end
+      false
+    end
+
+    # sort of hacky, but check to see if we have any columns defined in the config
+    # if we do, return the string of columns, formatted appropriately
+    # otherwise, just return an empty string
+    def appropriate_column_listing(columns = columns_joined)
+      has_config_defined_cols? == true ? ", #{columns}" : ""
     end
 
     def tree_sql(instance)
-      "WITH RECURSIVE cte (id, path)  AS (
+      cte_params = has_config_defined_cols? ? "id, parent_id, path, #{columns_joined}" : "id, parent_id, path"
+
+      "WITH RECURSIVE cte (#{cte_params})  AS (
          SELECT  id,
-           array[id] AS path
+           parent_id,
+           array[id] AS path#{appropriate_column_listing}
          FROM    #{table_name}
          WHERE   id = #{instance.id}
 
          UNION ALL
 
          SELECT  #{table_name}.id,
-            cte.path || #{table_name}.id
+            #{table_name}.parent_id,
+            cte.path || #{table_name}.id#{appropriate_column_listing(columns_with_table_name)}
          FROM    #{table_name}
          JOIN cte ON #{table_name}.parent_id = cte.id
        )"
@@ -44,25 +80,14 @@ module Treeify
 
     def tree_sql_for(instance)
       "#{tree_sql(instance)}
-       SELECT id FROM cte
+       SELECT * FROM cte
        ORDER BY path"
     end
 
     def tree_sql_for_ancestors(instance)
-      "WITH RECURSIVE cte (id, path)  AS (
-         SELECT  id,
-           array[id] AS path
-         FROM    #{table_name}
-         WHERE   id = #{instance.id}
-         
-         UNION ALL
-
-         SELECT  #{table_name}.id,
-            cte.path || #{table_name}.id
-         FROM    #{table_name}
-         JOIN cte ON #{table_name}.parent_id = cte.id
-       )
-      SELECT cte.id FROM cte WHERE cte.id != #{instance.id}"
+      "#{tree_sql(instance)}
+      SELECT * FROM cte 
+      WHERE cte.id != #{instance.id}"
     end
   end
         
@@ -111,4 +136,6 @@ module Treeify
       nested_hash.has_key? item['parent_id']
     }.values
   end
+
+  
 end 

metadata

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