dm-is-nested_set 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ 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.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-is-nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-nested_set}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   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-01}
+  s.date = %q{2011-03-10}
   s.description = %q{DataMapper plugin allowing the creation of nested sets from data models}
   s.email = %q{sindre [a] identu [d] no}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-is-nested_set}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  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",
@@ -47,18 +47,18 @@ Gem::Specification.new do |s|
     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.rc2"])
+      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.1.0.rc3"])
       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"])
     else
-      s.add_dependency(%q<dm-adjust>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-adjust>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-adjust>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-adjust>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

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

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

metadata

@@ -2,7 +2,7 @@
 name: dm-is-nested_set
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin allowing the creation of nested sets from data models