eb_nested_set 0.3.7 → 0.3.8

data/README.md

@@ -14,8 +14,8 @@ Edge:
 
 From source:
 
-    git clone git://github.com/jnicklas/even_better_nested_set.git
-    cd even_better_nested_set
+    git clone git://github.com/jnicklas/eb_nested_set.git
+    cd eb_nested_set
     rake install
 
 If you're running Rails, just add it to your environment.rb file
@@ -24,7 +24,7 @@ If you're running Rails, just add it to your environment.rb file
 
 You can also install it as a Rails plugin.
 
-    script/plugin install git://github.com/jnicklas/even_better_nested_set.git
+    script/plugin install git://github.com/jnicklas/eb_nested_set.git
 
 ## Contributing
 
@@ -72,7 +72,7 @@ or more conveniently:
 
 Add these keys to your translation file:
 
-    even_better_nested_set:
+    eb_nested_set:
       parent_not_in_scope: "nay, thy parent not be in scope {{scope_name}}"
       illegal_nesting: "arr tis be illegal nesting"
 

data/Rakefile

@@ -6,10 +6,10 @@ require 'spec/rake/spectask'
 require 'yard'
 
 GEM = "eb_nested_set"
-GEM_VERSION = "0.3.7"
+GEM_VERSION = "0.3.8"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
-HOMEPAGE = "http://github.com/jnicklas/even_better_nested_set/tree/master"
+HOMEPAGE = "http://github.com/jnicklas/eb_nested_set/tree/master"
 SUMMARY = "A cool acts_as_nested_set alternative"
 
 spec = Gem::Specification.new do |s|

data/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), 'lib', 'even_better_nested_set')
+require File.join(File.dirname(__FILE__), 'lib', 'eb_nested_set')

data/lib/eb_nested_set.rb

@@ -33,8 +33,8 @@ module EvenBetterNestedSet
       end
     RUBY
 
-    named_scope :roots, :conditions => { :parent_id => nil }, :order => "#{nested_set_column(:left)} asc"
-    has_many :children, :class_name => self.name, :foreign_key => :parent_id, :order => "#{nested_set_column(:left)} asc"
+    named_scope :roots, :conditions => { :parent_id => nil }
+    has_many :children, :class_name => self.name, :foreign_key => :parent_id
     belongs_to :parent, :class_name => self.name, :foreign_key => :parent_id
 
     named_scope :descendants, lambda { |node|
@@ -182,6 +182,10 @@ module EvenBetterNestedSet
     def root?
       not parent_id?
     end
+
+    def leaf?
+      (right - left) <= 1
+    end
     
     ##
     # Checks if this node is a descendant of node
@@ -371,7 +375,7 @@ module EvenBetterNestedSet
     
     def illegal_nesting
       if parent_id? and family_ids.include?(parent_id)
-        errors.add(:parent_id, I18n.t('even_better_nested_set.illegal_nesting', :default => 'cannot move node to its own descendant'))
+        errors.add(:parent_id, I18n.t('eb_nested_set.illegal_nesting', :default => 'cannot move node to its own descendant'))
       end
     end
     
@@ -456,7 +460,7 @@ module EvenBetterNestedSet
       if self.class.nested_set_options[:scope] && parent_id
         parent.reload # Make sure we are testing the record corresponding to the parent_id
         if self.send(self.class.nested_set_options[:scope]) != parent.send(self.class.nested_set_options[:scope])
-          message = I18n.t('even_better_nested_set.parent_not_in_scope',
+          message = I18n.t('eb_nested_set.parent_not_in_scope',
             :default => "cannot be a record with a different {{scope_name}} to this record",
             :scope_name => self.class.nested_set_options[:scope]
           )

data/spec/nested_set_behavior.rb

@@ -402,6 +402,15 @@ describe "all nested set models", :shared => true do
       end
     end
     
+    describe "#leaf?" do
+      it "should be true if node doesn't have descendants" do
+        @r1.reload.should_not be_leaf
+        @r1c1.reload.should_not be_leaf
+        @r1c1s1.reload.should be_leaf
+        @r2c1.reload.should be_leaf
+      end
+    end
+    
     describe "#descendant_of(other_node)" do
       it "should be true if other_node is an ancestor of node" do
         reload_models @r1, @r1c2s2

data/spec/spec_helper.rb

@@ -14,13 +14,13 @@ dbconfig = case ENV["DB"]
   when "postgresql"
     {
       :adapter => 'postgresql',
-      :database => 'even_better_nested_set_test',
+      :database => 'eb_nested_set_test',
       :host => '127.0.0.1'
     }
   when "mysql"
     {
       :adapter => 'mysql',
-      :database => 'even_better_nested_set_test',
+      :database => 'eb_nested_set_test',
       :host => '127.0.0.1'
     }
   else

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eb_nested_set
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  hash: 3
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +15,7 @@ autorequire: eb_nested_set
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 +02:00
+date: 2010-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +40,7 @@ files:
 - spec/nested_set_behavior.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/jnicklas/even_better_nested_set/tree/master
+homepage: http://github.com/jnicklas/eb_nested_set/tree/master
 licenses: []
 
 post_install_message: 
@@ -43,21 +49,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A cool acts_as_nested_set alternative