mongomatic 0.8.2 → 0.9.0.pre

data/CHANGELOG

@@ -1,4 +1,5 @@
 = 0.9.pre
+ * Add Mongomatic::Base#find_or_initialize method (jsmestad)
 
  Internal:
  * Updated development dependencies and Jeweler definitions (jsmestad)

data/Gemfile

@@ -2,8 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 gem "activesupport", ">= 3.0.0"
-gem "mongo", ">= 1.2.4"
-gem "bson", ">= 1.2.4"
+gem "mongo", ">= 1.3.1"
+gem "bson", ">= 1.3.1"
 gem "i18n", ">= 0.5.0"
 
 # Add dependencies to develop your gem here.

data/LICENSE

@@ -1,20 +1,190 @@
-Copyright (c) 2009 Ben Myles
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright 2010-2011 Ben Myles
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.rdoc

@@ -230,6 +230,14 @@ You can add your own observers to CollectionName using CollectionName.add_observ
 
 It is worth noting that you should be careful the operations you perform on the instance of your class passed to the observer callbacks. Calling operations that invoke callbacks can result in an infinite loop if improperly structured. 
 
+== Contributors
+
+* Ben Myles -- http://github.com/benmyles
+* Justin Smestad -- http://github.com/jsmestad
+* Jordan West -- http://github.com/jrwest
+
+Additional contributors can be viewed at: https://github.com/mongomachine/mongomatic/contributors
+
 == Copyright
 
-Copyright (c) 2010 Ben Myles. See LICENSE for details.
+Copyright (c) 2010-2011 Ben Myles. See LICENSE for details.

data/Rakefile

@@ -7,10 +7,9 @@ begin
     gem.name = "mongomatic"
     gem.summary = %Q{Mongomatic is a modular Ruby object mapper for Mongo}
     gem.description = %Q{Mongomatic is a modular Ruby object mapper for Mongo}
-    gem.email = "ben.myles@gmail.com"
-    gem.homepage = "http://mongomatic.com/"
+    gem.email = ["ben.myles@gmail.com", "justin.smestad@gmail.com"]
+    gem.homepage = "http://github.com/mongomachine/mongomatic"
     gem.authors = ["Ben Myles", "Justin Smestad"]
-    gem.license = "MIT"
   end
   Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0.pre

data/lib/mongomatic/base.rb

@@ -4,13 +4,13 @@ module Mongomatic
     include Mongomatic::Util
     include Mongomatic::ActiveModelCompliancy
     include Mongomatic::TypedFields
-    
+
     class << self
       # Returns this models own db attribute if set, otherwise will return Mongomatic.db
       def db
         @db || Mongomatic.db || raise(ArgumentError, "No db supplied")
       end
-      
+
       # Override Mongomatic.db with a Mongo::DB instance for this model specifically
       #  MyModel.db = Mongo::Connection.new().db('mydb_mymodel')
       def db=(obj)
@@ -33,33 +33,38 @@ module Mongomatic
       def find(query={}, opts={})
         Mongomatic::Cursor.new(self, collection.find(query, opts))
       end
-      
+
+      # Query MongoDB for existing document. If found, return existing or initialize a new object with the parameters
+      def find_or_initialize(query={}, opts={})
+        find_one(query, opts) || new(query, true)
+      end
+
       # Query MongoDB and return one document only. Same arguments as http://api.mongodb.org/ruby/current/Mongo/Collection.html#find_one-instance_method
       def find_one(query={}, opts={})
         return nil unless doc = self.collection.find_one(query, opts)
         self.new(doc, false)
       end
-      
+
       # Return a Mongomatic::Cursor instance of all documents in the collection.
       def all
         find
       end
-      
+
       # Iterate over all documents in the collection (uses a Mongomatic::Cursor)
       def each
         find.each { |found| yield(found) }
       end
-      
+
       # Return the first document in the collection
       def first
         find.limit(1).next_document
       end
-      
+
       # Is the collection empty? This method is much more efficient than doing Collection.count == 0
       def empty?
         find.limit(1).has_next? == false
       end
-      
+
       # Return the number of documents in the collection
       def count
         find.count
@@ -70,17 +75,17 @@ module Mongomatic
         collection.drop
         do_callback(:after_drop)
       end
-      
+
       def do_callback(meth)
         return false unless respond_to?(meth, true)
         send(meth)
       end
-      
+
       def insert(doc_hash, opts={})
         d = new(doc_hash)
         d.insert(opts)
       end
-      
+
       def insert!(doc_hash, opts={})
         insert(doc_hash, opts.merge(:safe => true))
       end
@@ -95,16 +100,16 @@ module Mongomatic
       self.errors  = Mongomatic::Errors.new
       do_callback(:after_initialize)
     end
-    
+
     def doc=(hash)
       hash = Mongomatic::MHash.new(hash) unless hash.is_a?(Mongomatic::MHash)
       @doc = hash
     end
-    
+
     def doc
       @doc
     end
-    
+
     # Override this with your own validate() method for validations.
     # Simply push your errors into the self.errors property and
     # if self.errors remains empty your document will be valid.
@@ -114,7 +119,7 @@ module Mongomatic
     def validate
       true
     end
-    
+
     def valid?
       check_typed_fields!
       self.errors = Mongomatic::Errors.new
@@ -123,38 +128,38 @@ module Mongomatic
       do_callback(:after_validate)
       self.errors.empty?
     end
-    
-    def is_new?
-      self.is_new == true
-    end
-    
+
     def new?
       self.is_new == true
     end
-    
+
+    def is_new?
+      !!new?
+    end
+
     # Set a field on this document:
     #  mydoc["name"] = "Ben"
     #  mydoc["address"] = { "city" => "San Francisco" }
     def []=(k,v)
       @doc[k.to_s] = v
     end
-    
+
     # Returns true if document contains key
     def has_key?(key)
       field, hash = hash_for_field(key.to_s, true)
       hash.has_key?(field)
     end
-    
+
     def set_value_for_key(key, value)
       field, hash = hash_for_field(key.to_s)
       hash[field] = value
     end
-    
+
     def value_for_key(key)
       field, hash = hash_for_field(key.to_s, true)
       hash[field]
     end
-   
+
     ##
     # Same as Hash#delete
     #
@@ -172,18 +177,18 @@ module Mongomatic
     def [](k)
       @doc[k.to_s]
     end
-    
+
     # Merge this document with the supplied hash. Useful for updates:
     #  mydoc.merge(params[:user])
     def merge(hash)
       hash.each { |k,v| self[k] = v }; @doc
     end
-    
+
     # Will return true if the document has been removed.
     def removed?
       self.removed == true
     end
-    
+
     # Check equality with another Mongomatic document
     def ==(obj)
       obj.is_a?(self.class) && obj.doc["_id"] == @doc["_id"]
@@ -222,7 +227,7 @@ module Mongomatic
       do_callback(:after_insert_or_update)
       ret
     end
-    
+
     # Calls insert(...) with {:safe => true} passed in as an option. 
     #   * Raises Mongo::OperationError if there was a DB error on inserting
     # If you want to raise the following errors also, pass in {:raise => true}
@@ -231,7 +236,7 @@ module Mongomatic
     def insert!(opts={})
       insert(opts.merge(:safe => true))
     end
-    
+
     # Will persist any changes you have made to the document. Silently fails on
     # db update error. Use update! or pass in {:safe => true} to raise a
     # Mongo::OperationError if that's what you want.
@@ -254,7 +259,7 @@ module Mongomatic
       do_callback(:after_insert_or_update)
       ret
     end
-    
+
     # Calls update(...) with {:safe => true} passed in as an option. 
     #   * Raises Mongo::OperationError if there was a DB error on updating
     # If you want to raise the following errors also, pass in {:raise => true}
@@ -264,7 +269,7 @@ module Mongomatic
     def update!(opts={},update_doc=@doc)
       update(opts.merge(:safe => true),update_doc)
     end
-    
+
     # Remove this document from the collection. Silently fails on db error,
     # use remove! or pass in {:safe => true} if you want an exception raised.
     # If you want to raise the following errors also, pass in {:raise => true}
@@ -284,8 +289,8 @@ module Mongomatic
       do_callback(:after_remove)
       ret
     end
-    
-    # Calls remove(...) with {:safe => true} passed in as an option. 
+
+    # Calls remove(...) with {:safe => true} passed in as an option.
     #   * Raises Mongo::OperationError if there was a DB error on removing
     # If you want to raise the following errors also, pass in {:raise => true}
     #   * Raises Mongomatic::Exceptions::DocumentIsNew if document is new
@@ -293,32 +298,33 @@ module Mongomatic
     def remove!(opts={})
       remove(opts.merge(:safe => true))
     end
-    
+
     # Return this document as a hash.
     def to_hash
       @doc || {}
     end
-    
+
     def hash_for_field(field, break_if_dne=false)
       parts = field.split(".")
       curr_hash = self.doc
       return [parts[0], curr_hash] if parts.size == 1
       field = parts.pop # last one is the field
       parts.each_with_index do |part, i|
-        return [part, curr_hash] if break_if_dne && !curr_hash.has_key?(part)
-        curr_hash[part] ||= {}
-        return [field, curr_hash[part]] if parts.size == i+1
-        curr_hash = curr_hash[part]
+        part_accessor = curr_hash.kind_of?(Array) ? part.to_i : part
+        return [part, curr_hash] if break_if_dne && !curr_hash.has_key?(part_accessor)
+        curr_hash[part_accessor] ||= {}
+        return [field, curr_hash[part_accessor]] if parts.size == i+1
+        curr_hash = curr_hash[part_accessor]
       end
     end
-    
+
     def do_callback(meth)
       notify(meth) if self.class.included_modules.include?(Mongomatic::Observable) # TODO entire block is smelly, doesnt belong here 
-      
+
       return false unless respond_to?(meth, true)
       send(meth)
     end
-    
+
     def transaction(key=nil, duration=5, &block)
       raise Mongomatic::Exceptions::DocumentIsNew if new?
       if key.is_a?(Hash) && key[:scope]

data/lib/mongomatic/cursor.rb

@@ -8,9 +8,9 @@ module Mongomatic
   #  User.find({"zip" => 94107}).count
   class Cursor
     include Enumerable
-    
+
     attr_accessor :mongo_cursor
-    
+
     def initialize(obj_class, mongo_cursor)
       @obj_class    = obj_class
       @mongo_cursor = mongo_cursor
@@ -19,42 +19,42 @@ module Mongomatic
     def method_missing(name, *args)
       @mongo_cursor.send name, *args
     end
-    
+
     # Is the cursor empty? This method is much more efficient than doing cursor.count == 0
     def empty?
       @mongo_cursor.has_next? == false
     end
-    
+
     def next_document
       if doc = @mongo_cursor.next_document
         @obj_class.new(doc, false)
       end
     end
-    
+
     alias :next :next_document
-    
+
     def each
       @mongo_cursor.each do |doc|
         yield(@obj_class.new(doc, false))
       end
     end
-    
+
     def current_limit
       @mongo_cursor.limit
     end
-    
+
     def limit(number_to_return)
       @mongo_cursor.limit(number_to_return); self
     end
-    
+
     def current_skip
       @mongo_cursor.skip
     end
-    
+
     def skip(number_to_skip)
       @mongo_cursor.skip(number_to_skip); self
     end
-    
+
     def sort(key_or_list, direction = nil)
       @mongo_cursor.sort(key_or_list, direction); self
     end

data/mongomatic.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomatic}
-  s.version = "0.8.2"
+  s.version = "0.9.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles", "Justin Smestad"]
-  s.date = %q{2011-05-07}
+  s.date = %q{2011-05-24}
   s.description = %q{Mongomatic is a modular Ruby object mapper for Mongo}
-  s.email = %q{ben.myles@gmail.com}
+  s.email = ["ben.myles@gmail.com", "justin.smestad@gmail.com"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -57,31 +57,18 @@ Gem::Specification.new do |s|
     "test/test_typed_fields.rb",
     "test/test_validations.rb"
   ]
-  s.homepage = %q{http://mongomatic.com/}
-  s.licenses = ["MIT"]
+  s.homepage = %q{http://github.com/mongomachine/mongomatic}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
   s.summary = %q{Mongomatic is a modular Ruby object mapper for Mongo}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_exceptions.rb",
-    "test/test_find.rb",
-    "test/test_misc.rb",
-    "test/test_modifiers.rb",
-    "test/test_observable.rb",
-    "test/test_persistence.rb",
-    "test/test_transaction_lock.rb",
-    "test/test_typed_fields.rb",
-    "test/test_validations.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<mongo>, [">= 1.2.4"])
-      s.add_runtime_dependency(%q<bson>, [">= 1.2.4"])
+      s.add_runtime_dependency(%q<mongo>, [">= 1.3.1"])
+      s.add_runtime_dependency(%q<bson>, [">= 1.3.1"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.11"])
@@ -91,8 +78,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, ["~> 0.6.5"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<mongo>, [">= 1.2.4"])
-      s.add_dependency(%q<bson>, [">= 1.2.4"])
+      s.add_dependency(%q<mongo>, [">= 1.3.1"])
+      s.add_dependency(%q<bson>, [">= 1.3.1"])
       s.add_dependency(%q<i18n>, [">= 0.5.0"])
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.11"])
@@ -103,8 +90,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<mongo>, [">= 1.2.4"])
-    s.add_dependency(%q<bson>, [">= 1.2.4"])
+    s.add_dependency(%q<mongo>, [">= 1.3.1"])
+    s.add_dependency(%q<bson>, [">= 1.3.1"])
     s.add_dependency(%q<i18n>, [">= 0.5.0"])
     s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.11"])

data/test/helper.rb

@@ -7,12 +7,15 @@ require 'pp'
 require "#{File.dirname(__FILE__)}/../lib/mongomatic"
 #require 'mongomatic'
 
-Mongomatic.db = Mongo::Connection.new.db("mongomatic_test")
+Mongomatic.db = Mongo::Connection.new('127.0.0.1', 27017, {
+  :connect => true,
+  :auths => [{'db_name' => 'admin', 'username' => 'admin', 'password' => 'admin'}]
+}).db("mongomatic_test")
 
 class Person < Mongomatic::Base
   include Mongomatic::Expectations::Helper
   attr_accessor :callback_tests
-  
+
   class << self
     attr_accessor :class_callbacks
     def create_indexes
@@ -33,34 +36,34 @@ class Person < Mongomatic::Base
   def validate
     self.errors.add "name", "can't be empty" if self["name"].blank?
   end
-  
+
   private
-  
+
   def before_validate
     self.callback_tests ||= []
     self.callback_tests << :before_validate
   end
-  
+
   def after_validate
     self.callback_tests ||= []
     self.callback_tests << :after_validate
   end
-  
+
   def before_insert
     self.callback_tests ||= []
     self.callback_tests << :before_insert
   end
-  
+
   def before_insert_or_update
     self.callback_tests ||= []
     self.callback_tests << :before_insert_or_update
   end
-  
+
   def after_insert_or_update
     self.callback_tests ||= []
     self.callback_tests << :after_insert_or_update
   end
-  
+
   def after_insert
     self.callback_tests ||= []
     self.callback_tests << :after_insert
@@ -70,22 +73,22 @@ class Person < Mongomatic::Base
     self.callback_tests ||= []
     self.callback_tests << :before_update
   end
-  
+
   def after_update
     self.callback_tests ||= []
     self.callback_tests << :after_update
   end
-  
+
   def before_remove
     self.callback_tests ||= []
     self.callback_tests << :before_remove
   end
-  
+
   def after_remove
     self.callback_tests ||= []
     self.callback_tests << :after_remove
   end
-  
+
 end
 
 class Thing < Mongomatic::Base
@@ -101,7 +104,7 @@ end
 class Foobar < Mongomatic::Base
   include Mongomatic::Observable
   observer :FoobarObserver
-  
+
   def validate
     errors << ["color", "must not be blank"] if self["color"].blank?
     errors << "missing style" if self["style"].blank?
@@ -113,7 +116,7 @@ end
 
 class Rig < Mongomatic::Base
   include Mongomatic::Observable
-  
+
   # :cast => true, :raise => false is the default
   typed_field "age",                :type => :fixnum,  :cast => true
   typed_field "manufacturer.name",  :type => :string,  :cast => true
@@ -124,7 +127,7 @@ end
 
 class Clock < Mongomatic::Base
   typed_field "ticks", :type => :fixnum, :cast => true
-  
+
   def tick!
     transaction do
       self.reload
@@ -133,4 +136,4 @@ class Clock < Mongomatic::Base
       self.update!
     end
   end
-end
+end

data/test/test_find.rb

@@ -6,38 +6,52 @@ class TestFind < MiniTest::Unit::TestCase
     Person.collection.drop
     p1 = Person.new(:name => "Jordan")
     p1.insert
-    
+
     assert_equal p1, Person.find_one(:name => "Jordan")
   end
-  
+
   def test_find_one_with_id
     Person.collection.drop
     p1 = Person.new(:name => "Jordan")
     p1.insert
-    
+
     assert_equal p1, Person.find_one(p1['_id'])
   end
-  
+
   def test_find_one_with_id_or_hash
     Person.collection.drop
     Person.create_indexes
-    
+
     p = Person.new(:name => "Ben1", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
     assert p.insert!.is_a?(BSON::ObjectId)
     assert_equal 1, Person.count
-    
+
     found = Person.find({"_id" => BSON::ObjectId(p["_id"].to_s)}).next
     assert_equal found, p
-    
+
     assert_raises(TypeError) { Person.find_one(p["_id"].to_s) }
-    
+
     found = Person.find_one({"_id" => p["_id"].to_s})
     assert_equal found, nil
-    
+
     found = Person.find_one({"_id" => BSON::ObjectId(p["_id"].to_s)})
     assert_equal found, p
   end
-  
+
+  def test_find_or_initialize_with_query
+    Person.collection.drop
+    p1 = Person.new(:name => 'Jordan')
+    p1.insert
+    assert_equal p1, Person.find_one(:name => "Jordan")
+
+    r1 = Person.find_or_initialize({:name => 'Jordan'})
+    assert_equal r1.is_new?, false
+    assert_equal r1, p1
+
+    r2 = Person.find_or_initialize({:name => 'Jason'})
+    assert_equal r2.is_new?, true
+  end
+
   def test_limit_and_sort
     Person.collection.drop
     p = Person.new(:name => "Ben", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
@@ -46,11 +60,11 @@ class TestFind < MiniTest::Unit::TestCase
     p2 = Person.new(:name => "Ben2", :birth_year => 1984, :created_at => Time.now.utc, :admin => true)
     assert p2.insert.is_a?(BSON::ObjectId)
     assert_equal 2, Person.collection.count
-    
+
     cursor = Person.find({"_id" => p["_id"]})
     found  = cursor.next
     assert_equal p, found
-    
+
     cursor = Person.find()
     assert_equal 0, cursor.current_limit
     assert_equal 2, cursor.to_a.size
@@ -69,13 +83,13 @@ class TestFind < MiniTest::Unit::TestCase
     cursor = Person.find().sort("name", Mongo::DESCENDING)
     assert_equal p2, cursor.next
   end
-  
+
   def test_instance_of_class_returned_on_find_one
     Person.collection.drop
     p1 = Person.new(:name => "Jordan")
     p1.insert
-    
+
     assert_equal Person, Person.find_one(:name => "Jordan").class
   end
-  
-end
+
+end

data/test/test_modifiers.rb

@@ -153,6 +153,14 @@ class TestModifiers < MiniTest::Unit::TestCase
     p1 = Person.find_one(p1["_id"])
     assert_equal "Ben", p1["l1"]["l2"]["l3"]["l4"]["name"]
   end
+
+  def test_set_for_embedded_hash_of_nested_document_collection
+    p1 = Person.new(:name => "Tony")
+    p1.push('friends', Person.new(:name => "Jordan").doc)
+    assert p1.insert!
+    p1.set!("friends.0.isAwesome", "Absolutely!")
+    assert_equal "Absolutely!", p1["friends"][0]["isAwesome"]
+  end
   
   def test_unset
     p1 = Person.new(:name => "Jordan")

data/test/test_typed_fields.rb

@@ -16,7 +16,7 @@ class TestTypedFields < MiniTest::Unit::TestCase
     assert_equal true, r.valid?
     assert_equal "(800) 123 456 789", r["manufacturer"]["phone"]
   end
-  
+
   def test_cast_string
     r = Rig.new
     r["manufacturer"] = {}
@@ -25,7 +25,7 @@ class TestTypedFields < MiniTest::Unit::TestCase
     assert r.valid?
     assert_equal ["Wings","Parachuting","Company"].to_s, r["manufacturer"]["name"]
   end
-  
+
   def test_cast_number
     r = Rig.new
     r["age"] = "4"
@@ -33,7 +33,7 @@ class TestTypedFields < MiniTest::Unit::TestCase
     assert r.valid?
     assert_equal 4, r["age"]
   end
-  
+
   def test_cast_float
     r = Rig.new
     r["waist_measurement"] = "34.3"
@@ -41,7 +41,7 @@ class TestTypedFields < MiniTest::Unit::TestCase
     assert r.valid?
     assert_equal 34.3, r["waist_measurement"]
   end
-  
+
   def test_cast_object_id
     r = Rig.new
     assert r.insert
@@ -50,4 +50,4 @@ class TestTypedFields < MiniTest::Unit::TestCase
     r2.insert
     assert_equal "BSON::ObjectId", r2["friends_rig_id"].class.to_s
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongomatic
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.2
+  prerelease: 6
+  version: 0.9.0.pre
 platform: ruby
 authors: 
 - Ben Myles
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 Z
+date: 2011-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -124,7 +124,9 @@ dependencies:
   prerelease: false
   version_requirements: *id010
 description: Mongomatic is a modular Ruby object mapper for Mongo
-email: ben.myles@gmail.com
+email: 
+- ben.myles@gmail.com
+- justin.smestad@gmail.com
 executables: []
 
 extensions: []
@@ -172,9 +174,9 @@ files:
 - test/test_transaction_lock.rb
 - test/test_typed_fields.rb
 - test/test_validations.rb
-homepage: http://mongomatic.com/
-licenses: 
-- MIT
+homepage: http://github.com/mongomachine/mongomatic
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -189,9 +191,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -199,14 +201,5 @@ rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Mongomatic is a modular Ruby object mapper for Mongo
-test_files: 
-- test/helper.rb
-- test/test_exceptions.rb
-- test/test_find.rb
-- test/test_misc.rb
-- test/test_modifiers.rb
-- test/test_observable.rb
-- test/test_persistence.rb
-- test/test_transaction_lock.rb
-- test/test_typed_fields.rb
-- test/test_validations.rb
+test_files: []
+