mongomatic 0.1.2 → 0.1.3

data/lib/mongomatic/base.rb

@@ -28,7 +28,7 @@ module Mongomatic
       
       def find_one(query={}, opts={})
         return nil unless doc = self.collection.find_one(query, opts)
-        self.new(doc)
+        self.new(doc, false)
       end
       
       def all
@@ -48,11 +48,20 @@ module Mongomatic
       end
     end
 
-    attr_accessor :removed
+    attr_accessor :removed, :is_new
 
-    def initialize(doc={})
+    def initialize(doc={}, is_new=true)
       @doc = doc.stringify_keys
       self.removed = false
+      self.is_new  = is_new
+    end
+    
+    def is_new?
+      self.is_new == true
+    end
+    
+    def new?
+      self.is_new == true
     end
     
     def []=(k,v)
@@ -74,10 +83,6 @@ module Mongomatic
     def ==(obj)
       obj.is_a?(self.class) && obj.doc["_id"] == @doc["_id"]
     end
-    
-    def new?
-      @doc["_id"] == nil
-    end
 
     def reload
       if obj = self.class.find({"_id" => @doc["_id"]}).next_document
@@ -90,7 +95,8 @@ module Mongomatic
       self.send(:before_insert) if self.respond_to?(:before_insert)
       self.send(:before_insert_or_update) if self.respond_to?(:before_insert_or_update)
       if ret = self.class.collection.insert(@doc,opts)
-        @doc["_id"] = @doc.delete(:_id); ret
+        @doc["_id"] = @doc.delete(:_id) if @doc[:_id]
+        self.is_new = false
       end
       self.send(:after_insert) if self.respond_to?(:after_insert)
       self.send(:after_insert_or_update) if self.respond_to?(:after_insert_or_update)

data/lib/mongomatic/cursor.rb

@@ -20,7 +20,7 @@ module Mongomatic
     
     def next_document
       if doc = @mongo_cursor.next_document
-        @obj_class.new(doc)
+        @obj_class.new(doc, false)
       end
     end
     
@@ -28,14 +28,10 @@ module Mongomatic
     
     def each
       @mongo_cursor.each do |doc|
-        yield(@obj_class.new(doc))
+        yield(@obj_class.new(doc, false))
       end
     end
     
-    # def to_a
-    #   @mongo_cursor.to_a.collect { |doc| @obj_class.new(doc) }
-    # end
-    
     def current_limit
       @mongo_cursor.limit
     end

data/test/test_mongomatic.rb

@@ -183,4 +183,33 @@ class TestMongomatic < Test::Unit::TestCase
     
     assert_equal 1, Person.count
   end
+  
+  should "have the is_new flag set appropriately" do
+    Person.collection.drop
+    p = Person.new
+    assert p.is_new?
+    assert !p.insert
+    assert p.is_new?
+    p["name"] = "Ben"
+    assert p.insert
+    assert !p.is_new?
+    p = Person.find_one(p["_id"])
+    assert !p.is_new?
+  end
+  
+  should "be able to set a custom id" do
+    Person.collection.drop
+    p = Person.new(:name => "Ben")
+    assert p.is_new?
+    p["_id"] = "mycustomid"
+    assert p.insert
+    found = Person.find_one({"_id" => "mycustomid"})
+    assert_equal found, p
+    assert !p.is_new?
+    found["age"] = 26
+    assert found.update
+    found = Person.find_one({"_id" => "mycustomid"})
+    assert_equal found["_id"], "mycustomid"
+    assert_equal 26, found["age"]
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ben Myles