mongo_mapper-unstable 2010.1.6 → 2010.1.12

data/lib/mongo_mapper.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 # if Gem is defined i'll assume you are using rubygems and lock specific versions
 # call me crazy but a plain old require will just get the latest version you have installed
 # so i want to make sure that if you are using gems you do in fact have the correct versions
@@ -98,29 +100,28 @@ module MongoMapper
   end
 end
 
-require 'mongo_mapper/support'
-require 'mongo_mapper/callbacks'
 require 'mongo_mapper/finder_options'
-require 'mongo_mapper/dirty'
+require 'mongo_mapper/support'
+require 'mongo_mapper/descendant_appends'
+
 require 'mongo_mapper/dynamic_finder'
 require 'mongo_mapper/key'
-require 'mongo_mapper/pagination'
-require 'mongo_mapper/serialization'
-require 'mongo_mapper/validations'
-require 'mongo_mapper/rails_compatibility/document'
-require 'mongo_mapper/rails_compatibility/embedded_document'
+
+require 'mongo_mapper/plugins'
+require 'mongo_mapper/plugins/associations'
+require 'mongo_mapper/plugins/callbacks'
+require 'mongo_mapper/plugins/clone'
+require 'mongo_mapper/plugins/descendants'
+require 'mongo_mapper/plugins/dirty'
+require 'mongo_mapper/plugins/equality'
+require 'mongo_mapper/plugins/identity_map'
+require 'mongo_mapper/plugins/inspect'
+require 'mongo_mapper/plugins/keys'
+require 'mongo_mapper/plugins/logger'
+require 'mongo_mapper/plugins/pagination'
+require 'mongo_mapper/plugins/rails'
+require 'mongo_mapper/plugins/serialization'
+require 'mongo_mapper/plugins/validations'
+
 require 'mongo_mapper/embedded_document'
-require 'mongo_mapper/document'
-require 'mongo_mapper/associations'
-require 'mongo_mapper/associations/base'
-require 'mongo_mapper/associations/proxy'
-require 'mongo_mapper/associations/collection'
-require 'mongo_mapper/associations/many_documents_proxy'
-require 'mongo_mapper/associations/belongs_to_proxy'
-require 'mongo_mapper/associations/belongs_to_polymorphic_proxy'
-require 'mongo_mapper/associations/many_polymorphic_proxy'
-require 'mongo_mapper/associations/many_embedded_proxy'
-require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
-require 'mongo_mapper/associations/many_documents_as_proxy'
-require 'mongo_mapper/associations/one_proxy'
-require 'mongo_mapper/associations/in_array_proxy'
+require 'mongo_mapper/document'

data/performance/read_write.rb

@@ -0,0 +1,52 @@
+# The purpose of this is to check finding, initializing, 
+# and creating objects (typecasting times/dates and booleans).
+
+require 'pp'
+require 'benchmark'
+require 'rubygems'
+
+# to test with slow version just do this:
+# gem 'mongo_mapper', '0.6.10'
+# and comment out this:
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'mongo_mapper'
+
+MongoMapper.database = 'testing'
+ 
+class Foo
+  include MongoMapper::Document
+  key :approved, Boolean
+  key :count, Integer
+  key :approved_at, Time
+  key :expire_on, Date
+  timestamps!
+end
+Foo.collection.remove
+
+Benchmark.bm(5) do |x|
+  ids = []
+  x.report("write") do
+    1000.times { |i| ids << Foo.create(:count => 0, :approved => true, :approved_at => Time.now, :expire_on => Date.today).id }
+  end
+
+  x.report("read ") do
+    ids.each { |id| Foo.first(:id => id) }
+  end
+end
+
+# I was get something like this on my puny macbook air:
+#            user     system      total        real
+# write  4.810000   0.090000   4.900000 (  5.039949)
+# read   2.730000   0.070000   2.800000 (  2.990749)
+#
+#
+# After these commits:
+#
+#   * http://github.com/jnunemaker/mongomapper/commit/e5091fa140d5fae2721017b53027092233694ee5
+#   * http://github.com/jnunemaker/mongomapper/commit/c22bbde4fa1cfbc310d79cb0e50203310ffb03d1
+#
+# I'm now getting something like this:
+#            user     system      total        real
+# write  1.660000   0.050000   1.710000 (  1.752676)
+# read   1.060000   0.050000   1.110000 (  1.263429)

data/specs.watchr

@@ -1,6 +1,27 @@
+def growl(title, msg, img)
+  %x{growlnotify -m #{ msg.inspect} -t #{title.inspect} --image ~/.watchr/#{img}.png}
+end
+
+def form_growl_message(str)
+  results = str.split("\n").last
+  if results =~ /[1-9]\s(failure|error)s?/
+    growl "Test Results", "#{results}", "fail"
+  elsif results != ""
+    growl "Test Results", "#{results}", "pass"
+  end
+end
+
 def run(cmd)
   puts(cmd)
-  system(cmd)
+  output = ""
+  IO.popen(cmd) do |com|
+    com.each_char do |c|
+      print c
+      output << c
+      $stdout.flush
+    end
+  end
+  form_growl_message output
 end
 
 def run_test_file(file)
@@ -17,7 +38,7 @@ end
 
 watch('test/test_helper\.rb') { system('clear'); run_all_tests }
 watch('test/.*/test_.*\.rb') { |m| system('clear'); run_test_file(m[0]) }
-watch('lib/.*') { |m| related_test_files(m[0]).each { |file| system('clear'); run_test_file(file) } }
+watch('lib/.*') { |m| related_test_files(m[0]).each { |file| run_test_file(file) } }
 
 # Ctrl-\
 Signal.trap('QUIT') do

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -72,7 +72,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
       setup do
         Property.key :thing_id, ObjectId
         Property.belongs_to :thing, :dependent => :destroy
-        Thing.has_many :properties
+        Thing.many :properties
 
         @thing = Thing.create(:name => "Tree")
         @property1 = Property.create

data/test/functional/associations/test_many_embedded_polymorphic_proxy.rb

@@ -21,30 +21,49 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
 
   should "be able to replace the association" do
     catalog = Catalog.new
-    catalog.medias = [Video.new("file" => "video.mpg", "length" => 3600)]
+    catalog.medias = [Video.new('file' => 'video.mpg', 'length' => 3600)]
     catalog.save.should be_true
 
     catalog = catalog.reload
     catalog.medias.size.should == 1
-    catalog.medias[0].file.should == "video.mpg"
+    catalog.medias[0].file.should == 'video.mpg'
   end
-
+  
+  context "count" do
+    should "default to 0" do
+      Catalog.new.medias.count.should == 0
+    end
+    
+    should 'return correct count if any are embedded' do
+      catalog = Catalog.new
+      catalog.medias = [
+        Video.new('file' => 'video.mpg', 'length' => 3600),
+        Music.new('file' => 'music.mp3', 'bitrate' => '128kbps'),
+        Image.new('file' => 'image.png', 'width' => 800, 'height' => 600)
+      ]
+      catalog.medias.count.should == 3
+      catalog.save.should be_true
+      catalog.reload
+      catalog.medias.count.should == 3
+    end
+  end
+  
   should "store different associations" do      
     catalog = Catalog.new
     catalog.medias = [
-      Video.new("file" => "video.mpg", "length" => 3600),
-      Music.new("file" => "music.mp3", "bitrate" => "128kbps"),
-      Image.new("file" => "image.png", "width" => 800, "height" => 600)
+      Video.new('file' => 'video.mpg', 'length' => 3600),
+      Music.new('file' => 'music.mp3', 'bitrate' => '128kbps'),
+      Image.new('file' => 'image.png', 'width' => 800, 'height' => 600)
     ]
     catalog.save.should be_true
     
     catalog = catalog.reload
     catalog.medias.size.should == 3
-    catalog.medias[0].file.should == "video.mpg"
+    catalog.medias[0].file.should == 'video.mpg'
     catalog.medias[0].length.should == 3600
-    catalog.medias[1].file.should == "music.mp3"
+    catalog.medias[1].file.should == 'music.mp3'
     catalog.medias[1].bitrate.should == "128kbps"
-    catalog.medias[2].file.should == "image.png"
+    catalog.medias[2].file.should == 'image.png'
     catalog.medias[2].width.should == 800
     catalog.medias[2].height.should == 600
   end
@@ -52,38 +71,38 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
   context "With modularized models" do
     should "set associations correctly" do
       fleet_attributes = { 
-        "name" => "My Fleet", 
-        "transports" => [
-          {"_type" => "TrModels::Ambulance", "license_plate" => "GGG123", "icu" => true},
-          {"_type" => "TrModels::Car", "license_plate" => "ABC123", "model" => "VW Golf", "year" => 2001}, 
-          {"_type" => "TrModels::Car", "license_plate" => "DEF123", "model" => "Honda Accord", "year" => 2008},
+        'name' => 'My Fleet', 
+        'transports' => [
+          {'_type' => 'TrModels::Ambulance', 'license_plate' => 'GGG123', 'icu' => true},
+          {'_type' => 'TrModels::Car', 'license_plate' => 'ABC123', 'model' => 'VW Golf', 'year' => 2001}, 
+          {'_type' => 'TrModels::Car', 'license_plate' => 'DEF123', 'model' => 'Honda Accord', 'year' => 2008},
         ] 
       }
       
       fleet = TrModels::Fleet.new(fleet_attributes)
       fleet.transports.size.should == 3
       fleet.transports[0].class.should == TrModels::Ambulance
-      fleet.transports[0].license_plate.should == "GGG123"
+      fleet.transports[0].license_plate.should == 'GGG123'
       fleet.transports[0].icu.should be_true
       fleet.transports[1].class.should == TrModels::Car
-      fleet.transports[1].license_plate.should == "ABC123"
-      fleet.transports[1].model.should == "VW Golf"
+      fleet.transports[1].license_plate.should == 'ABC123'
+      fleet.transports[1].model.should == 'VW Golf'
       fleet.transports[1].year.should == 2001
       fleet.transports[2].class.should == TrModels::Car
-      fleet.transports[2].license_plate.should == "DEF123"
-      fleet.transports[2].model.should == "Honda Accord"
+      fleet.transports[2].license_plate.should == 'DEF123'
+      fleet.transports[2].model.should == 'Honda Accord'
       fleet.transports[2].year.should == 2008      
       fleet.save.should be_true
       
       fleet = fleet.reload
       fleet.transports.size.should == 3
-      fleet.transports[0].license_plate.should == "GGG123"
+      fleet.transports[0].license_plate.should == 'GGG123'
       fleet.transports[0].icu.should be_true
-      fleet.transports[1].license_plate.should == "ABC123"
-      fleet.transports[1].model.should == "VW Golf"
+      fleet.transports[1].license_plate.should == 'ABC123'
+      fleet.transports[1].model.should == 'VW Golf'
       fleet.transports[1].year.should == 2001
-      fleet.transports[2].license_plate.should == "DEF123"
-      fleet.transports[2].model.should == "Honda Accord"
+      fleet.transports[2].license_plate.should == 'DEF123'
+      fleet.transports[2].model.should == 'Honda Accord'
       fleet.transports[2].year.should == 2008      
     end
     
@@ -101,31 +120,31 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
     
     should "be able to replace the association" do
       fleet = TrModels::Fleet.new
-      fleet.transports = [TrModels::Car.new("license_plate" => "DCU2013", "model" => "Honda Civic")]
+      fleet.transports = [TrModels::Car.new('license_plate' => 'DCU2013', 'model' => 'Honda Civic')]
       fleet.save.should be_true
     
       fleet = fleet.reload
       fleet.transports.size.should == 1
-      fleet.transports[0].license_plate.should == "DCU2013"
+      fleet.transports[0].license_plate.should == 'DCU2013'
     end
     
     should "store different associations" do
       fleet = TrModels::Fleet.new
       fleet.transports = [
-        TrModels::Car.new("license_plate" => "ABC1223", "model" => "Honda Civic", "year" => 2003),
-        TrModels::Bus.new("license_plate" => "XYZ9090", "max_passengers" => 51),
-        TrModels::Ambulance.new("license_plate" => "HDD3030", "icu" => true)
+        TrModels::Car.new('license_plate' => 'ABC1223', 'model' => 'Honda Civic', 'year' => 2003),
+        TrModels::Bus.new('license_plate' => 'XYZ9090', 'max_passengers' => 51),
+        TrModels::Ambulance.new('license_plate' => 'HDD3030', 'icu' => true)
       ]
       fleet.save.should be_true
     
       fleet = fleet.reload
       fleet.transports.size.should == 3
-      fleet.transports[0].license_plate.should == "ABC1223"
-      fleet.transports[0].model.should == "Honda Civic"
+      fleet.transports[0].license_plate.should == 'ABC1223'
+      fleet.transports[0].model.should == 'Honda Civic'
       fleet.transports[0].year.should == 2003
-      fleet.transports[1].license_plate.should == "XYZ9090"
+      fleet.transports[1].license_plate.should == 'XYZ9090'
       fleet.transports[1].max_passengers.should == 51
-      fleet.transports[2].license_plate.should == "HDD3030"
+      fleet.transports[2].license_plate.should == 'HDD3030'
       fleet.transports[2].icu.should == true
     end
   end
@@ -134,9 +153,9 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
     should "work using a block passed to many" do
       catalog = Catalog.new
       medias = catalog.medias = [
-        Video.new("file" => "video.mpg", "length" => 3600, :visible => true),
-        Music.new("file" => "music.mp3", "bitrate" => "128kbps", :visible => true),
-        Image.new("file" => "image.png", "width" => 800, "height" => 600, :visible => false)
+        Video.new('file' => 'video.mpg', 'length' => 3600, :visible => true),
+        Music.new('file' => 'music.mp3', 'bitrate' => '128kbps', :visible => true),
+        Image.new('file' => 'image.png', 'width' => 800, 'height' => 600, :visible => false)
       ]
       catalog.save
       catalog.medias.visible.should == [medias[0], medias[1]]
@@ -145,9 +164,9 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
     should "work using many's :extend option" do
       fleet = TrModels::Fleet.new
       transports = fleet.transports = [
-        TrModels::Car.new("license_plate" => "ABC1223", "model" => "Honda Civic", "year" => 2003, :purchased_on => 2.years.ago.to_date),
-        TrModels::Bus.new("license_plate" => "XYZ9090", "max_passengers" => 51, :purchased_on => 3.years.ago.to_date),
-        TrModels::Ambulance.new("license_plate" => "HDD3030", "icu" => true, :purchased_on => 1.year.ago.to_date)
+        TrModels::Car.new('license_plate' => 'ABC1223', 'model' => 'Honda Civic', 'year' => 2003, :purchased_on => 2.years.ago.to_date),
+        TrModels::Bus.new('license_plate' => 'XYZ9090', 'max_passengers' => 51, :purchased_on => 3.years.ago.to_date),
+        TrModels::Ambulance.new('license_plate' => 'HDD3030', 'icu' => true, :purchased_on => 1.year.ago.to_date)
       ]
       fleet.save
       fleet.transports.to_be_replaced.should == [transports[1]]

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -3,120 +3,139 @@ require 'models'
 
 class ManyEmbeddedProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.remove
-    RealPerson.collection.remove
+    @comment_class = EDoc do
+      key :name, String
+      key :body, String
+    end
+    @post_class = Doc do
+      key :title, String
+    end
+    @post_class.many :comments, :class => @comment_class
+    
+    @pet_class = EDoc do
+      key :name, String
+    end
+    @person_class = EDoc do
+      key :name, String
+    end
+    @person_class.key :child, @person_class
+    @person_class.many :pets, :class => @pet_class
+    
+    @owner_class = Doc do
+      key :name, String
+    end
+    @owner_class.many :pets, :class => @pet_class
   end
     
   should "default reader to empty array" do
-    Project.new.addresses.should == []
+    @post_class.new.comments.should == []
   end
   
   should "allow adding to association like it was an array" do
-    project = Project.new
-    project.addresses << Address.new
-    project.addresses.push Address.new
-    project.addresses.size.should == 2
+    post = @post_class.new
+    post.comments << @comment_class.new
+    post.comments.push @comment_class.new
+    post.comments.size.should == 2
   end
 
   should "be embedded in document on save" do
-    sb = Address.new(:city => 'South Bend', :state => 'IN')
-    chi = Address.new(:city => 'Chicago', :state => 'IL')
-    project = Project.new
-    project.addresses << sb
-    project.addresses << chi
-    project.save
+    frank = @comment_class.new(:name => 'Frank', :body => 'Hi!')
+    bill = @comment_class.new(:name => 'Bill', :body => 'Hi!')
+    post = @post_class.new
+    post.comments << frank
+    post.comments << bill
+    post.save
 
-    project.reload
-    project.addresses.size.should == 2
-    project.addresses[0].should == sb
-    project.addresses[1].should == chi
+    post.reload
+    post.comments.size.should == 2
+    post.comments[0].should == frank
+    post.comments[1].should == bill
   end
   
   should "allow embedding arbitrarily deep" do
-    @document = Doc do
-      key :person, Person
-    end
+    @klass = Doc()
+    @klass.key :person, @person_class
     
-    meg = Person.new(:name => "Meg")
-    meg.child = Person.new(:name => "Steve")
-    meg.child.child = Person.new(:name => "Linda")
+    meg             = @person_class.new(:name => 'Meg')
+    meg.child       = @person_class.new(:name => 'Steve')
+    meg.child.child = @person_class.new(:name => 'Linda')
     
-    doc = @document.new(:person => meg)
+    doc = @klass.new(:person => meg)
     doc.save
-    
     doc.reload
+    
     doc.person.name.should == 'Meg'
     doc.person.child.name.should == 'Steve'
     doc.person.child.child.name.should == 'Linda'
   end
   
-  should "allow assignment of 'many' embedded documents using a hash" do
+  should "allow assignment of many embedded documents using a hash" do
     person_attributes = { 
-      "name" => "Mr. Pet Lover", 
-      "pets" => [
-        {"name" => "Jimmy", "species" => "Cocker Spainel"},
-        {"name" => "Sasha", "species" => "Siberian Husky"}, 
+      'name' => 'Mr. Pet Lover', 
+      'pets' => [
+        {'name' => 'Jimmy', 'species' => 'Cocker Spainel'},
+        {'name' => 'Sasha', 'species' => 'Siberian Husky'}, 
       ] 
     }
     
-    pet_lover = RealPerson.new(person_attributes)
-    pet_lover.name.should == "Mr. Pet Lover"
-    pet_lover.pets[0].name.should == "Jimmy"
-    pet_lover.pets[0].species.should == "Cocker Spainel"
-    pet_lover.pets[1].name.should == "Sasha"
-    pet_lover.pets[1].species.should == "Siberian Husky"
-    pet_lover.save.should be_true
-    
-    pet_lover.reload
-    pet_lover.name.should == "Mr. Pet Lover"
-    pet_lover.pets[0].name.should == "Jimmy"
-    pet_lover.pets[0].species.should == "Cocker Spainel"
-    pet_lover.pets[1].name.should == "Sasha"
-    pet_lover.pets[1].species.should == "Siberian Husky"
+    owner = @owner_class.new(person_attributes)
+    owner.name.should == 'Mr. Pet Lover'
+    owner.pets[0].name.should == 'Jimmy'
+    owner.pets[0].species.should == 'Cocker Spainel'
+    owner.pets[1].name.should == 'Sasha'
+    owner.pets[1].species.should == 'Siberian Husky'
+
+    owner.save.should be_true
+    owner.reload
+
+    owner.name.should == 'Mr. Pet Lover'
+    owner.pets[0].name.should == 'Jimmy'
+    owner.pets[0].species.should == 'Cocker Spainel'
+    owner.pets[1].name.should == 'Sasha'
+    owner.pets[1].species.should == 'Siberian Husky'
   end
 
   context "embedding many embedded documents" do
     setup do
-      @document = Doc do
-        many :people
-      end
+      @klass = Doc()
+      @klass.many :people, :class => @person_class
     end
 
     should "persist all embedded documents" do
-      meg    = Person.new(:name => "Meg")
-      sparky = Pet.new(:name => "Sparky", :species => "Dog")
-      koda   = Pet.new(:name => "Koda", :species => "Dog")
-
-      doc = @document.new
-      meg.pets << sparky
-      meg.pets << koda
+      meg = @person_class.new(:name => 'Meg', :pets => [
+        @pet_class.new(:name => 'Sparky', :species => 'Dog'),
+        @pet_class.new(:name => 'Koda', :species => 'Dog')
+      ])
+      
+      doc = @klass.new
       doc.people << meg
       doc.save
-
       doc.reload
-      doc.people.first.name.should == "Meg"
+      
+      doc.people.first.name.should == 'Meg'
       doc.people.first.pets.should_not == []
-      doc.people.first.pets.first.name.should == "Sparky"
-      doc.people.first.pets.first.species.should == "Dog"
-      doc.people.first.pets[1].name.should == "Koda"
-      doc.people.first.pets[1].species.should == "Dog"
+      doc.people.first.pets.first.name.should == 'Sparky'
+      doc.people.first.pets.first.species.should == 'Dog'
+      doc.people.first.pets[1].name.should == 'Koda'
+      doc.people.first.pets[1].species.should == 'Dog'
     end
 
     should "create a reference to the root document for all embedded documents before save" do
-      meg    = Person.new(:name => "Meg")
-      sparky = Pet.new(:name => "Sparky", :species => "Dog")
-      doc    = @document.new
+      doc = @klass.new
+      meg = @person_class.new(:name => 'Meg')
+      pet = @pet_class.new(:name => 'Sparky', :species => 'Dog')
+      
       doc.people << meg
-      meg.pets << sparky
+      meg.pets << pet
 
       doc.people.first._root_document.should == doc
       doc.people.first.pets.first._root_document.should == doc
     end
 
     should "create a reference to the root document for all embedded documents" do
-      sparky = Pet.new(:name => "Sparky", :species => "Dog")
-      meg    = Person.new(:name => "Meg", :pets => [sparky])
-      doc    = @document.new
+      sparky = @pet_class.new(:name => 'Sparky', :species => 'Dog')
+      meg    = @person_class.new(:name => 'Meg', :pets => [sparky])
+      doc    = @klass.new
       doc.people << meg
       doc.save
 
@@ -127,13 +146,28 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
   end
   
   should "allow finding by id" do
-    sparky = Pet.new(:name => "Sparky", :species => "Dog")
-    meg    = Person.new(:name => "Meg", :pets => [sparky])
+    sparky = @pet_class.new(:name => 'Sparky', :species => 'Dog')
+    meg    = @owner_class.create(:name => 'Meg', :pets => [sparky])
     
     meg.pets.find(sparky._id).should     == sparky  # oid
     meg.pets.find(sparky.id.to_s).should == sparky  # string
   end
   
+  context "count" do
+    should "default to 0" do
+      @owner_class.new.pets.count.should == 0
+    end
+    
+    should "return correct count if any are embedded" do
+      owner = @owner_class.new(:name => 'Meg')
+      owner.pets = [@pet_class.new, @pet_class.new]
+      owner.pets.count.should == 2
+      owner.save
+      owner.reload
+      owner.pets.count.should == 2
+    end
+  end
+  
   context "extending the association" do
     setup do
       @address_class = EDoc do

data/test/functional/test_dirty.rb

@@ -112,7 +112,7 @@ class DirtyTest < Test::Unit::TestCase
     should "be hash of keys with values of changes if there are changes" do
       doc = @document.new
       doc.phrase = 'A penny saved is a penny earned.'
-      doc.changes.should == {'phrase' => [nil, 'A penny saved is a penny earned.']}
+      doc.changes['phrase'].should == [nil, 'A penny saved is a penny earned.']
     end
   end