lib/candy/crunch.rb in candy-0.2.5 vs lib/candy/crunch.rb in candy-0.2.6

@@ -161,22 +161,22 @@
       def collection=(val)
         case val
         when Mongo::Collection
           @collection = val
         when String
-          @collection = db.collection(val)
+          @collection_name = val  # Don't collapse the probability wave until called upon
         when nil
           @collection = nil
         else
           raise ConnectionError, "The collection attribute needs a Mongo::Collection object or a name string."
         end
       end
       
       # Returns the collection you gave, or creates a default collection named for the current class.
       # (By which we mean _just_ the class name, not the full module namespace.)
       def collection
-        @collection ||= db.collection(name.sub(/^.*::/,''))
+        @collection ||= db.collection(collection_name)
       end
       
       # Creates an index on the specified property, with an optional direction specified as either :asc or :desc.
       # (Note that this is deliberately a very simple method. If you want multi-key or unique indexes, just call
       # #create_index directly on the collection.)
@@ -189,9 +189,18 @@
         end
         collection.create_index([[property, mongo_direction]])
       end
       
     private
+      # If we were passed a string on #collection= then we want to pass it to the DB when the collection is referenced,
+      # not right away.  So store it and pass it back on the initial call to #collection.  If nothing, pass the 
+      # class name instead.
+      def collection_name
+        collection_name = @collection_name || name.sub(/^.*::/,'')
+        @collection_name = nil  # Forget this name to avoid confusion on subsequent calls
+        collection_name
+      end
+      
       # If we don't have a username AND password, returns the DB given.  If we do, returns the DB if-and-only-if
       # we can authenticate on that DB.
       def maybe_authenticate(db)
         if @username && @password
           db if db.authenticate(@username, @password)
\ No newline at end of file