chrislloyd-even_better_nested_set 0.3 → 0.3.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "even_better_nested_set"
-GEM_VERSION = "0.3"
+GEM_VERSION = "0.3.1"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
 HOMEPAGE = "http://github.com/jnicklas/even_better_nested_set/tree/master"

data/lib/even_better_nested_set.rb

@@ -16,15 +16,17 @@ module EvenBetterNestedSet
     end
     
     module ClassMethods
-
+      
+      attr_accessor :nested_set_options
+      
       def find_last_root
         find(:first, :order => "#{nested_set_column(:right)} DESC", :conditions => { :parent_id => nil })
       end
 
       def find_boundaries(id)
         query = "SELECT #{nested_set_column(:left)}, #{nested_set_column(:right)}" +
-                "FROM #{quote_db_label(table_name)}" +
-                "WHERE #{quote_db_label(primary_key)} = #{id}"
+                "FROM #{quote_db_property(table_name)}" +
+                "WHERE #{quote_db_property(primary_key)} = #{id}"
         connection.select_rows(query).first
       end
 
@@ -55,15 +57,8 @@ module EvenBetterNestedSet
         return roots
       end
       
-      def set_nested_set_columns(left,right)
-        @nested_set_columns = {
-          :left => quote_db_label(left||'lft'),
-          :right => quote_db_label(right||'rgt')
-        }
-      end
-      
       def nested_set_column(name)
-        @nested_set_columns[name.to_sym]
+        quote_db_property(nested_set_options[name])
       end
       
       # Recalculates the left and right values for the entire tree
@@ -76,8 +71,8 @@ module EvenBetterNestedSet
         end
       end
       
-      def quote_db_label(name)
-        "`#{name}`".gsub('.','`.`')
+      def quote_db_property(property)
+        "`#{property}`".gsub('.','`.`')
       end
       
     end
@@ -132,7 +127,7 @@ module EvenBetterNestedSet
       
       transaction do
         reload_boundaries
-        query = "SELECT id FROM #{self.class.quote_db_label(base_class.table_name)} " + 
+        query = "SELECT id FROM #{self.class.quote_db_property(base_class.table_name)} " + 
                 "WHERE #{nested_set_column(:left)} >= #{left} AND #{nested_set_column(:right)} <= #{right} " +
                 "ORDER BY #{nested_set_column(:left)}"
         @family_ids = base_class.connection.select_values(query).map(&:to_i)
@@ -173,11 +168,19 @@ module EvenBetterNestedSet
       @cached_children ||= []
       @cached_children.push(*nodes)
     end
-
+    
+    def left
+      read_attribute(self.class.nested_set_options[:left])
+    end
+    
     def left=(left) #:nodoc:
       raise EvenBetterNestedSet::IllegalAssignmentError, "left is an internal attribute used by EvenBetterNestedSet, do not assign it directly as is may corrupt the data in your database"
     end
     
+    def right
+      read_attribute(self.class.nested_set_options[:right])
+    end
+    
     def right=(right) #:nodoc:
       raise EvenBetterNestedSet::IllegalAssignmentError, "right is an internal attribute used by EvenBetterNestedSet, do not assign it directly as is may corrupt the data in your database"
     end
@@ -195,8 +198,6 @@ module EvenBetterNestedSet
     
     protected
     
-    attr_reader :nested_set_options
-    
     def illegal_nesting
       if parent_id? and family_ids.include?(parent_id)
         errors.add(:parent_id, 'cannot move node to its own descendant')
@@ -268,8 +269,8 @@ module EvenBetterNestedSet
     end
     
     def set_boundaries(left, right)
-      write_attribute(:left, left)
-      write_attribute(:right, right)
+      write_attribute(self.class.nested_set_options[:left], left)
+      write_attribute(self.class.nested_set_options[:right], right)
     end
         
     def reload_boundaries
@@ -281,10 +282,10 @@ module EvenBetterNestedSet
     end
     
     def validate_parent_is_within_scope
-      if nested_set_options[:scope] && parent_id
+      if self.class.nested_set_options[:scope] && parent_id
         parent.reload # Make sure we are testing the record corresponding to the parent_id
-        if self.send(nested_set_options[:scope]) != parent.send(nested_set_options[:scope])
-          errors.add(:parent_id, "cannot be a record with a different #{nested_set_options[:scope]} to this record")
+        if self.send(self.class.nested_set_options[:scope]) != parent.send(self.class.nested_set_options[:scope])
+          errors.add(:parent_id, "cannot be a record with a different #{self.class.nested_set_options[:scope]} to this record")
         end
       end
     end
@@ -293,12 +294,12 @@ module EvenBetterNestedSet
   module ClassMethods
     
     def acts_as_nested_set(options = {})
+      options = { :left => :left, :right => :right }.merge!(options)
       options[:scope] = "#{options[:scope]}_id" if options[:scope]
       
-      
       include NestedSet
       
-      set_nested_set_columns options[:left], options[:right]
+      self.nested_set_options = options
       
       named_scope :roots, :conditions => { :parent_id => nil }, :order => "#{nested_set_column(:left)} asc"
       
@@ -320,12 +321,6 @@ module EvenBetterNestedSet
       validate_on_update :illegal_nesting
       validate :validate_parent_is_within_scope
       
-      class_eval do
-        define_method :nested_set_options do
-          options
-        end
-      end
-      
       delegate :nested_set_column, :to => "self.class"
     end
     

data/spec/directory_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 require File.dirname(__FILE__) + '/nested_set_behavior'
 
 class Directory < ActiveRecord::Base
-  acts_as_nested_set :left => 'left', :right => 'right'
+  acts_as_nested_set :left => :lft, :right => :rgt
   
   validates_presence_of :name
 end
@@ -24,4 +24,4 @@ describe Directory do
   
   it_should_behave_like "all nested set models"
   
-end
+end

data/spec/employee_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 require File.dirname(__FILE__) + '/nested_set_behavior'
 
 class Employee < ActiveRecord::Base
-  acts_as_nested_set :scope => :company, :left => 'left', :right => 'right'
+  acts_as_nested_set :scope => :company
   
   validates_presence_of :name
 end

data/spec/spec_helper.rb

@@ -49,8 +49,8 @@ end
 class TestMigration < ActiveRecord::Migration
   def self.up
     create_table :directories, :force => true do |t|
-      t.column :left, :integer
-      t.column :right, :integer
+      t.column :lft, :integer
+      t.column :rgt, :integer
       t.column :parent_id, :integer
       t.column :name, :string
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chrislloyd-even_better_nested_set
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jonas Nicklas