arboreal 0.1.2 → 0.2.0

data/lib/arboreal/active_record_extensions.rb

@@ -1,6 +1,8 @@
+require 'active_record'
+
 module Arboreal
   module ActiveRecordExtensions
-    
+
     # Declares that this ActiveRecord::Base model has a tree-like structure.
     def acts_arboreal
 
@@ -11,22 +13,29 @@ module Arboreal
       include Arboreal::InstanceMethods
 
       before_validation :populate_ancestry_string
-      
+
       validate do |record|
         record.send(:validate_parent_not_ancestor)
       end
 
       before_save :detect_ancestry_change
       after_save  :apply_ancestry_change_to_descendants
-      
-      named_scope :roots, {
-        :conditions => ["parent_id IS NULL"]
-      }
-      
+
+      case ActiveRecord::VERSION::MAJOR
+
+      when 3
+        scope :roots, where(:parent_id => nil)
+
+      when 2
+        named_scope :roots, {
+          :conditions => ["parent_id IS NULL"]
+        }
+
+      end
+
     end
-    
+
   end
 end
 
-require 'active_record'
 ActiveRecord::Base.extend(Arboreal::ActiveRecordExtensions)

data/lib/arboreal/version.rb

@@ -1,3 +1,3 @@
 module Arboreal
-  VERSION = "0.1.2".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/arboreal_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 require 'arboreal'
 
 class Node < ActiveRecord::Base
-  
+
   acts_arboreal
-  
+
   class Migration < ActiveRecord::Migration
 
     def self.up
@@ -22,7 +22,7 @@ class Node < ActiveRecord::Base
     end
 
   end
-  
+
 end
 
 describe "Arboreal hierarchy" do
@@ -30,7 +30,7 @@ describe "Arboreal hierarchy" do
   before(:all) do
     Node::Migration.up
   end
-  
+
   after(:all) do
     Node::Migration.down
   end
@@ -42,9 +42,9 @@ describe "Arboreal hierarchy" do
     @nsw = @australia.children.create!(:name => "New South Wales")
     @sydney = @nsw.children.create!(:name => "Sydney")
   end
-  
+
   describe "node" do
-  
+
     describe "#parent" do
       it "returns the parent" do
         @victoria.parent.should == @australia
@@ -62,7 +62,7 @@ describe "Arboreal hierarchy" do
         @victoria.siblings.should == [@nsw]
       end
     end
-    
+
     it "cannot be it's own parent" do
       lambda do
         @australia.update_attributes!(:parent => @australia)
@@ -76,9 +76,9 @@ describe "Arboreal hierarchy" do
     end
 
   end
-    
+
   describe "root node" do
-  
+
     describe "#parent" do
       it "returns nil" do
         @australia.parent.should == nil
@@ -90,7 +90,7 @@ describe "Arboreal hierarchy" do
         @australia.ancestors.should be_empty
       end
     end
-    
+
     describe "#ancestry_string" do
       it "is a single dash" do
         @australia.ancestry_string.should == "-"
@@ -140,15 +140,15 @@ describe "Arboreal hierarchy" do
     end
 
     describe "#root" do
-      
+
      it "is itself" do
        @australia.root.should == @australia
      end
-     
+
     end
-    
+
   end
-  
+
   describe "leaf node" do
 
     describe "#ancestry_string" do
@@ -164,11 +164,11 @@ describe "Arboreal hierarchy" do
     end
 
     describe "#ancestors" do
-      
+
       it "returns all ancestors, depth-first" do
         @melbourne.ancestors.all.should == [@australia, @victoria]
       end
-      
+
     end
 
     describe "#children" do
@@ -192,14 +192,14 @@ describe "Arboreal hierarchy" do
     end
 
   end
-  
+
   describe ".roots" do
-    
+
     it "returns root nodes" do
       @nz = Node.create!(:name => "New Zealand")
       Node.roots.to_set.should == [@australia, @nz].to_set
     end
-    
+
   end
 
   describe "when a node changes parent" do
@@ -209,9 +209,9 @@ describe "Arboreal hierarchy" do
       @nz = Node.create!(:name => "New Zealand")
       @victoria.update_attributes!(:parent => @nz)
     end
-    
+
     describe "each descendant" do
-      
+
       it "follows" do
 
         @melbourne.reload
@@ -223,30 +223,30 @@ describe "Arboreal hierarchy" do
         @box_hill.ancestors.should_not include(@australia)
 
       end
-      
+
     end
-    
+
   end
-  
+
   describe "node created using find_or_create_by" do
-    
+
     before do
       @tasmania = @australia.children.find_or_create_by_name("Tasmania")
     end
-    
+
     it "still has the right ancestry" do
       @tasmania.ancestors.should == [@australia]
     end
-    
+
   end
-  
+
   describe ".rebuild_ancestry" do
 
     before do
       Node.connection.update("UPDATE nodes SET ancestry_string = 'corrupt'")
       Node.rebuild_ancestry
     end
-    
+
     it "re-populates all ancestry_strings" do
       Node.count(:conditions => {:ancestry_string => 'corrupt'}).should == 0
     end
@@ -255,21 +255,21 @@ describe "Arboreal hierarchy" do
       @melbourne.reload.ancestors.should == [@australia, @victoria]
       @sydney.reload.ancestors.should == [@australia, @nsw]
     end
-    
+
   end
-  
+
 end
 
 class RedNode < Node; end
 class GreenNode < Node; end
 class BlueNode < Node; end
-  
+
 describe "polymorphic hierarchy" do
 
   before(:all) do
     Node::Migration.up
   end
-  
+
   after(:all) do
     Node::Migration.down
   end
@@ -279,7 +279,7 @@ describe "polymorphic hierarchy" do
     @green = GreenNode.create!(:parent => @red)
     @blue = BlueNode.create!(:parent => @green)
   end
-  
+
   describe "#descendants" do
     it "includes nodes of other types" do
       @red.descendants.should include(@green, @blue)
@@ -297,5 +297,5 @@ describe "polymorphic hierarchy" do
       @blue.ancestors.should include(@red, @green)
     end
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -39,14 +39,4 @@ DB_CONFIGS = {
 test_adapter = (ENV["AR_ADAPTER"] || "sqlite3")
 test_db_config = DB_CONFIGS[test_adapter].merge(:adapter => test_adapter)
 
-Spec::Runner.configure do |config|
-
-  config.before(:all) do
-    ActiveRecord::Base.establish_connection(test_db_config)
-  end
-
-  config.after(:all) do
-    ActiveRecord::Base.clear_active_connections!
-  end
-
-end
+ActiveRecord::Base.establish_connection(test_db_config)

metadata

@@ -1,57 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arboreal
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70308116360600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70308116360600
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70308116360000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id002
-description: |
-  Arboreal is yet another extension to ActiveRecord to support tree-shaped data structures.
-  
-  Internally, Arboreal maintains a computed "ancestry_string" column, which caches the path from the root of
+  prerelease: false
+  version_requirements: *70308116360000
+description: ! 'Arboreal is yet another extension to ActiveRecord to support tree-shaped
+  data structures.
+
+
+  Internally, Arboreal maintains a computed "ancestry_string" column, which caches
+  the path from the root of
+
   a tree to each node, allowing efficient retrieval of both ancestors and descendants.
-  
-  Arboreal surfaces relationships within the tree like "children", "ancestors", "descendants", and "siblings"
+
+
+  Arboreal surfaces relationships within the tree like "children", "ancestors", "descendants",
+  and "siblings"
+
   as scopes, so that additional filtering/pagination can be performed.
 
+'
 email: mdub@dogbiscuit.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - lib/arboreal/active_record_extensions.rb
 - lib/arboreal/class_methods.rb
 - lib/arboreal/instance_methods.rb
@@ -64,33 +68,30 @@ files:
 - LICENSE
 homepage: http://github.com/mdub/arboreal
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Arboreal
 - --main
 - README.rdoc
-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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Efficient tree structures for ActiveRecord
 test_files: []
-