mongo_doc 0.5.5 → 0.6.0

data/.gitignore

@@ -1,6 +1,5 @@
 *.sw?
 .DS_Store
-.rvmrc
 coverage
 rdoc
 pkg

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm_gemset_create_on_use_flag=1
+rvm gemset use mongo_doc

data/Gemfile

@@ -0,0 +1,9 @@
+gem install activesupport -v ">= 3.0.0.beta"
+gem install activemodel -v ">=3.0.0.beta"
+gem install mongo -v "= 0.20.1"
+gem install bson -v "= 0.20.1"
+gem install bson_ext -v "= 0.20.1"
+gem install leshill-will_paginate -v "= 2.3.11"
+gem install rspec -v "= 1.3.0"
+gem install cucumber -v ">= 0.6.2"
+

data/README.textile

@@ -1,18 +1,16 @@
 h1. MongoDoc
 
-Version: Maelstrom (0.5.5) 2010/04/08
+Version: Hurricane (0.6.0) 2010/05/14
 
 h2. Notes
 
-* 2010-03-12 Thanks to weather (in ATL, cleaned up attr_accessor and switched to embed association macros
-* 2010-03-10 Slides are out of date, use key instead of attr_accessor with MongoDoc::Document (implementation was way too hackish)
-* 2010-02-23 API is *changing* significantly
-* 2010-01-23 Tracking MongoDoc with @git@? *READ THIS NOTE*[1]
+This version of MongoDoc works with Rails 3[1]
 
 h2. Quick Start
 
 * install MongoDB (at least 1.4.0)
 * install the Ruby driver @gem install mongo@
+* install the native extensions for BSON @gem install bson_ext@
 * install MongoDoc @gem install mongo_doc@
 * run an example from this directory @ruby -Ilib examples/simple_object.rb@
 
@@ -24,7 +22,7 @@ MongoDoc is _also_ an extension of the "Mongo Ruby Driver":http://github.com/mon
 
 MongoDoc is *not* ActiveRecord for mongoDB.  We do not have callbacks, nor do we have dynamic finders.  We do have associations, named scopes, and other features.
 
-MongoDoc *is* simple, easy-to-use, and fast. And it works with Rails (2.3.x at the moment, 3 soonish?).
+MongoDoc *is* simple, easy-to-use, and fast. And it works with Rails 3.
 
 MongoDoc is designed to work with document data, if you are looking to map relational data in mongoDB, you will have to look elsewhere.
 
@@ -119,12 +117,6 @@ MongoDoc *requires* mongoDB v1.4.0 or later.
 
 bc. sudo gem install mongo_doc
 
-h2. Rails 3
-
-As of version 0.5.0, you can use the mongo_doc-rails gem to add Rails3 support.
-
-bc. sudo gem install mongo_doc-rails
-
 h2. Connecting
 
 By default, MongoDoc will read its configuration from @./mongodb.yml@. If that file does not exist, it will attempt to connect to a standard MongoDB local server setup and use a database name of @"mongodoc"@.
@@ -189,6 +181,6 @@ h2. Copyright
 
 Copyright (c) 2009 - 2010 Les Hill. See LICENSE for details.
 
-fn1. Building from @HEAD@? MongoDoc *requires* mongoDB v1.3.2 or later. That means you must be using the 1.3.x nightly build as of 2010-01-22 .
+fn1. If you are using Rails 2.3.x you need to be using the @mongo_doc_rails2@ gem from the rails2 branch on "github":http://github.com/leshill/mongodoc/tree/rails2
 
 fn2. The Ruby driver exposes an API that understands JSON.

data/Rakefile

@@ -9,11 +9,11 @@ begin
     gem.email = "leshill@gmail.com"
     gem.homepage = "http://github.com/leshill/mongodoc"
     gem.authors = ["Les Hill"]
-    gem.add_dependency "activesupport", ">= 2.3.4"
+    gem.add_dependency "activesupport", ">= 3.0.0.beta"
+    gem.add_dependency "activemodel", ">=3.0.0.beta"
     gem.add_dependency "mongo", "= 0.20.1"
     gem.add_dependency "bson", "= 0.20.1"
     gem.add_dependency "bson_ext", "= 0.20.1"
-    gem.add_dependency "durran-validatable", "= 2.0.1"
     gem.add_dependency "leshill-will_paginate", "= 2.3.11"
     gem.add_development_dependency "rspec", "= 1.3.0"
     gem.add_development_dependency "cucumber", ">= 0.6.2"
@@ -164,6 +164,12 @@ namespace :prof do
         runner.reads(10000)
       end
     end
+
+    Benchmark.bm do |bm|
+      bm.report(what + " query") do
+        runner.query_all
+      end
+    end
   end
 
   def profile(what, runner)
@@ -173,6 +179,7 @@ namespace :prof do
     runner.generate(1000)
     runner.writes(1000)
     runner.reads(1000)
+    runner.query_all
 
     result = RubyProf.stop
     printer = RubyProf::FlatPrinter.new(result)

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.0

data/lib/mongo_doc/document.rb

@@ -6,6 +6,12 @@ require 'mongo_doc/criteria'
 require 'mongo_doc/finders'
 require 'mongo_doc/index'
 require 'mongo_doc/scope'
+require 'active_model/naming'
+require 'active_model/translation'
+require 'active_model/deprecated_error_methods'
+require 'active_model/errors'
+require 'active_model/validator'
+require 'active_model/validations'
 require 'mongo_doc/validations'
 
 module MongoDoc
@@ -25,7 +31,9 @@ module MongoDoc
         extend Finders
         extend Index
         extend Scope
-        include Validations
+        include ::ActiveModel::Validations
+        extend ::ActiveModel::Naming
+        extend Validations
 
         alias id _id
       end
@@ -44,6 +52,10 @@ module MongoDoc
       self.class._attributes.all? {|var| self.send(var) == other.send(var)}
     end
 
+    def destroyed?
+      _id.nil?
+    end
+
     def new_record?
       _id.nil?
     end

data/lib/mongo_doc/validations/validates_embedded.rb

@@ -1,12 +1,16 @@
 module MongoDoc
   module Validations
-    class ValidatesEmbedded < ::Validatable::ValidationBase
-      def valid?(instance)
-        instance.send(attribute).valid?
+    module ValidatesEmbedded
+      def validates_embedded(*attr_names)
+        validates_with EmbeddedValidator, _merge_attributes(attr_names)
       end
 
-      def message(instance)
-        super || "is invalid"
+      class EmbeddedValidator < ::ActiveModel::EachValidator
+        def validate(record)
+          attributes.each do |attr|
+            record.errors.add(attr) unless record.send(attr).valid?
+          end
+        end
       end
     end
   end

data/lib/mongo_doc/validations.rb

@@ -1,16 +1,9 @@
+require 'mongo_doc/validations/validates_embedded'
+
 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
+    def self.extended(klass)
+      klass.extend MongoDoc::Validations::ValidatesEmbedded
     end
   end
 end

data/lib/mongo_doc.rb

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

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.5.5"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-04-08}
+  s.date = %q{2010-05-14}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rvmrc",
+     "Gemfile",
      "HISTORY.md",
      "LICENSE",
      "README.textile",
@@ -97,7 +99,6 @@ Gem::Specification.new do |s|
      "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",
      "lib/mongoid/contexts/paging.rb",
@@ -205,30 +206,30 @@ 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<activesupport>, [">= 2.3.4"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta"])
       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"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta"])
       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"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta"])
     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"])

data/perf/mongo_doc_object.rb

@@ -75,4 +75,9 @@ class MongoDocObject
     end
   end
 
+  def query_all
+    collection.find.each do |obj|
+      given_name = obj.name.given
+    end
+  end
 end

data/perf/mongo_document.rb

@@ -75,4 +75,10 @@ class MongoDocument
       raise 'Not found' unless doc.name.given == documents[i].name.given
     end
   end
+
+  def query_all
+    collection.find.each do |doc|
+      given_name = doc.name.given
+    end
+  end
 end

data/perf/ruby_driver.rb

@@ -40,4 +40,10 @@ class RubyDriver
       raise 'Not found' unless obj and obj['name']['given'] == objects[i][:name][:given]
     end
   end
+
+  def query_all
+    collection.find().each do |obj|
+      given_name = obj['name']['given']
+    end
+  end
 end

data/spec/document_spec.rb

@@ -550,4 +550,131 @@ describe "MongoDoc::Document" do
       MongoDoc::Collection.should === ClassMethods.collection
     end
   end
+
+  context "ActiveModel compliance" do
+    class ActiveModelComplianceTest
+      include MongoDoc::Document
+    end
+
+    let(:model) { ActiveModelComplianceTest.new }
+
+    describe "#to_param" do
+      let(:string_id) { mock }
+
+      before(:each) do
+        model.instance_variable_set(:@_id, mock(:oid, :to_s => string_id))
+      end
+
+      it "returns the string form of the document id" do
+        model.to_param.should == string_id
+      end
+    end
+
+    describe "#valid?" do
+      subject { model }
+      it "responds to #valid?" do
+        should respond_to(:valid?)
+      end
+    end
+
+    describe "#new_record?" do
+      subject { model }
+      it "responds to #new_record?" do
+        should respond_to(:new_record?)
+      end
+
+      context "when the object has an id" do
+        before(:each) do
+          model.instance_variable_set(:@_id, mock(:id))
+        end
+
+        it "is false" do
+          should_not be_new_record
+        end
+      end
+
+      context "when the object has no id" do
+        before(:each) do
+          model.instance_variable_set(:@_id, nil)
+        end
+
+        it "is true" do
+          should be_new_record
+        end
+      end
+    end
+
+    describe "#destroyed?" do
+      subject { model }
+
+      it "responds to #destroyed?" do
+        should respond_to(:destroyed?)
+      end
+
+      context "when the object has an id" do
+        before(:each) do
+          model.instance_variable_set(:@_id, mock(:id))
+        end
+
+        it "is false" do
+          should_not be_destroyed
+        end
+      end
+
+      context "when the object has no id" do
+        before(:each) do
+          model.instance_variable_set(:@_id, nil)
+        end
+
+        it "is true" do
+          should be_destroyed
+        end
+      end
+    end
+
+    describe "#errors" do
+      subject { model }
+      it "responds to errors" do
+        should respond_to(:errors)
+      end
+
+      describe "#[]" do
+        it "returns an array on a missing key lookup" do
+          model.errors[:does_not_exist].should be_an(Array)
+        end
+      end
+
+      describe "#full_messages" do
+        it "returns an array" do
+          model.errors.full_messages.should be_an(Array)
+        end
+      end
+    end
+
+    describe ".model_name" do
+      it "responds to model_name" do
+        ActiveModelComplianceTest.should respond_to(:model_name)
+      end
+
+      it "is a string" do
+        ActiveModelComplianceTest.model_name.should be_a(String)
+      end
+
+      it "has a human inflector" do
+        ActiveModelComplianceTest.model_name.human.should be_a(String)
+      end
+
+      it "has a partial path inflector" do
+        ActiveModelComplianceTest.model_name.partial_path.should be_a(String)
+      end
+
+      it "has a singular inflector" do
+        ActiveModelComplianceTest.model_name.singular.should be_a(String)
+      end
+
+      it "has a plural inflector" do
+        ActiveModelComplianceTest.model_name.plural.should be_a(String)
+      end
+    end
+  end
 end

data/spec/validations_spec.rb

@@ -16,7 +16,7 @@ describe MongoDoc::Validations do
     it { should respond_to(:errors) }
 
     it "is included by Document" do
-      MongoDoc::Validations.should === subject
+      ::ActiveModel::Validations.should === subject
     end
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-05-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,28 +25,30 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 0
+        - 0
+        - beta
+        version: 3.0.0.beta
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        - 20
-        - 1
-        version: 0.20.1
+        - 0
+        - beta
+        version: 3.0.0.beta
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bson
+  name: mongo
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -60,7 +62,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: bson
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -74,17 +76,17 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: durran-validatable
+  name: bson_ext
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 0
+        - 20
         - 1
-        version: 2.0.1
+        version: 0.20.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -142,6 +144,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rvmrc
+- Gemfile
 - HISTORY.md
 - LICENSE
 - README.textile
@@ -219,7 +223,6 @@ files:
 - 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
 - lib/mongoid/contexts/paging.rb

data/lib/mongo_doc/validations/macros.rb

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