light_mongo 0.3.0 → 0.4.0

data/README.md

@@ -13,6 +13,10 @@ LightMongo is best installed via `gem install light_mongo` and required as norma
 It is dependent on the gem `mongo`, which is the MongoDB Ruby driver.
 For performance reasons I would recommend also installing `mongo_ext`, the C extensions for the driver.
 
+Rails
+-----
+Please see [LightMongo-Rails][lm_rails] for an ActionPack-compatible bridge.
+
 The problem
 -----------
 Developers occasionally encounter a domain which defies simple modelling in an ActiveRecord relational style, and look to some of the nosql databases for a solution.  They find Mongo, a document database, and feel it might provide the flexibility they need.  After a bit of research they pick out a persistence library which seems popular and well maintained.  It even emulates most of ActiveRecord's behaviour, style and relational philosophy.  Great!
@@ -131,7 +135,7 @@ Future development
 1. Migrations (e.g. when you rename classes or modify their collection style).
 2. Some kind of validations, perhaps.
 
-
+[lm_rails]:http://github.com/elliotcm/light_mongo-rails
 
 
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/integration/support/integration_helper.rb

@@ -6,4 +6,4 @@ def db_teardown
   after(:each) do
     LightMongo.connection.drop_database(LightMongo.database.name)
   end
-end
+end

data/lib/document/persistence.rb

@@ -89,7 +89,9 @@ module LightMongo
         end
         
         def find(query=nil)
-          query = {'_id' => query} unless query.nil? or query.is_a?(Hash)
+          return new(collection.find_one(query)) if query.is_a?(Mongo::ObjectID)
+          return new(collection.find_one(Mongo::ObjectID.from_string(query))) if query.is_a? String
+          
           collection.find(query).map{|bson_hash| new(bson_hash)}
         end
         

data/lib/document/serialization/serializer.rb

@@ -27,7 +27,7 @@ module LightMongo
                 end
 
                 if object_to_deserialize.has_key?('_embed') and object_to_deserialize['_embed'] == true
-                  return Object.const_get(class_name).find(object_to_deserialize['_id']).first
+                  return Object.const_get(class_name).find(object_to_deserialize['_id'])
                 end
               end
               

data/spec/document/persistence_spec.rb

@@ -160,19 +160,41 @@ describe LightMongo::Document::Persistence do
   end
   
   describe ".find(query=nil)" do
-    before(:each) do
-      @no_query_results = mock(:no_query_results)
-      @query_results = mock(:query_results)
-      TestClass.stub!(:new).with(@no_query_results).and_return(@no_query_object = mock(:no_query_object))
-      TestClass.stub!(:new).with(@query_results).and_return(@query_object = mock(:query_object))
+    context "when passed a string" do
+      before(:each) do
+        @query = "4bae6ac37bc7693598000001"
+        Mongo::ObjectID.stub!(:from_string).with(@query).and_return(oid = mock(:oid))
+        @test_class_collection.stub!(:find_one).with(oid).and_return(results = mock(:results))
+        TestClass.stub!(:new).with(results).and_return(@TestObject = mock(:TestObject))
+      end
+      
+      it "does a single-record lookup using the string as an ID" do
+        TestClass.find(@query).should == @TestObject
+      end
+    end
+    
+    context "when passed an OID" do
+      before(:each) do
+        @query = Mongo::ObjectID.from_string("4bae6ac37bc7693598000001")
+        @test_class_collection.stub!(:find_one).with(@query).and_return(results = mock(:results))
+        TestClass.stub!(:new).with(results).and_return(@TestObject = mock(:TestObject))
+      end
+      
+      it "does a single-record lookup using the ID" do
+        TestClass.find(@query).should == @TestObject
+      end
     end
     
-    it "maps MongoDB::Collection.find" do
-      @test_class_collection.should_receive(:find).and_return([@no_query_results])
-      TestClass.find.should == [@no_query_object]
+    context "when passed anything else" do
+      before(:each) do
+        @query = mock(:query)
+        @test_class_collection.stub!(:find).with(@query).and_return([results = mock(:results)])
+        TestClass.stub!(:new).with(results).and_return(@TestObject = mock(:TestObject))
+      end
       
-      @test_class_collection.should_receive(:find).with({'_id' => query = mock(:query)}).and_return([@query_results])
-      TestClass.find(query).should == [@query_object]
+      it "does a multi-record lookup on the query" do
+        TestClass.find(@query).should == [@TestObject]
+      end
     end
   end
   

data/spec/document/serialization/serializer_spec.rb

@@ -97,7 +97,7 @@ describe Serializer do
         end
         
         it "recovers the linked document" do
-          TestClass.stub!(:find).with(@id).and_return([test_instance = mock(:test_instance)])
+          TestClass.stub!(:find).with(@id).and_return(test_instance = mock(:test_instance))
           
           Serializer.deserialize(@object).should == test_instance
         end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Elliot Crosby-McCullough
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +00:00
+date: 2010-03-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency