mongodoc 0.2.1 → 0.2.2

data/lib/mongodoc/cursor.rb

@@ -2,13 +2,19 @@ module MongoDoc
   class Cursor
     include Enumerable
 
-    attr_accessor :_cursor
-    delegate :close, :closed?, :count, :explain, :limit, :query_options_hash, :query_opts, :skip, :sort, :to => :_cursor
+    attr_accessor :_collection, :_cursor
 
-    def initialize(cursor)
+    delegate :admin, :close, :closed?, :count, :explain, :fields, :full_collection_name, :hint, :limit, :order, :query_options_hash, :query_opts, :selector, :skip, :snapshot, :sort, :timeout, :to => :_cursor
+
+    def initialize(mongodoc_collection, cursor)
+      self._collection = mongodoc_collection
       self._cursor = cursor
     end
 
+    def collection
+      _collection
+    end
+
     def each
       _cursor.each do |next_document|
         yield MongoDoc::BSON.decode(next_document)

data/lib/mongodoc/document.rb

@@ -4,8 +4,10 @@ require 'mongodoc/attributes'
 require 'mongodoc/criteria'
 require 'mongodoc/finders'
 require 'mongodoc/named_scope'
+require 'mongodoc/validations/macros'
 
 module MongoDoc
+  class UnsupportedOperation < RuntimeError; end
   class DocumentInvalidError < RuntimeError; end
   class NotADocumentError < RuntimeError; end
 
@@ -17,10 +19,10 @@ module MongoDoc
         extend ClassMethods
         extend Finders
         extend NamedScope
-        include Validatable
+        include ::Validatable
+        extend Validations::Macros
 
         alias :id :_id
-        alias :to_param :_id
       end
     end
 
@@ -34,10 +36,11 @@ module MongoDoc
     end
 
     def attributes
-      self.class._attributes.inject({}) do |hash, attr|
+      hash = {}
+      self.class._attributes.each do |attr|
         hash[attr] = send(attr)
-        hash
       end
+      hash
     end
 
     def attributes=(attrs)
@@ -50,6 +53,16 @@ module MongoDoc
       _id.nil?
     end
 
+    def remove
+      raise UnsupportedOperation.new('Document#remove is not supported for embedded documents') if _root
+      remove_document
+    end
+
+    def remove_document
+      return _root.remove_document if _root
+      _remove
+    end
+
     def save(validate = true)
       return _root.save(validate) if _root
       return _save(false) unless validate and not valid?
@@ -64,16 +77,21 @@ module MongoDoc
 
     def to_bson(*args)
       {MongoDoc::BSON::CLASS_KEY => self.class.name}.tap do |bson_hash|
-        bson_hash['_id'] = _id unless _id.nil?
+        bson_hash['_id'] = _id unless new_record?
         self.class._attributes.each do |name|
           bson_hash[name.to_s] = send(name).to_bson(args)
         end
       end
     end
 
+    def to_param
+      _id.to_s
+    end
+
     def update_attributes(attrs)
       strict = attrs.delete(:__strict__)
       self.attributes = attrs
+      return save if new_record?
       return false unless valid?
       if strict
         _strict_update_attributes(_path_to_root(self, attrs), false)
@@ -85,6 +103,7 @@ module MongoDoc
     def update_attributes!(attrs)
       strict = attrs.delete(:__strict__)
       self.attributes = attrs
+      return save! if new_record?
       raise DocumentInvalidError unless valid?
       if strict
         _strict_update_attributes(_path_to_root(self, attrs), true)
@@ -112,28 +131,15 @@ module MongoDoc
 
       def create(attrs = {})
         instance = new(attrs)
-        _create(instance, false) if instance.valid?
+        instance.save(false)
         instance
       end
 
       def create!(attrs = {})
         instance = new(attrs)
-        raise MongoDoc::DocumentInvalidError unless instance.valid?
-        _create(instance, true)
+        instance.save!(true)
         instance
       end
-
-      protected
-
-      def _create(instance, safe)
-        instance.send(:notify_before_save_observers)
-        instance._id = collection.insert(instance, :safe => safe)
-        instance.send(:notify_save_success_observers)
-        instance._id
-      rescue Mongo::MongoDBError => e
-        instance.send(:notify_save_failed_observers)
-        raise e
-      end
     end
 
     protected
@@ -144,12 +150,20 @@ module MongoDoc
 
     def _naive_update_attributes(attrs, safe)
       return _root.send(:_naive_update_attributes, attrs, safe) if _root
-      _collection.update({'_id' => self._id}, MongoDoc::Query.set_modifier(attrs), :safe => safe)
+      _update({}, attrs, safe)
+    end
+
+    def _remove
+      _collection.remove({'_id' => _id})
     end
 
     def _strict_update_attributes(attrs, safe, selector = {})
-      return _root.send(:_strict_update_attributes, attrs, safe, _selector_path_to_root('_id' => _id)) if _root
-      _collection.update({'_id' => _id}.merge(selector), MongoDoc::Query.set_modifier(attrs), :safe => safe)
+      return _root.send(:_strict_update_attributes, attrs, safe, _path_to_root(self, '_id' => _id)) if _root
+      _update(selector, attrs, safe)
+    end
+
+    def _update(selector, data, safe)
+      _collection.update({'_id' => _id}.merge(selector), MongoDoc::Query.set_modifier(data), :safe => safe)
     end
 
     def _save(safe)
@@ -197,6 +211,5 @@ module MongoDoc
     def notify_save_failed_observers
       save_observers.each {|obs| obs.save_failed_callback(self) }
     end
-
   end
 end

data/lib/mongodoc/validations/macros.rb

@@ -0,0 +1,11 @@
+require 'mongodoc/validations/validates_embedded'
+
+module MongoDoc
+  module Validations
+    module Macros
+      def validates_embedded(*args)
+        add_validations(args, MongoDoc::Validations::ValidatesEmbedded)
+      end
+    end
+  end
+end

data/lib/mongodoc/validations/validates_embedded.rb

@@ -0,0 +1,13 @@
+module MongoDoc
+  module Validations
+    class ValidatesEmbedded < ::Validatable::ValidationBase
+      def valid?(instance)
+        instance.send(attribute).valid?
+      end
+
+      def message(instance)
+        super || "is invalid"
+      end
+    end
+  end
+end

data/mongodb.example.yml

@@ -1,6 +1,14 @@
-name: test
-host: localhost
-port: 27017
-options:
-  auto_reconnect: true
+development:
+  name: development
+  host: localhost
+  port: 27017
+  options:
+    auto_reconnect: true
+
+test:
+  name: test
+  host: localhost
+  port: 27017
+  options:
+    auto_reconnect: true
 

data/mongodoc.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongodoc}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-02-16}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+     "README.textile",
+     "TODO"
   ]
   s.files = [
     ".document",
@@ -22,6 +23,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.textile",
      "Rakefile",
+     "TODO",
      "VERSION",
      "data/.gitignore",
      "examples/simple_document.rb",
@@ -32,6 +34,7 @@ Gem::Specification.new do |s|
      "features/named_scopes.feature",
      "features/new_record.feature",
      "features/partial_updates.feature",
+     "features/removing_documents.feature",
      "features/saving_an_object.feature",
      "features/step_definitions/collection_steps.rb",
      "features/step_definitions/criteria_steps.rb",
@@ -44,10 +47,15 @@ Gem::Specification.new do |s|
      "features/step_definitions/objects.rb",
      "features/step_definitions/partial_update_steps.rb",
      "features/step_definitions/query_steps.rb",
+     "features/step_definitions/removing_documents_steps.rb",
      "features/step_definitions/util_steps.rb",
      "features/support/support.rb",
      "features/using_criteria.feature",
      "lib/mongodoc.rb",
+     "lib/mongodoc/associations/collection_proxy.rb",
+     "lib/mongodoc/associations/document_proxy.rb",
+     "lib/mongodoc/associations/hash_proxy.rb",
+     "lib/mongodoc/associations/proxy_base.rb",
      "lib/mongodoc/attributes.rb",
      "lib/mongodoc/bson.rb",
      "lib/mongodoc/collection.rb",
@@ -72,15 +80,18 @@ Gem::Specification.new do |s|
      "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",
+     "lib/mongodoc/validations/macros.rb",
+     "lib/mongodoc/validations/validates_embedded.rb",
      "mongod.example.yml",
      "mongodb.example.yml",
      "mongodoc.gemspec",
      "perf/mongodoc_runner.rb",
      "perf/ruby_driver_runner.rb",
      "script/console",
+     "spec/associations/collection_proxy_spec.rb",
+     "spec/associations/document_proxy_spec.rb",
+     "spec/associations/hash_proxy_spec.rb",
      "spec/attributes_spec.rb",
      "spec/bson_matchers.rb",
      "spec/bson_spec.rb",
@@ -97,8 +108,6 @@ Gem::Specification.new do |s|
      "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"
@@ -106,10 +115,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/leshill/mongodoc}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6.pre.3}
   s.summary = %q{ODM for MongoDB}
   s.test_files = [
-    "spec/attributes_spec.rb",
+    "spec/associations/collection_proxy_spec.rb",
+     "spec/associations/document_proxy_spec.rb",
+     "spec/associations/hash_proxy_spec.rb",
+     "spec/attributes_spec.rb",
      "spec/bson_matchers.rb",
      "spec/bson_spec.rb",
      "spec/collection_spec.rb",
@@ -123,8 +135,6 @@ Gem::Specification.new do |s|
      "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",
      "examples/simple_document.rb",
@@ -136,27 +146,27 @@ 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.2"])
-      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.18.2"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.3"])
+      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.18.3"])
       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.2.9"])
-      s.add_development_dependency(%q<cucumber>, ["= 0.4.4"])
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_development_dependency(%q<cucumber>, ["= 0.6.2"])
     else
-      s.add_dependency(%q<mongo>, ["= 0.18.2"])
-      s.add_dependency(%q<mongo_ext>, ["= 0.18.2"])
+      s.add_dependency(%q<mongo>, ["= 0.18.3"])
+      s.add_dependency(%q<mongo_ext>, ["= 0.18.3"])
       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.2.9"])
-      s.add_dependency(%q<cucumber>, ["= 0.4.4"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<cucumber>, ["= 0.6.2"])
     end
   else
-    s.add_dependency(%q<mongo>, ["= 0.18.2"])
-    s.add_dependency(%q<mongo_ext>, ["= 0.18.2"])
+    s.add_dependency(%q<mongo>, ["= 0.18.3"])
+    s.add_dependency(%q<mongo_ext>, ["= 0.18.3"])
     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.2.9"])
-    s.add_dependency(%q<cucumber>, ["= 0.4.4"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<cucumber>, ["= 0.6.2"])
   end
 end
 

data/spec/associations/collection_proxy_spec.rb

@@ -0,0 +1,200 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+
+describe MongoDoc::Associations::CollectionProxy do
+  class CollectionProxyTest
+    include MongoDoc::Document
+
+    key :name
+  end
+
+  let(:root) { stub('root', :register_save_observer => nil) }
+  let(:proxy) { MongoDoc::Associations::CollectionProxy.new(:assoc_name => 'has_many_name', :assoc_class => CollectionProxyTest, :root => root, :parent => root) }
+  let(:item) { CollectionProxyTest.new }
+
+  context "#<<" do
+    it "appends the item to the collection" do
+      (proxy << item).should include(item)
+    end
+
+    context "when the item is a Hash" do
+      let(:hash) {{:name => 'hash'}}
+
+      it "does not register a save observer" do
+        root.should_not_receive(:register_save_observer)
+        proxy << hash
+      end
+
+      it "does not set the root" do
+        hash.should_not_receive(:_root=)
+        proxy << hash
+      end
+
+      it "adds the hash to the collection" do
+        proxy << hash
+        proxy.should include(hash)
+      end
+    end
+
+    context "when the item is not a MongoDoc::Document" do
+      let(:other_item) {'not a doc'}
+
+      it "does not register a save observer" do
+        root.should_not_receive(:register_save_observer)
+        proxy << other_item
+      end
+
+      it "does not set the root" do
+        other_item.should_not_receive(:_root=)
+        proxy << other_item
+      end
+
+      it "adds the item to the collection" do
+        proxy << other_item
+        proxy.should include(other_item)
+      end
+    end
+
+    context "when the item is a MongoDoc::Document" do
+      it "registers a save observer" do
+        root.should_receive(:register_save_observer)
+        proxy << item
+      end
+
+      it "sets the root" do
+        proxy << item
+        item._root.should == root
+      end
+    end
+
+    context "when the item is an array" do
+      it "adds the array" do
+        array = ['something else']
+        proxy << array
+        proxy.should include(array)
+      end
+    end
+  end
+
+  context "#[]=" do
+    it "sets the item at the index" do
+      proxy[1] = item
+      proxy[1].should == item
+    end
+
+    context "when the item is not a MongoDoc::Document" do
+      let(:other_item) {'not a doc'}
+
+      it "does not register a save observer" do
+        root.should_not_receive(:register_save_observer)
+        proxy[1] = other_item
+      end
+
+      it "does not set the root" do
+        other_item.should_not_receive(:_root=)
+        proxy[1] = other_item
+      end
+
+      it "adds the item to the collection" do
+        proxy[1] = other_item
+        proxy.should include(other_item)
+      end
+    end
+
+    context "when the item is a MongoDoc::Document" do
+      it "registers a save observer" do
+        root.should_receive(:register_save_observer)
+        proxy[1] = item
+      end
+
+      it "sets the root" do
+        proxy[1] = item
+        item._root.should == root
+      end
+    end
+  end
+
+  context "#concat" do
+    it "appends the items from the array to self" do
+      proxy.concat([item])
+      proxy.should include(item)
+    end
+  end
+
+  context "#replace" do
+    it "clears the existing collection" do
+      proxy.should_receive(:clear)
+      proxy.replace([item])
+    end
+
+    it "concats the other onto self" do
+      other = [item]
+      proxy.should_receive(:concat).with(other)
+      proxy.replace(other)
+    end
+  end
+
+  context "#unshift" do
+    let(:proxy_with_item) { proxy << 'other' }
+
+    it "adds the item to the front of the collection" do
+      proxy_with_item.unshift(item)
+      proxy_with_item[0].should == item
+    end
+
+    context "when the item is not a MongoDoc::Document" do
+      let(:other_item) {'not a doc'}
+
+      it "does not register a save observer" do
+        root.should_not_receive(:register_save_observer)
+        proxy_with_item.unshift(other_item)
+      end
+
+      it "does not set the root" do
+        other_item.should_not_receive(:_root=)
+        proxy_with_item.unshift(other_item)
+      end
+
+      it "adds the item to the front of the collection" do
+        proxy_with_item.unshift(other_item)
+        proxy_with_item[0].should == other_item
+      end
+    end
+
+    context "when the item is a MongoDoc::Document" do
+      let(:new_item) { CollectionProxyTest.new }
+
+      it "registers a save observer" do
+        root.should_receive(:register_save_observer)
+        proxy_with_item.unshift(new_item)
+      end
+
+      it "sets the root" do
+        proxy_with_item.unshift(new_item)
+        new_item._root.should == root
+      end
+
+      it "adds the item to the front of the collection" do
+        proxy_with_item.unshift(new_item)
+        proxy_with_item[0].should == new_item
+      end
+    end
+  end
+
+  context "#build" do
+    let(:name) {'built'}
+
+    it "adds a built item to the collection" do
+      proxy.build({:name => name}).last.name.should == name
+    end
+
+    it "registers a save observer" do
+      root.should_receive(:register_save_observer)
+      proxy.build({:name => name})
+    end
+
+    it "sets the root" do
+      proxy.build({:name => name})
+      proxy.last._root.should == root
+    end
+  end
+end