dm-is-nested_set 0.9.6 → 0.9.7

data/lib/dm-is-nested_set.rb

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

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

@@ -163,8 +163,7 @@ module DataMapper
         # @raise <UnableToPositionError> if node is unable to calculate a new position for the element
         # @see move_without_saving
         def move(vector)
-          move_without_saving(vector)
-          save
+          move_without_saving(vector) && save
         end
 
         ##

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

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

data/spec/integration/nested_set_spec.rb

@@ -3,56 +3,6 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
-  class User
-    include DataMapper::Resource
-
-    property :id, Serial
-    property :name, String
-
-    has n, :categories
-  end
-
-  class Category
-    include DataMapper::Resource
-
-    property :id, Integer, :serial => true
-    property :name, String
-    property :class_name, Discriminator
-
-    belongs_to :user
-
-    is :nested_set, :scope => [:user_id]
-
-    def pos; [lft,rgt] end # convenience method only for speccing.
-  end
-
-  class CustomCategory < Category
-
-  end
-
-  def setup
-    repository(:default) do
-
-      User.auto_migrate!
-      @paul = User.create!(:name => "paul")
-      @john = User.create!(:name => "john")
-
-      Category.auto_migrate!
-      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
-
-  setup
-
   # id | lft| rgt| title
   #========================================
   # 1  | 1  | 20 | - Electronics
@@ -77,7 +27,54 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
   # |                                       Electronics                                                  |
   # |____________________________________________________________________________________________________|
 
-  describe 'DataMapper::Is::NestedSet' do
+  describe DataMapper::Is::NestedSet do
+    before do
+      Object.send(:remove_const, :User) if defined?(User)
+      class User
+        include DataMapper::Resource
+
+        property :id, Serial
+        property :name, String
+
+        has n, :categories
+      end
+
+      Object.send(:remove_const, :Category) if defined?(Category)
+      class Category
+        include DataMapper::Resource
+
+        property :id, Integer, :serial => true
+        property :name, String
+        property :class_name, Discriminator
+
+        belongs_to :user
+
+        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!
+
+      repository(:default) do
+        @paul = User.create(:name => "paul")
+        @john = User.create(:name => "john")
+
+        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
 
     describe 'Class#rebuild_tree_from_set' do
       it 'should reset all parent_ids correctly' do
@@ -138,8 +135,6 @@ 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
@@ -248,9 +243,9 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         repository(:default) do |repos|
           Category.auto_migrate!
 
-          c1 = Category.create!(:name => "New Electronics")
+          c1 = Category.create(:name => "New Electronics")
 
-          c2 = Category.create!(:name => "OLED TVs")
+          c2 = Category.create(:name => "OLED TVs")
 
           c1.pos.should == [1,4]
           c1.root.should == c1
@@ -299,7 +294,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     describe 'scoping' do
       it 'should detach from list when changing scope' do
         repository(:default) do |repos|
-          setup
           plasma = Category.get(5)
           plasma.pos.should == [7,8]
           plasma.user_id = 1
@@ -312,7 +306,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     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

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '>=0.9.5'
+    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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -06:00
+date: 2008-11-18 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.6
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: DataMapper plugin allowing the creation of nested sets from data models
 email: 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin allowing the creation of nested sets from data models