dm-is-nested_set 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,26 +5,26 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
 gem 'dm-adjust', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-adjust#{REPO_POSTFIX}"
 
 group :development do
 
-  gem 'jeweler', '~> 1.5.2'
-  gem 'rake',    '~> 0.8.7'
-  gem 'rspec',   '~> 1.3.1'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rake',    '~> 0.9.2'
+  gem 'rspec',   '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-is-nested_set.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-is-nested_set}
-  s.version = "1.1.0"
+  s.name = "dm-is-nested_set"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sindre Aarsaether"]
-  s.date = %q{2011-03-16}
-  s.description = %q{DataMapper plugin allowing the creation of nested sets from data models}
-  s.email = %q{sindre [a] identu [d] no}
+  s.date = "2011-09-09"
+  s.description = "DataMapper plugin allowing the creation of nested sets from data models"
+  s.email = "sindre [a] identu [d] no"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -33,35 +33,31 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-is-nested_set}
+  s.homepage = "http://github.com/datamapper/dm-is-nested_set"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{DataMapper plugin allowing the creation of nested sets from data models}
-  s.test_files = [
-    "spec/integration/nested_set_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "DataMapper plugin allowing the creation of nested sets from data models"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-adjust>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<dm-adjust>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-adjust>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<dm-adjust>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

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

@@ -70,7 +70,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?
-          args = DataMapper::Ext::Array.to_hash(nested_set_parent.zip([]))
+          args = Hash[ nested_set_parent.zip([]) ]
           roots.length > 1 ? false : first(args)
         end
 
@@ -80,7 +80,7 @@ module DataMapper
         def roots
           # TODO scoping
           # TODO supply filtering-option?
-          args = DataMapper::Ext::Array.to_hash(nested_set_parent.zip([]))
+          args = Hash[ nested_set_parent.zip([]) ]
           all(args)
         end
 
@@ -117,8 +117,7 @@ module DataMapper
         #
         # @private
         def nested_set_scope
-          pairs = model.base_model.nested_set_scope.map{ |p| [ p, attribute_get(p) ] }
-          DataMapper::Ext::Array.to_hash(pairs)
+          Hash[ model.base_model.nested_set_scope.map { |p| [ p, attribute_get(p) ] } ]
         end
 
         ##
@@ -126,10 +125,10 @@ module DataMapper
         # @private
         def original_nested_set_scope
           # TODO commit
-          pairs = model.base_model.nested_set_scope.map{ |p|
+          pairs = model.base_model.nested_set_scope.map do |p|
             [ p, (property = properties[p]) && original_attributes.key?(property) ? original_attributes[property] : attribute_get(p) ]
-          }
-          DataMapper::Ext::Array.to_hash(pairs)
+          end
+          Hash[ pairs ]
         end
 
         ##

data/spec/integration/nested_set_spec.rb

@@ -72,7 +72,7 @@ describe DataMapper::Is::NestedSet do
     describe 'Class#rebuild_tree_from_set' do
       it 'should reset all parent_ids correctly' do
         DataMapper.repository do
-          plasma = Category.get(5)
+          plasma = Category.first(:name => 'Plasma')
           plasma.parent_id.should == 2
           plasma.ancestor.id.should == 2
           plasma.pos.should == [7,8]
@@ -104,8 +104,8 @@ describe DataMapper::Is::NestedSet do
     describe '#ancestor, #ancestors and #self_and_ancestors' do
       it 'should return ancestors in an array' do
         DataMapper.repository do
-          c8 = Category.get(8)
-          c8.ancestor.should == Category.get(7)
+          c8 = Category.first(:name => 'Flash')
+          c8.ancestor.should == Category.first(:name => 'MP3 Players')
           c8.ancestor.should == c8.parent
 
           c8.ancestors.map{|a|a.name}.should == ['Electronics','Portable Electronics','MP3 Players']
@@ -131,7 +131,7 @@ describe DataMapper::Is::NestedSet do
     describe '#descendants and #self_and_descendants' do
       it 'should return all subnodes of node' do
         DataMapper.repository do
-          r = Category.get(1)
+          r = Category.first(:name => 'Electronics')
           r.self_and_descendants.length.should == 10
           r.descendants.length.should == 9
           r.name.should == 'Electronics'
@@ -176,30 +176,30 @@ describe DataMapper::Is::NestedSet do
       it 'should move items correctly with :higher / :highest / :lower / :lowest' do
         DataMapper.repository do
 
-          Category.get(4).pos.should == [5,6]
+          Category.first(:name => 'LCD').pos.should == [5,6]
 
-          Category.get(4).move(:above => Category.get(3))
-          Category.get(4).pos.should == [3,4]
+          Category.first(:name => 'LCD').move(:above => Category.first(:name => 'Tube'))
+          Category.first(:name => 'LCD').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.first(:name => 'LCD').move(:higher).should == false
+          Category.first(:name => 'LCD').pos.should == [3,4]
+          Category.first(:name => 'Tube').pos.should == [5,6]
+          Category.first(:name => 'LCD').right_sibling.should == Category.first(:name => 'Tube')
 
-          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.first(:name => 'LCD').move(:lower)
+          Category.first(:name => 'LCD').pos.should == [5,6]
+          Category.first(:name => 'LCD').left_sibling.should == Category.first(:name => 'Tube')
+          Category.first(:name => 'LCD').right_sibling.should == Category.first(:name => 'Plasma')
 
-          Category.get(4).move(:highest)
-          Category.get(4).pos.should == [3,4]
-          Category.get(4).move(:higher).should == false
+          Category.first(:name => 'LCD').move(:highest)
+          Category.first(:name => 'LCD').pos.should == [3,4]
+          Category.first(:name => 'LCD').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.first(:name => 'LCD').move(:lowest)
+          Category.first(:name => 'LCD').pos.should == [7,8]
+          Category.first(:name => 'LCD').left_sibling.should == Category.first(:name => 'Plasma')
 
-          Category.get(4).move(:higher) # should reset the tree to how it was
+          Category.first(:name => 'LCD').move(:higher) # should reset the tree to how it was
 
         end
       end
@@ -207,10 +207,10 @@ describe DataMapper::Is::NestedSet do
       it 'should move items correctly with :indent / :outdent' do
         DataMapper.repository do
 
-          mp3_players = Category.get(7)
+          mp3_players = Category.first(:name => 'MP3 Players')
 
-          portable_electronics = Category.get(6)
-          televisions = Category.get(2)
+          portable_electronics = Category.first(:name => 'Portable Electronics')
+          televisions = Category.first(:name => 'Televisions')
 
           mp3_players.pos.should == [11,14]
           #mp3_players.descendants.length.should == 1
@@ -287,7 +287,7 @@ describe DataMapper::Is::NestedSet do
     describe 'scoping' do
       it 'should detach from list when changing scope' do
         DataMapper.repository do
-          plasma = Category.get(5)
+          plasma = Category.first(:name => 'Plasma')
           plasma.pos.should == [7,8]
           plasma.update(:user => @other)
           plasma.pos.should == [1,2]
@@ -298,9 +298,9 @@ describe DataMapper::Is::NestedSet do
     describe 'integrity' do
       it 'should detach object from list when deleted' do
         DataMapper.repository do
-          lcd = Category.get(4)
+          lcd = Category.first(:name => 'LCD')
           lcd.pos.should == [5,6]
-          Category.get(3).destroy
+          Category.first(:name => 'Tube').destroy
           lcd.pos.should == [3,4]
         end
       end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -10,53 +17,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-adjust
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-adjust
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: rspec
 description: DataMapper plugin allowing the creation of nested sets from data models
 email: sindre [a] identu [d] no
 executables: []
@@ -82,7 +110,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-is-nested_set
 licenses: []
 
@@ -96,20 +123,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin allowing the creation of nested sets from data models
-test_files: 
-- spec/integration/nested_set_spec.rb
-- spec/spec_helper.rb
+test_files: []
+