dm-is-nested_set 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
@@ -83,7 +83,6 @@ group :runtime do # Runtime dependencies (as in the gemspec)
 
   gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
   gem 'dm-adjust',       DM_VERSION, :git => "#{DATAMAPPER}/dm-adjust.git"
-  gem 'dm-transactions', DM_VERSION, :git => "#{DATAMAPPER}/dm-transactions.git"
 
 end
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Sindre Aarsaether
+Copyright (c) 2010 Sindre Aarsaether
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,14 +10,13 @@ begin
     gem.summary     = 'DataMapper plugin allowing the creation of nested sets from data models'
     gem.description = gem.summary
     gem.email       = 'sindre [a] identu [d] no'
-    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Sindre Aarsaether' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',         '~> 1.0.0.rc2'
-    gem.add_dependency 'dm-adjust',       '~> 1.0.0.rc2'
-    gem.add_dependency 'dm-transactions', '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core',   '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-adjust', '~> 1.0.0.rc3'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-is-nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-nested_set}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sindre Aarsaether"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{DataMapper plugin allowing the creation of nested sets from data models}
   s.email = %q{sindre [a] identu [d] no}
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-is-nested_set}
+  s.homepage = %q{http://github.com/datamapper/dm-is-nested_set}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
@@ -53,20 +53,17 @@ 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<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<dm-transactions>, ["~> 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<dm-transactions>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<dm-transactions>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

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

@@ -203,46 +203,44 @@ module DataMapper
             return false
           end
 
-          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 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 = rgt - lft + 1
+          ##
+          # 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 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 = rgt - lft + 1
 
-              # make a gap at position, that is as wide as this node
-              model.base_model.adjust_gap!(nested_set, position - 1, gap)
+            # make a gap at position, that is as wide as this node
+            model.base_model.adjust_gap!(nested_set, position - 1, gap)
 
-              eager_props = model.properties.values_at(:lft, :rgt)
+            eager_props = model.properties.values_at(:lft, :rgt)
 
-              # FIXME don't use @api private
-              # offset this node (and all its descendants) to the right position
-              eager_load(eager_props)
+            # FIXME don't use @api private
+            # offset this node (and all its descendants) to the right position
+            eager_load(eager_props)
 
-              old_position = lft
-              offset = position - old_position
+            old_position = lft
+            offset = position - old_position
 
-              nested_set.all(:rgt => lft..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.
-              model.base_model.adjust_gap!(nested_set, old_position, -gap)
+            # close the gap this movement left behind.
+            model.base_model.adjust_gap!(nested_set, old_position, -gap)
 
-              # FIXME don't use @api private
-              eager_load(eager_props)
+            # FIXME don't use @api private
+            eager_load(eager_props)
 
-            else
-              # make a gap where the new node can be inserted
-              model.base_model.adjust_gap!(nested_set, position - 1, 2)
-              # set the position fields
-              self.lft, self.rgt = position, position + 1
-            end
-            self.parent = ancestor
+          else
+            # make a gap where the new node can be inserted
+            model.base_model.adjust_gap!(nested_set, position - 1, 2)
+            # set the position fields
+            self.lft, self.rgt = position, position + 1
           end
+
+          self.parent = ancestor
         end
 
         ##
@@ -371,10 +369,13 @@ module DataMapper
           self_and_siblings.detect { |v| v.lft == rgt + 1 }
         end
 
-       private
+      private
+
         def detach
-          offset = lft - rgt - 1
-          model.base_model.adjust_gap!(nested_set, rgt, offset)
+          unless lft.nil? || rgt.nil?
+            offset = lft - rgt - 1
+            model.base_model.adjust_gap!(nested_set, rgt, offset)
+          end
           self.lft, self.rgt = nil, nil
         end
 

data/lib/dm-is-nested_set.rb

@@ -1,5 +1,4 @@
 require 'dm-core'
 require 'dm-adjust'
-require 'dm-transactions'
 
 require 'dm-is-nested_set/is/nested_set'

data/spec/integration/nested_set_spec.rb

@@ -25,8 +25,7 @@ require 'spec_helper'
 # |____________________________________________________________________________________________________|
 
 describe DataMapper::Is::NestedSet do
-  before do
-    Object.send(:remove_const, :User) if defined?(User)
+  before :all do
     class ::User
       include DataMapper::Resource
 
@@ -36,48 +35,43 @@ describe DataMapper::Is::NestedSet do
       has n, :categories
     end
 
-    Object.send(:remove_const, :Category) if defined?(Category)
     class ::Category
       include DataMapper::Resource
 
-      property :id,         Serial
-      property :name,       String
-      property :class_name, Discriminator
+      property :id,   Serial
+      property :name, String
+      property :type, Discriminator
 
       belongs_to :user
 
-      is :nested_set, :scope => [:user_id]
+      is :nested_set, :scope => [ :user_id ]
 
       def pos; [lft,rgt] end # convenience method only for speccing.
     end
-
-    Object.send(:remove_const, :CustomCategory) if defined?(CustomCategory)
-    class ::CustomCategory < Category; end
-
-    DataMapper.auto_migrate!
-
-    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
 
   supported_by :sqlite, :mysql, :postgres do
+    before do
+      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
-        DataMapper.repository(:default) do
+        DataMapper.repository do
           plasma = Category.get(5)
           plasma.parent_id.should == 2
           plasma.ancestor.id.should == 2
@@ -97,7 +91,7 @@ describe DataMapper::Is::NestedSet do
 
     describe 'Class#leaves and #leaves' do
       it 'should return all nodes without descendants' do
-        DataMapper.repository(:default) do
+        DataMapper.repository do
           Category.leaves.length.should == 6
 
           r = Category.root
@@ -109,7 +103,7 @@ describe DataMapper::Is::NestedSet do
 
     describe '#ancestor, #ancestors and #self_and_ancestors' do
       it 'should return ancestors in an array' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
           c8 = Category.get(8)
           c8.ancestor.should == Category.get(7)
           c8.ancestor.should == c8.parent
@@ -122,7 +116,7 @@ describe DataMapper::Is::NestedSet do
 
     describe '#children' do
       it 'should return children of node' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
           r = Category.root
           r.children.length.should == 2
 
@@ -136,7 +130,7 @@ describe DataMapper::Is::NestedSet do
 
     describe '#descendants and #self_and_descendants' do
       it 'should return all subnodes of node' do
-        DataMapper.repository(:default) do
+        DataMapper.repository do
           r = Category.get(1)
           r.self_and_descendants.length.should == 10
           r.descendants.length.should == 9
@@ -151,7 +145,7 @@ describe DataMapper::Is::NestedSet do
 
     describe '#siblings and #self_and_siblings' do
       it 'should return all siblings of node' do
-        DataMapper.repository(:default) do
+        DataMapper.repository do
           r = Category.root
           r.self_and_siblings.length.should == 1
           r.descendants.length.should == 9
@@ -180,7 +174,7 @@ describe DataMapper::Is::NestedSet do
       # 10 | 17 | 18 |     - 2 Way Radios
 
       it 'should move items correctly with :higher / :highest / :lower / :lowest' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
 
           Category.get(4).pos.should == [5,6]
 
@@ -211,7 +205,7 @@ describe DataMapper::Is::NestedSet do
       end
 
       it 'should move items correctly with :indent / :outdent' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
 
           mp3_players = Category.get(7)
 
@@ -239,7 +233,7 @@ describe DataMapper::Is::NestedSet do
 
     describe 'moving objects with #move_* #and place_node_at' do
       it 'should set left/right when choosing a parent' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
           Category.auto_migrate!
 
           c1 = @user.categories.create(:name => 'New Electronics')
@@ -292,7 +286,7 @@ describe DataMapper::Is::NestedSet do
 
     describe 'scoping' do
       it 'should detach from list when changing scope' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
           plasma = Category.get(5)
           plasma.pos.should == [7,8]
           plasma.update(:user => @other)
@@ -303,7 +297,7 @@ describe DataMapper::Is::NestedSet do
 
     describe 'integrity' do
       it 'should detach object from list when deleted' do
-        DataMapper.repository(:default) do |repos|
+        DataMapper.repository do
           lcd = Category.get(4)
           lcd.pos.should == [5,6]
           Category.get(3).destroy

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,36 +44,19 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-transactions
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 977940575
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc2
-        version: 1.0.0.rc2
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -84,7 +67,7 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: DataMapper plugin allowing the creation of nested sets from data models
 email: sindre [a] identu [d] no
 executables: []
@@ -115,7 +98,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-nested_set
+homepage: http://github.com/datamapper/dm-is-nested_set
 licenses: []
 
 post_install_message: