Merge branch 'devin/issues/2'

lib/treeify.rb

@@ -13,17 +13,18 @@ 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") }
+
   end
 
   module ClassMethods
-
-    def config(hash = {})
-      # apparently columns is a reserved word in rails
-      self.cols       = hash[:cols]
+
+    def tree_config(hash = {})
+      self.cols = hash[:cols]
     end
 
     def tree_sql(instance)

spec/spec_helper.rb

@@ -18,7 +18,7 @@
 
 class Node < ActiveRecord::Base
   include Treeify
-  config({cols: [:name]})
+  tree_config({cols: [:name]})
 
   validates_uniqueness_of :name
   validates_uniqueness_of :parent_id, :scope=> :id

spec/treeify_spec.rb

@@ -2,6 +2,10 @@
 
 describe Treeify do
   describe "Initialization" do
+    it "has the correct config values" do
+      expect(Node.cols).to eq([:name])
+    end
+
     it "is set up correctly" do
       expect(Node.table_name).to eq("nodes")
       expect(Node.cols).to eq([:name])
@@ -118,9 +122,6 @@
        }
       ])
     end
-
-
-
   end
 end