mongoid_nested_set 0.1.2 → 0.1.3

data/Gemfile

@@ -1,18 +1,19 @@
 source "http://rubygems.org"
 
-gem "mongoid", ">= 2.0.0.beta.20"
+gem "mongoid", ">= 2.1.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 1.5"
   gem "rcov", ">= 0"
-  gem 'rspec-core'
+  gem 'rspec-core', "~> 2.0"
+  gem 'rdoc'
 end
 
 group :test do
-  gem 'rspec-expectations'
+  gem 'rspec-expectations', "~> 2.0"
   gem 'rr'
   gem 'remarkable_mongoid'
   gem 'database_cleaner'

data/Gemfile.lock

@@ -1,59 +1,59 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    bson (1.1.4)
+      i18n (~> 0.5.0)
+    activesupport (3.0.10)
+    bson (1.3.1)
     builder (2.1.2)
-    database_cleaner (0.6.0)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     git (1.2.5)
     i18n (0.5.0)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mongo (1.1.4)
-      bson (>= 1.1.1)
-    mongoid (2.0.0.beta.20)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.1.9)
       activemodel (~> 3.0)
-      mongo (~> 1.1)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    rake (0.8.7)
-    rcov (0.9.9)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rdoc (3.9.4)
     remarkable (4.0.0.alpha4)
       rspec (>= 2.0.0.alpha11)
     remarkable_activemodel (4.0.0.alpha4)
       remarkable (~> 4.0.0.alpha4)
       rspec (>= 2.0.0.alpha11)
-    remarkable_mongoid (0.5.0)
-      remarkable_activemodel (>= 4.0.0.alpha2)
-    rr (1.0.2)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    remarkable_mongoid (0.6.0)
+      remarkable_activemodel (~> 4.0.0.alpha4)
+    rr (1.0.3)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
-    tzinfo (0.3.23)
-    will_paginate (3.0.pre2)
+    rspec-mocks (2.6.0)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.0)
   database_cleaner
-  jeweler (~> 1.5.1)
-  mongoid (>= 2.0.0.beta.20)
+  jeweler (~> 1.5)
+  mongoid (>= 2.1.0)
   rcov
+  rdoc
   remarkable_mongoid
   rr
-  rspec-core
-  rspec-expectations
+  rspec-core (~> 2.0)
+  rspec-expectations (~> 2.0)

data/README.markdown

@@ -22,7 +22,7 @@ Install as Gem
 
 via Gemfile
 
-    gem 'mongoid_nested_set', '0.1.0'
+    gem 'mongoid_nested_set', '0.1.3'
 
 
 ## Usage

data/Rakefile

@@ -34,8 +34,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/mongoid_nested_set/base.rb

@@ -45,10 +45,10 @@ module Mongoid::Acts::NestedSet
 
         field left_field_name, :type => Integer
         field right_field_name, :type => Integer
-        field outline_number_field_name if outline_number_field_name
+        field outline_number_field_name, :type => String if outline_number_field_name
         field :depth, :type => Integer
 
-        references_many :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :default_order => criteria.asc(left_field_name)
+        references_many :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :order => criteria.asc(left_field_name)
         referenced_in   :parent,   :class_name => self.name, :foreign_key => parent_field_name
 
         attr_accessor :skip_before_destroy

data/mongoid_nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_nested_set}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brandon Turner"]
-  s.date = %q{2010-12-29}
+  s.authors = [%q{Brandon Turner}]
+  s.date = %q{2011-08-26}
   s.description = %q{Fully featured tree implementation for Mongoid using the nested set model}
   s.email = %q{bturner@bltweb.net}
   s.extra_rdoc_files = [
@@ -50,48 +50,36 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/thinkwell/mongoid_nested_set}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Nested set based tree implementation for Mongoid}
-  s.test_files = [
-    "spec/matchers/nestedset_pos.rb",
-    "spec/models/circle_node.rb",
-    "spec/models/node.rb",
-    "spec/models/node_without_nested_set.rb",
-    "spec/models/numbering_node.rb",
-    "spec/models/renamed_fields.rb",
-    "spec/models/shape_node.rb",
-    "spec/models/square_node.rb",
-    "spec/models/test_document.rb",
-    "spec/models/unscoped_node.rb",
-    "spec/mongoid_nested_set_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.20"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec-core>, [">= 0"])
+      s.add_development_dependency(%q<rspec-core>, ["~> 2.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.20"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<mongoid>, [">= 2.1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec-core>, [">= 0"])
+      s.add_dependency(%q<rspec-core>, ["~> 2.0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.20"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<mongoid>, [">= 2.1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec-core>, [">= 0"])
+    s.add_dependency(%q<rspec-core>, ["~> 2.0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end
 

data/spec/models/test_document.rb

@@ -21,10 +21,11 @@ module Mongoid::Acts::NestedSet
 
       def test_set_attributes(attrs)
         attrs.each do |key, val|
+          key = key.to_s
           if Mongoid.allow_dynamic_fields ||
-              fields.keys.any? { |k| k.to_s == key.to_s } ||
-              associations.any? { |a| a[0].to_s == key.to_s || a[1].foreign_key.to_s == key.to_s }
-            @attributes[key] = val
+              fields.keys.any? { |k| k.to_s == key } ||
+              associations.any? { |a| a[0].to_s == key || a[1].foreign_key.to_s == key }
+            @attributes[key] = self.typed_value_for(key, val)
           end
         end
         self

data/spec/mongoid_nested_set_spec.rb

@@ -147,9 +147,10 @@ describe "A Mongoid::Document" do
     end
 
     it "has a parent field" do
-      Node.should have_field('parent_id', :type => String)
-      RenamedFields.should have_field('mother_id', :type => String)
-      RenamedFields.should_not have_field('parent_id', :type => String)
+      # Starting in Mongoid 2.0.rc1, all foreign keys are Objects
+      Node.should have_field('parent_id', :type => Object)
+      RenamedFields.should have_field('mother_id', :type => Object)
+      RenamedFields.should_not have_field('parent_id', :type => Object)
     end
 
     it "does not have a number field" do
@@ -684,7 +685,7 @@ describe "A Mongoid::Document" do
       NumberingNode.should respond_to('each_with_outline_number')
     end
 
-    it "does not have a number field" do
+    it "has a number field" do
       NumberingNode.should have_field('number', :type => String)
     end
 

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ Mongoid.configure do |config|
 end
 
 RSpec.configure do |config|
-  config.mock_with RR::Adapters::Rspec
+  config.mock_with :rr
   config.include(Mongoid::Acts::NestedSet::Matchers)
 
   config.before(:suite) do

metadata

@@ -1,105 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid_nested_set
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brandon Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-29 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &25185020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *25185020
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &25184540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *25184540
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &25184060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *25184060
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &25183200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *25183200
+- !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &25182460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: *25182460
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &25070500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *25070500
 description: Fully featured tree implementation for Mongoid using the nested set model
 email: bturner@bltweb.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -131,49 +116,32 @@ files:
 - spec/models/unscoped_node.rb
 - spec/mongoid_nested_set_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/thinkwell/mongoid_nested_set
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1884730706523752762
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -922553073555053444
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Nested set based tree implementation for Mongoid
-test_files: 
-- spec/matchers/nestedset_pos.rb
-- spec/models/circle_node.rb
-- spec/models/node.rb
-- spec/models/node_without_nested_set.rb
-- spec/models/numbering_node.rb
-- spec/models/renamed_fields.rb
-- spec/models/shape_node.rb
-- spec/models/square_node.rb
-- spec/models/test_document.rb
-- spec/models/unscoped_node.rb
-- spec/mongoid_nested_set_spec.rb
-- spec/spec_helper.rb
+test_files: []