dm-is-awesome_set 0.11.1 → 1.0.1

data/.gitignore

@@ -1,2 +1,4 @@
 pkg/*
+.bundle
+*.gem
 

data/Gemfile

@@ -0,0 +1,20 @@
+source 'http://rubygems.org'
+
+gem 'activesupport',       '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => 'active_support'
+
+gem 'dm-core',             '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-core.git'
+gem 'dm-transactions',     '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-transactions.git'
+gem 'dm-migrations',       '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-migrations.git'
+gem 'dm-types',            '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-types.git'
+gem 'dm-validations',      '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-validations.git'
+gem 'dm-adjust',           '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-adjust.git'
+gem 'dm-aggregates',       '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-aggregates.git'
+
+gem 'dm-do-adapter',       '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-do-adapter.git'
+gem 'dm-sqlite-adapter',   '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-sqlite-adapter.git'
+gem 'dm-mysql-adapter',    '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-mysql-adapter.git'
+# gem 'dm-postgres-adapter', '~> 1.0.0',      :git => 'git://github.com/datamapper/dm-postgres-adapter.git'
+
+gem 'rake',                '~> 0.8.7'
+gem 'jeweler',             '~> 1.4'
+gem 'rspec',               '~> 1.3'

data/Rakefile

@@ -1,9 +1,7 @@
-require 'rubygems'
 require 'rake'
 
 begin
 
-  gem 'jeweler', '>= 1.4'
   require 'jeweler'
 
   FileList['tasks/**/*.rake'].each { |task| load task }
@@ -17,9 +15,10 @@ begin
     gem.homepage    = "http://github.com/snusnu/dm-is-awesome_set"
     gem.authors     = ["Jeremy Nicoll", "David Haslem", "Martin Gamsjaeger (snusnu)"]
 
-    gem.add_dependency 'dm-core',           '~> 0.10'
-    gem.add_dependency 'dm-adjust',         '~> 0.10'
-    gem.add_dependency 'dm-aggregates',     '~> 0.10'
+    gem.add_dependency 'dm-core',           '~> 1.0'
+    gem.add_dependency 'dm-adjust',         '~> 1.0'
+    gem.add_dependency 'dm-aggregates',     '~> 1.0'
+    gem.add_dependency 'dm-transactions',     '~> 1.0'
 
     gem.add_development_dependency 'rspec', '~> 1.2.9'
 
@@ -31,5 +30,4 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-task :spec => :check_dependencies
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.11.1
+1.0.1

data/dm-is-awesome_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-awesome_set}
-  s.version = "0.11.1"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Nicoll", "David Haslem", "Martin Gamsjaeger (snusnu)"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-07-09}
   s.description = %q{A library that lets any datamapper model act like a nested set}
   s.email = %q{jnicoll@gnexp.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README",
      "Rakefile",
@@ -40,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/snusnu/dm-is-awesome_set}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A nested set plugin for datamapper}
   s.test_files = [
     "spec/dm-is-awesome_set_spec.rb",
@@ -51,21 +52,24 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10"])
-      s.add_runtime_dependency(%q<dm-adjust>, ["~> 0.10"])
-      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 0.10"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-transactions>, ["~> 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10"])
-      s.add_dependency(%q<dm-adjust>, ["~> 0.10"])
-      s.add_dependency(%q<dm-aggregates>, ["~> 0.10"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0"])
+      s.add_dependency(%q<dm-adjust>, ["~> 1.0"])
+      s.add_dependency(%q<dm-aggregates>, ["~> 1.0"])
+      s.add_dependency(%q<dm-transactions>, ["~> 1.0"])
       s.add_dependency(%q<rspec>, ["~> 1.2.9"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10"])
-    s.add_dependency(%q<dm-adjust>, ["~> 0.10"])
-    s.add_dependency(%q<dm-aggregates>, ["~> 0.10"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0"])
+    s.add_dependency(%q<dm-adjust>, ["~> 1.0"])
+    s.add_dependency(%q<dm-aggregates>, ["~> 1.0"])
+    s.add_dependency(%q<dm-transactions>, ["~> 1.0"])
     s.add_dependency(%q<rspec>, ["~> 1.2.9"])
   end
 end

data/lib/dm-is-awesome_set.rb

@@ -1,4 +1,4 @@
-['dm-core', 'dm-adjust', 'dm-aggregates', 'dm-validations'].each do |dm_var|
+['dm-core', 'dm-adjust', 'dm-aggregates', 'dm-transactions'].each do |dm_var|
   require dm_var
 end
 
@@ -28,7 +28,7 @@ module DataMapper
       def is_awesome_set(options={})
         extend  DataMapper::Is::AwesomeSet::ClassMethods
         include DataMapper::Is::AwesomeSet::InstanceMethods
-
+        
         opts = set_options(options)
         [:child_key, :scope].each {|var| raise "#{var} must be an Array" unless opts[var].is_a?(Array)}
 
@@ -41,7 +41,7 @@ module DataMapper
         belongs_to :parent,  class_opts
         has n,     :children, class_opts
 
-        before :save_self do
+        before :save do
           move_without_saving(:root) if lft.nil? #You don't want to use new_record? here.  Trust me, you don't.
         end
 
@@ -78,7 +78,14 @@ module DataMapper
           check_scope(hash)
           ret = {}
           send_to_obj = hash.is_a?(self)
-          scope_keys.each { |sk| ret[sk] = send_to_obj ? hash.attribute_get(sk) : hash[sk] }
+          
+          scope_keys.each do |sk| 
+            if send_to_obj && self.public_method_defined?(name = sk)
+              ret[sk] = hash.__send__(sk)
+            else
+              ret[sk] = hash[sk] 
+            end
+          end
           ret
         end
 
@@ -157,7 +164,7 @@ module DataMapper
         # @see move_without_saving
 
         def move(vector)
-          transaction do
+          get_class.transaction do
             move_without_saving(vector)
             save!
           end
@@ -218,12 +225,26 @@ module DataMapper
           get_class.all(scope_hash.merge(:rgt.lt => rgt, :lft.gt => lft, :order => [:lft.asc]))
         end
 
-
         # Same as descendents, but returns self as well
         def self_and_descendents
           get_class.all(scope_hash.merge(:rgt.lte => rgt, :lft.gte => lft, :order => [:lft.asc]))
         end
 
+        def descendant?(ancestor)
+          ancestor.lft < lft && ancestor.rgt > rgt
+        end
+
+        def self_or_descendant?(ancestor)
+          ancestor.lft <= lft && ancestor.rgt >= rgt
+        end
+
+        def ancestor?(descendant)
+          descendant.lft > lft && descendant.rgt < rgt
+        end
+
+        def self_or_ancestor?(descendant)
+          descendant.lft >= lft && descendant.rgt <= rgt
+        end
 
         # Fixed spelling for when English majors are peering over your shoulder
         def descendants; descendents; end
@@ -236,35 +257,37 @@ module DataMapper
 
         def attributes_set(hash) #:nodoc:
           hash = hash || {}
-          hash.each { |k,v| attribute_set(k,v) }
+          self.attributes = hash
         end
 
         # Destroys the current node and all children nodes, running their before and after hooks
         # Returns the destroyed objects
         def destroy
-          sads = self_and_descendants
-          hooks = get_class.const_get('INSTANCE_HOOKS')
-          before_methods = hooks[:destroy][:before].map { |hash| hash[:name] }
-          after_methods =  hooks[:destroy][:after].map  { |hash| hash[:name] }
-          # Trigger all the before :destroy methods
-          sads.each { |sad| before_methods.each { |bf| sad.send(bf) } }
-          # dup is called here because destroy! likes to clear out the array, understandably.
-          transaction do
-            sads.dup.destroy!
-            adjust_gap!(full_set, lft, -(rgt - lft + 1))
+          return true if destroyed?
+          catch :halt do
+            sads = self_and_descendants
+            # Trigger all the before :destroy methods
+            sads.each { |sad| sad.before_destroy_hook }
+            # dup is called here because destroy! likes to clear out the array, understandably.
+            get_class.transaction do
+              sads.dup.destroy!
+              adjust_gap!(full_set, lft, -(rgt - lft + 1))
+            end
+            # Now go through after all the after :destroy methods.
+            sads.each { |sad| sad.after_destroy_hook }
           end
-          # Now go through after all the after :destroy methods.
-          sads.each { |sad| after_methods.each { |bf| sad.send(bf) } }
+          destroyed?
         end
 
         # Same as @destroy, but does not run the hooks
         def destroy!
+          return true if destroyed?
           sad = self_and_descendants
-          transaction do
+          get_class.transaction do
             sad.dup.destroy!
             adjust_gap!(full_set, lft, -(rgt - lft + 1))
           end
-          sad
+          destroyed?
         end
 
       protected

data/spec/dm-is-awesome_set_spec.rb

@@ -16,6 +16,8 @@ describe DataMapper::Is::AwesomeSet do
       Category.auto_migrate!
       Discrim1.auto_migrate!
       Discrim2.auto_migrate!
+      FileServer.auto_migrate!
+      FileServerItem.auto_migrate!
     end
 
     it "puts itself as the last root in the defined scope on initial save" do
@@ -30,6 +32,17 @@ describe DataMapper::Is::AwesomeSet do
       c3.pos.should eql([1,2])
       c4.pos.should eql([3,4])
 
+      s1 = FileServer.create({:name => 'foo'})
+      s2 = FileServer.create({:name => 'bar'})
+      f1 = FileServerItem.create({:file_server => s1})
+      f2 = FileServerItem.create({:file_server => s1})
+      f1.pos.should eql([1,2])
+      f2.pos.should eql([3,4])
+      
+      f3 = FileServerItem.create({:file_server => s2})
+      f4 = FileServerItem.create({:file_server => s2})
+      f3.pos.should eql([1,2])
+      f4.pos.should eql([3,4])
     end
 
     it "moves itself into a parent" do
@@ -51,7 +64,8 @@ describe DataMapper::Is::AwesomeSet do
       c3.pos.should eql([3,6])
       c2.pos.should eql([4,5])
 
-      # This is to ensure that
+      # This section is to ensure that scope updates
+      # when moving into a parent with different scope
       c4 = Category.new
       c4.move(:into => c1)
       [c1,c2,c3, c4].each { |c| c.reload }
@@ -61,6 +75,16 @@ describe DataMapper::Is::AwesomeSet do
       c3.pos.should eql([5,8])
       c2.pos.should eql([6,7])
     end
+    
+    it "moves itself into a parent with relationship scope update" do
+      s1 = FileServer.create({:name => 'foo'})
+      f1 = FileServerItem.create({:file_server => s1})
+      f2 = FileServerItem.new
+      f2.sco.should_not eql(f1.sco)
+      f2.move(:into => f1)
+      [f1, f2].each { |f| f.reload }
+      f2.sco.should eql(f1.sco)
+    end
 
     it "moves around properly" do
       c1 = Category.create(scope)
@@ -185,9 +209,26 @@ describe DataMapper::Is::AwesomeSet do
       c3 = Category.create(scope)
       c2.move :into => c1
       c3.move :into => c2
+      c2.root.should_not be_nil
+      c2.root.id.should eql(c1.id)
       c3.root.should_not be_nil
       c3.root.id.should eql(c1.id)
     end
+    
+    it "identifies the root with relationship scopes" do
+      # Root with relationship scope
+      s1 = FileServer.create({:name => 'foo'})
+      f1 = FileServerItem.create({:file_server => s1})
+      f2 = FileServerItem.create({:file_server => s1})
+      f3 = FileServerItem.create({:file_server => s1})
+      f2.move(:into => f1)
+      f3.move(:into => f2)
+      f2.root.should_not be_nil
+      f2.root.id.should eql(f1.id)
+      f3.root.should_not be_nil
+      f3.root.id.should eql(f1.id)
+      
+    end
 
     it "gets all roots in the current scope" do
       c1 = Category.create(scope)
@@ -197,6 +238,18 @@ describe DataMapper::Is::AwesomeSet do
       c3 = Category.create(scope2)
       c4 = Category.create(scope2)
       c3.roots.size.should eql(2)
+      
+      # All roots for scope if relationship in scope
+      s1 = FileServer.create({:name => 'foo'})
+      f1 = FileServerItem.create({:file_server => s1})
+      f2 = FileServerItem.create({:file_server => s1})
+      f2.roots.size.should eql(2)
+      
+      s2 = FileServer.create({:name => 'bar'})
+      f3 = FileServerItem.create({:file_server => s2})
+      f4 = FileServerItem.create({:file_server => s2})
+      f3.roots.size.should eql(2)
+      
     end
 
     it "gets all ancestors" do
@@ -292,7 +345,62 @@ describe DataMapper::Is::AwesomeSet do
       c5.pos.should eql([9,10])
 
       c6.pos.should eql([1,2])
+      
+    end
+    
+    it "moves scope properly with relationships" do
+      # Relationship scope tests
+      s1 = FileServer.create({:name => 'foo'})
+      server1 = {:file_server => s1}
+      f1 = FileServerItem.create({:file_server => s1})
+      f2 = FileServerItem.create({:file_server => s1})
+      f3 = FileServerItem.create({:file_server => s1})
+      
+      s2 = FileServer.create({:name => 'bar'})
+      server2 = {:file_server => s2}
+      f4 = FileServerItem.create({:file_server => s2})
+      f5 = FileServerItem.create({:file_server => s2})
+      f6 = FileServerItem.create({:file_server => s2})
+      
+      f1.move(:into => f4)
+      [f1,f2,f3,f4,f5,f6].each { |c| c.reload }
+      f1.sco.should eql(server2)
+      
+      f2.pos.should eql([1,2])
+      f3.pos.should eql([3,4])
+      
+      f4.pos.should eql([1,4])
+      f1.pos.should eql([2,3])
+      f5.pos.should eql([5,6])
+      f6.pos.should eql([7,8])
+      
+      f4.move(:into => f2)
+      [f1,f2,f3,f4,f5,f6].each { |c| c.reload }
+      f1.sco.should eql(server1)
+      f4.sco.should eql(server1)
+
+      f2.pos.should eql([1,6])
+      f4.pos.should eql([2,5])
+      f1.pos.should eql([3,4])
+      f3.pos.should eql([7,8])
+
 
+      f5.pos.should eql([1,2])
+      f6.pos.should eql([3,4])
+
+      # You can move into the root of a different scope by passing an object from that scope
+      # or a hash that represents that scope
+      f5.move(:root => server1)
+      [f1,f2,f3,f4,f5,f6].each { |c| c.reload }
+      f5.sco.should eql(server1)
+
+      f2.pos.should eql([1,6])
+      f4.pos.should eql([2,5])
+      f1.pos.should eql([3,4])
+      f3.pos.should eql([7,8])
+      f5.pos.should eql([9,10])
+
+      f6.pos.should eql([1,2])
     end
   
     it "should get all rows in the database if the discrimator is not part of scope" do
@@ -312,6 +420,66 @@ describe DataMapper::Is::AwesomeSet do
       Discrim2.roots(scope2.merge(:type => 'CatD22')).size.should eql(2)
     end
     
+    
+    it "should destroy properly" do
+
+      c1 = Category.create(scope)
+      c2 = Category.create(scope)
+
+      c3 = Category.create(scope2)
+      c4 = Category.create(scope2)
+      c5 = Category.create(scope2)
+      c6 = Category.create(scope2)
+      c5.move(:into => c4)
+      [c3,c4,c5,c6].each{|c| c.reload }
+      c4.move(:into => c3)
+      [c3,c4,c5,c6].each{|c| c.reload}
+      c6.move(:into => c3)
+      [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+      
+      c1.pos.should eql([1,2])
+      c2.pos.should eql([3,4])
+      
+      c3.pos.should eql([1,8])
+      c4.pos.should eql([2,5])
+      c5.pos.should eql([3,4])
+      c6.pos.should eql([6,7])
+      # These won't be received without the identity map
+      # c4.should_receive(:before_destroy_hook).once
+      #       c5.should_receive(:before_destroy_hook).once
+      #       c4.should_receive(:after_destroy_hook).once
+      #       c5.should_receive(:after_destroy_hook).once
+      #       c6.should_not_receive(:before_destroy_hook)
+      #       c6.should_not_receive(:after_destroy_hook)
+      
+      lambda {
+        c2.destroy
+      }.should_not raise_error
+      [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+      # c1.destroyed?.should be_false
+      Category.all(:id => c1.id).should_not be_empty
+      # c2.destroyed?.should be_true
+      Category.all(:id => c2.id).should be_empty
+      lambda {
+        c4.destroy
+      }.should_not raise_error
+      [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+      Category.all(:id => c4.id).should be_empty
+      Category.all(:id => c5.id).should be_empty
+      Category.all(:id => c3.id).should_not be_empty
+      Category.all(:id => c6.id).should_not be_empty
+      
+      [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+      
+      c3.pos.should eql([1, 4])
+      c6.pos.should eql([2, 3])
+      lambda {
+        c3.destroy!
+      }.should_not raise_error  
+      Category.all.should have(1).items
+      Category.all.first.should eql(c1)
+    end
+    
   end
   
   describe "with active DM Identity Map" do
@@ -320,6 +488,8 @@ describe DataMapper::Is::AwesomeSet do
       Category.auto_migrate!
       Discrim1.auto_migrate!
       Discrim2.auto_migrate!
+      FileServer.auto_migrate!
+      FileServerItem.auto_migrate!
     end
       
     it "puts itself as the last root in the defined scope on initial save when using the identity map" do
@@ -373,6 +543,19 @@ describe DataMapper::Is::AwesomeSet do
       end
     end
     
+    
+    it "moves itself into a parent with relationship scope update when using the identity map" do
+      repository do
+        s1 = FileServer.create({:name => 'foo'})
+        f1 = FileServerItem.create({:file_server => s1})
+        f2 = FileServerItem.new
+        f2.sco.should_not eql(f1.sco)
+        f2.move(:into => f1)
+        [f1, f2].each { |f| f.reload }
+        f2.sco.should eql(f1.sco)
+      end
+    end
+    
     it "moves around properly when using the identity map" do
       repository do
         c1 = Category.create(scope)
@@ -508,6 +691,23 @@ describe DataMapper::Is::AwesomeSet do
       end
     end
     
+    
+    it "identifies the root with relationship scopes when using the identity map" do
+      # Root with relationship scope
+      repository do
+        s1 = FileServer.create({:name => 'foo'})
+        f1 = FileServerItem.create({:file_server => s1})
+        f2 = FileServerItem.create({:file_server => s1})
+        f3 = FileServerItem.create({:file_server => s1})
+        f2.move(:into => f1)
+        f3.move(:into => f2)
+        f2.root.should_not be_nil
+        f2.root.id.should eql(f1.id)
+        f3.root.should_not be_nil
+        f3.root.id.should eql(f1.id)
+      end
+    end
+    
     it "gets all roots in the current scope when using the identity map" do
       repository do
         c1 = Category.create(scope)
@@ -623,6 +823,64 @@ describe DataMapper::Is::AwesomeSet do
       end
     end
     
+    
+    it "moves scope properly with relationships when using the identity map" do
+      repository do
+        # Relationship scope tests
+        s1 = FileServer.create({:name => 'foo'})
+        server1 = {:file_server => s1}
+        f1 = FileServerItem.create({:file_server => s1})
+        f2 = FileServerItem.create({:file_server => s1})
+        f3 = FileServerItem.create({:file_server => s1})
+    
+        s2 = FileServer.create({:name => 'bar'})
+        server2 = {:file_server => s2}
+        f4 = FileServerItem.create({:file_server => s2})
+        f5 = FileServerItem.create({:file_server => s2})
+        f6 = FileServerItem.create({:file_server => s2})
+    
+        f1.move(:into => f4)
+        [f1,f2,f3,f4,f5,f6].each { |c| c.reload }
+        f1.sco.should eql(server2)
+    
+        f2.pos.should eql([1,2])
+        f3.pos.should eql([3,4])
+    
+        f4.pos.should eql([1,4])
+        f1.pos.should eql([2,3])
+        f5.pos.should eql([5,6])
+        f6.pos.should eql([7,8])
+    
+        f4.move(:into => f2)
+        [f1,f2,f3,f4,f5,f6].each { |c| c.reload }
+        f1.sco.should eql(server1)
+        f4.sco.should eql(server1)
+
+        f2.pos.should eql([1,6])
+        f4.pos.should eql([2,5])
+        f1.pos.should eql([3,4])
+        f3.pos.should eql([7,8])
+
+
+        f5.pos.should eql([1,2])
+        f6.pos.should eql([3,4])
+
+        # You can move into the root of a different scope by passing an object from that scope
+        # or a hash that represents that scope
+        f5.move(:root => server1)
+        [f1,f2,f3,f4,f5,f6].each { |c| c.reload }
+        f5.sco.should eql(server1)
+
+        f2.pos.should eql([1,6])
+        f4.pos.should eql([2,5])
+        f1.pos.should eql([3,4])
+        f3.pos.should eql([7,8])
+        f5.pos.should eql([9,10])
+
+        f6.pos.should eql([1,2])
+      end
+    end
+    
     it "should get all rows in the database if the discrimator is not part of scope when using the identity map" do
       repository do
         c1 = CatD11.create(scope)
@@ -644,6 +902,66 @@ describe DataMapper::Is::AwesomeSet do
       end
     end
     
+    
+    it "should destroy properly when using identity map" do
+      repository do
+        c1 = Category.create(scope)
+        c2 = Category.create(scope)
+
+        c3 = Category.create(scope2)
+        c4 = Category.create(scope2)
+        c5 = Category.create(scope2)
+        c6 = Category.create(scope2)
+        c5.move(:into => c4)
+        [c3,c4,c5,c6].each{|c| c.reload }
+        c4.move(:into => c3)
+        [c3,c4,c5,c6].each{|c| c.reload}
+        c6.move(:into => c3)
+        [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+      
+        c1.pos.should eql([1,2])
+        c2.pos.should eql([3,4])
+      
+        c3.pos.should eql([1,8])
+        c4.pos.should eql([2,5])
+        c5.pos.should eql([3,4])
+        c6.pos.should eql([6,7])
+        c4.should_receive(:before_destroy_hook).once
+        c5.should_receive(:before_destroy_hook).once
+        c4.should_receive(:after_destroy_hook).once
+        c5.should_receive(:after_destroy_hook).once
+        c6.should_not_receive(:before_destroy_hook)
+        c6.should_not_receive(:after_destroy_hook)
+      
+        lambda {
+          c2.destroy
+        }.should_not raise_error
+        [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+        # c1.destroyed?.should be_false
+        Category.all(:id => c1.id).should_not be_empty
+        # c2.destroyed?.should be_true
+        Category.all(:id => c2.id).should be_empty
+        lambda {
+          c4.destroy
+        }.should_not raise_error
+        [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+        Category.all(:id => c4.id).should be_empty
+        Category.all(:id => c5.id).should be_empty
+        Category.all(:id => c3.id).should_not be_empty
+        Category.all(:id => c6.id).should_not be_empty
+      
+        [c1,c2,c3,c4,c5,c6].each { |c| c.reload }
+      
+        c3.pos.should eql([1, 4])
+        c6.pos.should eql([2, 3])
+        lambda {
+          c3.destroy!
+        }.should_not raise_error
+        Category.all.should have(1).items
+        Category.all.first.should eql(c1)
+      end
+    end
+    
   end
 
 

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 
 require 'dm-core'
+require 'dm-migrations'
 require 'dm-adjust'
 require 'dm-aggregates'
-require 'dm-types'
-require 'dm-validations'
+require 'dm-transactions'
 
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'dm-is-awesome_set'
@@ -93,6 +93,26 @@ end
 class CatD22 < Discrim2
 end
 
+class FileServer
+  include DataMapper::Resource
+
+  property :id,       Serial
+  property :name,     String
+end
+
+class FileServerItem
+  include DataMapper::Resource
+
+  property :id,       Serial
+  property :name,     String
+  belongs_to :file_server
+  is :awesome_set, :scope => [:file_server]
+  # convenience methods only for speccing.
+  def pos; [lft,rgt] end
+  def sco; {:file_server => file_server}; end
+  
+end
+
 # Quick hack for ruby 1.8.6 - really, it's a hack. Don't use this anywhere else.
 
 class Hash

data/tasks/spec.rake

@@ -19,7 +19,4 @@ RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
   rcov.threshold = 100
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-awesome_set
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  hash: 21
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jeremy Nicoll
@@ -11,49 +17,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -05:00
+date: 2010-07-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.10"
-    version: 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-adjust
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.10"
-    version: 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: dm-transactions
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.10"
-    version: 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id005
 description: A library that lets any datamapper model act like a nested set
 email: jnicoll@gnexp.com
 executables: []
@@ -66,6 +108,7 @@ extra_rdoc_files:
 - TODO
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README
 - Rakefile
@@ -93,21 +136,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.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A nested set plugin for datamapper