mongo_mapper 0.5.7 → 0.5.8

data/Rakefile

@@ -1,16 +1,18 @@
 require 'rubygems'
 require 'rake'
 require 'jeweler'
+require 'yard'
+require 'yard/rake/yardoc_task'
+
 Jeweler::Tasks.new do |gem|
   gem.name        = "mongo_mapper"
   gem.summary     = %Q{Awesome gem for modeling your domain and storing it in mongo}
-  gem.description = %Q{Awesome gem for modeling your domain and storing it in mongo}
   gem.email       = "nunemaker@gmail.com"
   gem.homepage    = "http://github.com/jnunemaker/mongomapper"
   gem.authors     = ["John Nunemaker"]
   
   gem.add_dependency('activesupport', '>= 2.3')
-  gem.add_dependency('mongo', '0.15.1')
+  gem.add_dependency('mongo', '0.16')
   gem.add_dependency('jnunemaker-validatable', '1.8.0')
   
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
@@ -47,3 +49,7 @@ end
 
 task :default  => :test
 task :test     => :check_dependencies
+
+YARD::Rake::YardocTask.new(:doc) do |t|
+  t.options = ["--legacy"]
+end

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/lib/mongo_mapper/associations/many_documents_proxy.rb

@@ -56,6 +56,12 @@ module MongoMapper
         apply_scope(doc).save
         doc
       end
+      
+      def create!(attrs={})
+        doc = klass.new(attrs)
+        apply_scope(doc).save!
+        doc
+      end
 
       def destroy_all(options={})
         all(options).map(&:destroy)

data/mongo_mapper.gemspec

@@ -5,13 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-10-29}
   s.default_executable = %q{mmconsole}
-  s.description = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
   s.extra_rdoc_files = [
@@ -142,7 +141,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.16"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -150,7 +149,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.15.1"])
+      s.add_dependency(%q<mongo>, ["= 0.16"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -159,7 +158,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.15.1"])
+    s.add_dependency(%q<mongo>, ["= 0.16"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Status.collection.clear
-    Project.collection.clear
+    Status.collection.remove
+    Project.collection.remove
   end
   
   should "default to nil" do
@@ -14,7 +14,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   end
 
   should "be able to replace the association" do
-    status = Status.new
+    status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
     status.save.should be_true
@@ -27,7 +27,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   end
 
   should "unset the association" do
-    status = Status.new
+    status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
     status.save.should be_true
@@ -41,7 +41,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   
   context "association id set but document not found" do
     setup do
-      @status = Status.new
+      @status = Status.new(:name => 'Foo!')
       project = Project.new(:name => "mongomapper")
       @status.target = project
       @status.save.should be_true

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class BelongsToProxyTest < Test::Unit::TestCase
   def setup
-    Status.collection.clear
-    Project.collection.clear
+    Status.collection.remove
+    Project.collection.remove
   end
   
   should "default to nil" do
@@ -14,7 +14,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   end
   
   should "be able to replace the association" do
-    status = Status.new
+    status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.project = project
     status.save.should be_true
@@ -25,7 +25,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   end
   
   should "unset the association" do
-    status = Status.new
+    status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.project = project
     status.save.should be_true

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyDocumentsAsProxyTest < Test::Unit::TestCase
   def setup
-    Post.collection.clear
-    PostComment.collection.clear
+    Post.collection.remove
+    PostComment.collection.remove
   end
 
   should "default reader to empty array" do

data/test/functional/associations/test_many_embedded_polymorphic_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Catalog.collection.clear
-    TrModels::Fleet.collection.clear
+    Catalog.collection.remove
+    TrModels::Fleet.collection.remove
   end
   
   should "default reader to empty array" do

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyEmbeddedProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.clear
-    RealPerson.collection.clear
+    Project.collection.remove
+    RealPerson.collection.remove
   end
     
   should "default reader to empty array" do
@@ -45,7 +45,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :person, Person
     end
-    @document.collection.clear
+    @document.collection.remove
     
     meg = Person.new(:name => "Meg")
     meg.child = Person.new(:name => "Steve")
@@ -92,7 +92,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
         set_collection_name 'test'
         many :people
       end
-      @document.collection.clear
+      @document.collection.remove
     end
 
     should "persist all embedded documents" do

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Room.collection.clear
-    Message.collection.clear
+    Room.collection.remove
+    Message.collection.remove
   end
   
   should "default reader to empty array" do

data/test/functional/associations/test_many_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.clear
-    Status.collection.clear
+    Project.collection.remove
+    Status.collection.remove
   end
   
   should "default reader to empty array" do
@@ -14,9 +14,9 @@ class ManyProxyTest < Test::Unit::TestCase
 
   should "allow adding to association like it was an array" do
     project = Project.new
-    project.statuses <<     Status.new
-    project.statuses.push   Status.new
-    project.statuses.concat Status.new
+    project.statuses <<     Status.new(:name => 'Foo1!')
+    project.statuses.push   Status.new(:name => 'Foo2!')
+    project.statuses.concat Status.new(:name => 'Foo3!')
     project.statuses.size.should == 3
   end
 
@@ -59,14 +59,14 @@ class ManyProxyTest < Test::Unit::TestCase
   context "create" do
     should "assign foreign key" do
       project = Project.create
-      status = project.statuses.create
+      status = project.statuses.create(:name => 'Foo!')
       status.project_id.should == project.id
     end
     
     should "save record" do
       project = Project.create
       lambda {
-        project.statuses.create
+        project.statuses.create(:name => 'Foo!')
       }.should change { Status.count }
     end
     
@@ -77,13 +77,42 @@ class ManyProxyTest < Test::Unit::TestCase
     end
   end
   
+  context "create!" do
+    should "assign foreign key" do
+      project = Project.create
+      status = project.statuses.create!(:name => 'Foo!')
+      status.project_id.should == project.id
+    end
+    
+    should "save record" do
+      project = Project.create
+      lambda {
+        project.statuses.create!(:name => 'Foo!')
+      }.should change { Status.count }
+    end
+    
+    should "allow passing attributes" do
+      project = Project.create
+      status = project.statuses.create!(:name => 'Foo!')
+      status.name.should == 'Foo!'
+    end
+    
+    should "raise exception if not valid" do
+      project = Project.create
+      lambda {
+        project.statuses.create!(:name => nil)
+      }.should raise_error(MongoMapper::DocumentNotValid)
+    end
+  end
+  
+  
   context "count" do
     should "work scoped to association" do
       project = Project.create
-      3.times { project.statuses.create }
+      3.times { project.statuses.create(:name => 'Foo!') }
       
       other_project = Project.create
-      2.times { other_project.statuses.create }
+      2.times { other_project.statuses.create(:name => 'Foo!') }
       
       project.statuses.count.should == 3
       other_project.statuses.count.should == 2

data/test/functional/test_associations.rb

@@ -8,7 +8,7 @@ class AssociationsTest < Test::Unit::TestCase
       
       many :posts, :class_name => 'AssociationsTest::AwesomePost', :foreign_key => :creator_id
     end
-    AwesomeUser.collection.clear
+    AwesomeUser.collection.remove
     
     class AwesomeTag
       include MongoMapper::EmbeddedDocument
@@ -28,8 +28,8 @@ class AssociationsTest < Test::Unit::TestCase
       many :tags, :class_name => 'AssociationsTest::AwesomeTag', :foreign_key => :post_id
     end
     
-    AwesomeUser.collection.clear
-    AwesomePost.collection.clear
+    AwesomeUser.collection.remove
+    AwesomePost.collection.remove
     
     user = AwesomeUser.create
     tag1 = AwesomeTag.new(:name => 'awesome')

data/test/functional/test_binary.rb

@@ -7,7 +7,7 @@ class BinaryTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :contents, Binary
     end
-    klass.collection.clear
+    klass.collection.remove
     
     doc = klass.new(:contents => '010101')
     doc.save

data/test/functional/test_callbacks.rb

@@ -30,7 +30,7 @@ class CallbacksTest < Test::Unit::TestCase
           @history = nil
         end
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "get the order right for creating documents" do

data/test/functional/test_dirty.rb

@@ -8,10 +8,10 @@ class DirtyTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :phrase, String
     end
-    @document.collection.clear
+    @document.collection.remove
     
-    Status.collection.clear
-    Project.collection.clear
+    Status.collection.remove
+    Project.collection.remove
   end
   
   context "marking changes" do

data/test/functional/test_document.rb

@@ -12,7 +12,7 @@ class DocumentTest < Test::Unit::TestCase
       key :age, Integer
       key :date, Date
     end
-    @document.collection.clear
+    @document.collection.remove
   end
 
   context "Saving a document with a custom id" do
@@ -194,7 +194,7 @@ class DocumentTest < Test::Unit::TestCase
           include MongoMapper::Document
           set_collection_name 'test'
         end
-        @document.collection.clear
+        @document.collection.remove
       end
 
       should "create the document" do
@@ -569,13 +569,13 @@ class DocumentTest < Test::Unit::TestCase
         class ::Property
           include MongoMapper::Document
         end
-        Property.collection.clear
+        Property.collection.remove
 
         class ::Thing
           include MongoMapper::Document
           key :name, String
         end
-        Thing.collection.clear
+        Thing.collection.remove
       end
 
       teardown do
@@ -701,7 +701,7 @@ class DocumentTest < Test::Unit::TestCase
           include MongoMapper::Document
           set_collection_name 'foobarbazwickdoesnotexist'
         end
-        @document.collection.clear
+        @document.collection.remove
 
         klass.count.should == 0
       end
@@ -952,7 +952,7 @@ class DocumentTest < Test::Unit::TestCase
         key :_type, String
         key :name, String
       end
-      DocParent.collection.clear
+      DocParent.collection.remove
 
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end

data/test/functional/test_embedded_document.rb

@@ -10,7 +10,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       key :first_name, String
       key :last_name, String
     end
-    @document.collection.clear
+    @document.collection.remove
   end
     
   context "Saving a document with an embedded document" do

data/test/functional/test_pagination.rb

@@ -13,7 +13,7 @@ class PaginationTest < Test::Unit::TestCase
         
         def self.per_page; 1 end
       end
-      @document.collection.clear
+      @document.collection.remove
       
       @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})

data/test/functional/test_rails_compatibility.rb

@@ -14,7 +14,7 @@ class TestRailsCompatibility < Test::Unit::TestCase
   
   context "Document" do
     setup do
-      Order.collection.clear
+      Order.collection.remove
     end
 
     should "alias new to new_record?" do

data/test/functional/test_validations.rb

@@ -8,7 +8,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "not insert document" do
@@ -32,7 +32,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "raise error" do
@@ -48,7 +48,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "raise error" do
@@ -68,7 +68,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
       
       @doc = @document.create(:name => 'John Nunemaker')
     end
@@ -97,7 +97,7 @@ class ValidationsTest < Test::Unit::TestCase
           errors.add(:action, 'is invalid') if action.blank?
         end
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "work with validate_on_create callback" do
@@ -140,7 +140,7 @@ class ValidationsTest < Test::Unit::TestCase
         key :name, String
         validates_uniqueness_of :name
       end
-      @document.collection.clear
+      @document.collection.remove
     end
 
     should "not fail if object is new" do
@@ -223,7 +223,7 @@ class ValidationsTest < Test::Unit::TestCase
           key :scope, String
           validates_uniqueness_of :name, :scope => :scope
         end
-        @document.collection.clear
+        @document.collection.remove
       end
       
       should "fail if the same name exists in the scope" do
@@ -264,7 +264,7 @@ class ValidationsTest < Test::Unit::TestCase
           key :second_scope, String
           validates_uniqueness_of :name, :scope => [:first_scope, :second_scope]
         end
-        @document.collection.clear
+        @document.collection.remove
       end
       
       should "fail if the same name exists in the scope" do
@@ -303,7 +303,7 @@ class ValidationsTest < Test::Unit::TestCase
         
         key :name, String, :unique => true
       end
-      @document.collection.clear
+      @document.collection.remove
       
       doc = @document.create(:name => 'John')
       doc.should_not have_error_on(:name)

data/test/models.rb

@@ -109,23 +109,24 @@ class Answer
   key :body, String
 end
 
+module PeopleExtensions
+  def find_by_name(name)
+    detect { |p| p.name == name }
+  end
+end
+
+module CollaboratorsExtensions
+  def top
+    first
+  end
+end
+
 class Project
   include MongoMapper::Document
 
   key :name, String
   
-  module PeopleExtensions
-    def find_by_name(name)
-      detect { |p| p.name == name }
-    end
-  end
   many :people, :extend => PeopleExtensions
-  
-  module CollaboratorsExtensions
-    def top
-      first
-    end
-  end
   many :collaborators, :extend => CollaboratorsExtensions
   
   many :statuses, :order => 'position' do
@@ -155,7 +156,7 @@ class Status
   key :project_id, String
   key :target_id, String
   key :target_type, String
-  key :name, String
+  key :name, String, :required => true
   key :position, Integer
 
   belongs_to :project

data/test/unit/test_document.rb

@@ -8,7 +8,7 @@ class DocumentTest < Test::Unit::TestCase
         include MongoMapper::Document
         set_collection_name 'test'
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "have logger method" do
@@ -102,7 +102,7 @@ class DocumentTest < Test::Unit::TestCase
         key :name, String
         key :age, Integer
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "have access to logger" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.15.1
+        version: "0.16"
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.4
     version: 
-description: Awesome gem for modeling your domain and storing it in mongo
+description: 
 email: nunemaker@gmail.com
 executables: 
 - mmconsole