ordered_tree 0.1.9 → 0.2.1

data/.rvmrc

@@ -1 +1 @@
-rvm @ordered_tree
+rvm use ruby-1.9.2-p290@ordered_tree

data/Gemfile

@@ -1,10 +1,7 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-gem "activerecord", ">= 3.0.0"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem "activerecord", ">= 3.1.1"
+
 group :development do
   gem "rspec", "~> 2.6.0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -1,52 +1,54 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.7)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    ffi (1.0.9)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    ffi (1.0.10)
     git (1.2.5)
-    guard (0.3.4)
+    guard (0.8.8)
       thor (~> 0.14.6)
-    guard-rspec (0.3.1)
-      guard (>= 0.2.2)
-    i18n (0.5.0)
-    jeweler (1.6.2)
+    guard-rspec (0.5.3)
+      guard (>= 0.8.4)
+    i18n (0.6.0)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    libnotify (0.5.5)
-    rake (0.9.1)
-    rb-inotify (0.8.5)
+    libnotify (0.5.9)
+    multi_json (1.0.3)
+    rake (0.9.2.2)
+    rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    rcov (0.9.9)
+    rcov (0.9.11)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
     thor (0.14.6)
-    tzinfo (0.3.27)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.0.0)
+  activerecord (>= 3.1.1)
   bundler (~> 1.0.0)
   guard-rspec
   jeweler (~> 1.6.2)

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.1

data/lib/ordered_tree.rb

@@ -28,19 +28,22 @@ module OrderedTree #:nodoc:
     self.ordered_tree_config.update(options) if options.is_a?(Hash)
 
     belongs_to :parent_node,
-      :class_name => self.name,
+      :class_name  => self.name,
       :foreign_key => ordered_tree_config[:foreign_key],
       :primary_key => ordered_tree_config[:primary_key],
-      :conditions => proc {scope_condition}
+      :conditions  => proc {scope_condition}
     has_many :child_nodes,
-      :class_name => self.name,
+      :class_name  => self.name,
       :foreign_key => ordered_tree_config[:foreign_key],
       :primary_key => ordered_tree_config[:primary_key],
-      :conditions => proc {scope_condition},
-      :order => ordered_tree_config[:order]
+      :conditions  => proc {scope_condition},
+      :order       => ordered_tree_config[:order]
     scope :roots, lambda { |*args|
+      column = "#{self.table_name}.#{self.ordered_tree_config[:foreign_key].to_sym}"
       scope_condition = args[0]
-      where(scope_condition).where(self.ordered_tree_config[:foreign_key].to_sym => 0).order(self.ordered_tree_config[:order])
+      where(scope_condition).
+        where("#{column} = 0 OR #{column} IS NULL").
+        order(self.ordered_tree_config[:order])
     }
 
     include OrderedTree::ClassMethods

data/ordered_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ordered_tree}
-  s.version = "0.1.9"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
-  s.date = %q{2011-08-07}
+  s.date = %q{2011-11-13}
   s.description = %q{Uses parent_id and position to create an ordered tree.}
   s.email = %q{ramon@tayag.net}
   s.extra_rdoc_files = [
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.1.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<libnotify>, [">= 0"])
       s.add_development_dependency(%q<rb-inotify>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 3.1.1"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rb-inotify>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 3.1.1"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])

data/spec/ordered_tree_spec.rb

@@ -29,20 +29,30 @@ describe OrderedTree do
     # This is especially important for working with root items that may belong to different accounts
     it "should only work within that scope" do
       # when the scope is an association
-      ordered_tree Page, :scope => :person do
-        Page.create(:person => @people[0]).position.should == 1
-        Page.create(:person => @people[2]).position.should == 1
-        Page.create(:person => @people[0]).position.should == 2
-        Page.create(:person => @people[1]).position.should == 1
+      Object.send :remove_const, 'Page'
+      class Page < ActiveRecord::Base
+        belongs_to :person
+        ordered_tree :scope => :person
       end
 
+      Page.create(:person => @people[0]).position.should == 1
+      Page.create(:person => @people[2]).position.should == 1
+      Page.create(:person => @people[0]).position.should == 2
+      Page.create(:person => @people[1]).position.should == 1
+
       # when the scope is an association id
-      ordered_tree Page, :scope => :person_id do
-        Page.create(:person => @people[0]).position.should == 3
-        Page.create(:person => @people[2]).position.should == 2
-        Page.create(:person => @people[0]).position.should == 4
-        Page.create(:person => @people[1]).position.should == 2
+      Object.send :remove_const, 'Page'
+      class Page < ActiveRecord::Base
+        belongs_to :person
+        ordered_tree :scope => :person_id
       end
+      Page.create(:person => @people[0]).position.should == 3
+      Page.create(:person => @people[2]).position.should == 2
+      Page.create(:person => @people[0]).position.should == 4
+      Page.create(:person => @people[1]).position.should == 2
+
+      Object.send :remove_const, 'Page'
+      load 'fixtures/page.rb'
     end
 
     it "should only work within that scope_condition overridden method" do
@@ -73,7 +83,7 @@ describe OrderedTree do
       page_2.position.should == 1
       page_2.parent.should == nil
       page_3.position.should == 1
-      page_3.parent.should == page_1
+      page_3.parent.id.should == page_1.id
       page_4.position.should == 2
       page_4.parent.should == nil
       page_5.position.should == 1
@@ -110,6 +120,15 @@ describe OrderedTree do
       @people[0].reload
       @people[2].parent != @people[7]
     end
+
+    context "and a scope and primary key are supplied" do
+      it "should not allow assigning a parent as one of its descendants" do
+        c1 = Category.create(:person_id => 1, :alt_id => 10)
+        c1a = Category.create(:parent_id => 10, :person_id => 1, :alt_id => 30)
+        (c1a.children << c1).should be_false
+        c1.errors[:base].should include("is an ancestor of the new parent.")
+      end
+    end
   end
 
   describe "when validate :on => :update is called," do
@@ -160,9 +179,14 @@ describe OrderedTree do
   end
 
   describe "class#roots" do
-    it "should return all the roots" do
+    it "should return all people with parent_id of 0" do
       Person.roots.should == [@people[0], @people[11]]
     end
+
+    it "should return all people with parent_id of nil" do
+      page = Page.create :person => @people[0]
+      Page.roots.should include(page)
+    end
   end
 
   it "should reorder the list when stuff are destroyed" do

data/spec/spec_helper.rb

@@ -4,9 +4,9 @@ require 'rubygems'
 require 'active_record'
 require 'rspec'
 require 'ordered_tree'
-require 'spec/fixtures/person'
-require 'spec/fixtures/page'
-require 'spec/fixtures/category'
+require 'fixtures/person'
+require 'fixtures/page'
+require 'fixtures/category'
 
 #Allow to connect to SQLite
 ActiveRecord::Base.establish_connection(
@@ -32,19 +32,25 @@ def reset_database
     #add_index :people, [:parent_id], :name => "index_people_on_parent_id"
   end
   ActiveRecord::Base.connection.create_table(:pages) do |t|
-    t.integer :parent_id, :null => false, :default => 0
+    t.integer :parent_id
     t.integer :position
     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 :parent_id
     t.integer :position
     t.integer :alt_id
     t.integer :person_id
   end
 end
 
+# Using this doesn't seem to work when >= Rails 3.1
+# http://stackoverflow.com/q/7446358/61018
+#
+# I haven't found a real solution but will just make separate classes
+# to have different configurations, so we don't have to open
+# things up in the spec.
 def ordered_tree(klass, *opts)
   klass.ordered_tree *opts
   yield

metadata

@@ -1,167 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ordered_tree
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 9
-  version: 0.1.9
 platform: ruby
-authors: 
+authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-07 00:00:00 +08:00
+date: 2011-11-13 00:00:00.000000000 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &87969330 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87969330
+- !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &87897880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
+  type: :development
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87897880
+- !ruby/object:Gem::Dependency
   name: bundler
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &87897640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
+  type: :development
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87897640
+- !ruby/object:Gem::Dependency
   name: jeweler
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &87897400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.6.2
+  type: :development
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87897400
+- !ruby/object:Gem::Dependency
   name: rcov
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &87897160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87897160
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &87896910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87896910
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &87896610 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87896610
+- !ruby/object:Gem::Dependency
   name: libnotify
-  type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &87896310 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *87896310
+- !ruby/object:Gem::Dependency
   name: rb-inotify
-  type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &87896010 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id009
+  version_requirements: *87896010
 description: Uses parent_id and position to create an ordered tree.
 email: ramon@tayag.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.textile
-files: 
+files:
 - .rvmrc
 - CHANGELOG
 - Gemfile
@@ -186,37 +143,31 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ramontayag/ordered_tree
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 539117903
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Gem version of Wizard's ActsAsTree
 test_files: []
-