awesome_nested_set 1.4.2 → 1.4.3

data/Rakefile

@@ -22,7 +22,8 @@ Jeweler::Tasks.new do |s|
   s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
   s.test_files = Dir['test/**/*.{yml,rb}']
 end
-
+ Jeweler::GemcutterTasks.new
+ 
 desc 'Default: run unit tests.'
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/awesome_nested_set.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{awesome_nested_set}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Daniel Morrison"]
-  s.date = %q{2009-09-08}
+  s.date = %q{2009-10-07}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [
@@ -38,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/collectiveidea/awesome_nested_set}
   s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An awesome nested set implementation for Active Record}
   s.test_files = [
     "test/db/database.yml",

data/lib/awesome_nested_set.rb

@@ -60,16 +60,17 @@ module CollectiveIdea #:nodoc:
             extend Columns
             extend ClassMethods
             
-            belongs_to :parent, :class_name => self.base_class.class_name,
+            belongs_to :parent, :class_name => self.base_class.to_s,
               :foreign_key => parent_column_name
-            has_many :children, :class_name => self.base_class.class_name,
+            has_many :children, :class_name => self.base_class.to_s,
               :foreign_key => parent_column_name, :order => quoted_left_column_name
 
             attr_accessor :skip_before_destroy
           
             # no bulk assignment
-            attr_protected  left_column_name.intern,
-                            right_column_name.intern
+            if accessible_attributes.blank?
+              attr_protected  left_column_name.intern, right_column_name.intern 
+            end
                           
             before_create  :set_default_left_and_right
             before_save    :store_new_parent
@@ -88,7 +89,7 @@ module CollectiveIdea #:nodoc:
             named_scope :roots, :conditions => {parent_column_name => nil}, :order => quoted_left_column_name
             named_scope :leaves, :conditions => "#{quoted_right_column_name} - #{quoted_left_column_name} = 1", :order => quoted_left_column_name
 
-            define_callbacks("before_move", "after_move") if self.respond_to?(:define_callbacks)
+            define_callbacks("before_move", "after_move")
           end
           
         end
@@ -160,7 +161,7 @@ module CollectiveIdea #:nodoc:
           # Don't rebuild a valid tree.
           return true if valid?
           
-          scope = lambda{}
+          scope = lambda{|node|}
           if acts_as_nested_set_options[:scope]
             scope = lambda{|node| 
               scope_column_names.inject(""){|str, column_name|
@@ -442,7 +443,7 @@ module CollectiveIdea #:nodoc:
         end
         
         def store_new_parent
-          @move_to_new_parent_id = parent_id_changed? ? parent_id : false
+          @move_to_new_parent_id = send("#{parent_column_name}_changed?") ? parent_id : false
           true # force callback to return true
         end
         
@@ -504,7 +505,7 @@ module CollectiveIdea #:nodoc:
         
         def move_to(target, position)
           raise ActiveRecord::ActiveRecordError, "You cannot move a new node" if self.new_record?
-          return if callback(:before_move) == false
+          return if run_callbacks(:before_move) == false
           transaction do
             if target.is_a? self.class.base_class
               target.reload_nested_set
@@ -567,7 +568,7 @@ module CollectiveIdea #:nodoc:
           end
           target.reload_nested_set if target
           self.reload_nested_set
-          callback(:after_move)
+          run_callbacks(:after_move)
         end
 
       end

data/test/awesome_nested_set_test.rb

@@ -11,6 +11,9 @@ class ScopedCategory < ActiveRecord::Base
   acts_as_nested_set :scope => :organization
   set_table_name 'categories'
 end
+class RenamedColumns < ActiveRecord::Base
+  acts_as_nested_set :parent_column => 'mother_id', :left_column => 'red', :right_column => 'black'
+end
 
 class AwesomeNestedSetTest < TestCaseClass
 
@@ -33,16 +36,28 @@ class AwesomeNestedSetTest < TestCaseClass
   def test_left_column_name
     assert_equal 'lft', Default.left_column_name
     assert_equal 'lft', Default.new.left_column_name
+    assert_equal 'red', RenamedColumns.left_column_name
+    assert_equal 'red', RenamedColumns.new.left_column_name
   end
-
+  
   def test_right_column_name
     assert_equal 'rgt', Default.right_column_name
     assert_equal 'rgt', Default.new.right_column_name
+    assert_equal 'black', RenamedColumns.right_column_name
+    assert_equal 'black', RenamedColumns.new.right_column_name
   end
 
   def test_parent_column_name
     assert_equal 'parent_id', Default.parent_column_name
     assert_equal 'parent_id', Default.new.parent_column_name
+    assert_equal 'mother_id', RenamedColumns.parent_column_name
+    assert_equal 'mother_id', RenamedColumns.new.parent_column_name
+  end
+  
+  def test_creation_with_altered_column_names
+    assert_nothing_raised do 
+      RenamedColumns.create!()
+    end
   end
   
   def test_quoted_left_column_name
@@ -730,4 +745,14 @@ class AwesomeNestedSetTest < TestCaseClass
 
       check_structure(Category.root.self_and_descendants, levels)
   end
+  
+  def test_model_with_attr_accessible
+    model = Class.new(ActiveRecord::Base)
+    model.set_table_name 'categories'
+    model.attr_accessible :name
+    assert_nothing_raised do
+      model.acts_as_nested_set
+      model.new(:name => 'foo')
+    end
+  end
 end

data/test/db/schema.rb

@@ -20,4 +20,11 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :notable_id, :integer
     t.column :notable_type, :string
   end
+  
+  create_table :renamed_columns, :force => true do |t|
+    t.column :name, :string
+    t.column :mother_id, :integer
+    t.column :red, :integer
+    t.column :black, :integer
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: awesome_nested_set
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -04:00
+date: 2009-10-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency