dm-is-nested_set 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,3 @@
+=== 0.9.8 / 2008-12-07
 
+* No changes this version

data/Manifest.txt

@@ -10,3 +10,5 @@ lib/dm-is-nested_set/is/version.rb
 spec/integration/nested_set_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,58 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-is-nested_set/is/version'
 
-AUTHOR = "Sindre Aarsaether"
-EMAIL  = "sindre [a] identu [d] no"
-GEM_NAME = "dm-is-nested_set"
+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'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
-
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
+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 ] }
 
-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)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin allowing the creation of nested sets from data models'
 
-  begin
-    t.rcov = 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 Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

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

@@ -24,26 +24,24 @@ 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 :save do
-          if self.new_record?
-            if !self.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)
-            end
-          else
-
-            if self.nested_set_scope != self.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)
-              # 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
+        before :create do
+          if !self.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)
+          end
+        end
 
+        before :update do
+          if self.nested_set_scope != self.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)
+            # 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
 

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

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module NestedSet
-      VERSION = "0.9.7"
+      VERSION = '0.9.8'
     end
   end
 end

data/lib/dm-is-nested_set.rb

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

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,23 +1,26 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-nested_set'
+
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# 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?
+
+require ROOT + 'lib/dm-is-nested_set'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
-  lib = "do_#{name}"
-
   begin
-    gem lib, '~>0.9.7'
-    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}"
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  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)
+
+    begin
+      gem 'rcov', '~>0.8'
+      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
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,19 +18,19 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
+  name: dm-adjust
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.9.8
     version: 
 description: DataMapper plugin allowing the creation of nested sets from data models
 email: 
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -56,6 +57,8 @@ files:
 - spec/integration/nested_set_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-is-nested_set
 post_install_message: