mongodoc 0.0.0 → 0.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodoc
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Les Hill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -05:00
+date: 2009-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,16 +73,23 @@ files:
 - features/saving_an_object.feature
 - features/step_definitions/collection_steps.rb
 - features/step_definitions/connect_steps.rb
+- features/step_definitions/criteria_steps.rb
 - features/step_definitions/document_steps.rb
+- features/step_definitions/documents.rb
 - features/step_definitions/json_steps.rb
 - features/step_definitions/object_steps.rb
+- features/step_definitions/objects.rb
 - features/step_definitions/util_steps.rb
 - features/support/support.rb
+- features/using_criteria.feature
 - lib/mongodoc.rb
 - lib/mongodoc/attributes.rb
-- lib/mongodoc/base.rb
 - lib/mongodoc/bson.rb
+- lib/mongodoc/collection.rb
 - lib/mongodoc/connection.rb
+- lib/mongodoc/criteria.rb
+- lib/mongodoc/cursor.rb
+- lib/mongodoc/document.rb
 - lib/mongodoc/ext/array.rb
 - lib/mongodoc/ext/binary.rb
 - lib/mongodoc/ext/boolean_class.rb
@@ -101,22 +108,22 @@ files:
 - lib/mongodoc/parent_proxy.rb
 - lib/mongodoc/proxy.rb
 - lib/mongodoc/query.rb
-- lib/mongodoc/value_equals.rb
 - mongod.example.yml
 - mongodoc.gemspec
 - script/console
 - spec/attributes_spec.rb
-- spec/base_ext.rb
-- spec/base_spec.rb
 - spec/bson_matchers.rb
 - spec/bson_spec.rb
+- spec/collection_spec.rb
 - spec/connection_spec.rb
+- spec/criteria_spec.rb
+- spec/cursor_spec.rb
+- spec/document_ext.rb
+- spec/document_spec.rb
 - spec/parent_proxy_spec.rb
 - spec/query_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/test_classes.rb
-- spec/test_documents.rb
 has_rdoc: true
 homepage: http://github.com/leshill/mongodoc
 licenses: []
@@ -147,13 +154,14 @@ specification_version: 3
 summary: ODM for MongoDB
 test_files: 
 - spec/attributes_spec.rb
-- spec/base_ext.rb
-- spec/base_spec.rb
 - spec/bson_matchers.rb
 - spec/bson_spec.rb
+- spec/collection_spec.rb
 - spec/connection_spec.rb
+- spec/criteria_spec.rb
+- spec/cursor_spec.rb
+- spec/document_ext.rb
+- spec/document_spec.rb
 - spec/parent_proxy_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
-- spec/test_classes.rb
-- spec/test_documents.rb

data/lib/mongodoc/base.rb

@@ -1,163 +0,0 @@
-require 'mongodoc/bson'
-require 'mongodoc/connection'
-require 'mongodoc/value_equals'
-require 'mongodoc/query'
-require 'mongodoc/attributes'
-
-module MongoDoc
-  module Document
-    class DocumentInvalidError < RuntimeError; end
-    class NotADocumentError < RuntimeError; end
-
-    def self.included(klass)
-      klass.instance_eval do
-        extend MongoDoc::Document::Attributes
-        extend MongoDoc::Document::BSONCreate
-        include MongoDoc::Document::ToBSON
-        include MongoDoc::Document::ValueEquals
-        include MongoDoc::Document::Identity
-        include Validatable
-      end
-    end
-
-    module ValueEquals
-      def ==(other)
-        return false unless self.class === other
-        self.class._attributes.all? {|var| self.send(var) == other.send(var)}
-      end
-    end
-    
-    module Identity
-      attr_accessor :_id
-      alias :id :_id
-      alias :to_param :_id
-
-      def new_record?
-        _id.nil?
-      end
-    end
-    
-    module ToBSON
-      def to_bson(*args)
-        {MongoDoc::BSON::CLASS_KEY => self.class.name}.tap do |bson_hash|
-          bson_hash['_id'] = _id unless _id.nil?
-          self.class._attributes.each do |name|
-            bson_hash[name.to_s] = send(name).to_bson(args)
-          end
-        end
-      end
-    end
-    
-    module BSONCreate
-      def bson_create(bson_hash, options = {})
-        new.tap do |obj|
-          bson_hash.each do |name, value|
-            obj.send("#{name}=", MongoDoc::BSON.decode(value, options))
-          end
-        end
-      end
-    end
-  end
-
-  class Base
-    include MongoDoc::Document
-
-    def attributes=(attrs)
-      attrs.each do |key, value|
-        send("#{key}=", value)
-      end
-    end
-
-    def initialize(attrs = {})
-      self.attributes = attrs
-    end
-
-    def save(validate = true)
-      return _root.save(validate) if _root
-      unless validate and not valid?
-        _save(false)
-      else
-        false
-      end
-    end
-    
-    def save!
-      return _root.save! if _root
-      if valid?
-        _save(true)
-      else
-        raise DocumentInvalidError
-      end
-    end
-
-    def update_attributes(attrs)
-      self.attributes = attrs
-      return false unless valid?
-      _propose_update_attributes(self, path_to_root(attrs), false)
-    end
-
-    def update_attributes!(attrs)
-      self.attributes = attrs
-      if valid?
-        _propose_update_attributes(self, path_to_root(attrs), true)
-      else
-        raise DocumentInvalidError
-      end
-    end
-
-    def self.collection_name
-      self.to_s.tableize.gsub('/', '.')
-    end
-
-    def self.collection
-      MongoDoc.database.collection(collection_name)
-    end
-
-    def self.count
-      collection.count
-    end
-
-    def self.create(attrs = {}, safe = false)
-      instance = new(attrs)
-      instance.valid? and _create(instance, false)
-    end
-    
-    def self.create!(attrs = {})
-      instance = new(attrs)
-      if instance.valid?
-        _create(instance, true)
-      else
-        raise DocumentInvalidError
-      end
-    end
-
-    def self.find_one(id)
-      MongoDoc::BSON.decode(collection.find_one(id))
-    end
-
-    protected
-
-    def _propose_update_attributes(src, attrs, safe)
-      if _parent
-        _parent.send(:_propose_update_attributes, src, attrs, safe)
-      else
-        _update_attributes(attrs, safe)
-      end
-    end
-
-    def _save(safe)
-      self._id = self.class.collection.save(self.to_bson, :safe => safe)
-    end
-
-    def _update_attributes(attrs,  safe)
-      self.class.collection.update({'_id' => self._id}, MongoDoc::Query.set_modifier(attrs.to_bson), :safe => safe)
-      result = MongoDoc.database.db_command({'getlasterror' => 1})
-      return (result and result.has_key?('updatedExisting') and result['updatedExisting'])
-    end
-
-    def self._create(instance, safe)
-      instance._id = collection.insert(instance.to_bson, :safe => safe)
-      instance
-    end
-  end
-end

data/lib/mongodoc/value_equals.rb

@@ -1,8 +0,0 @@
-module MongoDoc
-  module ValueEquals
-    def ==(other)
-      return false unless instance_variables.size == other.instance_variables.size
-      instance_variables.all? {|var| self.instance_variable_get(var) == other.instance_variable_get(var)}
-    end
-  end
-end

data/spec/base_spec.rb

@@ -1,273 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "MongoDoc::Base" do
-
-  context "satisfies form_for requirements" do
-    before do
-      @address = Address.new
-      @address._id = '1'
-    end
-    
-    it "#id returns the _id" do
-      @address.id.should == @address._id
-    end
-    
-    it "#to_param returns the _id" do
-      @address.to_param.should == @address._id
-    end
-    
-    context "#new_record?" do
-      it "is true when the object does not have an _id" do
-        @address._id = nil
-        @address.new_record?.should be_true
-      end
-      
-      it "is false when the object has an id" do
-        @address.new_record?.should be_false
-      end
-    end
-  end
-
-  context "validations" do
-    class SimpleValidationTest < MongoDoc::Base
-      key :data
-      validates_presence_of :data
-    end
-
-    it "are part of Base" do
-      Validatable.should === MongoDoc::Base.new
-    end
-
-    it "valid? fails when a document is invalid" do
-      doc = SimpleValidationTest.new
-      doc.should_not be_valid
-      doc.should have(1).error_on(:data)
-    end
-  end
-
-  context "#save" do
-    before do
-      @id = Mongo::ObjectID.new([1])
-      @address = Address.new
-      @collection = stub('collection')
-      Address.stub(:collection).and_return(@collection)
-    end
-
-    it "saves a #to_bson on the collection" do
-      bson = stub('bson')
-      @address.should_receive(:to_bson).and_return(bson)
-      @collection.should_receive(:save).with(bson, anything).and_return(Mongo::ObjectID.new([1]))
-      @address.save
-    end
-
-    it "sets the _id of the document" do
-      @collection.stub(:save).and_return(@id)
-      @address.save
-      @address._id.should == @id
-    end
-
-    it "returns the _id of the document" do
-      @collection.stub(:save).and_return(@id)
-      @address.save.should == @id
-    end
-
-    it "ignores validates if asked to" do
-      @address.stub(:valid?).and_return(false)
-      @collection.stub(:save).and_return(@id)
-      @address.save(false).should == @id
-    end
-
-    it "returns false if the object is not valid" do
-      @address.stub(:valid?).and_return(false)
-      @address.save.should be_false
-    end
-  end
-
-  context ".create" do
-    it "calls insert with the :safe => false option" do
-      collection = stub('collection')
-      Address.stub(:collection).and_return(collection)
-      collection.should_receive(:insert).with(anything, hash_including(:safe => false))
-      Address.create
-    end
-
-    it "is false if the object is not valid" do
-      class CreateValidationTest < MongoDoc::Base
-        key :data
-        validates_presence_of :data
-      end
-
-      CreateValidationTest.create.should be_false
-    end
-  end
-
-  context "#bang methods!" do
-    before do
-      @address = Address.new
-      @collection = stub('collection')
-      Address.stub(:collection).and_return(@collection)
-    end
-
-    it "create! calls insert with the :safe => true option" do
-      @collection.should_receive(:insert).with(anything, hash_including(:safe => true))
-      Address.create!
-    end
-
-    it "create! raises if not valid" do
-      class CreateBangValidationTest < MongoDoc::Base
-        key :data
-        validates_presence_of :data
-      end
-
-      expect do
-        CreateBangValidationTest.create!
-      end.should raise_error(MongoDoc::Document::DocumentInvalidError)
-    end
-
-    it "save! call insert with the :safe => true option" do
-      @collection.should_receive(:save).with(anything, hash_including(:safe => true))
-      @address.save!
-    end
-
-    it "save! raises if not valid" do
-      @address.stub(:valid?).and_return(false)
-      expect do
-        @address.save!
-      end.should raise_error(MongoDoc::Document::DocumentInvalidError)
-    end
-  end
-
-  context "#update_attributes" do
-    before do
-      @attrs = {:state => 'FL'}
-      @spec = {'_id' => 1}
-      @address = Address.new(@spec)
-      @address.stub(:_update_attributes).and_return(true)
-    end
-
-    it "returns true on success" do
-      @address.update_attributes(@attrs).should be_true
-    end
-
-    it "sets the attributes" do
-      @address.update_attributes(@attrs)
-      @address.state.should == 'FL'
-    end
-
-    it "calls _update_attributes" do
-      @address.should_receive(:_update_attributes).with(@attrs, false)
-      @address.update_attributes(@attrs)
-    end
-
-    it "returns false if the object is not valid" do
-      @address.stub(:valid?).and_return(false)
-      @address.update_attributes(@attrs).should be_false
-    end
-
-    context "with a bang" do
-      it "with a bang, updates the document with the :safe => true option" do
-        @address.should_receive(:_update_attributes).with(@attrs, true)
-        @address.update_attributes!(@attrs)
-      end
-
-      it "raises if not valid" do
-        @address.stub(:valid?).and_return(false)
-        expect do
-          @address.update_attributes!(@attrs)
-        end.should raise_error(MongoDoc::Document::DocumentInvalidError)
-      end
-    end
-  end
-
-  context "from a nested document" do
-    class NestedDocsRoot < MongoDoc::Base
-      has_many :nested_children
-    end
-
-    class NestedChild < MongoDoc::Base
-      has_one :leaf
-    end
-
-    class LeafDoc < MongoDoc::Base
-      key :data
-    end
-
-    context "#save" do
-      before do
-        @leaf = LeafDoc.new
-        @root = NestedDocsRoot.new(:nested_children => [NestedChild.new(:leaf => @leaf)])
-      end
-
-      it "calls the root document's save" do
-        @root.should_receive(:save).with(true)
-        @leaf.save
-      end
-
-      it "(with bang!) calls the root documents save!" do
-        @root.should_receive(:save!)
-        @leaf.save!
-      end
-    end
-
-    context "with no has_many, update_attributes" do
-      before do
-        @leaf = LeafDoc.new
-        @root = NestedChild.new(:leaf => @leaf)
-      end
-
-      it "calls the root document's _update_attributes with a full attribute path and not safe" do
-        @root.should_receive(:_update_attributes).with({'leaf.data' => 'data'}, false)
-        @leaf.update_attributes(:data => 'data')
-      end
-
-      it "(with bang!) calls the root document's _update_attributes with a full attribute path and safe" do
-        @root.should_receive(:_update_attributes).with({'leaf.data' => 'data'}, true)
-        @leaf.update_attributes!(:data => 'data')
-      end
-    end
-    
-    context "with has_many, update_attributes" do
-      before do
-        @leaf = LeafDoc.new
-        NestedDocsRoot.new(:nested_children => [NestedChild.new(:leaf => @leaf)])
-      end
-
-      it "returns false" do
-        @leaf.update_attributes(:data => 'data').should be_false
-      end
-
-      it "sets an error on base" do
-        @leaf.update_attributes(:data => 'data')
-        @leaf.errors[:base].should_not be_nil
-      end
-
-      it "(with bang!) returns false" do
-        @leaf.update_attributes!(:data => 'data').should be_false
-      end
-
-      it "(with bang!) sets an error on base" do
-        @leaf.update_attributes(:data => 'data')
-        @leaf.errors[:base].should_not be_nil
-      end
-    end
-
-  end
-
-  it ".count calls the collection count" do
-    collection = stub('collection')
-    MongoDoc::Base.stub(:collection).and_return(collection)
-    collection.should_receive(:count).and_return(1)
-    MongoDoc::Base.count
-  end
-
-  it ".collection_name returns the name of the collection for this class" do
-    Address.collection_name.should == Address.to_s.tableize.gsub('/', '.')
-  end
-
-  it ".collection calls through MongoDoc.database using the class name" do
-    db = stub('db')
-    db.should_receive(:collection).with(MongoDoc::Base.to_s.tableize.gsub('/', '.'))
-    MongoDoc.should_receive(:database).and_return(db)
-    MongoDoc::Base.collection
-  end
-end

data/spec/test_classes.rb

@@ -1,19 +0,0 @@
-require 'mongodoc/value_equals'
-
-class Movie
-  include MongoDoc::ValueEquals
-  
-  attr_accessor :title, :director, :writers
-end
-
-class Director
-  include MongoDoc::ValueEquals
-  
-  attr_accessor :name, :awards
-end
-
-class AcademyAward
-  include MongoDoc::ValueEquals
-  
-  attr_accessor :year, :category
-end

data/spec/test_documents.rb

@@ -1,35 +0,0 @@
-class Address < MongoDoc::Base
-  key :street
-  key :city
-  key :state
-  key :zip_code
-end
-
-class Place < MongoDoc::Base
-  key :name
-  has_one :address
-end
-
-class Location < MongoDoc::Base
-  has_one :address
-  key :website
-end
-
-class WifiAccessible < Location
-  key :network_name
-end
-
-class WebSite
-  attr_accessor :url
-end
-
-module Automobile
-  class Ariel < MongoDoc::Base
-    key :name
-  end
-end
-
-class Contact < MongoDoc::Base
-  key :name
-  has_many :addresses
-end