mongo_doc_rails2 0.6.1 → 0.6.2

data/.gitignore

@@ -1,6 +1,6 @@
+.bundle
 *.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/README.textile

@@ -1,27 +1,28 @@
 h1. MongoDoc
 
-Version: Hurricane (0.6.1) 2010/05/10
+Version: Hurricane (0.6.2) 2010/06/25
 
 h2. Notes
 
-This version of MongoDoc is for Rails v2.3.x[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 MongoDoc @gem install mongo_doc_rails2@
+* 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@
 
 h2. Introduction
 
 MongoDoc is a simple and easy to use ActiveRecord-like object mapper for "mongoDB":http://www.mongodb.org in Ruby.
 
-MongoDoc is _also_ an extension of the "Mongo Ruby Driver":http://github.com/mongodb/mongo-ruby-driver making it a  snap to get Ruby in and out of mongoDB.
+MongoDoc is _also_ an extension of the "Mongo Ruby Driver":http://github.com/mongodb/mongo-ruby-driver making it a snap to get Ruby in and out of mongoDB.
 
 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. This version works with Rails 2.3.x.
+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.
 
@@ -114,7 +115,7 @@ h2. Installation
 
 MongoDoc *requires* mongoDB v1.4.0 or later.
 
-bc. gem install mongo_doc_rails2
+bc. % gem install mongo_doc
 
 h2. Connecting
 
@@ -155,6 +156,17 @@ Finally, if you do not want to use the database configuration file, you can also
 
 bc. MongoDoc::Connection.name = 'stats'
 
+h2. Cleaning the database during testing
+
+When testing you may need to clean up and return the database to an empty state. @MongoDoc::DatabaseCleaner.clean_database@ is a helper that can be used to do this, for example with @RSpec@ (note the @require@):
+
+bc. require 'mongo_doc/database_cleaner'
+RSpec.configure do |config|
+  config.before(:each) do
+    MongoDoc::DatabaseCleaner.clean_database
+  end
+end
+
 h2. Credits
 
 Les Hill, leshill on github
@@ -180,6 +192,6 @@ h2. Copyright
 
 Copyright (c) 2009 - 2010 Les Hill. See LICENSE for details.
 
-fn1. If you are using Rails 3.x you need to be using the @mongo_doc@ gem from the master branch on "github":http://github.com/leshill/mongodoc .
+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

@@ -3,20 +3,20 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "mongo_doc_rails2"
-    gem.summary = %Q{ODM for MongoDB - for Rails 2.3.x}
-    gem.description = %Q{ODM for MongoDB - for Rails 2.3.x}
+    gem.name = "mongo_doc"
+    gem.summary = %Q{ODM for MongoDB}
+    gem.description = %Q{ODM for MongoDB}
     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 "mongo", "= 1.0.1"
-    gem.add_dependency "bson", "= 1.0.1"
-    gem.add_dependency "bson_ext", "= 1.0.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"
+    gem.add_dependency "activesupport", ">= 3.0.0.beta.4"
+    gem.add_dependency "activemodel", ">=3.0.0.beta.4"
+    gem.add_dependency "mongo", ">= 1.0.0"
+    gem.add_dependency "bson", ">= 1.0.0"
+    gem.add_dependency "bson_ext", ">= 1.0.0"
+    gem.add_development_dependency "rspec", ">= 2.0.0.beta.12"
+    gem.add_development_dependency "cucumber", ">= 0.8.3"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -34,16 +34,14 @@ namespace :cucumber do
   end
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.ruby_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.ruby_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
@@ -66,21 +64,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-namespace :mongo do
-  desc 'Start mongod'
-  task :start do
-    default_config = { "dbpath" => "/data/db" }
-    config = begin
-      YAML.load_file(File.join(File.dirname(__FILE__), 'mongod.yml'))
-    rescue Exception => e
-      {}
-    end
-    config = default_config.merge(config)
-    sh("nohup #{config['mongod'] || 'mongod'} --dbpath #{config['dbpath']} &")
-    puts "\n"
-  end
-end
-
 namespace :mongoid do
   desc 'Sync criteria from Mongoid'
   task :sync do

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.3

data/features/support/support.rb

@@ -1,8 +1,9 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 require 'cucumber'
-require 'spec/expectations'
+require 'rspec/expectations'
 require 'spec/bson_matchers'
 require 'mongo_doc'
+require 'active_support/json'
 
 MongoDoc::Connection.env = 'cucumber'
 MongoDoc::Connection.config_path = './features/mongodb.yml'

data/lib/mongo_doc.rb

@@ -1,12 +1,13 @@
 require 'mongo'
 require 'active_support'
-require 'validatable'
-require 'will_paginate/collection'
+require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end
 
 require 'mongo_doc/connection'
 require 'mongo_doc/collection'
 require 'mongo_doc/document'
+
+require 'mongo_doc/railtie' if defined?(Rails)

data/lib/mongo_doc/attributes.rb

@@ -40,6 +40,7 @@ module MongoDoc
       end
 
       def attr_accessor_with_mongo(*args)
+        return attr_accessor_without_mongo(*args) if args.first == :validation_context
         opts = args.extract_options!
         default = opts.delete(:default)
         type = opts.delete(:type)

data/lib/mongo_doc/connection.rb

@@ -6,10 +6,10 @@ module MongoDoc
 
     extend self
 
-    attr_writer :config_path, :env, :host, :name, :options, :port, :strict
+    attr_writer :config_path, :default_name, :env, :host, :name, :options, :port, :strict
 
     def config_path
-      @config_path || default_path
+      @config_path || './mongodb.yml'
     end
 
     def configuration
@@ -24,12 +24,12 @@ module MongoDoc
       @database ||= connection.db(name, :strict => strict)
     end
 
+    def default_name
+      @default_name ||= "mongo_doc"
+    end
+
     def env
-      if rails?
-        Rails.env
-      else
-        @env ||= 'development'
-      end
+      @env ||= 'development'
     end
 
     def host
@@ -61,26 +61,6 @@ module MongoDoc
       connection
     end
 
-    def default_name
-      if rails?
-        "#{Rails.root.basename}_#{Rails.env}"
-      else
-        "mongo_doc"
-      end
-    end
-
-    def default_path
-      if rails?
-        Rails.root + 'config/mongodb.yml'
-      else
-        './mongodb.yml'
-      end
-    end
-
-    def rails?
-      Object.const_defined?("Rails")
-    end
-
     def verify_server_version(connection)
       raise UnsupportedServerVersionError.new('MongoDoc requires at least mongoDB version 1.4.0') unless connection.server_version >= "1.4.0"
     end

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/ext/numeric.rb

@@ -4,9 +4,9 @@ class Numeric
   end
 end
 
-class BigDecimal
+class Float
   def self.cast_from_string(string)
-    BigDecimal.new(string) unless string.blank?
+    string.to_f unless string.blank?
   end
 end
 

data/lib/mongo_doc/validations.rb

@@ -1,12 +1,9 @@
-require 'mongo_doc/validations/macros'
+require 'mongo_doc/validations/validates_embedded'
 
 module MongoDoc
   module Validations
-    def self.included(klass)
-      klass.class_eval do
-        include ::Validatable
-        extend Macros
-      end
+    def self.extended(klass)
+      klass.extend MongoDoc::Validations::ValidatesEmbedded
     end
   end
 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/mongo_doc_rails2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc_rails2}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-06-30}
   s.description = %q{ODM for MongoDB - for Rails 2.3.x}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rvmrc",
      "HISTORY.md",
      "LICENSE",
      "README.textile",
      "Rakefile",
      "TODO",
      "VERSION",
-     "data/.gitignore",
      "examples/simple_document.rb",
      "examples/simple_object.rb",
      "features/collections.feature",
@@ -97,7 +97,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",
@@ -120,7 +119,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/matchers/nin.rb",
      "lib/mongoid/matchers/size.rb",
      "mongo_doc_rails2.gemspec",
-     "mongod.example.yml",
      "mongodb.example.yml",
      "perf/mongo_doc_object.rb",
      "perf/mongo_document.rb",
@@ -156,14 +154,13 @@ Gem::Specification.new do |s|
      "spec/new_record_spec.rb",
      "spec/root_spec.rb",
      "spec/scope_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/validations_spec.rb"
   ]
   s.homepage = %q{http://github.com/leshill/mongodoc}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ODM for MongoDB - for Rails 2.3.x}
   s.test_files = [
     "spec/array_including_argument_matcher.rb",
@@ -204,20 +201,20 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<mongo>, ["= 1.0.1"])
-      s.add_runtime_dependency(%q<bson>, ["= 1.0.1"])
-      s.add_runtime_dependency(%q<bson_ext>, ["= 1.0.1"])
+      s.add_runtime_dependency(%q<mongo>, [">= 1.0.1"])
+      s.add_runtime_dependency(%q<bson>, [">= 1.0.1"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.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<mongo>, ["= 1.0.1"])
-      s.add_dependency(%q<bson>, ["= 1.0.1"])
-      s.add_dependency(%q<bson_ext>, ["= 1.0.1"])
+      s.add_dependency(%q<mongo>, [">= 1.0.1"])
+      s.add_dependency(%q<bson>, [">= 1.0.1"])
+      s.add_dependency(%q<bson_ext>, [">= 1.0.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"])
@@ -225,9 +222,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<mongo>, ["= 1.0.1"])
-    s.add_dependency(%q<bson>, ["= 1.0.1"])
-    s.add_dependency(%q<bson_ext>, ["= 1.0.1"])
+    s.add_dependency(%q<mongo>, [">= 1.0.1"])
+    s.add_dependency(%q<bson>, [">= 1.0.1"])
+    s.add_dependency(%q<bson_ext>, [">= 1.0.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"])

data/spec/array_including_argument_matcher.rb

@@ -1,6 +1,6 @@
 # From http://gist.github.com/62943
 # Author http://github.com/trotter
-module Spec
+module RSpec
   module Mocks
     module ArgumentMatchers
 

data/spec/associations/collection_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+require 'spec_helper'
 
 describe MongoDoc::Associations::CollectionProxy do
   class CollectionProxyTest

data/spec/associations/document_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..',  'spec_helper'))
+require 'spec_helper'
 
 describe "MongoDoc::Associations::DocumentProxy" do
   class Parent

data/spec/associations/hash_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+require 'spec_helper'
 
 describe MongoDoc::Associations::HashProxy do
   class HashProxyTest

data/spec/attributes_spec.rb

@@ -27,10 +27,23 @@ describe "MongoDoc::Attributes" do
       include MongoDoc::Attributes
 
       attr_accessor :attr1, :attr2
+      attr_accessor :validation_context
     end
 
     it "adds its arguments to _keys" do
-      TestKeys._keys.should == [:attr1, :attr2]
+      TestKeys._keys.should include(:attr1, :attr2)
+    end
+
+    context "the :validation_context attribute from ActiveModel" do
+
+      it "is an attribute" do
+        TestKeys.new.should respond_to(:validation_context)
+        TestKeys.new.should respond_to(:validation_context=)
+      end
+
+      it "is not in _keys" do
+        TestKeys._keys.should_not include(:validation_context)
+      end
     end
 
     describe "accessors" do

data/spec/bson_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "BSON for Mongo (BSON)" do
   describe "#decode" do

data/spec/collection_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "MongoDoc::Collection" do
 
@@ -85,9 +85,9 @@ describe "MongoDoc::Collection" do
 
     context "#insert" do
       let(:doc) { {'sample' => 'data'} }
+      let(:options) { {:safe => false} }
 
       it "delegates to the Mongo::Collection" do
-        options = {:safe => false}
         mongo_collection.should_receive(:insert).with(doc, options)
         collection.insert(doc, options)
       end

data/spec/connection_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 # Resets for testing
 module MongoDoc
@@ -53,23 +53,30 @@ describe "MongoDoc::Connection.Connections" do
 
   context "Rails environment" do
 
+    class FauxApp
+      def root
+        Pathname.new('faux_app')
+      end
+    end
+
     module FauxRails
       extend self
 
       def env
-        'development'
+        'staging'
       end
+    end
 
-      def root
-        Pathname.new('rails_root')
-      end
+    before(:all) do
+      Object.const_set('Rails', FauxRails)
+      require 'mongo_doc/railties/config'
     end
 
     before do
-      Object.const_set('Rails', FauxRails)
+      MongoDoc::Railties::Config.config(FauxApp.new)
     end
 
-    after do
+    after(:all) do
       Object.send(:remove_const, 'Rails')
     end
 
@@ -78,7 +85,7 @@ describe "MongoDoc::Connection.Connections" do
     end
 
     it "default the configuration location to Rails.root + '/config/mongodb.yml'" do
-      MongoDoc::Connection.config_path.should == FauxRails.root + 'config/mongodb.yml'
+      MongoDoc::Connection.config_path.to_s.should == 'faux_app/config/mongodb.yml'
     end
 
     context "without a configuration" do
@@ -95,7 +102,7 @@ describe "MongoDoc::Connection.Connections" do
       end
 
       it "creates a default database with strict false" do
-        connection.should_receive(:db).with("rails_root_development", :strict => false)
+        connection.should_receive(:db).with("faux_app_staging", :strict => false)
         MongoDoc::Connection.database
       end
     end

data/spec/contexts_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe MongoDoc::Contexts do
 

data/spec/cursor_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "MongoDoc::Cursor" do
   let(:mongo_cursor) { stub('cursor') }

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/embedded_save_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "Saving embedded documents" do
   class NestedDocsRoot

data/spec/ext_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper.rb'
+require 'spec_helper'
 
 describe "Ruby Object Extensions" do
   context "Rails3 support" do
@@ -46,15 +46,15 @@ describe "Ruby Object Extensions" do
       end
     end
 
-    context "Numeric" do
-      context "BigDecimal" do
+    context "Numbers" do
+      context "Float" do
         it "returns nil for a blank string" do
-          BigDecimal.cast_from_string('').should be_nil
+          Float.cast_from_string('').should be_nil
         end
 
         it "converts from a string to a BigDecimal" do
-          big_decimal = BigDecimal.new("123")
-          BigDecimal.cast_from_string(big_decimal.to_s).should == big_decimal
+          float = "12345.6789".to_f
+          Float.cast_from_string(float.to_s).should == float
         end
       end
 

data/spec/finders_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper.rb"))
+require 'spec_helper'
 
 describe MongoDoc::Finders do
   class FindersTest

data/spec/index_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper.rb"
+require 'spec_helper'
 
 describe MongoDoc::Index do
   class Address

data/spec/matchers_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe MongoDoc::Matchers do
 

data/spec/new_record_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "MongoDoc::Document _id and #new_record?" do
   class Child

data/spec/scope_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper.rb"))
+require 'spec_helper'
 
 describe MongoDoc::Scope do
 

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo_doc'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'bson_matchers'
 require 'hash_matchers'
 require 'array_including_argument_matcher'
 require 'document_ext'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(BsonMatchers)
   config.include(HashMatchers)
 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

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc_rails2
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Les Hill
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -04:00
+date: 2010-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: mongo
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -63,9 +70,11 @@ dependencies:
   name: bson_ext
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -77,9 +86,11 @@ dependencies:
   name: durran-validatable
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 0
@@ -91,9 +102,11 @@ dependencies:
   name: leshill-will_paginate
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 3
@@ -105,9 +118,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -119,9 +134,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 6
@@ -142,13 +159,13 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rvmrc
 - HISTORY.md
 - LICENSE
 - README.textile
 - Rakefile
 - TODO
 - VERSION
-- data/.gitignore
 - examples/simple_document.rb
 - examples/simple_object.rb
 - features/collections.feature
@@ -219,7 +236,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
@@ -242,7 +258,6 @@ files:
 - lib/mongoid/matchers/nin.rb
 - lib/mongoid/matchers/size.rb
 - mongo_doc_rails2.gemspec
-- mongod.example.yml
 - mongodb.example.yml
 - perf/mongo_doc_object.rb
 - perf/mongo_document.rb
@@ -278,7 +293,6 @@ files:
 - spec/new_record_spec.rb
 - spec/root_spec.rb
 - spec/scope_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/validations_spec.rb
 has_rdoc: true
@@ -291,23 +305,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ODM for MongoDB - for Rails 2.3.x

data/data/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

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

data/mongod.example.yml

@@ -1,2 +0,0 @@
-mongod: /usr/local/bin/mongod
-dbpath: /data/db

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---format nested