mongomatic 0.5.0 → 0.5.1

data/README.rdoc

@@ -37,7 +37,7 @@ Mongomatic allows you to map your Ruby objects to Mongo documents. It is designe
   u.valid?
   => true
   u.insert
-  => BSON::ObjectID('4c32834f0218236321000001')
+  => BSON::ObjectId('4c32834f0218236321000001')
 
   User.empty?
   => false
@@ -48,14 +48,14 @@ Mongomatic allows you to map your Ruby objects to Mongo documents. It is designe
   => 137 
   
   found = User.find_one({"name" => "Ben Myles"})
-  => #<User:0x00000101939a48 @doc={"_id"=>BSON::ObjectID('4c32834f0218236321000001'), "name"=>"Ben Myles", "email"=>"me@somewhere.com"}, @removed=false, @is_new=false, @errors=[]>
-  User.find_one(BSON::ObjectID('4c32834f0218236321000001')) == found
+  => #<User:0x00000101939a48 @doc={"_id"=>BSON::ObjectId('4c32834f0218236321000001'), "name"=>"Ben Myles", "email"=>"me@somewhere.com"}, @removed=false, @is_new=false, @errors=[]>
+  User.find_one(BSON::ObjectId('4c32834f0218236321000001')) == found
   => true
   
   cursor = User.find({"name" => "Ben Myles"})
   => #<Mongomatic::Cursor:0x0000010195b4e0 @obj_class=User, @mongo_cursor=<Mongo::Cursor:0x80cadac0 namespace='mongomatic_test.User' @selector={"name"=>"Ben Myles"}>>
   found = cursor.next
-  => #<User:0x00000101939a48 @doc={"_id"=>BSON::ObjectID('4c32834f0218236321000001'), "name"=>"Ben Myles", "email"=>"me@somewhere.com"}, @removed=false, @is_new=false, @errors=[]>
+  => #<User:0x00000101939a48 @doc={"_id"=>BSON::ObjectId('4c32834f0218236321000001'), "name"=>"Ben Myles", "email"=>"me@somewhere.com"}, @removed=false, @is_new=false, @errors=[]>
   found.remove
   => 67
   User.count

data/lib/mongomatic/base.rb

@@ -142,7 +142,7 @@ module Mongomatic
     end
 
     # Insert the document into the database. Will return false if the document has
-    # already been inserted or is invalid. Returns the generated BSON::ObjectID
+    # already been inserted or is invalid. Returns the generated BSON::ObjectId
     # for the new document. Will silently fail if MongoDB is unable to insert the
     # document, use insert! if you want an error raised instead. Note that this will
     # require an additional call to the db.

data/lib/mongomatic/errors.rb

@@ -7,7 +7,7 @@ module Mongomatic
     def on(field, sep=" ")
       ret = []
       self.each do |err|
-        ret << err.join(sep) if err.first =~ /^#{field}/ 
+        ret << err.join(sep) if err.first =~ /^#{field.to_s.split('_').join(' ')}/i 
       end
       case ret.size
       when 0

data/lib/mongomatic/modifiers.rb

@@ -206,7 +206,7 @@ module Mongomatic
     # Adds value to the array only if its not in the array already.<br/>
     # Or to add many values:<br/>
     # { $addToSet : { a : { $each : [ 3 , 5 , 6 ] } } }
-    #  user.add_to_set("friend_ids", BSON::ObjectID('...'))
+    #  user.add_to_set("friend_ids", BSON::ObjectId('...'))
     def add_to_set(field, val, safe=false)
       mongo_field = field.to_s
       field, hash = hash_for_field(mongo_field)

data/test/test_mongomatic.rb

@@ -9,7 +9,7 @@ class TestMongomatic < Test::Unit::TestCase
     assert_equal p1, Person.find_one(:name => "Jordan")
   end
   
-  should "find one with an instance of BSON::ObjectID" do
+  should "find one with an instance of BSON::ObjectId" do
     Person.collection.drop
     p1 = Person.new(:name => "Jordan")
     p1.insert
@@ -33,15 +33,15 @@ class TestMongomatic < Test::Unit::TestCase
     assert Person.find({"name" => "Jordan"}).empty?
   end
   
-  should "find one with ObjectID or hash only" do
+  should "find one with ObjectId or hash only" do
     Person.collection.drop
     Person.create_indexes
     
     p = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
-    assert p.insert!.is_a?(BSON::ObjectID)
+    assert p.insert!.is_a?(BSON::ObjectId)
     assert_equal 1, Person.count
     
-    found = Person.find({"_id" => BSON::ObjectID(p["_id"].to_s)}).next
+    found = Person.find({"_id" => BSON::ObjectId(p["_id"].to_s)}).next
     assert_equal found, p
     
     assert_raise(TypeError) { Person.find_one(p["_id"].to_s) }
@@ -49,7 +49,7 @@ class TestMongomatic < Test::Unit::TestCase
     found = Person.find_one({"_id" => p["_id"].to_s})
     assert_equal found, nil
     
-    found = Person.find_one({"_id" => BSON::ObjectID(p["_id"].to_s)})
+    found = Person.find_one({"_id" => BSON::ObjectId(p["_id"].to_s)})
     assert_equal found, p
   end
   
@@ -64,8 +64,8 @@ class TestMongomatic < Test::Unit::TestCase
     Person.collection.drop
     p1 = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
     p2 = Person.new(:name => "Ben2", :birth_year => 1986, :created_at => Time.now.utc, :admin => true)
-    assert p1.insert.is_a?(BSON::ObjectID)
-    assert p2.insert.is_a?(BSON::ObjectID)
+    assert p1.insert.is_a?(BSON::ObjectId)
+    assert p2.insert.is_a?(BSON::ObjectId)
     assert_equal 2, Person.collection.count
     assert_equal 2, Person.find.inject(0) { |sum, p| assert p.is_a?(Person); sum += 1 }
     assert_equal p2, Person.find.max { |p1,p2| p1["birth_year"] <=> p2["birth_year"] }
@@ -86,7 +86,7 @@ class TestMongomatic < Test::Unit::TestCase
     
     assert !p.update
     
-    assert p.insert.is_a?(BSON::ObjectID)
+    assert p.insert.is_a?(BSON::ObjectId)
     
     assert_equal 1, Person.collection.count
 
@@ -113,10 +113,10 @@ class TestMongomatic < Test::Unit::TestCase
   should "be able to limit and sort" do
     Person.collection.drop
     p = Person.new(:name => "Ben", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
-    assert p.insert.is_a?(BSON::ObjectID)
+    assert p.insert.is_a?(BSON::ObjectId)
     assert_equal 1, Person.collection.count
     p2 = Person.new(:name => "Ben2", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
-    assert p2.insert.is_a?(BSON::ObjectID)
+    assert p2.insert.is_a?(BSON::ObjectId)
     assert_equal 2, Person.collection.count
     
     cursor = Person.find({"_id" => p["_id"]})
@@ -146,7 +146,7 @@ class TestMongomatic < Test::Unit::TestCase
     Person.collection.drop
     1000.upto(2000) do |i|
       p = Person.new(:name => "Ben#{i}", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
-      assert p.insert.is_a?(BSON::ObjectID)
+      assert p.insert.is_a?(BSON::ObjectId)
     end
     i = 1000
     Person.find().sort(["name", :asc]).each { |p| assert_equal "Ben#{i}", p["name"]; i += 1 }
@@ -161,7 +161,7 @@ class TestMongomatic < Test::Unit::TestCase
   should "be able to merge hashes" do
     Person.collection.drop
     p = Person.new(:name => "Ben", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
-    assert p.insert.is_a?(BSON::ObjectID)
+    assert p.insert.is_a?(BSON::ObjectId)
     assert_equal 1, Person.collection.count
     p.merge(:birth_year => 1986)
     p.update
@@ -176,7 +176,7 @@ class TestMongomatic < Test::Unit::TestCase
     assert p.valid?
     assert_equal [:before_validate, :after_validate], p.callback_tests
     p.callback_tests = []
-    assert p.insert.is_a?(BSON::ObjectID)
+    assert p.insert.is_a?(BSON::ObjectId)
     assert_equal [:before_validate, :after_validate,  :before_insert, :before_insert_or_update, :after_insert, :after_insert_or_update], p.callback_tests
     p.callback_tests = []
     p.update
@@ -194,7 +194,7 @@ class TestMongomatic < Test::Unit::TestCase
     Person.create_indexes
     
     p = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
-    assert p.insert!.is_a?(BSON::ObjectID)
+    assert p.insert!.is_a?(BSON::ObjectId)
     assert_equal 1, Person.count
     
     p = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
@@ -519,5 +519,34 @@ class TestMongomatic < Test::Unit::TestCase
     p.valid?
     assert_nil p.errors.on(:name)
   end
+  
+  should "be able to use errors.on case insensitive" do
+    p = Person.new
+    class << p
+      def validate
+        expectations do 
+          be_expected self['name'], ['Name', 'cannot be empty']
+          be_expected self['age'], 'Age cannot be empty'
+        end
+      end
+    end
+    
+    p.valid?
+    assert_equal 'Name cannot be empty', p.errors.on('name')
+    assert_equal 'Age cannot be empty', p.errors.on(:age)
+  end
 
+  should "be able to use errors.on with multi word fields" do
+    p = Person.new
+    class << p
+      def validate
+        expectations do 
+          be_expected self['hair_color'], 'Hair color must exist'
+        end
+      end
+    end
+    
+    p.valid?
+    assert_equal 'Hair color must exist', p.errors.on(:hair_color)
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -07:00
+date: 2010-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,13 +38,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 7
+        version: 1.0.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -53,13 +53,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 7
+        version: 1.0.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -68,13 +68,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency