mongo_doc 0.3.1 → 0.3.2

data/README.textile

@@ -1,9 +1,17 @@
 h1. MongoDoc
 
-Version: 0.2.4 2/23/10
+Version: 0.3.2 2010/03/11
 
-2010-02-23 API is *changing* significantly
-2010-01-23 Tracking MongoDoc with @git@? *READ THIS NOTE*[1]
+* 2010-03-10 Slides are out of date, use key instead of attr_accessor with MongoDoc::Document (implementation was way too hackish)
+* 2010-02-23 API is *changing* significantly
+* 2010-01-23 Tracking MongoDoc with @git@? *READ THIS NOTE*[1]
+
+h2. Quick Start
+
+* install MongoDB (at least 1.3.2)
+* install the Ruby driver @gem install mongo@
+* install MongoDoc @gem install mongo_doc@
+* run an example from this directory @ruby -Ilib examples/simple_object.rb@
 
 h2. Introduction
 

data/TODO

@@ -1,4 +1,4 @@
-As of 2010-02-23
+As of 2010-03-06
 
 Associations
 ------------
@@ -8,13 +8,18 @@ Pull associations out of attributes and refactor
 Criteria
 --------
 
-Make critieria module, include into Document, CriteriaProxy, Association?
+Make critieria module; include into CriteriaProxy, Association?
+page, per_page, paginate shuould be wrapped or not?
+
+Contexts
+--------
+
+Extract Mongo context as module, Document#collection => klass.collection Collection#collection => klass
 
 Documentation
 -------------
 
 How to get started with Rails
-Using mongohq
 
 Dynamic Attributes
 ------------------
@@ -29,3 +34,7 @@ Validations
 
 validates_hash_keys :has_hash_name, :in => [array of names]
 
+
+Q
+-
+What is Criteria#ids

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/examples/simple_document.rb

@@ -25,7 +25,12 @@ Contact.collection.drop
 contact = Contact.new(:name => 'Hashrocket', :interests => ['ruby', 'rails', 'agile'])
 contact.addresses << Address.new(:street => '320 1st Street North, #712', :city => 'Jacksonville Beach', :state => 'FL', :zip_code => '32250', :phone_number => '877 885 8846')
 contact.save
+
+# Finders
+Contact.find_all.each {|c| puts c.name}
+puts contact.to_param
 puts Contact.find_one(contact.to_param).addresses.first.street
+Contact.find(contact.to_param).each {|c| puts c.name}
 
 hashrocket = Contact.in_state('FL').find {|contact| contact.name == 'Hashrocket'}
 
@@ -33,3 +38,9 @@ hashrocket_address = hashrocket.addresses.first
 hashrocket_address.update_attributes(:street => '320 First Street North, #712')
 
 puts Contact.where(:name => 'Hashrocket').first.addresses.first.street
+
+# Criteria behave like new AR3 AREL queries
+hr = Contact.where(:name => 'Hashrocket')
+hr_in = hr.where('addresses.state' => 'IN')
+puts hr.count
+puts hr_in.count

data/examples/simple_object.rb

@@ -25,6 +25,10 @@ contact.addresses = [address]
 
 collection.save(contact)
 
-results = collection.find('addresses.state' => 'FL')
-hashrocket = results.to_a.find {|contact| contact.name == 'Hashrocket'}
-puts hashrocket.addresses.first.phone_number
+in_florida = collection.where('addresses.state' => 'FL')
+puts in_florida.first.addresses.first.phone_number
+rocket_oid_names = collection.where('name' => /rocket/)
+puts rocket_oid_names.first.addresses.first.phone_number
+interested_in_ruby = collection.in('interests' => ['ruby'])
+puts interested_in_ruby.first.addresses.first.phone_number
+

data/features/collections.feature

@@ -0,0 +1,9 @@
+Feature: Collection with Criteria
+
+  Scenario: saving a ruby object
+    Given a new collection named 'test'
+    And an object 'movie'
+    When I save the object 'movie'
+    And I query the collection 'test' with the criteria where(:title => 'Gone with the Wind')
+    Then the query result has 1 documents
+

data/features/step_definitions/collection_steps.rb

@@ -12,3 +12,6 @@ Then /the collection should have (\d+) documents?/ do |count|
   @collection.count.should == count.to_i
 end
 
+When "I query the collection '$collection_name' with the criteria $criteria" do |collection_name, criteria|
+  @query = eval("@collection.#{criteria}")
+end

data/features/step_definitions/documents.rb

@@ -28,3 +28,11 @@ class Contact
   scope :contract_work, any_in(:interests => ['contract work'])
   scope :in_state, lambda {|state| where('addresses.state' => state)}
 end
+
+class Event
+  include MongoDoc::Document
+
+  key :name
+  key :venue
+  key :date, :type => Date
+end

data/features/step_definitions/objects.rb

@@ -7,18 +7,18 @@ end
 
 class Movie
   include ValueEquals
-  
+
   attr_accessor :title, :director, :writers
 end
 
 class Director
   include ValueEquals
-  
+
   attr_accessor :name, :awards
 end
 
 class AcademyAward
   include ValueEquals
-  
+
   attr_accessor :year, :category
 end

data/features/step_definitions/query_steps.rb

@@ -6,6 +6,10 @@ def query(klass_name = nil)
   @query ||= klass(klass_name).criteria
 end
 
+When "I also want a $number query with criteria $criteria" do |number, criteria|
+  instance_variable_set("@#{number}", eval("query.#{criteria}"))
+end
+
 Then /^the query result is equal to the document '(.*)'$/ do |name|
   doc = instance_variable_get("@#{name}")
   query.should == doc
@@ -55,3 +59,8 @@ end
 Then /^the query (is|is not) (empty|blank)$/ do |is, empty|
   query.send("#{empty}?").should == (is == 'is')
 end
+
+Then /^the (.+) query (is|is not) (empty|blank)$/ do |number, is, empty|
+  instance_variable_get("@#{number}").send("#{empty}?").should == (is == 'is')
+end
+

data/features/step_definitions/string_casting_steps.rb

@@ -0,0 +1,28 @@
+def last
+  @last
+end
+
+def last=(value)
+  @last = value
+end
+
+def all
+  @all ||= []
+end
+
+def all=(value)
+  @all = value
+end
+
+Given /^a class Event$/ do
+end
+
+Given /^I create an (.+) '(.+)' with:$/ do |klass_name, object_name, table|
+  Given "an #{klass_name} document named '#{object_name}' :", table
+end
+
+Then /^the object '(.+)' has an attribute '(.+)' of type (.*)$/ do |object_name, attr_name, type_name|
+  object = instance_variable_get("@#{object_name}")
+  type_name.constantize.should === object.send(attr_name)
+end
+

data/features/string_casting.feature

@@ -0,0 +1,10 @@
+Feature: String casting
+
+  Background:
+    Given a class Event
+
+  Scenario: Creating a new document
+    When I create an Event 'event' with:
+      | Name                 | Venue                          | Date       |
+      | NoSQL Live           | John Hancock Conference Center | 2010-03-11 |
+    Then the object 'event' has an attribute 'date' of type Date

data/features/using_criteria.feature

@@ -134,3 +134,9 @@ Feature: MongoDoc::Base
   Scenario: Is a criteria empty?
     When I query contacts with criteria all('interests' => ['ruby'])
     Then the query is not empty
+
+  Scenario: Criteria return a new criteria
+    When I query contacts with criteria all('interests' => ['ruby'])
+    And I also want a second query with criteria where('addresses.state' => 'HI')
+    Then the query is not empty
+    And the second query is empty

data/lib/mongo_doc/attributes.rb

@@ -19,6 +19,20 @@ module MongoDoc
       end
     end
 
+    def attributes
+      hash = {}
+      self.class._attributes.each do |attr|
+        hash[attr] = send(attr)
+      end
+      hash
+    end
+
+    def attributes=(attrs)
+      attrs.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+
     def _root
       @_root
     end
@@ -42,9 +56,41 @@ module MongoDoc
       end
 
       def key(*args)
+        opts = args.extract_options!
+        default = opts.delete(:default)
+        type = opts.delete(:type)
         args.each do |name|
           _keys << name unless _keys.include?(name)
-          attr_accessor name
+          if default
+            attr_writer name
+
+            define_method("_default_#{name}", default.kind_of?(Proc) ? default : Proc.new { default })
+            private "_default_#{name}"
+
+            module_eval(<<-RUBY, __FILE__, __LINE__)
+              def #{name}
+                unless defined? @#{name}
+                  @#{name} = _default_#{name}
+                end
+                class << self; attr_reader :#{name} end
+                @#{name}
+              end
+            RUBY
+          else
+            attr_accessor name
+          end
+
+          if type and type.respond_to?(:cast_from_string)
+            module_eval(<<-RUBY, __FILE__, __LINE__)
+              def #{name}_with_type=(value)               # def birth_date_with_type=(value)
+                if value.kind_of?(String)                 #   if value.kind_of?(String)
+                  value = #{type}.cast_from_string(value) #     value = Date.cast_from_string(value)
+                end                                       #   end
+                self.#{name}_without_type = value         #   self.birth_date_without_type = value
+              end                                         # end
+            RUBY
+            alias_method_chain "#{name}=", :type
+          end
         end
       end
 

data/lib/mongo_doc/bson.rb

@@ -1,18 +1,4 @@
-require 'mongo_doc/ext/array'
-require 'mongo_doc/ext/binary'
-require 'mongo_doc/ext/boolean_class'
-require 'mongo_doc/ext/date'
-require 'mongo_doc/ext/date_time'
-require 'mongo_doc/ext/dbref'
-require 'mongo_doc/ext/hash'
-require 'mongo_doc/ext/nil_class'
-require 'mongo_doc/ext/numeric'
-require 'mongo_doc/ext/object'
-require 'mongo_doc/ext/object_id'
-require 'mongo_doc/ext/regexp'
-require 'mongo_doc/ext/string'
-require 'mongo_doc/ext/symbol'
-require 'mongo_doc/ext/time'
+require 'mongo_doc/ext'
 
 module MongoDoc
   module BSON
@@ -29,7 +15,7 @@ module MongoDoc
         bson
       end
     end
-    
+
     def self.bson_create(bson_hash, options = {})
       return bson_hash if options[:raw_json]
       klass = bson_hash.delete(CLASS_KEY)

data/lib/mongo_doc/collection.rb

@@ -1,10 +1,33 @@
 require 'mongo_doc/cursor'
+require 'mongo_doc/criteria'
 
 module MongoDoc
   class Collection
     attr_accessor :_collection
 
-    delegate :[], :clear, :count, :create_index, :db, :distinct, :drop, :drop_index, :drop_indexes, :group, :hint, :index_information, :map_reduce, :mapreduce, :name, :options, :pk_factory, :remove, :rename, :size, :to => :_collection
+    include MongoDoc::Criteria
+
+    delegate \
+      :[],
+      :clear,
+      :count,
+      :create_index,
+      :db,
+      :distinct,
+      :drop,
+      :drop_index,
+      :drop_indexes,
+      :group,
+      :hint,
+      :index_information,
+      :map_reduce,
+      :mapreduce,
+      :name,
+      :options,
+      :pk_factory,
+      :remove,
+      :rename,
+      :size, :to => :_collection
 
     def initialize(name)
       self._collection = self.class.mongo_collection(name)
@@ -40,6 +63,10 @@ module MongoDoc
 
     protected
 
+    def collection
+      self
+    end
+
     def last_error
       MongoDoc::Connection.database.command({'getlasterror' => 1})
     end

data/lib/mongo_doc/contexts.rb

@@ -6,6 +6,9 @@ require "mongo_doc/contexts/mongo"
 
 module Mongoid
   module Contexts
+
+    class UnknownContext < RuntimeError; end
+
     # Determines the context to be used for this criteria. If the class is an
     # embedded document, then the context will be the array in the has_many
     # association it is in. If the class is a root, then the database itself
@@ -15,10 +18,13 @@ module Mongoid
     #
     # <tt>Contexts.context_for(criteria)</tt>
     def self.context_for(criteria)
-      if criteria.klass.respond_to?(:collection)
+      if criteria.klass.respond_to?(:_append)
+        return MongoDoc::Contexts::Enumerable.new(criteria)
+      elsif criteria.klass.respond_to?(:collection)
         return MongoDoc::Contexts::Mongo.new(criteria)
+      else
+        raise UnknownContext.new("Context not found for: #{criteria.klass}")
       end
-      return MongoDoc::Contexts::Enumerable.new(criteria)
     end
 
   end

data/lib/mongo_doc/criteria.rb

@@ -10,27 +10,59 @@ module MongoDoc
     #
     # <tt>Person.criteria</tt>
     def criteria
-      Mongoid::Criteria.new(self)
+      CriteriaWrapper.new(self)
     end
 
     delegate \
+      :aggregate,
+      :all,
       :and,
       :any_in,
-      :cache,
-      :enslave,
+      :blank?,
+      :count,
+      :empty?,
       :excludes,
       :extras,
+      :first,
+      :group,
       :id,
       :in,
+      :last,
       :limit,
+      :max,
+      :min,
       :not_in,
       :offset,
+      :one,
       :only,
       :order_by,
       :page,
+      :paginate,
       :per_page,
       :skip,
+      :sum,
       :where, :to => :criteria
+
+    class CriteriaWrapper < Mongoid::Criteria
+      %w(all and any_in cache enslave excludes extras fuse in limit not_in offset only order_by skip where).each do |method|
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def #{method}_with_wrapping(*args, &block)                # def and(*args, &block)
+            new_criteria = CriteriaWrapper.new(klass)               #   new_criteria = CriteriaWrapper.new(klass)
+            new_criteria.merge(self)                                #   new_criteria.merge(criteria)
+            new_criteria.#{method}_without_wrapping(*args, &block)  #   new_criteria.and_without_wrapping(*args, &block)
+            new_criteria                                            #   new_criteria
+          end                                                       # end
+
+          alias_method_chain :#{method}, :wrapping
+          protected :#{method}_without_wrapping
+        RUBY
+      end
+
+      protected
+
+      attr_accessor :criteria
+
+    end
   end
 end
 

data/lib/mongo_doc/document.rb

@@ -36,20 +36,6 @@ module MongoDoc
       self.class._attributes.all? {|var| self.send(var) == other.send(var)}
     end
 
-    def attributes
-      hash = {}
-      self.class._attributes.each do |attr|
-        hash[attr] = send(attr)
-      end
-      hash
-    end
-
-    def attributes=(attrs)
-      attrs.each do |key, value|
-        send("#{key}=", value)
-      end
-    end
-
     def new_record?
       _id.nil?
     end
@@ -132,13 +118,13 @@ module MongoDoc
 
       def create(attrs = {})
         instance = new(attrs)
-        instance.save(false)
+        instance.save(true)
         instance
       end
 
       def create!(attrs = {})
         instance = new(attrs)
-        instance.save!(true)
+        instance.save!
         instance
       end
     end

data/lib/mongo_doc/ext/boolean_class.rb

@@ -1,3 +1,9 @@
+class Boolean
+  def self.cast_from_string(value)
+    value == '1' || value.downcase == 'true'
+  end
+end
+
 class FalseClass
   def to_bson(*args)
     self
@@ -8,4 +14,4 @@ class TrueClass
   def to_bson(*args)
     self
   end
-end
+end

data/lib/mongo_doc/ext/date.rb

@@ -13,4 +13,7 @@ class Date
     Date.parse(*bson_hash.values_at('dt', 'sg'))
   end
 
+  def self.cast_from_string(value)
+    Date.parse(value) unless value.blank?
+  end
 end

data/lib/mongo_doc/ext/date_time.rb

@@ -10,4 +10,8 @@ class DateTime
   def self.bson_create(bson_hash, options = nil)
     DateTime.parse(*bson_hash.values_at('dt', 'sg'))
   end
+
+  def self.cast_from_string(string)
+    DateTime.parse(string) unless string.blank?
+  end
 end

data/lib/mongo_doc/ext/numeric.rb

@@ -4,14 +4,14 @@ class Numeric
   end
 end
 
-class Float
-  def to_bson(*args)
-    self
+class BigDecimal
+  def self.cast_from_string(string)
+    BigDecimal.new(string) unless string.blank?
   end
 end
 
 class Integer
-  def to_bson(*args)
-    self
+  def self.cast_from_string(string)
+    string.to_i unless string.blank?
   end
 end

data/lib/mongo_doc/ext/time.rb

@@ -2,4 +2,8 @@ class Time
   def to_bson(*args)
     self
   end
-end
+
+  def self.cast_from_string(string)
+    Time.parse(string) unless string.blank?
+  end
+end

data/lib/mongo_doc/ext.rb

@@ -0,0 +1,15 @@
+require 'mongo_doc/ext/array'
+require 'mongo_doc/ext/binary'
+require 'mongo_doc/ext/boolean_class'
+require 'mongo_doc/ext/date'
+require 'mongo_doc/ext/date_time'
+require 'mongo_doc/ext/dbref'
+require 'mongo_doc/ext/hash'
+require 'mongo_doc/ext/nil_class'
+require 'mongo_doc/ext/numeric'
+require 'mongo_doc/ext/object'
+require 'mongo_doc/ext/object_id'
+require 'mongo_doc/ext/regexp'
+require 'mongo_doc/ext/string'
+require 'mongo_doc/ext/symbol'
+require 'mongo_doc/ext/time'

data/lib/mongo_doc/finders.rb

@@ -6,17 +6,6 @@ module MongoDoc
       base.extend(Criteria) unless base === Criteria
     end
 
-    %w(count first last).each do |name|
-      module_eval <<-RUBY
-        # #{name.humanize} for this +Document+ class
-        #
-        # <tt>Person.#{name}</tt>
-        def #{name}
-          criteria.#{name}
-        end
-      RUBY
-    end
-
     # Find a +Document+ based on id (+String+ or +Mongo::ObjectID+)
     #
     # <tt>Person.find('1')</tt>

data/lib/mongoid/criterion/inclusion.rb

@@ -22,6 +22,7 @@ module Mongoid #:nodoc:
       def all(attributes = {})
         update_selector(attributes, "$all")
       end
+      alias :all_in :all
 
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"
@@ -61,7 +62,7 @@ module Mongoid #:nodoc:
       def in(attributes = {})
         update_selector(attributes, "$in")
       end
-      alias any_in in
+      alias :any_in :in
 
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-03-06}
+  s.date = %q{2010-03-11}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "data/.gitignore",
      "examples/simple_document.rb",
      "examples/simple_object.rb",
+     "features/collections.feature",
      "features/finders.feature",
      "features/mongodb.yml",
      "features/mongodoc_base.feature",
@@ -47,7 +48,9 @@ Gem::Specification.new do |s|
      "features/step_definitions/query_steps.rb",
      "features/step_definitions/removing_documents_steps.rb",
      "features/step_definitions/scope_steps.rb",
+     "features/step_definitions/string_casting_steps.rb",
      "features/step_definitions/util_steps.rb",
+     "features/string_casting.feature",
      "features/support/support.rb",
      "features/using_criteria.feature",
      "lib/mongo_doc.rb",
@@ -66,6 +69,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/criteria.rb",
      "lib/mongo_doc/cursor.rb",
      "lib/mongo_doc/document.rb",
+     "lib/mongo_doc/ext.rb",
      "lib/mongo_doc/ext/array.rb",
      "lib/mongo_doc/ext/binary.rb",
      "lib/mongo_doc/ext/boolean_class.rb",
@@ -115,6 +119,7 @@ Gem::Specification.new do |s|
      "spec/associations/collection_proxy_spec.rb",
      "spec/associations/document_proxy_spec.rb",
      "spec/associations/hash_proxy_spec.rb",
+     "spec/attributes_accessor_spec.rb",
      "spec/attributes_spec.rb",
      "spec/bson_matchers.rb",
      "spec/bson_spec.rb",
@@ -129,6 +134,7 @@ Gem::Specification.new do |s|
      "spec/document_ext.rb",
      "spec/document_spec.rb",
      "spec/embedded_save_spec.rb",
+     "spec/ext_spec.rb",
      "spec/finders_spec.rb",
      "spec/hash_matchers.rb",
      "spec/matchers_spec.rb",
@@ -149,6 +155,7 @@ Gem::Specification.new do |s|
     "spec/associations/collection_proxy_spec.rb",
      "spec/associations/document_proxy_spec.rb",
      "spec/associations/hash_proxy_spec.rb",
+     "spec/attributes_accessor_spec.rb",
      "spec/attributes_spec.rb",
      "spec/bson_matchers.rb",
      "spec/bson_spec.rb",
@@ -163,6 +170,7 @@ Gem::Specification.new do |s|
      "spec/document_ext.rb",
      "spec/document_spec.rb",
      "spec/embedded_save_spec.rb",
+     "spec/ext_spec.rb",
      "spec/finders_spec.rb",
      "spec/hash_matchers.rb",
      "spec/matchers_spec.rb",

data/spec/attributes_accessor_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "MongoDoc::Attributes attributes accessor" do
+  class AttributesTest
+    include MongoDoc::Attributes
+
+    key :name
+    key :age
+    key :birthdate
+  end
+
+  context "#attributes" do
+    subject do
+      AttributesTest.new.attributes
+    end
+
+    it "returns a hash of the given attributes" do
+      should have_key(:name)
+      should have_key(:age)
+      should have_key(:birthdate)
+    end
+  end
+
+  context "#attributes=" do
+    let(:object) { AttributesTest.new }
+
+    it "sets attributes from a hash" do
+      name = 'name'
+      object.attributes = {:name => name}
+      object.name.should == name
+    end
+  end
+end

data/spec/attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "MongoDoc::Attributes" do
   class AttributesTest
@@ -12,22 +12,20 @@ describe "MongoDoc::Attributes" do
 
   context ".key" do
     class TestKeys
-      include MongoDoc::Document
+      include MongoDoc::Attributes
+
+      key :attr1, :attr2
     end
 
     it "adds its arguments to _keys" do
-      TestKeys.key :attr1, :attr2
       TestKeys._keys.should == [:attr1, :attr2]
     end
 
     describe "accessors" do
-      before do
-        TestKeys.key :attr1
-      end
-
       subject do
         TestKeys.new
       end
+
       it "has an attr1 reader" do
         should respond_to(:attr1)
       end
@@ -37,9 +35,67 @@ describe "MongoDoc::Attributes" do
       end
     end
 
+    context "default values" do
+      class TestDefault
+        include MongoDoc::Attributes
+
+        key :with_default, :default => 'value'
+      end
+
+      let(:object) { TestDefault.new }
+
+      it "uses the default value" do
+        object.with_default.should == 'value'
+      end
+
+      it "only uses the default value once" do
+        object.with_default.should == 'value'
+        class << object
+          def _default_with_default
+            'other value'
+          end
+        end
+        object.with_default.should == 'value'
+      end
+
+      it "does not set the default value if the setter is invoked first" do
+        object.with_default = nil
+        object.with_default.should be_nil
+      end
+    end
+
+    context "specified type" do
+      class TestType
+        include MongoDoc::Attributes
+
+        key :birthdate, :type => Date
+      end
+
+      let(:object) { TestType.new }
+
+      it "does not call Type.cast_from_string when the set value is not a string" do
+        Date.should_not_receive :cast_from_string
+        object.birthdate = Date.today
+      end
+
+      context "when the accessor is set with a string" do
+        let(:date) { Date.today }
+
+        it "delegates to Type.cast_from_string to set the value" do
+          Date.should_receive(:cast_from_string).with(date.to_s)
+          object.birthdate = date.to_s
+        end
+
+        it "sets the value to the result of the case" do
+          object.birthdate = date.to_s
+          object.birthdate.should == date
+        end
+      end
+    end
+
     describe "used with inheritance" do
       class TestParent
-        include MongoDoc::Document
+        include MongoDoc::Attributes
 
         key :parent_attr
       end

data/spec/collection_spec.rb

@@ -17,6 +17,14 @@ describe "MongoDoc::Collection" do
       MongoDoc::Collection.new('collection_name')
     end
 
+    it "has Criteria mixed in" do
+      MongoDoc::Criteria.should === collection
+    end
+
+    it "#collection references self for Mongo context" do
+      collection.send(:collection).should == collection
+    end
+
     %w([] clear count create_index db distinct drop drop_index drop_indexes group hint index_information map_reduce mapreduce name options pk_factory remove rename size).each do |delegated_method|
       it "delegates #{delegated_method} to the Mongo::Collection" do
         mongo_collection.should_receive(delegated_method)

data/spec/contexts/mongo_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "MongoDoc::Contexts::MongoDoc" do
+describe "MongoDoc::Contexts::Mongo" do
 
   class Address
     include MongoDoc::Document

data/spec/contexts_spec.rb

@@ -2,27 +2,55 @@ require "spec_helper"
 
 describe MongoDoc::Contexts do
 
+  class ContextTest
+    include MongoDoc::Document
+
+    has_many :children
+  end
+
   context ".context_for" do
     let(:criteria) { stub('criteria', :klass => klass) }
 
     context "when criteria is for a top-level MongoDoc::Document" do
-      let(:klass) { stub('klass', :collection => stub('collection')) }
+      let(:klass) { ContextTest }
 
-      it "creates a MongoDoc context" do
+      it "creates a Mongo context" do
         MongoDoc::Contexts::Mongo.should_receive(:new).with(criteria)
         Mongoid::Contexts.context_for(criteria)
       end
     end
 
-    context "when criteria is for an embedded MongoDoc::Document" do
-      let(:klass) { stub('klass') }
+    context "when criteria is for an association" do
+      let(:klass) { ContextTest.new.children }
 
       it "creates an Enumerable context" do
         MongoDoc::Contexts::Enumerable.should_receive(:new).with(criteria)
         Mongoid::Contexts.context_for(criteria)
       end
     end
-  end
 
+    context "when criteria is for a MongoDoc::Collection" do
+      let(:klass) { MongoDoc::Collection.new('collection') }
+
+      before do
+        MongoDoc::Collection.stub(:mongo_collection).and_return(stub('collection'))
+      end
+
+      it "creates a Mongo context" do
+        MongoDoc::Contexts::Mongo.should_receive(:new).with(criteria)
+        Mongoid::Contexts.context_for(criteria)
+      end
+    end
+
+    context "when criteria is not recognized" do
+      let(:klass) { Object }
+
+      it "raises an exception" do
+        expect do
+          Mongoid::Contexts.context_for(criteria)
+        end.should raise_error(Mongoid::Contexts::UnknownContext)
+      end
+    end
+  end
 end
 

data/spec/criteria_spec.rb

@@ -4,16 +4,41 @@ describe MongoDoc::Criteria do
 
   class CriteriaTest
     extend MongoDoc::Criteria
+
+    def self.collection; end
   end
 
   context ".criteria" do
-    it "creates a new criteria for the document" do
-      CriteriaTest.criteria.should be_a_kind_of(Mongoid::Criteria)
+    it "creates a new CriteriaWrapper for the document" do
+      CriteriaTest.criteria.should be_a_kind_of(MongoDoc::Criteria::CriteriaWrapper)
+    end
+  end
+
+  context "CriteriaWrapper" do
+    let(:wrapper) { MongoDoc::Criteria::CriteriaWrapper.new(CriteriaTest) }
+
+    it "is a Criteria" do
+      Mongoid::Criteria.should === wrapper
     end
 
     it "sets the criteria klass" do
-      CriteriaTest.criteria.klass.should == CriteriaTest
+      wrapper.klass.should == CriteriaTest
+    end
+
+    %w(all and any_in cache enslave excludes fuse in limit offset only order_by skip where).each do |wrapping_method|
+      it "#{wrapping_method} returns a new CriteriaWrapper" do
+        wrapper.send(wrapping_method).object_id.should_not == wrapper.object_id
+      end
+    end
+
+    it "extras returns a new CriteriaWrapper" do
+      wrapper.extras({}).object_id.should_not == wrapper.object_id
     end
+
+    it "not_in returns a new CriteriaWrapper" do
+      wrapper.not_in({}).object_id.should_not == wrapper.object_id
+    end
+
   end
 
   context "criteria delegates" do
@@ -23,11 +48,22 @@ describe MongoDoc::Criteria do
       CriteriaTest.stub(:criteria).and_return(criteria)
     end
 
-    %w(and cache enslave excludes extras id in limit not_in offset only order_by page per_page skip where).each do |criteria_op|
+    %w(aggregate all and any_in blank? count empty? excludes extras first group id in last limit max min not_in offset one only order_by page paginate per_page skip sum where).each do |criteria_op|
       it "#{criteria_op} delegates to the criteria" do
         criteria.should_receive(criteria_op)
         CriteriaTest.send(criteria_op)
       end
     end
   end
+
+  context "criteria are reusable" do
+    it "creates a new instance on each invocation" do
+      original = CriteriaTest.any_in(:name => 'Les Hill')
+      chained = original.only(:name)
+      original.should_not == chained
+    end
+  end
+
+
+
 end

data/spec/document_spec.rb

@@ -33,24 +33,9 @@ describe "MongoDoc::Document" do
       end
     end
 
-    context "attributes" do
-      it "has an initialize method that takes a hash" do
-        data = 'data'
-        FormForTest.new(:data => data).data.should == data
-      end
-
-      it "can set attributes from a hash" do
-        test = FormForTest.new
-        data = 'data'
-        test.attributes = {:data => data}
-        test.data.should == data
-      end
-
-      it "returns all its attributes" do
-        data = 'data'
-        test = FormForTest.new(:data => data)
-        test.attributes.should == {:data => data}
-      end
+    it "#initialize takes a hash" do
+      data = 'data'
+      FormForTest.new(:data => data).data.should == data
     end
   end
 
@@ -238,8 +223,8 @@ describe "MongoDoc::Document" do
           CreateTest.stub(:new).and_return(instance)
         end
 
-        it "calls save on the instance with safe => false" do
-          instance.should_receive(:save).with(false)
+        it "calls save on the instance with validate => true" do
+          instance.should_receive(:save).with(true)
           CreateTest.create(:data => data)
         end
 
@@ -261,7 +246,7 @@ describe "MongoDoc::Document" do
         end
 
         it "calls save! on the instance" do
-          instance.should_receive(:save!)
+          instance.should_receive(:save!).with(no_args)
           CreateTest.create!(:data => data)
         end
 

data/spec/ext_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper.rb'
+
+describe "Ruby Object Extensions" do
+  context "Conversions" do
+    context "Boolean" do
+      it "converts from a '1' to true" do
+        Boolean.cast_from_string('1').should be_true
+      end
+
+      it "converts from a 'tRuE' to true" do
+        Boolean.cast_from_string('tRuE').should be_true
+      end
+
+      it "converts anything else to false" do
+        Boolean.cast_from_string('0').should be_false
+      end
+    end
+
+    context "Date" do
+      it "returns nil for a blank string" do
+        Date.cast_from_string('').should be_nil
+      end
+
+      it "converts from a string to a Date" do
+        date = Date.today
+        Date.cast_from_string(date.to_s).should == date
+      end
+    end
+
+    context "DateTime" do
+      it "returns nil for a blank string" do
+        DateTime.cast_from_string('').should be_nil
+      end
+
+      it "converts from a string to a DateTime" do
+        datetime = DateTime.now
+        DateTime.cast_from_string(datetime.to_s).should === datetime
+      end
+    end
+
+    context "Numeric" do
+      context "BigDecimal" do
+        it "returns nil for a blank string" do
+          BigDecimal.cast_from_string('').should be_nil
+        end
+
+        it "converts from a string to a BigDecimal" do
+          big_decimal = BigDecimal.new("123")
+          BigDecimal.cast_from_string(big_decimal.to_s).should == big_decimal
+        end
+      end
+
+      context "Integer" do
+        it "returns nil for a blank string" do
+          Integer.cast_from_string('').should be_nil
+        end
+
+        it "converts from a string to a Bignum" do
+          big_number = 1000000000000
+          Integer.cast_from_string(big_number.to_s).should == big_number
+        end
+
+        it "converts from a string to a Fixnum" do
+          fixnum = 1
+          Integer.cast_from_string(fixnum.to_s).should == fixnum
+        end
+      end
+    end
+
+    context "Time" do
+      it "returns nil for a blank string" do
+        Time.cast_from_string('').should be_nil
+      end
+
+      it "converts from a string to a Time" do
+        time = Time.now
+        Time.cast_from_string(time.to_s).to_s.should == time.to_s
+      end
+    end
+  end
+end

data/spec/finders_spec.rb

@@ -58,16 +58,4 @@ describe MongoDoc::Finders do
     end
   end
 
-  context "all other finders" do
-    before do
-      FindersTest.stub(:criteria).and_return(criteria)
-    end
-
-    %w(count first last).each do |which|
-      it "calls #{which} on the new criteria" do
-        criteria.should_receive(which)
-        FindersTest.send(which)
-      end
-    end
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,6 +134,7 @@ files:
 - data/.gitignore
 - examples/simple_document.rb
 - examples/simple_object.rb
+- features/collections.feature
 - features/finders.feature
 - features/mongodb.yml
 - features/mongodoc_base.feature
@@ -153,7 +154,9 @@ files:
 - features/step_definitions/query_steps.rb
 - features/step_definitions/removing_documents_steps.rb
 - features/step_definitions/scope_steps.rb
+- features/step_definitions/string_casting_steps.rb
 - features/step_definitions/util_steps.rb
+- features/string_casting.feature
 - features/support/support.rb
 - features/using_criteria.feature
 - lib/mongo_doc.rb
@@ -172,6 +175,7 @@ files:
 - lib/mongo_doc/criteria.rb
 - lib/mongo_doc/cursor.rb
 - lib/mongo_doc/document.rb
+- lib/mongo_doc/ext.rb
 - lib/mongo_doc/ext/array.rb
 - lib/mongo_doc/ext/binary.rb
 - lib/mongo_doc/ext/boolean_class.rb
@@ -221,6 +225,7 @@ files:
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
+- spec/attributes_accessor_spec.rb
 - spec/attributes_spec.rb
 - spec/bson_matchers.rb
 - spec/bson_spec.rb
@@ -235,6 +240,7 @@ files:
 - spec/document_ext.rb
 - spec/document_spec.rb
 - spec/embedded_save_spec.rb
+- spec/ext_spec.rb
 - spec/finders_spec.rb
 - spec/hash_matchers.rb
 - spec/matchers_spec.rb
@@ -279,6 +285,7 @@ test_files:
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
+- spec/attributes_accessor_spec.rb
 - spec/attributes_spec.rb
 - spec/bson_matchers.rb
 - spec/bson_spec.rb
@@ -293,6 +300,7 @@ test_files:
 - spec/document_ext.rb
 - spec/document_spec.rb
 - spec/embedded_save_spec.rb
+- spec/ext_spec.rb
 - spec/finders_spec.rb
 - spec/hash_matchers.rb
 - spec/matchers_spec.rb