fcoury-mongomapper 0.3.0 → 0.3.1

data/.gitignore

@@ -4,3 +4,4 @@ coverage
 rdoc
 pkg
 *~
+*.gem

data/History

@@ -1,6 +1,8 @@
 0.2.1(working)
 * 1 major addition
-  * Added Document#paginate which works just like find but adds pagination
+  * Added Document#paginate which works just like find but adds pagination (dcu did basics and I pimped)
+  * Added a basic console for playing around with MongoMapper (dcu)
+  * Embedded associations can now be deeply nested (Keith Hanson)
 
 0.2.0 7/7/2009
 * 2 major additions (observers, associations), several minor additions, and a few bug fixes

data/README.rdoc

@@ -2,16 +2,18 @@
 
 Awesome gem for modeling your domain and storing it in mongo.
 
-== Note on Releases
+Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
 
-Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code and run 'rake install' to install the gem.
+* rake gemspec
+* gem build mongomapper.gemspec
+* gem install the gem that was built
 
 == Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Dependencies

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/mmconsole

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+$:.unshift File.dirname(__FILE__)+"/../lib"
+
+require 'mongomapper'
+require 'irb'
+
+IRB.setup(nil)
+irb = IRB::Irb.new
+
+IRB.conf[:MAIN_CONTEXT] = irb.context
+
+irb.context.evaluate("require 'irb/completion'", 0)
+irb.context.evaluate(%@
+include XGen::Mongo::Driver
+include MongoMapper
+
+MongoMapper.database = "mmtest"
+$db = MongoMapper.database
+
+@, 0)
+
+puts %@
+Welcome to the MongoMapper Console!
+
+Example 1:
+  things = $db.collection("things")
+  things.insert("name" => "Raw Thing")
+  things.insert("name" => "Another Thing", "date" => Time.now)
+
+  cursor = things.find("name" => "Raw Thing")
+  puts cursor.next_object.inspect
+
+Example 2:
+  class Thing
+    include MongoMapper::Document
+    key :name, String, :required => true
+    key :date, Time
+  end
+
+  thing = Thing.new
+  thing.name = "My thing"
+  thing.date = Time.now
+  thing.save
+
+  all_things = Thing.all
+  puts all_things.map { |object| object.name }.inspect
+
+@
+
+trap("SIGINT") do
+  irb.signal_handle
+end
+catch(:IRB_EXIT) do
+  irb.eval_input
+end
+

data/lib/mongomapper/associations/polymorphic_has_many_embedded_proxy.rb

@@ -22,7 +22,16 @@ module MongoMapper
         (@_values || []).map do |e|
           ref_type = "#{@association.name}_type"
           class_name = e[ref_type]
-          klass = class_name ? Kernel.const_get(class_name) : @association.klass
+          if class_name
+            current = Kernel
+            parts = class_name.split("::")
+            parts.each do |p|
+              current = current.const_get(p)
+            end
+            klass = current
+          else
+            @association.klass
+          end
           klass.new(e)
         end
       end

data/lib/mongomapper/embedded_document.rb

@@ -214,14 +214,25 @@ module MongoMapper
       end
       
       def embedded_association_attributes
-        attributes = HashWithIndifferentAccess.new
+        embedded_attributes = HashWithIndifferentAccess.new
         self.class.associations.each_pair do |name, association|
-          if association.type == :many && association.klass.embeddable?
-            vals = instance_variable_get(association.ivar)
-            attributes[name] = vals.collect { |item| item.attributes } if vals
+          
+          if association.type == :many && association.klass.embeddable?            
+            if documents = instance_variable_get(association.ivar)
+              embedded_attributes[name] = documents.collect do |item|
+                attributes_hash = item.attributes
+                
+                item.send(:embedded_association_attributes).each_pair do |association_name, association_value|
+                  attributes_hash[association_name] = association_value
+                end
+                
+                attributes_hash
+              end
+            end
           end
         end
-        attributes
+        
+        embedded_attributes
       end
 
       def initialize_associations(attrs={})

data/mongomapper.gemspec

@@ -2,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
   s.date = %q{2009-07-19}
+  s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
+  s.executables = ["mmconsole"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -19,6 +21,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/mmconsole",
      "lib/mongomapper.rb",
      "lib/mongomapper/associations.rb",
      "lib/mongomapper/associations/array_proxy.rb",
@@ -57,11 +60,12 @@ Gem::Specification.new do |s|
      "test/test_serializations.rb",
      "test/test_validations.rb"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/jnunemaker/mongomapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mongomapper}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
     "test/serializers/test_json_serializer.rb",

data/test/test_associations.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-
+require 'ruby-debug'
 class Address
   include MongoMapper::EmbeddedDocument
 
@@ -31,6 +31,68 @@ class Person
   include MongoMapper::EmbeddedDocument
   key :name, String
   key :child, Person
+  
+  many :pets
+end
+
+class Pet
+  include MongoMapper::EmbeddedDocument
+  
+  key :name, String
+  key :species, String
+end
+
+class Media
+  include MongoMapper::EmbeddedDocument
+  key :file, String
+end
+
+class Video < Media
+  key :length, Integer
+end
+
+class Image < Media
+  key :width, Integer
+  key :height, Integer
+end
+
+class Music < Media
+  key :bitrate, String
+end
+
+class Catalog
+  include MongoMapper::Document
+  
+  many :medias, :polymorphic => true
+end
+
+module TrModels
+  class Transport
+    include MongoMapper::EmbeddedDocument
+    key :license_plate, String
+  end
+  
+  class Car < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+    key :model, String
+    key :year, Integer
+  end
+  
+  class Bus < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+    key :max_passengers, Integer
+  end
+  
+  class Ambulance < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+    key :icu, Boolean
+  end
+  
+  class Fleet
+    include MongoMapper::Document
+    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
+    key :name, String
+  end
 end
 
 class Media
@@ -57,12 +119,85 @@ class Catalog
   many :medias, :polymorphic => true
 end
 
+module TrModels
+  class Transport
+    include MongoMapper::EmbeddedDocument
+    key :license_plate, String
+  end
+  
+  class Car < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+    key :model, String
+    key :year, Integer
+  end
+  
+  class Bus < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+    key :max_passengers, Integer
+  end
+  
+  class Ambulance < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+    key :icu, Boolean
+  end
+  
+  class Fleet
+    include MongoMapper::Document
+    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
+    key :name, String
+  end
+end
+
 class AssociationsTest < Test::Unit::TestCase
   def setup
     Project.collection.clear
     Status.collection.clear
   end
   
+  context "Nested Polymorphic Many" do
+    should "default reader to empty array" do
+      fleet = TrModels::Fleet.new
+      fleet.transports.should == []
+    end
+
+    should "allow adding to association like it was an array" do
+      fleet = TrModels::Fleet.new
+      fleet.transports << TrModels::Car.new
+      fleet.transports.push TrModels::Bus.new
+      fleet.transports.size.should == 2
+    end
+
+    should "store the association" do
+      fleet = TrModels::Fleet.new
+      fleet.transports = [TrModels::Car.new("license_plate" => "DCU2013", "model" => "Honda Civic")]
+      fleet.save.should be_true
+
+      from_db = TrModels::Fleet.find(fleet.id)
+      from_db.transports.size.should == 1
+      from_db.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)
+      ]
+      fleet.save.should be_true
+
+      from_db = TrModels::Fleet.find(fleet.id)
+      from_db.transports.size.should == 3
+      from_db.transports[0].license_plate.should == "ABC1223"
+      from_db.transports[0].model.should == "Honda Civic"
+      from_db.transports[0].year.should == 2003
+      from_db.transports[1].license_plate.should == "XYZ9090"
+      from_db.transports[1].max_passengers.should == 51
+      from_db.transports[2].license_plate.should == "HDD3030"
+      from_db.transports[2].icu.should == true
+    end
+  end
+
   context "Polymorphic Many" do
     should "default reader to empty array" do
       catalog = Catalog.new
@@ -107,53 +242,6 @@ class AssociationsTest < Test::Unit::TestCase
     end
   end
 
-  context "Many embedded documents" do
-    should "default reader to empty array" do
-      project = Project.new
-      project.addresses.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
-    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
-
-      from_db = Project.find(project.id)
-      from_db.addresses.size.should == 2
-      from_db.addresses[0].should == sb
-      from_db.addresses[1].should == chi
-    end
-
-    should "allow embedding arbitrarily deep" do
-      @document = Class.new do
-        include MongoMapper::Document
-        key :person, Person
-      end
-
-      meg = Person.new(:name => "Meg")
-      meg.child = Person.new(:name => "Steve")
-      meg.child.child = Person.new(:name => "Linda")
-
-      doc = @document.new(:person => meg)
-      doc.save
-
-      from_db = @document.find(doc.id)
-      from_db.person.name.should == 'Meg'
-      from_db.person.child.name.should == 'Steve'
-      from_db.person.child.child.name.should == 'Linda'
-    end
-  end
-
   context "Polymorphic Belongs To" do
     should "default to nil" do
       status = Status.new
@@ -285,5 +373,33 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.person.child.name.should == 'Steve'
       from_db.person.child.child.name.should == 'Linda'
     end
+    
+    should "allow saving embedded documents in 'many' embedded documents" do
+      @document = Class.new do
+        include MongoMapper::Document
+        
+        many :people
+      end
+      
+      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
+      
+      doc.people << meg
+      doc.save
+      
+      from_db = @document.find(doc.id)
+      from_db.people.first.name.should == "Meg"
+      from_db.people.first.pets.should_not == []
+      from_db.people.first.pets.first.name.should == "Sparky"
+      from_db.people.first.pets.first.species.should == "Dog"
+      from_db.people.first.pets[1].name.should == "Koda"
+      from_db.people.first.pets[1].species.should == "Dog"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fcoury-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 
 date: 2009-07-19 00:00:00 -07:00
-default_executable: 
+default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -64,8 +64,8 @@ dependencies:
     version: 
 description: 
 email: nunemaker@gmail.com
-executables: []
-
+executables: 
+- mmconsole
 extensions: []
 
 extra_rdoc_files: 
@@ -78,6 +78,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/mmconsole
 - lib/mongomapper.rb
 - lib/mongomapper/associations.rb
 - lib/mongomapper/associations/array_proxy.rb
@@ -115,7 +116,7 @@ files:
 - test/test_rails_compatibility.rb
 - test/test_serializations.rb
 - test/test_validations.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/jnunemaker/mongomapper
 post_install_message: 
 rdoc_options: