dm-is-nested_set 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,12 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+lib/dm-is-nested_set.rb
+lib/dm-is-nested_set/is/nested_set.rb
+lib/dm-is-nested_set/is/version.rb
+spec/integration/nested_set_spec.rb
+spec/spec.opts
+spec/spec_helper.rb

data/{README → README.txt}

@@ -1,5 +1,4 @@
-dm-is-nested_set
-================
+= dm-is-nested_set
 
 DataMapper plugin allowing the creation of nested sets from data models.
 Provides all the same functionality as dm-is-tree, plus tons more! Read on.

data/Rakefile

@@ -1,51 +1,44 @@
 require 'rubygems'
 require 'spec'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 require 'pathname'
 
-CLEAN.include '{log,pkg}/'
+ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/dm-is-nested_set/is/version'
 
-spec = Gem::Specification.new do |s|
-  s.name             = 'dm-is-nested_set'
-  s.version          = '0.9.2'
-  s.platform         = Gem::Platform::RUBY
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w[ README LICENSE TODO ]
-  s.summary          = 'DataMapper plugin allowing the creation of nested sets from data models'
-  s.description      = s.summary
-  s.author           = 'Sindre Aarsaether'
-  s.email            = 'sindre@identu.no'
-  s.homepage         = 'http://github.com/sam/dm-more/tree/master/dm-is-nested_set'
-  s.require_path     = 'lib'
-  s.files            = FileList[ '{lib,spec}/**/*.rb', 'spec/spec.opts', 'Rakefile', *s.extra_rdoc_files ]
-  s.add_dependency('dm-core', "=#{s.version}")
-end
+AUTHOR = "Sindre Aarsaether"
+EMAIL  = "sindre [a] identu [d] no"
+GEM_NAME = "dm-is-nested_set"
+GEM_VERSION = DataMapper::Is::NestedSet::VERSION
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_CLEAN = ["log", "pkg"]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+
+PROJECT_NAME = "datamapper"
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-is-nested_set"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin allowing the creation of nested sets from data models"
+
+require ROOT.parent + 'tasks/hoe'
 
 task :default => [ :spec ]
 
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
 SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install #{spec.name} #{spec.version} (default ruby)"
+desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources", :verbose => false
+  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
 end
 
-desc "Uninstall #{spec.name} #{spec.version} (default ruby)"
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{spec.name} -v#{spec.version} -I -x", :verbose => false
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
 namespace :jruby do
-  desc "Install #{spec.name} #{spec.version} with JRuby"
+  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
   task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources}, :verbose => false
+    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
   end
 end
 

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

@@ -24,21 +24,6 @@ module DataMapper
         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]
 
-        #before :create do
-        #  # scenarios:
-        #  # - user creates a new object and does not specify a parent
-        #  # - user creates a new object with a direct reference to a parent
-        #  # - user spawnes a new object, and then moves it to a position
-        #  if !self.parent
-        #    self.class.root ? self.move_without_saving(:into => self.class.root) : self.move_without_saving(:to => 1)
-        #    # if this is actually root, it will not move a bit (as lft is already 1)
-        #  elsif self.parent && !self.lft
-        #    # user has set a parent before saving (and without moving it anywhere). just move into that, and continue
-        #    # might be som problems here if the referenced parent is not saved.
-        #    self.move_without_saving(:into => self.parent)
-        #  end
-        #end
-
         before :save do
           if self.new_record?
             if !self.parent
@@ -62,17 +47,14 @@ module DataMapper
           end
         end
 
-        #before :update do
-        #  # scenarios:
-        #  # - user moves the object to a position
-        #  # - user has changed the parent
-        #  # - user has removed any reference to a parent
-        #  # - user sets the parent_id to something, and then use #move before saving
-        #  if (self.parent && !self.lft) || (self.parent != self.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)
-        #  end
-        #end
+        before :destroy do
+          self.send(:detach)
+        end
+
+        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
 
       end
 
@@ -90,7 +72,7 @@ module DataMapper
         def root
           # TODO scoping
           # what should this return if there is a scope? always false, or node if there is only one?
-          roots.length > 1 ? false : roots.first
+          roots.length > 1 ? false : first(nested_set_parent.zip([]).to_hash)
         end
 
         ##
@@ -376,6 +358,13 @@ module DataMapper
         def right_sibling
           self_and_siblings.find{|v| v.lft == rgt+1}
         end
+        
+       private
+        def detach
+          offset = self.lft - self.rgt - 1
+          self.class.adjust_gap!(nested_set,self.rgt,offset)
+          self.lft,self.rgt = nil,nil
+        end
 
       end
 

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

@@ -0,0 +1,7 @@
+module DataMapper
+  module Is
+    module NestedSet
+      VERSION = "0.9.3"
+    end
+  end
+end

data/lib/dm-is-nested_set.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.2'
+gem 'dm-core', '=0.9.3'
 require 'dm-core'
 
-gem 'dm-adjust', '=0.9.2'
+gem 'dm-adjust', '=0.9.3'
 require 'dm-adjust'
 
 require Pathname(__FILE__).dirname.expand_path / 'dm-is-nested_set' / 'is' / 'nested_set.rb'

data/spec/integration/nested_set_spec.rb

@@ -17,15 +17,17 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     property :id, Integer, :serial => true
     property :name, String
+    property :class_name, Discriminator
 
     belongs_to :user
 
     is :nested_set, :scope => [:user_id]
 
-
-
-    # convenience method only for speccing.
-    def pos; [lft,rgt] end
+    def pos; [lft,rgt] end # convenience method only for speccing.
+  end
+  
+  class CustomCategory < Category
+    
   end
 
   def setup
@@ -36,16 +38,16 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       @john = User.create!(:name => "john")
 
       Category.auto_migrate!
-      electronics  = Category.create!(:id => 1, :name => "Electronics")
-      televisions  = Category.create!(:id => 2, :parent_id => 1,  :name => "Televisions")
-      tube         = Category.create!(:id => 3, :parent_id => 2,  :name => "Tube")
-      lcd          = Category.create!(:id => 4, :parent_id => 2,  :name => "LCD")
-      plasma       = Category.create!(:id => 5, :parent_id => 2,  :name => "Plasma")
-      portable_el  = Category.create!(:id => 6, :parent_id => 1,  :name => "Portable Electronics")
-      mp3_players  = Category.create!(:id => 7, :parent_id => 6,  :name => "MP3 Players")
-      flash        = Category.create!(:id => 8, :parent_id => 7,  :name => "Flash")
-      cd_players   = Category.create!(:id => 9, :parent_id => 6,  :name => "CD Players")
-      radios       = Category.create!(:id => 10,:parent_id => 6,  :name => "2 Way Radios")
+      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")
     end
   end
 
@@ -75,12 +77,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
   # |                                       Electronics                                                  |
   # |____________________________________________________________________________________________________|
 
-
-
   describe 'DataMapper::Is::NestedSet' do
-    before :all do
-
-    end
 
     describe 'Class#rebuild_tree_from_set' do
       it 'should reset all parent_ids correctly' do
@@ -95,13 +92,13 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         end
       end
     end
-
+    
     describe 'Class#root and #root' do
       it 'should return the toplevel node' do
         Category.root.name.should == "Electronics"
       end
     end
-
+    
     describe 'Class#leaves and #leaves' do
       it 'should return all nodes without descendants' do
         repository(:default) do
@@ -113,7 +110,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         end
       end
     end
-
+    
     describe '#ancestor, #ancestors and #self_and_ancestors' do
       it 'should return ancestors in an array' do
         repository(:default) do |repos|
@@ -126,7 +123,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         end
       end
     end
-
+    
     describe '#children' do
       it 'should return children of node' do
         repository(:default) do |repos|
@@ -141,14 +138,17 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
 
+    Category.get(1).children 
+
     describe '#descendants and #self_and_descendants' do
       it 'should return all subnodes of node' do
         repository(:default) do
-          r = Category.root
+          r = Category.get(1)
           r.self_and_descendants.length.should == 10
           r.descendants.length.should == 9
-
+          r.name.should == "Electronics"
           t = r.children[1]
+          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"]
         end
@@ -170,7 +170,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     describe '#move' do
-
+    
       # Outset:
       # id | lft| rgt| title
       #========================================
@@ -184,128 +184,140 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       # 8  | 12 | 13 |       - Flash
       # 9  | 15 | 16 |     - CD Players
       # 10 | 17 | 18 |     - 2 Way Radios
-
-
+    
       it 'should move items correctly with :higher / :highest / :lower / :lowest' do
         repository(:default) do |repos|
-
+    
           Category.get(4).pos.should == [5,6]
-
+    
           Category.get(4).move(:above => Category.get(3))
           Category.get(4).pos.should == [3,4]
-
+    
           Category.get(4).move(:higher).should == false
           Category.get(4).pos.should == [3,4]
           Category.get(3).pos.should == [5,6]
           Category.get(4).right_sibling.should == Category.get(3)
-
+    
           Category.get(4).move(:lower)
           Category.get(4).pos.should == [5,6]
           Category.get(4).left_sibling.should == Category.get(3)
           Category.get(4).right_sibling.should == Category.get(5)
-
+    
           Category.get(4).move(:highest)
           Category.get(4).pos.should == [3,4]
           Category.get(4).move(:higher).should == false
-
+    
           Category.get(4).move(:lowest)
           Category.get(4).pos.should == [7,8]
           Category.get(4).left_sibling.should == Category.get(5)
-
+    
           Category.get(4).move(:higher) # should reset the tree to how it was
-
+    
         end
       end
-
+    
       it 'should move items correctly with :indent / :outdent' do
         repository(:default) do |repos|
-
+    
           mp3_players = Category.get(7)
-
+    
           portable_electronics = Category.get(6)
           televisions = Category.get(2)
-
+    
           mp3_players.pos.should == [11,14]
           #mp3_players.descendants.length.should == 1
-
+    
           # The category is at the top of its parent, should not be able to indent.
           mp3_players.move(:indent).should == false
-
+    
           mp3_players.move(:outdent)
-
+    
           mp3_players.pos.should == [16,19]
           mp3_players.left_sibling.should == portable_electronics
-
+    
           mp3_players.move(:higher) # Move up above Portable Electronics
-
+    
           mp3_players.pos.should == [10,13]
           mp3_players.left_sibling.should == televisions
         end
       end
     end
-
+    
     describe 'moving objects with #move_* #and place_node_at' do
       it 'should set left/right when choosing a parent' do
         repository(:default) do |repos|
           Category.auto_migrate!
-
+    
           c1 = Category.create!(:name => "New Electronics")
-
+    
           c2 = Category.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.parent=c1
           c3.save
-
+    
           c1.pos.should == [1,6]
           c2.pos.should == [2,3]
           c3.pos.should == [4,5]
-
+    
           c3.parent=c2
           c3.save
-
+    
           c1.pos.should == [1,6]
           c2.pos.should == [2,5]
           c3.pos.should == [3,4]
-
+    
           c3.parent=c1
           c3.move(:into => c2)
-
+    
           c1.pos.should == [1,6]
           c2.pos.should == [2,5]
           c3.pos.should == [3,4]
-
+    
           c4 = Category.create(:name => "Tube", :parent => c2)
           c5 = Category.create(:name => "Flatpanel", :parent => c2)
-
+    
           c1.pos.should == [1,10]
           c2.pos.should == [2,9]
           c3.pos.should == [3,4]
           c4.pos.should == [5,6]
           c5.pos.should == [7,8]
-
+    
           c5.move(:above => c3)
           c3.pos.should == [5,6]
           c4.pos.should == [7,8]
           c5.pos.should == [3,4]
-
+    
         end
       end
     end
-
+    
     describe 'scoping' do
       it 'should detach from list when changing scope' do
-        setup
-        plasma = Category.get(5)
-        plasma.pos.should == [7,8]
-        plasma.user_id = 1
-        plasma.save
-
-        plasma.pos.should == [1,2]
+        repository(:default) do |repos|
+          setup
+          plasma = Category.get(5)
+          plasma.pos.should == [7,8]
+          plasma.user_id = 1
+          plasma.save
+          plasma.pos.should == [1,2]
+        end
+      end
+    end
+    
+    describe 'integrity' do
+      it 'should detach object from list when deleted' do
+        repository(:default) do |repos|
+          setup
+          lcd = Category.get(4)
+          lcd.pos.should == [5,6]
+          Category.get(3).destroy
+          lcd.pos.should == [3,4]
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -10,10 +10,11 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.2'
+    gem lib, '=0.9.3'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
+    DataObjects::Sqlite3.logger = DataObjects::Logger.new(Pathname(__FILE__).dirname+'dm.log',0)
     true
   rescue Gem::LoadError => e
     warn "Could not load #{lib}: #{e}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,43 +9,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05: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.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: DataMapper plugin allowing the creation of nested sets from data models
-email: sindre@identu.no
+email: 
+- sindre [a] identu [d] no
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.txt
 - LICENSE
 - TODO
 files: 
-- lib/dm-is-nested_set/is/nested_set.rb
+- History.txt
+- LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
 - lib/dm-is-nested_set.rb
+- lib/dm-is-nested_set/is/nested_set.rb
+- lib/dm-is-nested_set/is/version.rb
 - spec/integration/nested_set_spec.rb
-- spec/spec_helper.rb
 - spec/spec.opts
-- Rakefile
-- README
-- LICENSE
-- TODO
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-is-nested_set
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -62,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: datamapper
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin allowing the creation of nested sets from data models