ordered_tree 0.1.7 → 0.1.8

data/README.textile

@@ -154,6 +154,14 @@ pre. def scope_condition
   "site_id = #{site_id} AND user_login = '#{user_login}'"
 end
 
+h2. Making parent_id (the foreign key) point to something else
+
+If you want @parent_id@ to point to something else instead of the id, then supply @:primary_key => :alternate_id@ to the @ordered_tree@ method. This will only probably be useful in tandem with a scope:
+
+<pre>
+ordered_tree :primary_key => :relative_id, :scope => :account
+</pre>
+
 h2. Install
 
 gem 'ordered_tree'

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/ordered_tree.rb

@@ -24,10 +24,18 @@ module OrderedTree #:nodoc:
     self.ordered_tree_config ||= {}
     self.ordered_tree_config[:foreign_key] ||= :parent_id
     self.ordered_tree_config[:order] ||= :position
+    self.ordered_tree_config[:primary_key] ||= :id
     self.ordered_tree_config.update(options) if options.is_a?(Hash)
 
-    belongs_to :parent_node, :class_name => self.name, :foreign_key => ordered_tree_config[:foreign_key]
-    has_many :child_nodes, :class_name => self.name, :foreign_key => ordered_tree_config[:foreign_key], :order => ordered_tree_config[:order]
+    belongs_to :parent_node,
+      :class_name => self.name,
+      :foreign_key => ordered_tree_config[:foreign_key],
+      :primary_key => ordered_tree_config[:primary_key]
+    has_many :child_nodes,
+      :class_name => self.name,
+      :foreign_key => ordered_tree_config[:foreign_key],
+      :primary_key => ordered_tree_config[:primary_key],
+      :order => ordered_tree_config[:order]
     scope :roots, lambda { |*args|
       scope_condition = args[0]
       where(scope_condition).where(self.ordered_tree_config[:foreign_key].to_sym => 0).order(self.ordered_tree_config[:order])

data/ordered_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ordered_tree}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
-  s.date = %q{2011-06-15}
+  s.date = %q{2011-08-07}
   s.description = %q{Uses parent_id and position to create an ordered tree.}
   s.email = %q{ramon@tayag.net}
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/ordered_tree/instance_methods/misc.rb",
     "lib/ordered_tree/instance_methods/tree.rb",
     "ordered_tree.gemspec",
+    "spec/fixtures/category.rb",
     "spec/fixtures/page.rb",
     "spec/fixtures/person.rb",
     "spec/ordered_tree_spec.rb",

data/spec/fixtures/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  ordered_tree :primary_key => :alt_id
+end

data/spec/ordered_tree_spec.rb

@@ -6,6 +6,15 @@ describe OrderedTree do
     @people = Person.all
   end
 
+  describe "when a primary_key is supplied" do
+    it "should use the parent_id to point to the primary_key instead of :id" do
+      c1 = Category.create(:alt_id => 10)
+      c2 = Category.create(:parent_id => 10)
+      c2.parent.should == c1
+      c1.children.should include(c2)
+    end
+  end
+
   describe "when a scope is supplied" do
     # This is especially important for working with root items that may belong to different accounts
     it "should only work within that scope" do
@@ -59,6 +68,15 @@ describe OrderedTree do
       page_4.parent.should == nil
       page_5.position.should == 1
       page_5.parent.should == nil
+
+      # delete a root item
+      page_1.destroy
+
+      # reload all
+      [page_2, page_4, page_5].map(&:reload).each do |page|
+        page.position.should == 1
+        page.parent.should be_nil
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'ordered_tree'
 require 'spec/fixtures/person'
 require 'spec/fixtures/page'
+require 'spec/fixtures/category'
 
 #Allow to connect to SQLite
 ActiveRecord::Base.establish_connection(
@@ -21,7 +22,7 @@ RSpec.configure do |config|
 end
 
 def reset_database
-  %W(people pages).each do |table_name|
+  %W(people pages categories).each do |table_name|
     ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS '#{table_name}'")
   end
   ActiveRecord::Base.connection.create_table(:people) do |t|
@@ -36,6 +37,11 @@ def reset_database
     t.string :name
     t.integer :person_id
   end
+  ActiveRecord::Base.connection.create_table(:categories) do |t|
+    t.integer :parent_id, :null => false, :default => 0
+    t.integer :position
+    t.integer :alt_id
+  end
 end
 
 def ordered_tree(klass, *opts)
@@ -46,7 +52,7 @@ ensure
 end
 
 # Test Tree
-# 
+#
 # We will be working with this tree through out the tests
 #
 # people[0]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ordered_tree
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 +08:00
+date: 2011-08-07 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,7 @@ files:
 - lib/ordered_tree/instance_methods/misc.rb
 - lib/ordered_tree/instance_methods/tree.rb
 - ordered_tree.gemspec
+- spec/fixtures/category.rb
 - spec/fixtures/page.rb
 - spec/fixtures/person.rb
 - spec/ordered_tree_spec.rb