mongodoc 0.0.0 → 0.1.0

data/lib/mongodoc/proxy.rb

@@ -1,76 +1,74 @@
 # Thanks Sandro!
 # http://github.com/sandro
 module MongoDoc
-  module Document
-    class Proxy
-      # List of array methods (that are not in +Object+) that need to be
-      # delegated to +collection+.
-      ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map { |n| n.to_s }
+  class Proxy
+    # List of array methods (that are not in +Object+) that need to be
+    # delegated to +collection+.
+    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map { |n| n.to_s }
 
-      # List of additional methods that must be delegated to +collection+.
-      MUST_DEFINE = %w[to_a to_ary inspect to_bson ==]
+    # List of additional methods that must be delegated to +collection+.
+    MUST_DEFINE = %w[to_a to_ary inspect to_bson ==]
 
-      (ARRAY_METHODS + MUST_DEFINE).uniq.each do |method|
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args, &block)                 # def each(*args, &block)
-            collection.send(:#{method}, *args, &block)  #   collection.send(:each, *args, &block)
-          end                                          # end
-        RUBY
-      end
+    (ARRAY_METHODS + MUST_DEFINE).uniq.each do |method|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method}(*args, &block)                 # def each(*args, &block)
+          collection.send(:#{method}, *args, &block)  #   collection.send(:each, *args, &block)
+        end                                          # end
+      RUBY
+    end
 
-      attr_reader :assoc_name, :collection, :collection_class, :_parent, :_root
+    attr_reader :assoc_name, :collection, :collection_class, :_parent, :_root
 
-      def _parent=(parent)
-        @_parent = parent
-      end
+    def _parent=(parent)
+      @_parent = parent
+    end
 
-      def _root=(root)
-        @_root = root
-        collection.each do |item|
-          item._root = root
-        end
+    def _root=(root)
+      @_root = root
+      collection.each do |item|
+        item._root = root
       end
+    end
 
-      def initialize(options)
-        @assoc_name = options[:assoc_name]
-        @collection = []
-        @collection_class = options[:collection_class]
-        @_root = options[:root]
-        @_parent = options[:parent]
-      end
+    def initialize(options)
+      @assoc_name = options[:assoc_name]
+      @collection = []
+      @collection_class = options[:collection_class]
+      @_root = options[:root]
+      @_parent = options[:parent]
+    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
-          item._parent = self
-          item._root = _root
-        end
-        self
+    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
+        item._parent = self
+        item._root = _root
       end
-      alias_method :push, :<<
-      alias_method :concat, :<<
+      self
+    end
+    alias_method :push, :<<
+    alias_method :concat, :<<
 
-      # Lie about our class. Borrowed from Rake::FileList
-      # Note: Does not work for case equality (<tt>===</tt>)
-      def is_a?(klass)
-        klass == Array || super(klass)
-      end
-      alias kind_of? is_a?
+    # Lie about our class. Borrowed from Rake::FileList
+    # Note: Does not work for case equality (<tt>===</tt>)
+    def is_a?(klass)
+      klass == Array || super(klass)
+    end
+    alias kind_of? is_a?
 
-      def path_to_root(attrs)
-        _parent.path_to_root(attrs)
-      end
+    def path_to_root(attrs)
+      _parent.path_to_root(attrs)
+    end
 
-      protected
+    protected
 
-      def _propose_update_attributes(src, attrs, safe)
-        src.errors.add(:base, 'update_attributes called through a has_many')
-        false
-      end
+    def _propose_update_attributes(src, attrs, safe)
+      src.errors.add(:base, 'update_attributes called through a has_many')
+      false
     end
   end
 end

data/lib/mongodoc.rb

@@ -2,10 +2,12 @@ require 'rubygems'
 
 gem 'mongo', '0.16'
 gem 'durran-validatable', '1.8.2'
+gem "leshill-will_paginate", "2.3.11"
 
 require 'mongo'
 require 'activesupport'
 require 'validatable'
+require 'will_paginate/collection'
 
 module MongoDoc
   VERSION = '0.1'
@@ -14,4 +16,6 @@ module MongoDoc
   class NoDatabaseError < RuntimeError; end
 end
 
-require 'mongodoc/base'
+require 'mongodoc/connection'
+require 'mongodoc/collection'
+require 'mongodoc/document'

data/mongodoc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongodoc}
-  s.version = "0.0.0"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2009-11-22}
+  s.date = %q{2009-12-07}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -28,16 +28,23 @@ Gem::Specification.new do |s|
      "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",
@@ -56,22 +63,22 @@ Gem::Specification.new do |s|
      "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"
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/leshill/mongodoc}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -80,16 +87,17 @@ Gem::Specification.new do |s|
   s.summary = %q{ODM for MongoDB}
   s.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"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/attributes_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "MongoDoc::Document::Attributes" do
+describe "MongoDoc::Attributes" do
   context ".key" do
-    class TestKeys < MongoDoc::Base
+    class TestKeys < MongoDoc::Document
     end
 
     it "adds its arguments to _keys" do
@@ -28,7 +28,7 @@ describe "MongoDoc::Document::Attributes" do
     end
 
     describe "used with inheritance" do
-      class TestParent < MongoDoc::Base
+      class TestParent < MongoDoc::Document
         key :parent_attr
       end
 
@@ -47,18 +47,18 @@ describe "MongoDoc::Document::Attributes" do
   end
 
   context ".has_one" do
-    class TestDoc < MongoDoc::Base
+    class TestDoc < MongoDoc::Document
       has_one :subdoc
     end
 
-    class SubDoc < MongoDoc::Base
+    class SubDoc < MongoDoc::Document
       key :data
     end
 
     it "sets the subdocuments parent to the parent proxy" do
       subdoc = SubDoc.new
       doc = TestDoc.new(:subdoc => subdoc)
-      MongoDoc::Document::ParentProxy.should === subdoc._parent
+      MongoDoc::ParentProxy.should === subdoc._parent
       subdoc._parent._parent.should == doc
     end
 
@@ -77,7 +77,7 @@ describe "MongoDoc::Document::Attributes" do
       subdoc._root.should == doc
     end
 
-    class HasOneValidationTest < MongoDoc::Base
+    class HasOneValidationTest < MongoDoc::Document
       key :data
       validates_presence_of :data
     end
@@ -90,7 +90,7 @@ describe "MongoDoc::Document::Attributes" do
   end
 
   context "._attributes" do
-    class TestHasOneDoc < MongoDoc::Base
+    class TestHasOneDoc < MongoDoc::Document
       key :key
       has_one :has_one
     end
@@ -102,20 +102,20 @@ describe "MongoDoc::Document::Attributes" do
 
   context ".has_many" do
 
-    class SubHasManyDoc < MongoDoc::Base
+    class SubHasManyDoc < MongoDoc::Document
       key :data
     end
 
-    class TestHasManyDoc < MongoDoc::Base
+    class TestHasManyDoc < MongoDoc::Document
       has_many :sub_docs, :class_name => 'SubHasManyDoc'
     end
 
-    class TestImplicitHasManyDoc < MongoDoc::Base
+    class TestImplicitHasManyDoc < MongoDoc::Document
       has_many :sub_has_many_docs
     end
 
     it "uses a proxy" do
-      MongoDoc::Document::Proxy.should === TestHasManyDoc.new.sub_docs
+      MongoDoc::Proxy.should === TestHasManyDoc.new.sub_docs
     end
 
     it "sets the subdocuments parent to the proxy" do
@@ -135,12 +135,12 @@ describe "MongoDoc::Document::Attributes" do
       doc = TestImplicitHasManyDoc.new(:sub_has_many_docs => [subdoc])
     end
 
-    class HasManyValidationChild < MongoDoc::Base
+    class HasManyValidationChild < MongoDoc::Document
       key :data
       validates_presence_of :data
     end
 
-    class HasManyValidationTest < MongoDoc::Base
+    class HasManyValidationTest < MongoDoc::Document
       has_many :subdocs, :class_name => 'HasManyValidationChild'
     end
 

data/spec/bson_spec.rb

@@ -153,164 +153,44 @@ describe "BSON for Mongo (BSON)" do
   end
   
   describe "Extensions to Object" do
+    class Simple
+      attr_accessor :value
+    end
+    
+    class Complex
+      attr_accessor :array_of_simple
+    end
+    
     before do
-      @movie = Movie.new
-      @movie.title = 'Gone with the Wind'
-      @movie.director = 'Victor Fleming'
-      @movie.writers = ['Sidney Howard']
-      @director = Director.new
-      @director.name = 'Victor Fleming'
-      @director.awards = ['1940 - Best Director']
-      @movie.director = @director
+      @value1 = 'value1'
+      @simple1 = Simple.new
+      @simple1.value = @value1
+      @value2 = 'value2'
+      @simple2 = Simple.new
+      @simple2.value = @value2
+      @complex = Complex.new
+      @complex.array_of_simple = [@simple1, @simple2]
     end
 
     it "renders a json representation of a simple object" do
-      @director.to_bson.should be_bson_eql({"name" => "Victor Fleming", MongoDoc::BSON::CLASS_KEY => "Director", "awards" => ["1940 - Best Director"]})
+      @simple1.to_bson.should be_bson_eql({MongoDoc::BSON::CLASS_KEY => Simple.name, "value" => @value1})
     end
     
     it "renders a json representation of an object with embedded objects" do
-      @movie.to_bson.should be_bson_eql({"title" => "Gone with the Wind", MongoDoc::BSON::CLASS_KEY => "Movie", "writers" => ["Sidney Howard"], "director" => {"name" => "Victor Fleming", MongoDoc::BSON::CLASS_KEY => "Director", "awards" => ["1940 - Best Director"]}})
+      @complex.to_bson.should be_bson_eql({MongoDoc::BSON::CLASS_KEY => Complex.name, "array_of_simple" => [@simple1.to_bson, @simple2.to_bson]})
     end
 
     it "ignores a class hash when the :raw_json option is used" do
-      Movie.bson_create(@movie.to_bson.except(MongoDoc::BSON::CLASS_KEY), :raw_json => true).director.should == @director.to_bson
+      Complex.bson_create(@complex.to_bson.except(MongoDoc::BSON::CLASS_KEY), :raw_json => true).array_of_simple.first.should == @simple1.to_bson
     end
 
     it "roundtrips the object" do
-      MongoDoc::BSON.decode(@movie.to_bson).should be_kind_of(Movie)
-    end
-
-    it "allows for embedded objects" do
-      movie_from_bson = MongoDoc::BSON.decode(@movie.to_bson)
-      movie_from_bson.director.should be_kind_of(Director)
+      MongoDoc::BSON.decode(@complex.to_bson).should be_kind_of(Complex)
     end
 
     it "allows for embedded arrays of objects" do
-      award = AcademyAward.new
-      award.year = '1940'
-      award.category = 'Best Director'
-      @director.awards = [award]
-      director_from_bson = MongoDoc::BSON.decode(@director.to_bson)
-      director_from_bson.awards.each {|award| award.should be_kind_of(AcademyAward)}
-    end
-  end
-  
-  describe "MongoDoc::Base" do
-    before do
-      @address = Address.new
-      @address.street = '320 1st Street North'
-      @address.city = 'Jacksonville Beach'
-      @address.state = 'FL'
-      @address.zip_code = '32250'
-      @location = Location.new
-      @location.address = @address
-    end
-
-    it "encodes the class for the object" do
-      atom = Automobile::Ariel.new
-      atom.to_bson[MongoDoc::BSON::CLASS_KEY].should == Automobile::Ariel.name
-    end
-    
-    it "renders a json representation of the object" do
-      @location.to_bson.should be_bson_eql({MongoDoc::BSON::CLASS_KEY => "Location", "website" => nil, "address" => {"state" => "FL", MongoDoc::BSON::CLASS_KEY => "Address", "zip_code" => "32250", "street" => "320 1st Street North", "city" => "Jacksonville Beach"}})
-    end
-
-    it "includes the _id of the object" do
-      @location._id = Mongo::ObjectID.new
-      @location.to_bson.should be_bson_eql({MongoDoc::BSON::CLASS_KEY => "Location", "_id" => @location._id.to_bson, "website" => nil, "address" => {"state" => "FL", MongoDoc::BSON::CLASS_KEY => "Address", "zip_code" => "32250", "street" => "320 1st Street North", "city" => "Jacksonville Beach"}})
-    end
-
-    it "roundtrips the object" do
-      MongoDoc::BSON.decode(@location.to_bson).should be_kind_of(Location)
-    end
-
-    it "ignores the class hash when the :raw_json option is used" do
-      MongoDoc::BSON.decode(@location.to_bson.except(MongoDoc::BSON::CLASS_KEY), :raw_json => true)['address'].should == @address.to_bson
+      obj = MongoDoc::BSON.decode(@complex.to_bson)
+      obj.array_of_simple.each {|o| o.should be_kind_of(Simple)}
     end
-
-    it "allows for embedded MongoDoc objects" do
-      company_from_bson = MongoDoc::BSON.decode(@location.to_bson)
-      company_from_bson.should be_kind_of(Location)
-      company_from_bson.address.should be_kind_of(Address)
-    end
-
-    it "allows for derived classes" do
-      wifi = WifiAccessible.new
-      wifi.address = @address
-      wifi.network_name = 'hashrocket'
-      wifi_from_bson = MongoDoc::BSON.decode(wifi.to_bson)
-      wifi_from_bson.should be_kind_of(WifiAccessible)
-      wifi_from_bson.address.should be_kind_of(Address)
-    end
-
-    it "allows for embedded ruby objects" do
-      website = WebSite.new
-      website.url = 'http://hashrocket.com'
-      wifi = WifiAccessible.new
-      wifi.website = website
-      wifi_from_bson = MongoDoc::BSON.decode(wifi.to_bson)
-      wifi_from_bson.should be_kind_of(WifiAccessible)
-      wifi_from_bson.website.should be_kind_of(WebSite)
-    end
-
-    context "associations" do
-      context "has_one" do
-        class TestHasOneBsonDoc < MongoDoc::Base
-          has_one :subdoc
-        end
-
-        class SubHasOneBsonDoc < MongoDoc::Base
-          key :attr
-        end
-
-        it "#to_bson renders a bson representation of the document" do
-          doc = TestHasOneBsonDoc.new
-          subdoc = SubHasOneBsonDoc.new(:attr => "value")
-          bson = doc.to_bson
-          bson["subdoc"] = subdoc.to_bson
-          doc.subdoc = subdoc
-          doc.to_bson.should == bson
-        end
-
-        it "roundtrips" do
-          doc = TestHasOneBsonDoc.new
-          subdoc = SubHasOneBsonDoc.new(:attr => "value")
-          doc.subdoc = subdoc
-          MongoDoc::BSON.decode(doc.to_bson).should == doc
-        end
-      end
-
-      context "has_many" do
-
-        class SubHasManyBsonDoc < MongoDoc::Base
-          key :attr
-        end
-
-        class TestHasManyBsonDoc < MongoDoc::Base
-          has_many :subdoc, :class_name => 'SubHasManyBsonDoc'
-        end
-
-        it "#to_bson renders a bson representation of the document" do
-          doc = TestHasManyBsonDoc.new
-          subdoc = SubHasManyBsonDoc.new(:attr => "value")
-          bson = doc.to_bson
-          bson["subdoc"] = [subdoc].to_bson
-          doc.subdoc = subdoc
-          doc.to_bson.should == bson
-        end
-
-        it "roundtrips" do
-          doc = TestHasManyBsonDoc.new
-          subdoc = SubHasManyBsonDoc.new(:attr => "value")
-          doc.subdoc = subdoc
-          MongoDoc::BSON.decode(doc.to_bson).should == doc
-        end
-
-        it "roundtrips the proxy" do
-          doc = TestHasManyBsonDoc.new(:subdoc => SubHasManyBsonDoc.new(:attr => "value"))
-          MongoDoc::Document::Proxy.should === MongoDoc::BSON.decode(doc.to_bson).subdoc
-        end
-      end
-    end
-  end
+  end  
 end