candy 0.2.5 → 0.2.6

data/HISTORY.markdown

@@ -3,6 +3,15 @@ Candy History
 
 This document aims to provide only an overview.  Further, we've only really been tracking things since **v0.2**.  For obsessive detail, just check out the `git log`.
 
+v0.2.6 - 2010-05-03 (the "Spanish Fly" release)
+-----------------------------------------------
+Thanks to [xpaulbettsx](http://github.com/xpaulbettsx) for pointing out in issue \#4 that Candy was attempting to connect to localhost prematurely.  
+A stray setting of the collection name in CandyHash was the culprit, causing a cascade of lookups.  Refactored to maintain lazy evaluation of the whole MongoDB object chain, and while I was at it, moved most of the interesting objects into `autoload` conditions in the main Candy file instead of `require`.
+
+* Reorganized for autoloading
+* Fixed issue #4 - tries to connect to host immediately on require
+
+
 v0.2.5 - 2010-05-02 (the "John::Jacob::Jingleheimer::Schmidt" release)
 ----------------------------------------------------------------------
 As I was building an app based on several Sinatra building blocks, I realized that Candy was creating collection names like **Login::Person** and **Profile::Person** with complete module namespaces.  I wanted both of those **Person** classes to be different views on the same data, and having to override the collection name each time was becoming a pain.  I'm not sure that fully namespacing the collection names inside Mongo has much value, and we weren't really documenting that it was happening, so I've simplified things.

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/candy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{candy}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Eley"]

data/lib/candy.rb

@@ -1,7 +1,17 @@
 # encoding: utf-8
 
-# Make me one with everything...
-Dir[File.join(File.dirname(__FILE__), 'candy', '*.rb')].each {|f| require f}
+require 'candy/crunch'
+require 'candy/exceptions'
+
+module Candy
+  # Let's be minimalist here.  Some implementations may not need Collections, or Arrays, etc.
+  # Anything not in the autoload list below is unlikely to be accessed directly by an end user.
+  autoload :CandyHash, 'candy/hash'
+  autoload :CandyArray, 'candy/array'
+  autoload :Wrapper, 'candy/wrapper'
+  autoload :Piece, 'candy/piece'
+  autoload :Collection, 'candy/collection'
+end
 
 # Special keys for Candy metadata in the Mongo store. We try to keep these to a minimum, 
 # and we're using moderately obscure Unicode symbols to reduce the odds of collisions.

data/lib/candy/array.rb

@@ -10,7 +10,7 @@ module Candy
     include Crunch
     include Embeddable
     
-    # Included for purposes of 'embeddable' compatbility, but does nothing except pass its 
+    # Included for purposes of 'embeddable' compatibility, but does nothing except pass its 
     # parameters to the new object.  Since you can't save an array on its own anyway, there's
     # no need to flag it as "don't save."
     def self.embed(*args, &block)

data/lib/candy/crunch.rb

@@ -163,7 +163,7 @@ module Candy
         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
@@ -174,7 +174,7 @@ module Candy
       # 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.
@@ -191,6 +191,15 @@ module Candy
       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)

data/lib/candy/hash.rb

@@ -1,9 +1,6 @@
 require 'candy/piece'
 
 module Candy
-  # Stubbing to avoid circular dependency problems
-  module Piece
-  end
   
   # A subclass of Hash that behaves like a Candy::Piece.  This class has two major uses:
   #

data/lib/candy/piece.rb

@@ -2,7 +2,6 @@ require 'candy/array'
 require 'candy/crunch'
 require 'candy/embeddable'
 require 'candy/factory'
-require 'candy/hash'
 
 module Candy
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Stephen Eley