jnunemaker-mongomapper 0.3.4 → 0.3.5

data/History

@@ -1,3 +1,7 @@
+0.3.5 8/29/2009
+  * updated to 0.14 of the ruby driver
+  * _type key gets set automatically at initialize time if defined and blank
+
 0.3.4 8/28/2009
   * BACKWORDS COMPATIBILITY BREAK: Timestamps are now optional. To use them add timestamps! to your model.
   * BACKWORDS COMPATIBILITY BREAK: Associations keys are no longer created automatically when you use belongs_to and many. Too much was hidden from the developer. You now have to declare them like key :creator_id, String and such.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.rubyforge_project = "mongomapper"
     
     gem.add_dependency('activesupport')
-    gem.add_dependency('mongodb-mongo', '0.11.1')
+    gem.add_dependency('mongodb-mongo', '0.14')
     gem.add_dependency('jnunemaker-validatable', '1.7.2')
     
     gem.add_development_dependency('mocha', '0.9.4')

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/bin/mmconsole

@@ -11,7 +11,6 @@ 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"

data/lib/mongomapper.rb

@@ -2,10 +2,10 @@ require 'pathname'
 require 'rubygems'
 
 gem 'activesupport'
-gem 'mongodb-mongo', '0.11.1'
+gem 'mongodb-mongo', '0.14'
 gem 'jnunemaker-validatable', '1.7.2'
 
-require 'activesupport'
+# require 'activesupport'
 require 'mongo'
 require 'validatable'
 
@@ -54,7 +54,7 @@ module MongoMapper
   end
   
   def self.connection
-    @@connection ||= XGen::Mongo::Driver::Mongo.new
+    @@connection ||= Mongo::Connection.new
   end
 
   def self.connection=(new_connection)

data/lib/mongomapper/document.rb

@@ -59,13 +59,13 @@ module MongoMapper
 
       def find_by_id(id)
         criteria = FinderOptions.to_mongo_criteria(:_id => id)
-        if doc = collection.find_first(criteria)
+        if doc = collection.find_one(criteria)
           new(doc)
         end
       end
 
       def count(conditions={})
-        collection.count(FinderOptions.to_mongo_criteria(conditions))
+        collection.find(FinderOptions.to_mongo_criteria(conditions)).count
       end
 
       def create(*docs)
@@ -320,7 +320,7 @@ module MongoMapper
       
       def assign_id
         if read_attribute(:_id).blank?
-          write_attribute(:_id, XGen::Mongo::Driver::ObjectID.new.to_s)
+          write_attribute(:_id, Mongo::ObjectID.new.to_s)
         end
       end
 

data/lib/mongomapper/embedded_document.rb

@@ -84,7 +84,7 @@ module MongoMapper
 
     private
       def accessors_module
-        if const_defined?('MongoMapperKeys') && constants.include?( 'MongoMapperKeys' )
+        if const_defined?('MongoMapperKeys')
           const_get 'MongoMapperKeys'
         else 
           const_set 'MongoMapperKeys', Module.new
@@ -94,7 +94,7 @@ module MongoMapper
       def create_accessors_for(key)
         accessors_module.module_eval <<-end_eval
           def #{key.name}
-            read_attribute( :'#{key.name}' )
+            read_attribute(:'#{key.name}')
           end
 
           def #{key.name}_before_typecast
@@ -160,10 +160,14 @@ module MongoMapper
           end
 
           self.attributes = attrs
+          
+          if respond_to?(:_type=) && self['_type'].blank?
+            self._type = self.class.name
+          end
         end
 
         if self.class.embeddable? && read_attribute(:_id).blank?
-          write_attribute :_id, XGen::Mongo::Driver::ObjectID.new.to_s
+          write_attribute :_id, Mongo::ObjectID.new.to_s
         end
       end
 

data/mongomapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-08-28}
+  s.date = %q{2009-08-29}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -124,20 +124,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.11.1"])
+      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.14"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.2"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<mongodb-mongo>, ["= 0.11.1"])
+      s.add_dependency(%q<mongodb-mongo>, ["= 0.14"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.2"])
       s.add_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<mongodb-mongo>, ["= 0.11.1"])
+    s.add_dependency(%q<mongodb-mongo>, ["= 0.14"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.2"])
     s.add_dependency(%q<mocha>, ["= 0.9.4"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -141,7 +141,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "work with order" do
-        comments = @post.comments.find(:all, :order => '$natural desc')
+        comments = @post.comments.find(:all, :order => 'body desc')
         comments.should == [@comment2, @comment1]
       end
     end
@@ -179,7 +179,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "work with conditions" do
-        comment = @post.comments.first(:conditions => {:body => 'comment2'})
+        comment = @post.comments.first(:conditions => {:body => 'comment2'}, :order => 'body desc')
         comment.should == @comment2
       end
     end

data/test/functional/test_document.rb

@@ -26,7 +26,7 @@ class DocumentTest < Test::Unit::TestCase
   
   context "Loading a document from the database with keys that are not defined" do
     setup do
-      @id = XGen::Mongo::Driver::ObjectID.new.to_s
+      @id = Mongo::ObjectID.new.to_s
       @document.collection.insert({
         :_id            => @id,
         :first_name     => 'John', 

data/test/unit/test_document.rb

@@ -18,11 +18,11 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "have a connection" do
-      @document.connection.should be_instance_of(XGen::Mongo::Driver::Mongo)
+      @document.connection.should be_instance_of(Mongo::Connection)
     end
 
     should "allow setting different connection without affecting the default" do
-      conn = XGen::Mongo::Driver::Mongo.new
+      conn = Mongo::Connection.new
       @document.connection conn
       @document.connection.should == conn
       @document.connection.should_not == MongoMapper.connection
@@ -43,13 +43,13 @@ class DocumentTest < Test::Unit::TestCase
         include MongoMapper::Document
       end
       
-      Item.collection.should be_instance_of(XGen::Mongo::Driver::Collection)
+      Item.collection.should be_instance_of(Mongo::Collection)
       Item.collection.name.should == 'items'
     end
 
     should "allow setting the collection name" do
       @document.collection('foobar')
-      @document.collection.should be_instance_of(XGen::Mongo::Driver::Collection)
+      @document.collection.should be_instance_of(Mongo::Collection)
       @document.collection.name.should == 'foobar'
     end
   end # Document class

data/test/unit/test_embedded_document.rb

@@ -282,6 +282,27 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         }.should_not raise_error
       end
     end
+    
+    context "initialized when _type key present" do
+      setup do
+        ::FooBar = Class.new do
+          include MongoMapper::EmbeddedDocument
+          key :_type, String
+        end
+      end
+      
+      teardown do
+        Object.send(:remove_const, :FooBar)
+      end
+
+      should "set _type to class name" do
+        FooBar.new._type.should == 'FooBar'
+      end
+      
+      should "not change _type if already set" do
+        FooBar.new(:_type => 'Foo')._type.should == 'Foo'
+      end
+    end
 
     context "mass assigning keys" do
       should "update values for keys provided" do

data/test/unit/test_mongomapper.rb

@@ -4,19 +4,19 @@ class Address; end
 
 class MongoMapperTest < Test::Unit::TestCase  
   should "be able to write and read connection" do
-    conn = XGen::Mongo::Driver::Mongo.new
+    conn = Mongo::Connection.new
     MongoMapper.connection = conn
     MongoMapper.connection.should == conn
   end
   
   should "default connection to new mongo ruby driver" do
     MongoMapper.connection = nil
-    MongoMapper.connection.should be_instance_of(XGen::Mongo::Driver::Mongo)
+    MongoMapper.connection.should be_instance_of(Mongo::Connection)
   end
   
   should "be able to write and read default database" do
     MongoMapper.database = DefaultDatabase
-    MongoMapper.database.should be_instance_of(XGen::Mongo::Driver::DB)
+    MongoMapper.database.should be_instance_of(Mongo::DB)
     MongoMapper.database.name.should == DefaultDatabase
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -07:00
+date: 2009-08-29 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.11.1
+        version: "0.14"
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable