mongodoc 0.1.2 → 0.2.0

data/lib/mongodoc/named_scope.rb

@@ -0,0 +1,68 @@
+# Based on ActiveRecord::NamedScope
+module MongoDoc
+  module NamedScope
+    def scopes
+      read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
+    end
+
+    def named_scope(name, options = {}, &block)
+      name = name.to_sym
+      scopes[name] = lambda do |parent_scope, *args|
+        CriteriaProxy.new(parent_scope, Hash === options ? options : options.call(*args), &block)
+      end
+      (class << self; self; end).class_eval <<-EOT
+        def #{name}(*args)
+          scopes[:#{name}].call(self, *args)
+        end
+      EOT
+    end
+
+    class CriteriaProxy
+      attr_accessor :conditions, :klass, :parent_scope
+
+      delegate :scopes, :to => :parent_scope
+
+      def initialize(parent_scope, conditions, &block)
+        conditions ||= {}
+        [conditions.delete(:extend)].flatten.each { |extension| extend extension } if conditions.include?(:extend)
+        extend Module.new(&block) if block_given?
+        self.klass = parent_scope unless CriteriaProxy === parent_scope
+        self.parent_scope, self.conditions = parent_scope, conditions
+      end
+
+      def respond_to?(method, include_private = false)
+        super || if klass
+          proxy_found.respond_to?(method, include_private)
+        else
+          parent_scope.respond_to?(method, include_private)
+        end
+      end
+
+      protected
+
+      def proxy_found
+        @found || load_found
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        if scopes.include?(method)
+          scopes[method].call(self, *args)
+        elsif klass
+          proxy_found.send(method, *args, &block)
+        else
+          parent_scope.criteria(conditions)
+          parent_scope.send(method, *args, &block)
+        end
+      end
+
+      def load_found
+        @found = Criteria.new(klass)
+        @found.criteria(conditions)
+        @found
+      end
+    end
+  end
+end
+

data/lib/mongodoc/parent_proxy.rb

@@ -9,12 +9,21 @@ module MongoDoc
       @assoc_name = assoc_name
     end
 
-    def path_to_root(attrs)
-      assoc_attrs = attrs.inject({}) do |assoc_attrs, (key, value)|
-        assoc_attrs["#{assoc_name}.#{key}"] = value
-        assoc_attrs
+    def _path_to_root(src, attrs)
+      _parent._path_to_root(src, _annotated_keys(attrs))
+    end
+
+    def _selector_path_to_root(selector)
+      _parent._selector_path_to_root(_annotated_keys(selector))
+    end
+
+    protected
+
+    def _annotated_keys(hash)
+      hash.inject({}) do |annotated, (key, value)|
+        annotated["#{assoc_name}.#{key}"] = value
+        annotated
       end
-      _parent.path_to_root(assoc_attrs)
     end
 
     private
@@ -32,4 +41,4 @@ module MongoDoc
       end
     end
   end
-end
+end

data/lib/mongodoc/proxy.rb

@@ -39,15 +39,14 @@ module MongoDoc
     end
 
     alias_method :append, :<<
-    def <<(items)
-      items = [items] unless items.kind_of?(Array)
-      items.each do |item|
-        item = collection_class.new(item) if Hash === item
-        raise NotADocumentError unless collection_class === item
-        append item
+    def <<(item)
+      item = build(item) if Hash === item
+      if Document === item
         item._parent = self
         item._root = _root
+        _root.send(:register_save_observer, item)
       end
+      append item
       self
     end
     alias_method :push, :<<
@@ -60,15 +59,25 @@ module MongoDoc
     end
     alias kind_of? is_a?
 
-    def path_to_root(attrs)
-      _parent.path_to_root(attrs)
+    def _path_to_root(src, attrs)
+      assoc_path = "#{assoc_name}.#{index(src)}"
+      assoc_attrs = attrs.inject({}) do |assoc_attrs, (key, value)|
+        assoc_attrs["#{assoc_path}.#{key}"] = value
+        assoc_attrs
+      end
+      _parent._path_to_root(src, assoc_attrs)
     end
 
-    protected
+    def _selector_path_to_root(selector)
+      annotated_selector = selector.inject({}) do |annotated, (key, value)|
+        annotated["#{assoc_name}.#{key}"] = value
+        annotated
+      end
+      _parent._selector_path_to_root(annotated_selector)
+    end
 
-    def _propose_update_attributes(src, attrs, safe)
-      src.errors.add(:base, 'update_attributes called through a has_many')
-      false
+    def build(attrs)
+      collection_class.new(attrs)
     end
   end
-end
+end

data/lib/mongodoc.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 
-gem 'mongo', '0.18.1'
-gem 'mongo_ext', '0.18.1'
-gem 'durran-validatable', '1.8.3'
+gem 'mongo', '0.18.2'
+gem 'mongo_ext', '0.18.2'
+gem 'durran-validatable', '2.0.1'
 gem 'leshill-will_paginate', '2.3.11'
 
 require 'mongo'

data/mongodoc.gemspec

@@ -5,35 +5,45 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongodoc}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2010-01-18}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.textile"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.textile",
      "Rakefile",
      "VERSION",
      "data/.gitignore",
+     "examples/simple_document.rb",
+     "examples/simple_object.rb",
+     "features/finders.feature",
      "features/mongodb.yml",
      "features/mongodoc_base.feature",
+     "features/named_scopes.feature",
+     "features/new_record.feature",
+     "features/partial_updates.feature",
      "features/saving_an_object.feature",
      "features/step_definitions/collection_steps.rb",
      "features/step_definitions/criteria_steps.rb",
      "features/step_definitions/document_steps.rb",
      "features/step_definitions/documents.rb",
+     "features/step_definitions/finder_steps.rb",
      "features/step_definitions/json_steps.rb",
+     "features/step_definitions/named_scope_steps.rb",
      "features/step_definitions/object_steps.rb",
      "features/step_definitions/objects.rb",
+     "features/step_definitions/partial_update_steps.rb",
+     "features/step_definitions/query_steps.rb",
      "features/step_definitions/util_steps.rb",
      "features/support/support.rb",
      "features/using_criteria.feature",
@@ -60,12 +70,16 @@ Gem::Specification.new do |s|
      "lib/mongodoc/ext/string.rb",
      "lib/mongodoc/ext/symbol.rb",
      "lib/mongodoc/ext/time.rb",
+     "lib/mongodoc/finders.rb",
+     "lib/mongodoc/named_scope.rb",
      "lib/mongodoc/parent_proxy.rb",
      "lib/mongodoc/proxy.rb",
      "lib/mongodoc/query.rb",
      "mongod.example.yml",
      "mongodb.example.yml",
      "mongodoc.gemspec",
+     "perf/mongodoc_runner.rb",
+     "perf/ruby_driver_runner.rb",
      "script/console",
      "spec/attributes_spec.rb",
      "spec/bson_matchers.rb",
@@ -76,9 +90,15 @@ Gem::Specification.new do |s|
      "spec/cursor_spec.rb",
      "spec/document_ext.rb",
      "spec/document_spec.rb",
+     "spec/embedded_save_spec.rb",
+     "spec/finders_spec.rb",
+     "spec/hash_matchers.rb",
      "spec/mongodb.yml",
      "spec/mongodb_pairs.yml",
+     "spec/named_scope_spec.rb",
+     "spec/new_record_spec.rb",
      "spec/parent_proxy_spec.rb",
+     "spec/proxy_spec.rb",
      "spec/query_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -98,9 +118,17 @@ Gem::Specification.new do |s|
      "spec/cursor_spec.rb",
      "spec/document_ext.rb",
      "spec/document_spec.rb",
+     "spec/embedded_save_spec.rb",
+     "spec/finders_spec.rb",
+     "spec/hash_matchers.rb",
+     "spec/named_scope_spec.rb",
+     "spec/new_record_spec.rb",
      "spec/parent_proxy_spec.rb",
+     "spec/proxy_spec.rb",
      "spec/query_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "examples/simple_document.rb",
+     "examples/simple_object.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -108,24 +136,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, ["= 0.18.1"])
-      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.18.1"])
-      s.add_runtime_dependency(%q<durran-validatable>, ["= 1.8.3"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.2"])
+      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.18.2"])
+      s.add_runtime_dependency(%q<durran-validatable>, ["= 1.8.4"])
       s.add_runtime_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       s.add_development_dependency(%q<rspec>, ["= 1.2.9"])
       s.add_development_dependency(%q<cucumber>, ["= 0.4.4"])
     else
-      s.add_dependency(%q<mongo>, ["= 0.18.1"])
-      s.add_dependency(%q<mongo_ext>, ["= 0.18.1"])
-      s.add_dependency(%q<durran-validatable>, ["= 1.8.3"])
+      s.add_dependency(%q<mongo>, ["= 0.18.2"])
+      s.add_dependency(%q<mongo_ext>, ["= 0.18.2"])
+      s.add_dependency(%q<durran-validatable>, ["= 1.8.4"])
       s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       s.add_dependency(%q<rspec>, ["= 1.2.9"])
       s.add_dependency(%q<cucumber>, ["= 0.4.4"])
     end
   else
-    s.add_dependency(%q<mongo>, ["= 0.18.1"])
-    s.add_dependency(%q<mongo_ext>, ["= 0.18.1"])
-    s.add_dependency(%q<durran-validatable>, ["= 1.8.3"])
+    s.add_dependency(%q<mongo>, ["= 0.18.2"])
+    s.add_dependency(%q<mongo_ext>, ["= 0.18.2"])
+    s.add_dependency(%q<durran-validatable>, ["= 1.8.4"])
     s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
     s.add_dependency(%q<rspec>, ["= 1.2.9"])
     s.add_dependency(%q<cucumber>, ["= 0.4.4"])

data/perf/mongodoc_runner.rb

@@ -0,0 +1,90 @@
+require "benchmark"
+require "ruby-prof"
+require "mongodoc"
+
+class Person < MongoDoc::Document
+  key :birth_date
+  has_one :name
+  has_one :address
+  has_many :phones
+end
+
+class Name < MongoDoc::Document
+  key :given
+  key :family
+  key :middle
+end
+
+class Address < MongoDoc::Document
+  key :street
+  key :city
+  key :state
+  key :post_code
+  key :type
+end
+
+class Phone < MongoDoc::Document
+  key :country_code
+  key :number
+  key :type
+end
+
+class MongoDocRunner
+  def self.benchmark
+    MongoDoc.connect_to_database('mongodoc_perf_test')
+    MongoDoc.database.collection('people').drop
+
+    puts "Starting benchmark..."
+
+    10.times do |n|
+      person = Person.new(:birth_date => Date.new(1970, 1, 1))
+      name = Name.new(:given => "James", :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
+      person.save
+    end
+
+    Benchmark.bm do |bm|
+      bm.report('MongoDoc') do
+        10000.times do |n|
+          person = Person.new(:birth_date => Date.new(1970, 1, 1))
+          name = Name.new(:given => "James", :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
+          person.save
+        end
+      end
+    end
+
+  end
+
+  def self.profile
+    MongoDoc.connect_to_database('mongodoc_perf_test')
+    MongoDoc.database.collection('people').drop
+
+    RubyProf.start
+
+    puts "Starting profiler..."
+
+    1000.times do |n|
+      person = Person.new(:birth_date => Date.new(1970, 1, 1))
+      name = Name.new(:given => "James", :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
+      person.save
+    end
+
+    result = RubyProf.stop
+    printer = RubyProf::FlatPrinter.new(result)
+    printer.print(STDOUT, 0)
+  end
+end

data/perf/ruby_driver_runner.rb

@@ -0,0 +1,64 @@
+require "rubygems"
+require "ruby-prof"
+require "mongodoc"
+
+class RubyDriverRunner
+  def self.benchmark
+    MongoDoc.connect_to_database('mongodoc_perf_test')
+    collection = MongoDoc.database.collection('people')
+    collection.drop
+
+    puts "Starting benchmark..."
+
+    10.times do |n|
+      person = {:birth_date => Date.new(1970, 1, 1).to_bson, :phones => []}
+      name = {:given => "James", :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
+      collection.save(person)
+    end
+
+    Benchmark.bm do |bm|
+      bm.report('Driver') do
+        10000.times do |n|
+          person = {:birth_date => Date.new(1970, 1, 1).to_bson, :phones => []}
+          name = {:given => "James", :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
+          collection.save(person)
+        end
+      end
+    end
+  end
+
+  def self.profile
+    MongoDoc.connect_to_database('mongodoc_perf_test')
+    collection = MongoDoc.database.collection('people')
+    collection.drop
+
+    RubyProf.start
+
+    puts "Starting profiler..."
+
+    1000.times do |n|
+      person = {:birth_date => Date.new(1970, 1, 1), :phones => []}
+      name = {:given => "James", :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
+      collection.insert(person)
+    end
+
+    result = RubyProf.stop
+    printer = RubyProf::FlatPrinter.new(result)
+    printer.print(STDOUT, 0)
+  end
+end

data/spec/attributes_spec.rb

@@ -1,8 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "MongoDoc::Attributes" do
+  class AttributesTest
+    include MongoDoc::Attributes
+  end
+
+  it "defines _id attribute" do
+    AttributesTest.new.should respond_to(:_id)
+    AttributesTest.new.should respond_to(:_id=)
+  end
+
   context ".key" do
-    class TestKeys < MongoDoc::Document
+    class TestKeys
+      include MongoDoc::Document
     end
 
     it "adds its arguments to _keys" do
@@ -28,7 +38,9 @@ describe "MongoDoc::Attributes" do
     end
 
     describe "used with inheritance" do
-      class TestParent < MongoDoc::Document
+      class TestParent
+        include MongoDoc::Document
+
         key :parent_attr
       end
 
@@ -43,15 +55,23 @@ describe "MongoDoc::Attributes" do
       it "has the keys from the parent class" do
         TestChild._keys.should include(*TestParent._keys)
       end
+
+      it "does not add keys to the parent class" do
+        TestParent._keys.should_not include(:child_attr)
+      end
     end
   end
 
   context ".has_one" do
-    class TestDoc < MongoDoc::Document
+    class TestDoc
+      include MongoDoc::Document
+
       has_one :subdoc
     end
 
-    class SubDoc < MongoDoc::Document
+    class SubDoc
+      include MongoDoc::Document
+
       key :data
     end
 
@@ -77,7 +97,9 @@ describe "MongoDoc::Attributes" do
       subdoc._root.should == doc
     end
 
-    class HasOneValidationTest < MongoDoc::Document
+    class HasOneValidationTest
+      include MongoDoc::Document
+
       key :data
       validates_presence_of :data
     end
@@ -90,7 +112,9 @@ describe "MongoDoc::Attributes" do
   end
 
   context "._attributes" do
-    class TestHasOneDoc < MongoDoc::Document
+    class TestHasOneDoc
+      include MongoDoc::Document
+
       key :key
       has_one :has_one
     end
@@ -102,15 +126,21 @@ describe "MongoDoc::Attributes" do
 
   context ".has_many" do
 
-    class SubHasManyDoc < MongoDoc::Document
+    class SubHasManyDoc
+      include MongoDoc::Document
+
       key :data
     end
 
-    class TestHasManyDoc < MongoDoc::Document
+    class TestHasManyDoc
+      include MongoDoc::Document
+
       has_many :sub_docs, :class_name => 'SubHasManyDoc'
     end
 
-    class TestImplicitHasManyDoc < MongoDoc::Document
+    class TestImplicitHasManyDoc
+      include MongoDoc::Document
+
       has_many :sub_has_many_docs
     end
 
@@ -135,12 +165,16 @@ describe "MongoDoc::Attributes" do
       doc = TestImplicitHasManyDoc.new(:sub_has_many_docs => [subdoc])
     end
 
-    class HasManyValidationChild < MongoDoc::Document
+    class HasManyValidationChild
+      include MongoDoc::Document
+
       key :data
       validates_presence_of :data
     end
 
-    class HasManyValidationTest < MongoDoc::Document
+    class HasManyValidationTest
+      include MongoDoc::Document
+
       has_many :subdocs, :class_name => 'HasManyValidationChild'
     end
 
@@ -156,4 +190,4 @@ describe "MongoDoc::Attributes" do
       invalid.should have(1).error_on(:data)
     end
   end
-end
+end