candy 0.2.4 → 0.2.5

data/.gitignore

@@ -5,6 +5,9 @@
 *.tmproj
 tmtags
 
+## RVM
+.rvmrc
+
 ## EMACS
 *~
 \#*

data/HISTORY.markdown

@@ -1,18 +1,29 @@
-# Candy History
+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.4 - 2010-04-21 (the "No shortcuts!" release)
+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.
 
-While building validations and custom behavior on a new app, I realized that any method overrides in my classes
-were being bypassed if I passed the values in a hash to .new() -- it was just setting everything straight in Mongo.
-Inconsistent behavior is uncool.  So now every hash key calls the relevant assignment method in the class.
+* Default collection names no longer include module namespace paths
+
+
+v0.2.4 - 2010-04-21 (the "No shortcuts!" release)
+------------------------------------------------- 
+While building validations and custom behavior on a new app, I realized that
+any method overrides in my classes were being bypassed if I passed the values
+in a hash to .new() -- it was just setting everything straight in Mongo.
+Inconsistent behavior is uncool. So now every hash key calls the relevant
+assignment method in the class.
 
 * Values passed in hash to new objects call the relevant assignment methods
 * Fixed typo in README (thanks, kfl62)
 
-## v0.2.3 - 2010-04-13 (the "around and around we go") release
 
+v0.2.3 - 2010-04-13 (the "around and around we go") release
+-----------------------------------------------------------
 Turns out some Rails environments get really ornery if you introduce circular dependencies into your code.  Like, say, requiring 'candy/hash' inside 'candy/piece' and 'candy/piece' inside 'candy/hash'.  Who knew?
 
 (Rhetorical question.  _I_ should have known.  I'll restructure later to remove the breakage.)
@@ -20,22 +31,24 @@ Turns out some Rails environments get really ornery if you introduce circular de
 * Stubbed out Candy::Piece to resolve circular dependency issue
 
 
-## v0.2.2 - 2010-04-12 (the "I hate reporting bugs to the MongoDB team" release)
-
+v0.2.2 - 2010-04-12 (the "I hate reporting bugs to the MongoDB team" release)
+-----------------------------------------------------------------------------
 The Mongo gem has broken the BSON functions out into a separate bson gem, so I had to fix things.  This means Candy is no longer compatible with the Mongo gem < 0.20.1.  Que sera.  (Also, the bson_ext gem **must** be installed due to a bug.  I'll remove the dependency when they fix it.)  Additional minor bonus: authentication.
 
 * New BSON::* classes correctly referenced in Candy::Wrapper
 * Candy.username and Candy.password properties to automatically authenticate at the global level
 * Class-specific .username and .password properties for class-specific databases
 
-## v0.2.1 - 2010-04-04 (the "Oops" release)
 
+v0.2.1 - 2010-04-04 (the "Oops" release)
+----------------------------------------
 I screwed up in my use of Jeweler, and managed to get my versions out of sync between Github and Rubygems.org.  I tried to `gem yank` the one from Rubygems, but it won't let me push again with the same version number.  To justify bumping the patch number, I added this changelog.  Yeah, I know.  Pathetic.
 
 * The HISTORY file you're reading
 
-## v0.2.0 - 2010-04-04 (the "Candy for Easter" release)
 
+v0.2.0 - 2010-04-04 (the "Candy for Easter" release)
+----------------------------------------------------
 A nearly total rewrite.  Some specs still remain from v0.1, but very little actual code.  Added in this release were:
 
 * Candy::Collection
@@ -48,6 +61,7 @@ A nearly total rewrite.  Some specs still remain from v0.1, but very little actu
 * The Don't Be a Dick License
 * Other stuff I've surely forgotten about
 
-## v0.1 - 2010-02-16
 
+v0.1 - 2010-02-16
+-----------------
 Let's just call this one a "proof of concept" release.  It worked, but clumsily.  Only Candy::Piece was really implemented, with no embedding, and the bulk of the code was directly in `method_missing`.  Global variables like **$MONGO_HOST** were used instead of module properties, and the separation of driver and framework concerns was nonexistent.  Please don't look at it.  You'll make me blush.

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/candy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{candy}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Eley"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-05-03}
   s.description = %q{Candy provides simple, transparent object persistence for the MongoDB database.  Classes that 
 include Candy modules save all properties to Mongo automatically, can be recursively embedded,
 and can retrieve records with chainable open-ended class methods, eliminating the need for 

data/lib/candy/collection.rb

@@ -16,16 +16,13 @@ module Candy
       
       attr_reader :_candy_piece
       
-      # Sets the collection that all queries run against, qualified by
-      # the namespace of the current class.  (I.e., if this class is 
-      # BigModule::LittleModule::People, `collects :person` will look for
-      # a collection named "BigModule::LittleModule::Person".) You can also 
+      # Sets the collection that all queries run against.  You can also 
       # specify a class that includes Candy::Piece that will be instantiated
       # for all found records. Otherwise the collection name is used as a 
       # default, and CandyHash is a fallback.
       def collects(collection, piece = nil)
-        collectible = namespace + camelcase(collection)
-        piecemeal = (piece ? namespace + camelcase(piece) : collectible)
+        collectible = camelcase(collection)
+        piecemeal = namespace + (piece ? camelcase(piece) : collectible)
         self.collection = collectible
         @_candy_piece = Kernel.qualified_const_get(piecemeal) || CandyHash
       end

data/lib/candy/crunch.rb

@@ -172,8 +172,9 @@ module Candy
       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)
+        @collection ||= db.collection(name.sub(/^.*::/,''))
       end
       
       # Creates an index on the specified property, with an optional direction specified as either :asc or :desc.

data/spec/candy/crunch_spec.rb

@@ -95,7 +95,7 @@ describe Candy::Crunch do
     
     it "clears the collection when you set it" do
       PeanutBrittle.db = 'candy_test'
-      PeanutBrittle.collection.name.should == PeanutBrittle.name
+      PeanutBrittle.collection.name.should == 'PeanutBrittle'
       PeanutBrittle.db = nil
       PeanutBrittle.instance_variable_get(:@collection).should be_nil
     end
@@ -151,7 +151,7 @@ describe Candy::Crunch do
     end
   
     it "defaults to the class name" do
-      PeanutBrittle.collection.name.should == PeanutBrittle.name
+      PeanutBrittle.collection.name.should == 'PeanutBrittle'
     end
   
     it "throws an exception if you give it a type it can't recognize" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Stephen Eley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -04:00
+date: 2010-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency