mongo_doc 0.4.2 → 0.5.5

data/lib/mongo_doc/contexts/mongo.rb

@@ -219,7 +219,7 @@ module MongoDoc
         collection.find_one(selector, options)
       end
 
-      alias :first :one
+      alias first one
 
       SUM_REDUCE = "function(obj, prev) { if (prev.sum == 'start') { prev.sum = 0; } prev.sum += obj.[field]; }"
       # Sum the context.

data/lib/mongo_doc/document.rb

@@ -1,12 +1,12 @@
 require 'mongo_doc/bson'
-require 'mongo_doc/query'
 require 'mongo_doc/attributes'
+require 'mongo_doc/root'
 require 'mongo_doc/associations'
 require 'mongo_doc/criteria'
 require 'mongo_doc/finders'
 require 'mongo_doc/index'
 require 'mongo_doc/scope'
-require 'mongo_doc/validations/macros'
+require 'mongo_doc/validations'
 
 module MongoDoc
   class UnsupportedOperation < RuntimeError; end
@@ -18,19 +18,23 @@ module MongoDoc
     def self.included(klass)
       klass.class_eval do
         include Attributes
+        include Root
         extend Associations
         extend ClassMethods
         extend Criteria
         extend Finders
         extend Index
         extend Scope
-        include ::Validatable
-        extend Validations::Macros
+        include Validations
 
-        alias :id :_id
+        alias id _id
       end
     end
 
+    def _collection
+      _root and _root._collection or self.class.collection
+    end
+
     def initialize(attrs = {})
       self.attributes = attrs
     end
@@ -96,7 +100,7 @@ module MongoDoc
 
     module ClassMethods
       def bson_create(bson_hash, options = {})
-        new.tap do |obj|
+        allocate.tap do |obj|
           bson_hash.each do |name, value|
             obj.send("#{name}=", MongoDoc::BSON.decode(value, options))
           end
@@ -126,17 +130,13 @@ module MongoDoc
 
     protected
 
-    def _collection
-      self.class.collection
-    end
-
     def _remove
       _collection.remove({'_id' => _id})
     end
 
     def _update(selector, data, safe)
-      return _root.send(:_update, _path_to_root(self, {'_id' => _id}, true), _path_to_root(self, data), safe) if _root
-      _collection.update({'_id' => _id}.merge(selector), MongoDoc::Query.set_modifier(data), :safe => safe)
+      return _root.send(:_update, {_selector_path + '._id' => _id}, hash_with_modifier_path_keys(data), safe) if _root
+      _collection.update({'_id' => _id}.merge(selector), {'$set' => data}, :safe => safe)
     end
 
     def _save(safe)
@@ -149,8 +149,25 @@ module MongoDoc
       raise e
     end
 
+    def hash_with_modifier_path_keys(hash)
+      hash.stringify_keys!
+      {}.tap do |dup|
+        hash.each do |key, value|
+          dup[_modifier_path + '.' + key] = value
+        end
+      end
+    end
+
+    def path(parent_path, child_path)
+      if parent_path.blank?
+        child_path
+      else
+        parent_path + '.' + child_path
+      end
+    end
+
     def before_save_callback(root)
-      self._id = Mongo::ObjectID.new if new_record?
+      self._id = ::BSON::ObjectID.new if new_record?
     end
 
     def save_failed_callback(root)

data/lib/mongo_doc/ext/binary.rb

@@ -1,7 +1,7 @@
-module Mongo
+module BSON
   class Binary
     def to_bson(*args)
       self
     end
   end
-end
+end

data/lib/mongo_doc/ext/dbref.rb

@@ -1,7 +1,7 @@
-module Mongo
+module BSON
   class DBRef
     def to_bson(*args)
       self
     end
   end
-end
+end

data/lib/mongo_doc/ext/min_max_keys.rb

@@ -0,0 +1,13 @@
+module BSON
+  class MaxKey
+    def to_bson(*args)
+      self
+    end
+  end
+
+  class MinKey
+    def to_bson(*args)
+      self
+    end
+  end
+end

data/lib/mongo_doc/ext/object.rb

@@ -1,4 +1,6 @@
 class Object
+  define_method :singleton_class, instance_method(:metaclass) unless respond_to?(:singleton_class)
+
   def to_bson(*args)
     {MongoDoc::BSON::CLASS_KEY => self.class.name}.tap do |bson_hash|
       instance_variables.each do |name|
@@ -6,9 +8,9 @@ class Object
       end
     end
   end
-  
+
   def self.bson_create(bson_hash, options = {})
-    new.tap do |obj|
+    allocate.tap do |obj|
       bson_hash.each do |name, value|
         obj.instance_variable_set("@#{name}", MongoDoc::BSON.decode(value, options))
       end

data/lib/mongo_doc/ext/object_id.rb

@@ -1,7 +1,7 @@
-module Mongo
+module BSON
   class ObjectID
     def to_bson(*args)
       self
     end
   end
-end
+end

data/lib/mongo_doc/ext.rb

@@ -5,6 +5,7 @@ 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/min_max_keys'
 require 'mongo_doc/ext/nil_class'
 require 'mongo_doc/ext/numeric'
 require 'mongo_doc/ext/object'

data/lib/mongo_doc/finders.rb

@@ -6,7 +6,7 @@ module MongoDoc
       base.extend(Criteria) unless base === Criteria
     end
 
-    # Find a +Document+ based on id (+String+ or +Mongo::ObjectID+)
+    # Find a +Document+ based on id (+String+ or +BSON::ObjectID+)
     #
     # <tt>Person.find('1')</tt>
     # <tt>Person.find(obj_id_1, obj_id_2)</tt>
@@ -21,7 +21,7 @@ module MongoDoc
       criteria
     end
 
-    # Find a +Document+ based on id (+String+ or +Mongo::ObjectID+)
+    # Find a +Document+ based on id (+String+ or +BSON::ObjectID+)
     # or conditions
     #
     # <tt>Person.find_one('1')</tt>

data/lib/mongo_doc/root.rb

@@ -0,0 +1,26 @@
+module MongoDoc
+  module Root
+
+    attr_reader :_root
+
+    %w(_modifier_path _selector_path).each do |getter|
+      module_eval(<<-RUBY, __FILE__, __LINE__)
+        def #{getter}
+          @#{getter} ||= ''
+        end
+      RUBY
+    end
+
+    %w(_modifier_path _root _selector_path).each do |setter|
+      module_eval(<<-RUBY, __FILE__, __LINE__)
+        def #{setter}=(value)
+          @#{setter} = value
+          _associations.each do|a|
+            association = send(a)
+            association.#{setter} = value if association
+          end
+        end
+      RUBY
+    end
+  end
+end

data/lib/mongo_doc/validations.rb

@@ -0,0 +1,16 @@
+module MongoDoc
+  module Validations
+    def self.included(klass)
+      klass.class_eval do
+        if MongoDoc.const_defined?('ActiveModel')
+          include MongoDoc::ActiveModel::ActiveModelCompliance
+        else
+          require 'mongo_doc/validations/macros'
+
+          include ::Validatable
+          extend Macros
+        end
+      end
+    end
+  end
+end

data/lib/mongo_doc.rb

@@ -1,10 +1,11 @@
 require 'mongo'
 require 'active_support'
+require 'active_support/core_ext'
 require 'validatable'
 require 'will_paginate/collection'
 
 module MongoDoc
-  VERSION = '0.4.2'
+  VERSION = '0.5.4'
 end
 
 require 'mongo_doc/connection'

data/lib/mongoid/criterion/optional.rb

@@ -62,7 +62,7 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # object_id: A +String+ representation of a <tt>Mongo::ObjectID</tt>
+      # object_id: A +String+ representation of a <tt>BSON::ObjectID</tt>
       #
       # Example:
       #

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.4.2"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-04-08}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "examples/simple_document.rb",
      "examples/simple_object.rb",
      "features/collections.feature",
+     "features/embed_hash.feature",
      "features/finders.feature",
      "features/indexes.feature",
      "features/mongodb.yml",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
      "features/step_definitions/collection_steps.rb",
      "features/step_definitions/document_steps.rb",
      "features/step_definitions/documents.rb",
+     "features/step_definitions/embed_hash_steps.rb",
      "features/step_definitions/finder_steps.rb",
      "features/step_definitions/index_steps.rb",
      "features/step_definitions/json_steps.rb",
@@ -80,6 +82,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/ext/date_time.rb",
      "lib/mongo_doc/ext/dbref.rb",
      "lib/mongo_doc/ext/hash.rb",
+     "lib/mongo_doc/ext/min_max_keys.rb",
      "lib/mongo_doc/ext/nil_class.rb",
      "lib/mongo_doc/ext/numeric.rb",
      "lib/mongo_doc/ext/object.rb",
@@ -91,8 +94,9 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/finders.rb",
      "lib/mongo_doc/index.rb",
      "lib/mongo_doc/matchers.rb",
-     "lib/mongo_doc/query.rb",
+     "lib/mongo_doc/root.rb",
      "lib/mongo_doc/scope.rb",
+     "lib/mongo_doc/validations.rb",
      "lib/mongo_doc/validations/macros.rb",
      "lib/mongo_doc/validations/validates_embedded.rb",
      "lib/mongoid/contexts/enumerable.rb",
@@ -118,13 +122,15 @@ Gem::Specification.new do |s|
      "mongo_doc.gemspec",
      "mongod.example.yml",
      "mongodb.example.yml",
-     "perf/mongo_doc_runner.rb",
-     "perf/ruby_driver_runner.rb",
+     "perf/mongo_doc_object.rb",
+     "perf/mongo_document.rb",
+     "perf/ruby_driver.rb",
      "script/console",
      "spec/array_including_argument_matcher.rb",
      "spec/associations/collection_proxy_spec.rb",
      "spec/associations/document_proxy_spec.rb",
      "spec/associations/hash_proxy_spec.rb",
+     "spec/associations/proxy_base_spec.rb",
      "spec/associations_spec.rb",
      "spec/attributes_accessor_spec.rb",
      "spec/attributes_spec.rb",
@@ -148,10 +154,11 @@ Gem::Specification.new do |s|
      "spec/mongodb.yml",
      "spec/mongodb_pairs.yml",
      "spec/new_record_spec.rb",
-     "spec/query_spec.rb",
+     "spec/root_spec.rb",
      "spec/scope_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/validations_spec.rb"
   ]
   s.homepage = %q{http://github.com/leshill/mongodoc}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -163,6 +170,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/associations/proxy_base_spec.rb",
      "spec/associations_spec.rb",
      "spec/attributes_accessor_spec.rb",
      "spec/attributes_spec.rb",
@@ -184,9 +192,10 @@ Gem::Specification.new do |s|
      "spec/index_spec.rb",
      "spec/matchers_spec.rb",
      "spec/new_record_spec.rb",
-     "spec/query_spec.rb",
+     "spec/root_spec.rb",
      "spec/scope_spec.rb",
      "spec/spec_helper.rb",
+     "spec/validations_spec.rb",
      "examples/simple_document.rb",
      "examples/simple_object.rb"
   ]
@@ -197,29 +206,32 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.19.1"])
-      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.19.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.20.1"])
+      s.add_runtime_dependency(%q<bson>, ["= 0.20.1"])
+      s.add_runtime_dependency(%q<bson_ext>, ["= 0.20.1"])
       s.add_runtime_dependency(%q<durran-validatable>, ["= 2.0.1"])
       s.add_runtime_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
-      s.add_development_dependency(%q<cucumber>, ["= 0.6.2"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<mongo>, ["= 0.19.1"])
-      s.add_dependency(%q<mongo_ext>, ["= 0.19.1"])
+      s.add_dependency(%q<mongo>, ["= 0.20.1"])
+      s.add_dependency(%q<bson>, ["= 0.20.1"])
+      s.add_dependency(%q<bson_ext>, ["= 0.20.1"])
       s.add_dependency(%q<durran-validatable>, ["= 2.0.1"])
       s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
-      s.add_dependency(%q<cucumber>, ["= 0.6.2"])
+      s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<mongo>, ["= 0.19.1"])
-    s.add_dependency(%q<mongo_ext>, ["= 0.19.1"])
+    s.add_dependency(%q<mongo>, ["= 0.20.1"])
+    s.add_dependency(%q<bson>, ["= 0.20.1"])
+    s.add_dependency(%q<bson_ext>, ["= 0.20.1"])
     s.add_dependency(%q<durran-validatable>, ["= 2.0.1"])
     s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])
-    s.add_dependency(%q<cucumber>, ["= 0.6.2"])
+    s.add_dependency(%q<cucumber>, [">= 0.6.2"])
   end
 end
 

data/perf/mongo_doc_object.rb

@@ -0,0 +1,78 @@
+require "rubygems"
+require "ruby-prof"
+require "mongo_doc"
+
+class Person
+  attr_accessor :address, :birth_date, :name, :phones
+end
+
+class Name
+  attr_accessor :family, :given, :middle
+end
+
+class Address
+  attr_accessor :city, :post_code, :state, :street, :type
+end
+
+class Phone
+  attr_accessor :country_code, :number, :type
+end
+
+class MongoDocObject
+  attr_accessor :collection
+  attr_accessor :objects
+  attr_accessor :ids
+
+  def initialize
+    MongoDoc::Connection.name = 'mongo_doc_object_test'
+    self.collection = MongoDoc::Collection.new 'people'
+    collection.drop
+  end
+
+  def generate(count)
+    self.objects = []
+    self.ids = []
+    count.times do |i|
+      person = Person.new
+      person.birth_date = Date.new(1970, 1, 1)
+      person.phones = []
+
+      name = Name.new
+      name.given = "James #{i}"
+      name.family = "Kirk"
+      name.middle = "Tiberius"
+
+      address = Address.new
+      address.street = "1 Starfleet Command Way"
+      address.city = "San Francisco"
+      address.state = "CA"
+      address.post_code = "94133"
+      address.type = "Work"
+
+      phone = Phone.new
+      phone.country_code = 1
+      phone.number = "415-555-1212"
+      phone.type = "Mobile"
+
+      person.name = name
+      person.address = address
+      person.phones << phone
+
+      objects << person
+    end
+  end
+
+  def writes(count)
+    count.times do |i|
+      ids[i] = collection.save(objects[i])
+    end
+  end
+
+  def reads(count)
+    count.times do |i|
+      obj = collection.find_one(ids[i])
+      raise 'Not found' unless obj.name.given == objects[i].name.given
+    end
+  end
+
+end

data/perf/mongo_document.rb

@@ -0,0 +1,78 @@
+require "benchmark"
+require "ruby-prof"
+require "mongo_doc"
+
+class Person
+  include MongoDoc::Document
+
+  attr_accessor :birth_date, :type => Date
+
+  embed :name
+  embed :address
+  embed_many :phones
+end
+
+class Name
+  include MongoDoc::Document
+
+  attr_accessor :given
+  attr_accessor :family
+  attr_accessor :middle
+end
+
+class Address
+  include MongoDoc::Document
+
+  attr_accessor :street
+  attr_accessor :city
+  attr_accessor :state
+  attr_accessor :post_code
+  attr_accessor :type
+end
+
+class Phone
+  include MongoDoc::Document
+
+  attr_accessor :country_code
+  attr_accessor :number
+  attr_accessor :type
+end
+
+class MongoDocument
+  attr_accessor :collection
+  attr_accessor :documents
+
+  def initialize
+    MongoDoc::Connection.name = 'mongo_doc_object_test'
+    self.collection = MongoDoc::Collection.new 'people'
+    collection.drop
+  end
+
+  def generate(count)
+    self.documents = []
+    count.times do |i|
+      person = Person.new(:birth_date => Date.new(1970, 1, 1))
+      name = Name.new(:given => "James #{i}", :family => "Kirk", :middle => "Tiberius")
+      address = Address.new(:street => "1 Starfleet Command Way", :city => "San Francisco", :state => "CA", :post_code => "94133", :type => "Work")
+      phone = Phone.new(:country_code => 1, :number => "415-555-1212", :type => "Mobile")
+      person.name = name
+      person.address = address
+      person.phones << phone
+
+      documents << person
+    end
+  end
+
+  def writes(count)
+    count.times do |i|
+      documents[i].save
+    end
+  end
+
+  def reads(count)
+    count.times do |i|
+      doc = collection.find_one(documents[i]._id)
+      raise 'Not found' unless doc.name.given == documents[i].name.given
+    end
+  end
+end

data/perf/ruby_driver.rb

@@ -0,0 +1,43 @@
+require "rubygems"
+require "ruby-prof"
+require "mongo_doc"
+
+class RubyDriver
+  attr_accessor :collection
+  attr_accessor :objects
+  attr_accessor :ids
+
+  def initialize
+    MongoDoc::Connection.name = 'ruby_driver_test'
+    self.collection = MongoDoc::Connection.database.collection 'people'
+    collection.drop
+  end
+
+  def generate(count)
+    self.objects = []
+    self.ids = []
+    count.times do |i|
+      person = {:birth_date => Date.new(1970, 1, 1).to_bson, :phones => []}
+      name = {:given => "James #{i}", :family => "Kirk", :middle => "Tiberius"}
+      address = {:street => "1 Starfleet Command Way", :city => "San Francisco", :state => "CA", :post_code => "94133", :type => "Work"}
+      phone = {:country_code => 1, :number => "415-555-1212", :type => "Mobile"}
+      person[:name] = name
+      person[:address] = address
+      person[:phones] << phone
+      objects << person
+    end
+  end
+
+  def writes(count)
+    count.times do |i|
+      ids[i] = collection.save(objects[i])
+    end
+  end
+
+  def reads(count)
+    count.times do |i|
+      obj = collection.find_one(ids[i])
+      raise 'Not found' unless obj and obj['name']['given'] == objects[i][:name][:given]
+    end
+  end
+end

data/spec/associations/collection_proxy_spec.rb

@@ -7,17 +7,40 @@ describe MongoDoc::Associations::CollectionProxy do
     attr_accessor :name
   end
 
+  let(:name) { 'embed_many_name' }
   let(:root) { CollectionProxyTest.new }
-  let(:proxy) { MongoDoc::Associations::CollectionProxy.new(:assoc_name => 'embed_many_name', :assoc_class => CollectionProxyTest, :root => root, :parent => root) }
+  let(:proxy) { MongoDoc::Associations::CollectionProxy.new(:assoc_name => name, :assoc_class => CollectionProxyTest, :root => root, :parent => root) }
   let(:item) { CollectionProxyTest.new }
 
-  describe "#_path_to_root" do
-    it "inserts the association name and '$' when not a selector" do
-      proxy._path_to_root(CollectionProxyTest.new, 'name' => 'value').should == {"embed_many_name.$.name" => 'value'}
+  describe "#_modifier_path" do
+    it "cascades to child documents with our assoc name and $" do
+      document = stub
+      proxy.stub(:collection => [document])
+      document.should_receive(:_modifier_path=).with("new.path.#{name}.$")
+      MongoDoc::Associations::ProxyBase.stub(:is_document?).and_return(true)
+      proxy._modifier_path = 'new.path'
+    end
+  end
+
+  describe "#_selector_path=" do
+    it "cascades to child documents" do
+      document = stub
+      proxy.stub(:collection => [document])
+      document.should_receive("_selector_path=").with("new.path.#{name}")
+      MongoDoc::Associations::ProxyBase.stub(:is_document?).and_return(true)
+      proxy._selector_path = 'new.path'
+    end
+  end
+
+  context "#attach_document" do
+    it "sets the Document's modifier path to our modifier path" do
+      item.should_receive(:_modifier_path=).with('embed_many_name.$')
+      proxy.send(:attach_document, item)
     end
 
-    it "inserts the association name when a selector" do
-      proxy._path_to_root(CollectionProxyTest.new, {'name' => 'value'}, true).should == {"embed_many_name.name" => 'value'}
+    it "sets the Document's selector path to our selector path" do
+      item.should_receive(:_selector_path=).with('embed_many_name')
+      proxy.send(:attach_document, item)
     end
   end