chrislloyd-even_better_nested_set 0.2 → 0.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "even_better_nested_set"
-GEM_VERSION = "0.2"
+GEM_VERSION = "0.3"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
 HOMEPAGE = "http://github.com/jnicklas/even_better_nested_set/tree/master"
@@ -52,21 +52,31 @@ namespace :jruby do
   
 end
 
-file_list = FileList['spec/*_spec.rb']
+spec_files = FileList['spec/*_spec.rb']
+
+desc 'Default: run unit tests.'
+task :default => 'spec'
+
+task :specs => :spec
+desc "Run all examples"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts = ['--color']
+  t.spec_files = spec_files
+end
 
 namespace :spec do
   desc "Run all examples with RCov"
   Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = file_list
+    t.spec_files = spec_files
     t.rcov = true
     t.rcov_dir = "doc/coverage"
-    t.rcov_opts = ['--exclude', 'spec']
+    t.rcov_opts = ['--exclude', 'spec,rspec-*,rcov-*,gems']
     t.spec_opts = ['--color']
   end
   
   desc "Generate an html report"
   Spec::Rake::SpecTask.new('report') do |t|
-    t.spec_files = file_list
+    t.spec_files = spec_files
     t.rcov = true
     t.rcov_dir = "doc/coverage"
     t.rcov_opts = ['--exclude', 'spec']
@@ -75,7 +85,3 @@ namespace :spec do
   end
 
 end
-
-
-desc 'Default: run unit tests.'
-task :default => 'spec:rcov'

data/lib/even_better_nested_set.rb

@@ -23,8 +23,8 @@ module EvenBetterNestedSet
 
       def find_boundaries(id)
         query = "SELECT #{nested_set_column(:left)}, #{nested_set_column(:right)}" +
-                "FROM #{connection.quote_table_name(table_name)}" +
-                "WHERE #{connection.quote_table_name(primary_key)} = #{id}"
+                "FROM #{quote_db_label(table_name)}" +
+                "WHERE #{quote_db_label(primary_key)} = #{id}"
         connection.select_rows(query).first
       end
 
@@ -54,11 +54,16 @@ module EvenBetterNestedSet
         end
         return roots
       end
-    
-      # In the future perhaps this can be extended to allow for custom column names specified
-      # as options
+      
+      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)
-        connection.quote_column_name(name)
+        @nested_set_columns[name.to_sym]
       end
       
       # Recalculates the left and right values for the entire tree
@@ -70,7 +75,11 @@ module EvenBetterNestedSet
           end
         end
       end
-
+      
+      def quote_db_label(name)
+        "`#{name}`".gsub('.','`.`')
+      end
+      
     end
     
     def root?
@@ -123,7 +132,7 @@ module EvenBetterNestedSet
       
       transaction do
         reload_boundaries
-        query = "SELECT id FROM #{base_class.connection.quote_table_name(base_class.table_name)} " + 
+        query = "SELECT id FROM #{self.class.quote_db_label(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)
@@ -286,8 +295,11 @@ module EvenBetterNestedSet
     def acts_as_nested_set(options = {})
       options[:scope] = "#{options[:scope]}_id" if options[:scope]
       
+      
       include NestedSet
       
+      set_nested_set_columns options[:left], options[:right]
+      
       named_scope :roots, :conditions => { :parent_id => nil }, :order => "#{nested_set_column(:left)} asc"
       
       has_many :uncached_children, :class_name => self.name, :foreign_key => :parent_id, :order => "#{nested_set_column(:left)} asc"

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
+  acts_as_nested_set :left => 'left', :right => 'right'
   
   validates_presence_of :name
 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
+  acts_as_nested_set :scope => :company, :left => 'left', :right => 'right'
   
   validates_presence_of :name
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 require 'active_record'
-require 'ruby-debug'
+# require 'ruby-debug' # Slows down the tests massively
 
 require 'even_better_nested_set'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chrislloyd-even_better_nested_set
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: even_better_nested_set
 bindir: bin
 cert_chain: []
 
-date: 2009-02-11 00:00:00 -08:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: []