dm-is-nested_set 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-is-nested_set.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-is-nested_set'
 GEM_VERSION = DataMapper::Is::NestedSet::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION], ['dm-adjust', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin allowing the creation of nested sets from data models'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-is-nested_set/is/nested_set.rb

@@ -6,12 +6,12 @@ module DataMapper
       # docs in the works
       #
       def is_nested_set(options={})
-        options = { :child_key => [:parent_id], :scope => [] }.merge(options)
+        options = { :child_key => [ :parent_id ], :scope => [] }.merge(options)
 
         extend  DataMapper::Is::NestedSet::ClassMethods
         include DataMapper::Is::NestedSet::InstanceMethods
 
-        @nested_set_scope = options[:scope]
+        @nested_set_scope  = options[:scope]
         @nested_set_parent = options[:child_key]
 
         property :lft, Integer, :writer => :private
@@ -21,36 +21,36 @@ module DataMapper
         # be cut down to 1 instead of 2 queries. this would be the other way, but seems hackish:
         # options[:child_key].each{|pname| property(pname, Integer) unless properties.detect{|p| p.name == pname}}
 
-        belongs_to :parent,   :class_name => self.name, :child_key => options[:child_key], :order => [:lft.asc]
-        has n,     :children, :class_name => self.name, :child_key => options[:child_key], :order => [:lft.asc]
+        belongs_to :parent,   :model => self, :child_key => options[:child_key], :order => [ :lft ], :nullable => true
+        has n,     :children, :model => self, :child_key => options[:child_key], :order => [ :lft ]
 
         before :create do
-          if !self.parent
+          if !parent
             # TODO must change for nested sets
-            self.root ? self.move_without_saving(:into => self.root) : self.move_without_saving(:to => 1)
-          elsif self.parent && !self.lft
-            self.move_without_saving(:into => self.parent)
+            root ? move_without_saving(:into => root) : move_without_saving(:to => 1)
+          elsif parent && !lft
+            move_without_saving(:into => parent)
           end
         end
 
         before :update do
-          if self.nested_set_scope != self.original_nested_set_scope
+          if nested_set_scope != original_nested_set_scope
             # TODO detach from old list first. many edge-cases here, need good testing
-            self.lft,self.rgt = nil,nil
-            #puts "#{self.root.inspect} - #{[self.nested_set_scope,self.original_nested_set_scope].inspect}"
-            self.root ? self.move_without_saving(:into => self.root) : self.move_without_saving(:to => 1)
-          elsif (self.parent && !self.lft) || (self.parent != self.ancestor)
+            self.lft, self.rgt = nil, nil
+            #puts "#{root.inspect} - #{[nested_set_scope,original_nested_set_scope].inspect}"
+            root ? move_without_saving(:into => root) : move_without_saving(:to => 1)
+          elsif (parent && !lft) || (parent != ancestor)
             # if the parent is set, we try to move this into that parent, otherwise move into root.
-            self.parent ? self.move_without_saving(:into => self.parent) : self.move_without_saving(:into => self.class.root)
+            parent ? move_without_saving(:into => parent) : move_without_saving(:into => model.root)
           end
         end
 
         before :destroy do
-          self.send(:detach)
+          send(:detach)
         end
 
-        after_class_method :inherited do |retval,target|
-          target.instance_variable_set(:@nested_set_scope, @nested_set_scope.dup)
+        after_class_method :inherited do |retval, target|
+          target.instance_variable_set(:@nested_set_scope,  @nested_set_scope.dup)
           target.instance_variable_set(:@nested_set_parent, @nested_set_parent.dup)
         end
 
@@ -60,8 +60,8 @@ module DataMapper
         attr_reader :nested_set_scope, :nested_set_parent
 
         def adjust_gap!(scoped_set,at,adjustment)
-          scoped_set.all(:rgt.gt => at).adjust!({:rgt => adjustment},true)
-          scoped_set.all(:lft.gt => at).adjust!({:lft => adjustment},true)
+          scoped_set.all(:rgt.gt => at).adjust!({ :rgt => adjustment }, true)
+          scoped_set.all(:lft.gt => at).adjust!({ :lft => adjustment }, true)
         end
 
         ##
@@ -88,7 +88,7 @@ module DataMapper
         def leaves
           # TODO scoping, how should it act?
           # TODO supply filtering-option?
-          all(:conditions => ["rgt=lft+1"], :order => [:lft.asc])
+          all(:conditions => [ 'rgt = lft + ?', 1 ], :order => [ :lft ])
         end
 
         ##
@@ -104,7 +104,7 @@ module DataMapper
         ##
         # rebuilds the nested set using parent/child relationships and a chosen order
         #
-        def rebuild_set_from_tree(order=nil)
+        def rebuild_set_from_tree(order = nil)
           # TODO pending
         end
       end
@@ -115,7 +115,7 @@ module DataMapper
         #
         # @private
         def nested_set_scope
-          self.model.base_model.nested_set_scope.map{|p| [p,attribute_get(p)]}.to_hash
+          model.base_model.nested_set_scope.map{ |p| [ p, attribute_get(p) ] }.to_hash
         end
 
         ##
@@ -123,7 +123,7 @@ module DataMapper
         # @private
         def original_nested_set_scope
           # TODO commit
-          self.model.base_model.nested_set_scope.map{|p| [p, original_values.key?(p) ? original_values[p] : attribute_get(p)]}.to_hash
+          model.base_model.nested_set_scope.map{ |p| [ p, (property = properties[p]) && original_attributes.key?(property) ? original_attributes[property] : attribute_get(p) ] }.to_hash
         end
 
         ##
@@ -131,7 +131,7 @@ module DataMapper
         #
         def nested_set
           # TODO add option for serving it as a nested array
-          self.model.base_model.all(nested_set_scope.merge(:order => [:lft.asc]))
+          model.base_model.all(nested_set_scope.merge(:order => [ :lft ]))
         end
 
         ##
@@ -167,21 +167,25 @@ module DataMapper
         ##
         # @see move
         def move_without_saving(vector)
-          if vector.is_a? Hash then action,object = vector.keys[0],vector.values[0] else action = vector end
+          if vector.kind_of?(Hash)
+            action, object = vector.keys[0], vector.values[0]
+          else
+            action = vector
+          end
 
           changed_scope = nested_set_scope != original_nested_set_scope
 
           position = case action
-            when :higher  then left_sibling  ? left_sibling.lft    : nil # : "already at the top"
-            when :highest then ancestor      ? ancestor.lft+1      : nil # : "is root, or has no parent"
-            when :lower   then right_sibling ? right_sibling.rgt+1 : nil # : "already at the bottom"
-            when :lowest  then ancestor      ? ancestor.rgt        : nil # : "is root, or has no parent"
-            when :indent  then left_sibling  ? left_sibling.rgt    : nil # : "cannot find a sibling to indent into"
-            when :outdent then ancestor      ? ancestor.rgt+1      : nil # : "is root, or has no parent"
-            when :into    then object        ? object.rgt          : nil # : "supply an object"
-            when :above   then object        ? object.lft          : nil # : "supply an object"
-            when :below   then object        ? object.rgt+1        : nil # : "supply an object"
-            when :to      then object        ? object.to_i         : nil # : "supply a number"
+            when :higher  then left_sibling  ? left_sibling.lft      : nil  # : "already at the top"
+            when :highest then ancestor      ? ancestor.lft + 1      : nil  # : "is root, or has no parent"
+            when :lower   then right_sibling ? right_sibling.rgt + 1 : nil  # : "already at the bottom"
+            when :lowest  then ancestor      ? ancestor.rgt          : nil  # : "is root, or has no parent"
+            when :indent  then left_sibling  ? left_sibling.rgt      : nil  # : "cannot find a sibling to indent into"
+            when :outdent then ancestor      ? ancestor.rgt + 1      : nil  # : "is root, or has no parent"
+            when :into    then object        ? object.rgt            : nil  # : "supply an object"
+            when :above   then object        ? object.lft            : nil  # : "supply an object"
+            when :below   then object        ? object.rgt + 1        : nil  # : "supply an object"
+            when :to      then object        ? object.to_i           : nil  # : "supply a number"
           end
 
           ##
@@ -192,45 +196,45 @@ module DataMapper
           # raise UnableToPositionError unless position.is_a?(Integer) && position > 0
           return false if !position || position < 1
           # return false if you are trying to move this into another scope
-          return false if [:into, :above,:below].include?(action) && nested_set_scope != object.nested_set_scope
+          return false if [ :into, :above, :below ].include?(action) && nested_set_scope != object.nested_set_scope
           # if node is already in the requested position
-          if self.lft == position || self.rgt == position - 1
-            self.parent = self.ancestor # must set this again, because it might have been changed by the user before move.
+          if lft == position || rgt == position - 1
+            self.parent = ancestor # must set this again, because it might have been changed by the user before move.
             return false
           end
 
-
-          DataMapper::Transaction.new(self.repository) do |transaction|
+          model.transaction do
 
             ##
             # if this node is already positioned we need to move it, and close the gap it leaves behind etc
             # otherwise we only need to open a gap in the set, and smash that buggar in
             #
-            if self.lft && self.rgt
-              # raise exception if node is trying to move into one of its descendants (infinate loop, spacetime will warp)
-              raise RecursiveNestingError if position > self.lft && position < self.rgt
+            if lft && rgt
+              # raise exception if node is trying to move into one of its descendants (infinite loop, spacetime will warp)
+              raise RecursiveNestingError if position > lft && position < rgt
               # find out how wide this node is, as we need to make a gap large enough for it to fit in
-              gap = self.rgt - self.lft + 1
+              gap = rgt - lft + 1
 
               # make a gap at position, that is as wide as this node
-              self.model.base_model.adjust_gap!(nested_set,position-1,gap)
+              model.base_model.adjust_gap!(nested_set, position - 1, gap)
 
               # offset this node (and all its descendants) to the right position
-              self.reload_attributes(:lft,:rgt)
-              old_position = self.lft
+              reload_attributes([ :lft, :rgt ])
+              old_position = lft
               offset = position - old_position
 
-              nested_set.all(:rgt => self.lft..self.rgt).adjust!({:lft => offset, :rgt => offset},true)
+              nested_set.all(:rgt => lft..rgt).adjust!({ :lft => offset, :rgt => offset }, true)
+
               # close the gap this movement left behind.
-              self.model.base_model.adjust_gap!(nested_set,old_position,-gap)
-              self.reload_attributes(:lft,:rgt)
+              model.base_model.adjust_gap!(nested_set, old_position, -gap)
+              reload_attributes([ :lft, :rgt ])
             else
               # make a gap where the new node can be inserted
-              self.model.base_model.adjust_gap!(nested_set,position-1,2)
+              model.base_model.adjust_gap!(nested_set, position - 1, 2)
               # set the position fields
               self.lft, self.rgt = position, position + 1
             end
-            self.parent = self.ancestor
+            self.parent = ancestor
           end
         end
 
@@ -258,7 +262,7 @@ module DataMapper
         # @see #self_and_ancestors
         def ancestors
           nested_set.all(:lft.lt => lft, :rgt.gt => rgt)
-          #self_and_ancestors.reject{|r| r.key == self.key } # because identitymap is not used in console
+          #self_and_ancestors.reject{|r| r.key == key } # because identitymap is not used in console
         end
 
         ##
@@ -266,7 +270,7 @@ module DataMapper
         #
         # @return <Resource, NilClass> returns the parent-object, or nil if this is root/detached
         def ancestor
-          ancestors.reverse.first
+          ancestors.last
         end
 
         ##
@@ -302,7 +306,7 @@ module DataMapper
         def descendants
           # TODO add argument for returning as a nested array.
           # TODO supply filtering-option?
-          nested_set.all(:lft => (lft+1)..(rgt-1))
+          nested_set.all(:lft => (lft + 1)..(rgt - 1))
         end
 
         ##
@@ -311,7 +315,7 @@ module DataMapper
         # @return <Collection>
         def leaves
           # TODO supply filtering-option?
-          nested_set.all(:lft => (lft+1)..rgt, :conditions=>["rgt=lft+1"])
+          nested_set.all(:lft => (lft + 1)..rgt, :conditions => [ 'rgt = lft + ?',  1 ])
         end
 
         ##
@@ -320,7 +324,7 @@ module DataMapper
         #
         # @par
         def leaf?
-          rgt-lft == 1
+          rgt - lft == 1
         end
 
         ##
@@ -328,7 +332,7 @@ module DataMapper
         #
         # @return <Collection>
         def self_and_siblings
-          parent ? parent.children : [self]
+          parent ? parent.children : [ self ]
         end
 
         ##
@@ -339,7 +343,7 @@ module DataMapper
         def siblings
           # TODO find a way to return this as a collection?
           # TODO supply filtering-option?
-          self_and_siblings.reject{|r| r.key == self.key } # because identitymap is not used in console
+          self_and_siblings.reject { |r| r.key == key } # because identitymap is not used in console
         end
 
         ##
@@ -348,7 +352,7 @@ module DataMapper
         # @return <Resource, NilClass> the resource to the left, or nil if self is leftmost
         # @see #self_and_siblings
         def left_sibling
-          self_and_siblings.find{|v| v.rgt == lft-1}
+          self_and_siblings.detect { |v| v.rgt == lft - 1 }
         end
 
         ##
@@ -357,14 +361,14 @@ module DataMapper
         # @return <Resource, NilClass> the resource to the right, or nil if self is rightmost
         # @see #self_and_siblings
         def right_sibling
-          self_and_siblings.find{|v| v.lft == rgt+1}
+          self_and_siblings.detect { |v| v.lft == rgt + 1 }
         end
 
        private
         def detach
-          offset = self.lft - self.rgt - 1
-          self.model.base_model.adjust_gap!(nested_set,self.rgt,offset)
-          self.lft,self.rgt = nil,nil
+          offset = lft - rgt - 1
+          model.base_model.adjust_gap!(nested_set, rgt, offset)
+          self.lft, self.rgt = nil, nil
         end
 
       end

data/lib/dm-is-nested_set/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module NestedSet
-      VERSION = '0.9.11'
+      VERSION = '0.10.0'.freeze
     end
   end
 end

data/lib/dm-is-nested_set.rb

@@ -1,10 +1,4 @@
-require 'pathname'
-require 'rubygems'
-
-gem 'dm-core', '0.9.11'
-require 'dm-core'
-
-#gem 'dm-adjust', '0.9.11'
 require 'dm-adjust'
 
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-nested_set' / 'is' / 'nested_set'
+require 'dm-is-nested_set/is/nested_set'
+require 'dm-is-nested_set/is/version'

data/spec/integration/nested_set_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
@@ -33,7 +32,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       class ::User
         include DataMapper::Resource
 
-        property :id, Serial
+        property :id,   Serial
         property :name, String
 
         has n, :categories
@@ -43,8 +42,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       class ::Category
         include DataMapper::Resource
 
-        property :id, Integer, :serial => true
-        property :name, String
+        property :id,         Serial
+        property :name,       String
         property :class_name, Discriminator
 
         belongs_to :user
@@ -59,26 +58,26 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
       DataMapper.auto_migrate!
 
-      repository(:default) do
-        @paul = User.create(:name => "paul")
-        @john = User.create(:name => "john")
-
-        Category.create(:id => 1, :name => "Electronics")
-        Category.create(:id => 2, :parent_id => 1,  :name => "Televisions")
-        Category.create(:id => 3, :parent_id => 2,  :name => "Tube")
-        Category.create(:id => 4, :parent_id => 2,  :name => "LCD")
-        Category.create(:id => 5, :parent_id => 2,  :name => "Plasma")
-        Category.create(:id => 6, :parent_id => 1,  :name => "Portable Electronics")
-        Category.create(:id => 7, :parent_id => 6,  :name => "MP3 Players")
-        Category.create(:id => 8, :parent_id => 7,  :name => "Flash")
-        Category.create(:id => 9, :parent_id => 6,  :name => "CD Players")
-        Category.create(:id => 10,:parent_id => 6,  :name => "2 Way Radios")
+      DataMapper.repository do
+        @user  = User.create(:name => 'paul')
+        @other = User.create(:name => 'john')
+
+        electronics          = @user.categories.create(                                 :name => 'Electronics')
+        televisions          = @user.categories.create(:parent => electronics,          :name => 'Televisions')
+        tube                 = @user.categories.create(:parent => televisions,          :name => 'Tube')
+        lcd                  = @user.categories.create(:parent => televisions,          :name => 'LCD')
+        plasma               = @user.categories.create(:parent => televisions,          :name => 'Plasma')
+        portable_electronics = @user.categories.create(:parent => electronics,          :name => 'Portable Electronics')
+        mp3_players          = @user.categories.create(:parent => portable_electronics, :name => 'MP3 Players')
+        flash                = @user.categories.create(:parent => mp3_players,          :name => 'Flash')
+        cd_players           = @user.categories.create(:parent => portable_electronics, :name => 'CD Players')
+        two_way_radios       = @user.categories.create(:parent => portable_electronics, :name => '2 Way Radios')
       end
     end
 
     describe 'Class#rebuild_tree_from_set' do
       it 'should reset all parent_ids correctly' do
-        repository(:default) do
+        DataMapper.repository(:default) do
           plasma = Category.get(5)
           plasma.parent_id.should == 2
           plasma.ancestor.id.should == 2
@@ -92,13 +91,13 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe 'Class#root and #root' do
       it 'should return the toplevel node' do
-        Category.root.name.should == "Electronics"
+        Category.root.name.should == 'Electronics'
       end
     end
 
     describe 'Class#leaves and #leaves' do
       it 'should return all nodes without descendants' do
-        repository(:default) do
+        DataMapper.repository(:default) do
           Category.leaves.length.should == 6
 
           r = Category.root
@@ -110,56 +109,56 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe '#ancestor, #ancestors and #self_and_ancestors' do
       it 'should return ancestors in an array' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           c8 = Category.get(8)
           c8.ancestor.should == Category.get(7)
           c8.ancestor.should == c8.parent
 
-          c8.ancestors.map{|a|a.name}.should == ["Electronics","Portable Electronics","MP3 Players"]
-          c8.self_and_ancestors.map{|a|a.name}.should == ["Electronics","Portable Electronics","MP3 Players","Flash"]
+          c8.ancestors.map{|a|a.name}.should == ['Electronics','Portable Electronics','MP3 Players']
+          c8.self_and_ancestors.map{|a|a.name}.should == ['Electronics','Portable Electronics','MP3 Players','Flash']
         end
       end
     end
 
     describe '#children' do
       it 'should return children of node' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           r = Category.root
           r.children.length.should == 2
 
           t = r.children.first
           t.children.length.should == 3
-          t.children.first.name.should == "Tube"
-          t.children[2].name.should == "Plasma"
+          t.children.first.name.should == 'Tube'
+          t.children[2].name.should == 'Plasma'
         end
       end
     end
 
     describe '#descendants and #self_and_descendants' do
       it 'should return all subnodes of node' do
-        repository(:default) do
+        DataMapper.repository(:default) do
           r = Category.get(1)
           r.self_and_descendants.length.should == 10
           r.descendants.length.should == 9
-          r.name.should == "Electronics"
+          r.name.should == 'Electronics'
           t = r.children[1]
-          t.name.should == "Portable Electronics"
+          t.name.should == 'Portable Electronics'
           t.descendants.length.should == 4
-          t.descendants.map{|a|a.name}.should == ["MP3 Players","Flash","CD Players","2 Way Radios"]
+          t.descendants.map{|a|a.name}.should == ['MP3 Players','Flash','CD Players','2 Way Radios']
         end
       end
     end
 
     describe '#siblings and #self_and_siblings' do
       it 'should return all siblings of node' do
-        repository(:default) do
+        DataMapper.repository(:default) do
           r = Category.root
           r.self_and_siblings.length.should == 1
           r.descendants.length.should == 9
 
           televisions = r.children[0]
           televisions.siblings.length.should == 1
-          televisions.siblings.map{|a|a.name}.should == ["Portable Electronics"]
+          televisions.siblings.map{|a|a.name}.should == ['Portable Electronics']
         end
       end
     end
@@ -181,7 +180,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       # 10 | 17 | 18 |     - 2 Way Radios
 
       it 'should move items correctly with :higher / :highest / :lower / :lowest' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
 
           Category.get(4).pos.should == [5,6]
 
@@ -212,7 +211,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
 
       it 'should move items correctly with :indent / :outdent' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
 
           mp3_players = Category.get(7)
 
@@ -240,18 +239,18 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe 'moving objects with #move_* #and place_node_at' do
       it 'should set left/right when choosing a parent' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           Category.auto_migrate!
 
-          c1 = Category.create(:name => "New Electronics")
+          c1 = @user.categories.create(:name => 'New Electronics')
 
-          c2 = Category.create(:name => "OLED TVs")
+          c2 = @user.categories.create(:name => 'OLED TVs')
 
           c1.pos.should == [1,4]
           c1.root.should == c1
           c2.pos.should == [2,3]
 
-          c3 = Category.create(:name => "Portable Electronics")
+          c3 = @user.categories.create(:name => 'Portable Electronics')
           c3.parent=c1
           c3.save
 
@@ -273,8 +272,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
           c2.pos.should == [2,5]
           c3.pos.should == [3,4]
 
-          c4 = Category.create(:name => "Tube", :parent => c2)
-          c5 = Category.create(:name => "Flatpanel", :parent => c2)
+          c4 = @user.categories.create(:name => 'Tube',      :parent => c2)
+          c5 = @user.categories.create(:name => 'Flatpanel', :parent => c2)
 
           c1.pos.should == [1,10]
           c2.pos.should == [2,9]
@@ -293,11 +292,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe 'scoping' do
       it 'should detach from list when changing scope' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           plasma = Category.get(5)
           plasma.pos.should == [7,8]
-          plasma.user_id = 1
-          plasma.save
+          plasma.update(:user => @other)
           plasma.pos.should == [1,2]
         end
       end
@@ -305,7 +303,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe 'integrity' do
       it 'should detach object from list when deleted' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           lcd = Category.get(4)
           lcd.pos.should == [5,6]
           Category.get(3).destroy
@@ -313,6 +311,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         end
       end
     end
-
   end
 end

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,16 +1,19 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
+# use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
 
-ROOT = Pathname(__FILE__).dirname.parent.expand_path
+# use local dm-adjust if running from a typical dev checkout.
+lib = File.join('..', 'dm-adjust', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-adjust'
 
-# use local dm-adjust if running from dm-more directly
-lib = ROOT.parent.join('dm-adjust', 'lib').expand_path
-$LOAD_PATH.unshift(lib) if lib.directory?
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
 
-require ROOT + 'lib/dm-is-nested_set'
+require 'dm-is-nested_set'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,29 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-adjust
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin allowing the creation of nested sets from data models
 email: 
 - sindre [a] identu [d] no
@@ -40,15 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-is-nested_set.rb
@@ -60,11 +41,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-is-nested_set
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-nested_set
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -82,9 +65,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin allowing the creation of nested sets from data models
 test_files: []