mingo 0.4.1 → 0.4.2

data/lib/mingo/connection.rb

@@ -10,13 +10,13 @@ class Mingo
       !!db
     end
     
-    def connect(dbname_or_uri)
+    def connect(dbname_or_uri, options = {})
       self.collection = nil
       self.db = if dbname_or_uri.index('mongodb://') == 0
-        connection = Mongo::Connection.from_uri(dbname_or_uri)
+        connection = Mongo::Connection.from_uri(dbname_or_uri, options)
         connection.db(connection.auths.last['db_name'])
       else
-        Mongo::Connection.new.db(dbname_or_uri)
+        Mongo::Connection.new(nil, nil, options).db(dbname_or_uri)
       end
     end
     

data/lib/mingo/cursor.rb

@@ -70,7 +70,7 @@ class Mingo
       if @limit > 0 || @skip > 0
         ids = selector[:_id]["$in"]
         old_skip = @skip
-        selector[:_id]["$in"] = ids[@skip, @limit > 0 ? @limit : ids.size]
+        selector[:_id]["$in"] = Array(ids[@skip, @limit > 0 ? @limit : ids.size])
         @skip = 0
         begin
           yield

data/lib/mingo/many_proxy.rb

@@ -82,6 +82,11 @@ class Mingo
     def loaded?
       !!@loaded
     end
+
+    def reload
+      @loaded = @join_loaded = nil
+      self
+    end
     
     def find(selector = {}, options = {}, &block)
       @model.find(selector, find_options.merge(options), &block)
@@ -90,7 +95,17 @@ class Mingo
     def respond_to?(method, priv = false)
       super || method_missing(:respond_to?, method, priv)
     end
-  
+
+    def reset_counter_cache
+      delta = join_cursor.count - counter_cache
+      change_counter_cache delta
+      counter_cache
+    end
+
+    def cache_key
+      [@parent, @property, counter_cache]
+    end
+
     private
   
     def method_missing(method, *args, &block)

data/lib/mingo.rb

@@ -54,4 +54,15 @@ class Mingo < Hash
   def ==(other)
     other.is_a?(self.class) and other.id == self.id
   end
+
+  def cache_key
+    model_key = self.class.model_name.cache_key
+    if not persisted?
+      "#{model_key}/new"
+    elsif timestamp = self['updated_at']
+      "#{model_key}/#{id}-#{timestamp.utc.strftime("%Y%m%d%H%M%S")}"
+    else
+      "#{model_key}/#{id}"
+    end
+  end
 end

data/spec/mingo_spec.rb

@@ -200,13 +200,44 @@ describe User do
       cursor.to_a.should == [@doc2]
     end
 
+    it "doesn't die when offset is out of bounds" do
+      cursor = described_class.find([@doc3.id, @doc1.id, @doc2.id]).skip(4)
+      cursor.to_a.should be_empty
+    end
+
     it "returns correct count" do
       cursor = described_class.find([@doc3.id, @doc1.id, @doc2.id]).limit(1).skip(2)
-      cursor.next_document
       cursor.count.should == 3
     end
+
+    it "works with empty ID list" do
+      results = described_class.find([]).to_a
+      results.should be_empty
+    end
+
+    it "works with nonexistent ID" do
+      results = described_class.find([BSON::ObjectId.new]).to_a
+      results.should be_empty
+    end
   end
-  
+
+  context "cache_key" do
+    it "has it" do
+      build.cache_key.should == "users/new"
+    end
+
+    it "includes the ID if persisted" do
+      user = create
+      user.cache_key.should == "users/#{user.id}"
+    end
+
+    it "includes the timestamp if present" do
+      user = create
+      user['updated_at'] = Time.utc_time 2011, 12, 13, 14, 15, 16
+      user.cache_key.should == "users/#{user.id}-20111213141516"
+    end
+  end
+
   def build(*args)
     described_class.new(*args)
   end

metadata

@@ -2,7 +2,7 @@
 name: mingo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo