dm-is-nested_set 0.9.9 → 0.9.10

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.9.10 / 2009-01-19
+
+* 2 bug fixes:
+
+  * Fixed problem with multiple repositories and transaction
+  * Fixed problem where the lack of a common identity-map would not
+    close gap / move correctly.
+
 === 0.9.9 / 2009-01-04
 
 * 1 bug fix:

data/lib/dm-is-nested_set.rb

@@ -1,10 +1,10 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.9'
+gem 'dm-core', '~>0.9.10'
 require 'dm-core'
 
-#gem 'dm-adjust', '~>0.9.9'
+#gem 'dm-adjust', '~>0.9.10'
 require 'dm-adjust'
 
 require Pathname(__FILE__).dirname.expand_path / 'dm-is-nested_set' / 'is' / 'nested_set'

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

@@ -199,7 +199,8 @@ module DataMapper
             return false
           end
 
-          transaction do |transaction|
+
+          DataMapper::Transaction.new(self.repository) do |transaction|
 
             ##
             # if this node is already positioned we need to move it, and close the gap it leaves behind etc
@@ -210,23 +211,26 @@ module DataMapper
               raise RecursiveNestingError if position > self.lft && position < self.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
+
               # make a gap at position, that is as wide as this node
               self.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
               offset = position - old_position
+
               nested_set.all(:rgt => self.lft..self.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)
             else
               # make a gap where the new node can be inserted
               self.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
-
           end
         end
 

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

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module NestedSet
-      VERSION = '0.9.9'
+      VERSION = '0.9.10'
     end
   end
 end

data/spec/integration/nested_set_spec.rb

@@ -30,7 +30,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
   describe DataMapper::Is::NestedSet do
     before do
       Object.send(:remove_const, :User) if defined?(User)
-      class User
+      class ::User
         include DataMapper::Resource
 
         property :id, Serial
@@ -40,7 +40,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
 
       Object.send(:remove_const, :Category) if defined?(Category)
-      class Category
+      class ::Category
         include DataMapper::Resource
 
         property :id, Integer, :serial => true
@@ -55,7 +55,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
 
       Object.send(:remove_const, :CustomCategory) if defined?(CustomCategory)
-      class CustomCategory < Category; end
+      class ::CustomCategory < Category; end
 
       DataMapper.auto_migrate!
 

data/tasks/spec.rb

@@ -8,7 +8,7 @@ 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)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-adjust
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 description: DataMapper plugin allowing the creation of nested sets from data models
 email: