mongo_mapper 0.9.0 → 0.9.1

data/lib/mongo_mapper/extensions/boolean.rb

@@ -39,6 +39,6 @@ module MongoMapper
   end
 end
 
-class Boolean
-  extend MongoMapper::Extensions::Boolean
-end
+class Boolean; end unless defined?(Boolean)
+
+Boolean.extend MongoMapper::Extensions::Boolean

data/lib/mongo_mapper/extensions/object_id.rb

@@ -27,4 +27,6 @@ class BSON::ObjectId
   def to_json(options = nil)
     as_json.to_json
   end
+
+  alias to_str to_s
 end

data/lib/mongo_mapper/plugins/accessible.rb

@@ -3,18 +3,14 @@ module MongoMapper
     module Accessible
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :accessible_attributes
+      end
+
       module ClassMethods
         def attr_accessible(*attrs)
           raise AccessibleOrProtected.new(name) if try(:protected_attributes?)
-          self.write_inheritable_attribute(:attr_accessible, Set.new(attrs) + (accessible_attributes || []))
-        end
-
-        def accessible_attributes?
-          !accessible_attributes.nil?
-        end
-
-        def accessible_attributes
-          self.read_inheritable_attribute(:attr_accessible)
+          self.accessible_attributes = Set.new(attrs) + (accessible_attributes || [])
         end
       end
 
@@ -31,10 +27,6 @@ module MongoMapper
           super(filter_inaccessible_attrs(attrs))
         end
 
-        def accessible_attributes
-          self.class.accessible_attributes
-        end
-
         protected
           def filter_inaccessible_attrs(attrs)
             return attrs if accessible_attributes.blank? || attrs.blank?

data/lib/mongo_mapper/plugins/associations/proxy.rb

@@ -98,11 +98,6 @@ module MongoMapper
           end
         end
 
-        def ===(other)
-          load_target
-          other === target
-        end
-
         protected
           def method_missing(method, *args, &block)
             if load_target

data/lib/mongo_mapper/plugins/dirty.rb

@@ -53,15 +53,15 @@ module MongoMapper
           key = key.to_s
           old = read_key(key)
           attribute_will_change!(key) if attribute_should_change?(key, old, value)
-          changed_attributes.delete(key) unless value_changed?(key, attribute_was(key), value)
+          changed_attributes.delete(key) unless attribute_value_changed?(key, attribute_was(key), value)
           super(key, value)
         end
 
         def attribute_should_change?(key, old, value)
-          attribute_changed?(key) == false && value_changed?(key, old, value)
+          attribute_changed?(key) == false && attribute_value_changed?(key, old, value)
         end
 
-        def value_changed?(key_name, old, value)
+        def attribute_value_changed?(key_name, old, value)
           value = nil if keys[key_name.to_s].number? && value.blank?
           old != value
         end

data/lib/mongo_mapper/plugins/equality.rb

@@ -4,6 +4,12 @@ module MongoMapper
     module Equality
       extend ActiveSupport::Concern
 
+      module ClassMethods
+        def ===(other)
+          other.is_a?(self)
+        end
+      end
+
       module InstanceMethods
         def eql?(other)
           other.is_a?(self.class) && _id == other._id
@@ -16,4 +22,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/keys.rb

@@ -8,7 +8,7 @@ module MongoMapper
 
       included do
         extend ActiveSupport::DescendantsTracker
-        key :_id, ObjectId
+        key :_id, ObjectId, :default => lambda { BSON::ObjectId.new }
       end
 
       module ClassMethods
@@ -269,6 +269,11 @@ module MongoMapper
         def default_id_value(attrs={})
           id_provided = !attrs.nil? && attrs.keys.map { |k| k.to_s }.detect { |k| k == 'id' || k == '_id' }
           if !id_provided && self.class.can_default_id?
+            unless keys['_id'].default_value
+              warn "[DEPRECATED] Custom IDs will no longer be automatically populated. If you definte your own :_id key, set a default:\n  key :_id, String, :default => lambda { BSON::ObjectId.new }"
+              warn caller.grep(/test/).join("\n")
+            end
+
             write_key :_id, BSON::ObjectId.new
           end
         end

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -95,10 +95,18 @@ module MongoMapper
         def push(hash)
           self.class.push(id, hash)
         end
+        
+        def push_all(hash)
+          self.class.push_all(id, hash)
+        end
 
         def pull(hash)
           self.class.pull(id, hash)
         end
+        
+        def pull_all(hash)
+          self.class.pull_all(id, hash)
+        end
 
         def add_to_set(hash)
           self.class.push_uniq(id, hash)

data/lib/mongo_mapper/plugins/protected.rb

@@ -6,18 +6,14 @@ module MongoMapper
     module Protected
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :protected_attributes
+      end
+
       module ClassMethods
         def attr_protected(*attrs)
           raise AccessibleOrProtected.new(name) if try(:accessible_attributes?)
-          self.write_inheritable_attribute(:attr_protected, Set.new(attrs) + (protected_attributes || []))
-        end
-
-        def protected_attributes
-          self.read_inheritable_attribute(:attr_protected)
-        end
-
-        def protected_attributes?
-          !protected_attributes.nil?
+          self.protected_attributes = Set.new(attrs) + (protected_attributes || [])
         end
 
         def key(*args)
@@ -40,10 +36,6 @@ module MongoMapper
           super(filter_protected_attrs(attrs))
         end
 
-        def protected_attributes
-          self.class.protected_attributes
-        end
-
         protected
           def filter_protected_attrs(attrs)
             return attrs if protected_attributes.blank? || attrs.blank?

data/lib/mongo_mapper/plugins/querying.rb

@@ -11,7 +11,7 @@ module MongoMapper
         include PluckyMethods
 
         def find_each(opts={})
-          super(opts).each { |doc| yield load(doc) }
+          super(opts).each { |doc| yield(doc) }
         end
 
         def find_by_id(id)
@@ -61,12 +61,12 @@ module MongoMapper
 
         # @api private for now
         def query(options={})
-          Plucky::Query.new(collection).tap do |query|
-            query.extend(Decorator)
-            query.object_ids(object_id_keys)
-            query.update(options)
-            query.model(self)
-          end
+          query = Plucky::Query.new(collection, :transformer => transformer)
+          query.extend(Decorator)
+          query.object_ids(object_id_keys)
+          query.update(options)
+          query.model(self)
+          query
         end
 
         # @api private for now
@@ -75,6 +75,10 @@ module MongoMapper
         end
 
         private
+          def transformer
+            @transformer ||= lambda { |doc| load(doc) }
+          end
+
           def find_some(ids, options={})
             query = query(options).update(:_id => ids.flatten.compact.uniq)
             find_many(query.to_hash).compact

data/lib/mongo_mapper/plugins/querying/decorator.rb

@@ -21,18 +21,6 @@ module MongoMapper
           end
         end
 
-        def all(opts={})
-          super.map { |doc| model.load(doc) }
-        end
-
-        def first(opts={})
-          model.load(super)
-        end
-
-        def last(opts={})
-          model.load(super)
-        end
-
         private
           def method_missing(method, *args, &block)
             return super unless model.respond_to?(method)

data/lib/mongo_mapper/plugins/rails.rb

@@ -39,18 +39,14 @@ module MongoMapper
           one(*args)
         end
 
-        def has_many(*args)
-          many(*args)
+        def has_many(*args, &extension)
+          many(*args, &extension)
         end
 
         def column_names
           keys.keys
         end
-
-        def human_name
-          self.name.demodulize.titleize
-        end
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/scopes.rb

@@ -4,6 +4,10 @@ module MongoMapper
     module Scopes
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :_scopes
+      end
+
       module ClassMethods
         def scope(name, scope_options={})
           scopes[name] = lambda do |*args|
@@ -15,7 +19,7 @@ module MongoMapper
         end
 
         def scopes
-          read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
+          self._scopes || self._scopes = {}
         end
       end
     end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -57,6 +57,10 @@ module MongoMapper
           hash
         end
 
+        def to_xml(options = {}, &block)
+          XmlSerializer.new(self, options).serialize(&block)
+        end
+
       private
 
         def serializable_add_includes(options = {})
@@ -91,7 +95,13 @@ module MongoMapper
           self.new.from_xml(xml)
         end
       end
+    end
 
+    # Override default Serializer to use #serializable_hash
+    class XmlSerializer < ::ActiveModel::Serializers::Xml::Serializer
+      def attributes_hash
+        @serializable.serializable_hash(options)
+      end
     end
   end
 end

data/lib/mongo_mapper/plugins/validations.rb

@@ -56,7 +56,7 @@ module MongoMapper
       class AssociatedValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
           if !Array.wrap(value).all? { |c| c.nil? || c.valid? }
-            record.errors.add(attribute, :invalid, :default => options[:message], :value => value)
+            record.errors.add(attribute, :invalid, :message => options[:message], :value => value)
           end
         end
       end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.9.0'
+  Version = '0.9.1'
 end

data/test/functional/test_dirty.rb

@@ -99,6 +99,13 @@ class DirtyTest < Test::Unit::TestCase
     should "be false if no keys changed" do
       @document.new.changed?.should be_false
     end
+
+    should "not raise when key name is 'value'" do
+      @document.key :value, Integer
+
+      doc = @document.new
+      doc.value_changed?.should be_false
+    end
   end
 
   context "changes" do

data/test/functional/test_equality.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class EqualityTest < Test::Unit::TestCase
+  context "Case equality" do
+    setup do
+      @person = Doc()
+      @address = Doc()
+
+      @person.one :address, :class => @address, :foreign_key => :person_id
+      @address.belongs_to :person, :class => @person
+    end
+
+    should "work with proxies" do
+      person = @person.create!
+      address = @address.create!(:person => person)
+      @person.should === address.person
+      @address.should === person.address
+    end
+  end
+end

data/test/functional/test_modifiers.rb

@@ -368,6 +368,14 @@ class ModifierTest < Test::Unit::TestCase
       page.reload
       page.tags.should == %w(foo)
     end
+    
+    should "be able to push_all with modifier hashes" do
+      page = @page_class.create
+      page.push_all(:tags => %w(foo bar))
+
+      page.reload
+      page.tags.should == %w(foo bar)
+    end
 
     should "be able to pull with criteria and modifier hashes" do
       page = @page_class.create(:tags => %w(foo bar))
@@ -376,6 +384,14 @@ class ModifierTest < Test::Unit::TestCase
       page.reload
       page.tags.should == %w(bar)
     end
+    
+    should "be able to pull_all with criteria and modifier hashes" do
+      page = @page_class.create(:tags => %w(foo bar baz))
+      page.pull_all(:tags => %w(foo bar))
+
+      page.reload
+      page.tags.should == %w(baz)
+    end
 
     should "be able to add_to_set with criteria and modifier hash" do
       page  = @page_class.create(:tags => 'foo')

data/test/functional/test_string_id_compatibility.rb

@@ -23,7 +23,7 @@ class StringIdCompatibilityTest < Test::Unit::TestCase
   end
 
   should "assign correct _id for documents" do
-    project = @project_class.create
+    project = silence_stderr { @project_class.create }
     project._id.should == project.id
     project._id.should be_instance_of(String)
     project.id.size.should == 24
@@ -33,35 +33,43 @@ class StringIdCompatibilityTest < Test::Unit::TestCase
   end
 
   should "assign correct _id for embedded documents" do
-    note = @note_class.new
-    note.id.should == note._id
-    note.id.size.should == 24
+    silence_stderr do
+      note = @note_class.new
+      note.id.should == note._id
+      note.id.size.should == 24
+    end
   end
 
   should "find records" do
-    project = @project_class.create
-    @project_class.find(project.id).should == project
+    silence_stderr do
+      project = @project_class.create
+      @project_class.find(project.id).should == project
+    end
   end
 
   should "save embedded docs" do
-    n1 = @note_class.new
-    n2 = @note_class.new
-    n3 = @note_class.new
-    project = @project_class.create(:notes => [n1, n2, n3])
+    silence_stderr do
+      n1 = @note_class.new
+      n2 = @note_class.new
+      n3 = @note_class.new
+      project = @project_class.create(:notes => [n1, n2, n3])
 
-    project = project.reload
-    project.notes.size.should == 3
-    project.notes.should == [n1, n2, n3]
+      project = project.reload
+      project.notes.size.should == 3
+      project.notes.should == [n1, n2, n3]
+    end
   end
 
   should "be able to associate records" do
-    t1 = @task_class.new(:body => 'First task', :position => 1)
-    t2 = @task_class.new(:body => 'Second task', :position => 2)
-    t3 = @task_class.new(:body => 'Third task', :position => 3)
-    project = @project_class.create(:name => 'MM', :tasks => [t1, t2, t3])
+    silence_stderr do
+      t1 = @task_class.new(:body => 'First task', :position => 1)
+      t2 = @task_class.new(:body => 'Second task', :position => 2)
+      t3 = @task_class.new(:body => 'Third task', :position => 3)
+      project = @project_class.create(:name => 'MM', :tasks => [t1, t2, t3])
 
-    project = project.reload
-    project.tasks.count.should == 3
-    project.tasks.should == [t1, t2, t3]
+      project = project.reload
+      project.tasks.count.should == 3
+      project.tasks.should == [t1, t2, t3]
+    end
   end
 end

data/test/functional/test_validations.rb

@@ -323,6 +323,34 @@ class ValidationsTest < Test::Unit::TestCase
     end
   end
 
+  context "validating associated docs" do
+    setup do
+      @child_class = EDoc do
+        key :name, :required => true
+      end
+
+      @root_class = Doc { }
+      @root_class.many :children, :class => @child_class
+      @root_class.validates_associated :children, :message => 'are invalid'
+    end
+    
+    should "pass if there are no associated docs" do
+      doc = @root_class.new
+      doc.save.should be_true
+    end
+    
+    should "pass if the associated doc is valid" do
+      doc = @root_class.new
+      doc.children.build(:name => 'Joe')
+      doc.save.should be_true
+    end
+
+    should "fail if the associated doc is invalid" do
+      doc = @root_class.new
+      doc.children.build
+      doc.should have_error_on(:children, 'are invalid')
+    end
+  end
   # context "validates uniqueness of with :unique shortcut" do
   #   should "work" do
   #     @document = Doc do

data/test/unit/associations/test_proxy.rb

@@ -28,11 +28,6 @@ class ProxyTest < Test::Unit::TestCase
     @blank_proxy = FakeBlankProxy.new(@owner, @association)
   end
 
-  should 'return true for === target' do
-    @proxy = FakeProxy.new(@owner, @association)
-    @proxy.should === Array
-  end
-
   should "set target to nil when reset is called" do
     @proxy.reset
     @proxy.target.should be_nil
@@ -102,4 +97,4 @@ class ProxyTest < Test::Unit::TestCase
       lambda { @proxy.send(:gsub) }.should raise_error
     end
   end
-end
+end

data/test/unit/serializers/test_xml_serializer.rb

@@ -0,0 +1,193 @@
+require 'test_helper'
+
+class XmlSerializationTest < Test::Unit::TestCase
+  class Tag
+    include MongoMapper::EmbeddedDocument
+    key :name, String
+  end
+
+  class Contact
+    include MongoMapper::Document
+    key :name, String
+    key :age, Integer
+    key :created_at, Time
+    key :awesome, Boolean
+    key :preferences, Hash
+
+    many :tags, :class_name => 'XmlSerializationTest::Tag'
+  end
+
+  def setup
+    Kernel.const_set('TopLevelContact', Doc('TopLevelContact'))
+    TopLevelContact.key :name, String
+
+    Contact.include_root_in_json = false
+    @contact = Contact.new(
+      :name        => 'Konata Izumi',
+      :age         => 16,
+      :created_at  => Time.utc(2006, 8, 1),
+      :awesome     => true,
+      :preferences => { :shows => 'anime' }
+    )
+    @top_level_contact = TopLevelContact.new(
+      :name        => 'Konata Izumi'
+    )
+  end
+
+  def teardown
+    Kernel.send(:remove_const, 'TopLevelContact') if Object.const_defined?('TopLevelContact')
+  end
+
+  should "include root for class with no module" do
+    assert_match %r{<top-level-contact>}, @top_level_contact.to_xml
+  end
+
+  should "include demodulized root" do
+    assert_match %r{<contact>}, @contact.to_xml
+  end
+
+  should "encode all encodable attributes" do
+    xml = @contact.to_xml
+
+    assert_no_match %r{_id}, xml
+    assert_match %r{<id>#{@contact.id}</id>}, xml
+    assert_match %r{<name>Konata Izumi</name>}, xml
+    assert_match %r{<age.*>16</age>}, xml
+    assert_match %r(<created-at type="datetime">), xml
+    assert_match %r{<awesome type="boolean">true</awesome>}, xml
+    assert_match %r{<preferences>}, xml
+    assert_match %r{<shows>anime</shows>}, xml
+  end
+
+  should "allow attribute filtering with only" do
+    xml = @contact.to_xml(:only => [:name, :age])
+
+    assert_no_match %r{<id>}, xml
+    assert_match %r{<name>Konata Izumi</name>}, xml
+    assert_match %r{<age type="integer">16</age>}, xml
+    assert_no_match %r{awesome}, xml
+    assert_no_match %r{created-at}, xml
+    assert_no_match %r{preferences}, xml
+  end
+
+  should "allow attribute filtering with except" do
+    xml = @contact.to_xml(:except => [:name, :age])
+
+    assert_no_match %r{<name>Konata Izumi</name>}, xml
+    assert_no_match %r{<age type="integer">16</age>}, xml
+    assert_match %r{<id>}, xml
+    assert_match %r{awesome}, xml
+    assert_match %r{created-at}, xml
+    assert_match %r{preferences}, xml
+  end
+
+  context "_id key" do
+    should "not be included by default" do
+      assert_no_match %r{_id}, @contact.to_xml
+    end
+
+    should "not be included even if :except is used" do
+      assert_no_match %r{_id}, @contact.to_xml(:except => :name)
+    end
+  end
+
+  context "id method" do
+    setup do
+      def @contact.label; "Has cheezburger"; end
+      def @contact.favorite_quote; "Constraints are liberating"; end
+    end
+
+    should "be included by default" do
+      assert_match %r{<id>#{@contact.id}</id>}, @contact.to_xml
+    end
+
+    should "be included when single method included" do
+      xml = @contact.to_xml(:methods => :label)
+      assert_match %r{<id>}, xml
+      assert_match %r{<label>Has cheezburger</label>}, xml
+      assert_match %r{<name>Konata Izumi</name>}, xml
+      assert_no_match %r{favorite_quote}, xml
+    end
+
+    should "be included when multiple methods included" do
+      xml = @contact.to_xml(:methods => [:label, :favorite_quote])
+      assert_match %r{<id>}, xml
+      assert_match %r{<label>Has cheezburger</label>}, xml
+      assert_match %r{<name>Konata Izumi</name>}, xml
+      assert_match %r{<favorite-quote>Constraints are liberating</favorite-quote>}, xml
+    end
+
+    should "not be included if :only is present" do
+      assert_no_match %r{<id}, @contact.to_xml(:only => :name)
+    end
+
+    should "be represented by a string" do
+      assert_match %r{<id>}, @contact.to_xml
+    end
+  end
+
+  context "including methods" do
+    setup do
+      def @contact.label; "Has cheezburger"; end
+      def @contact.favorite_quote; "Constraints are liberating"; end
+    end
+
+    should "include single method" do
+      assert_match %r{<label>Has cheezburger</label>}, @contact.to_xml(:methods => :label)
+    end
+
+    should "include multiple methods" do
+      xml = @contact.to_xml(:only => :name, :methods => [:label, :favorite_quote])
+      assert_match %r{<label>Has cheezburger</label>}, xml
+      assert_match %r{<favorite-quote>Constraints are liberating</favorite-quote>}, xml
+      assert_match %r{<name>Konata Izumi</name>}, xml
+      assert_no_match %r{age}, xml
+      assert_no_match %r{awesome}, xml
+      assert_no_match %r{created-at}, xml
+      assert_no_match %r{preferences}, xml
+    end
+  end
+
+  context "array of records" do
+    setup do
+      @contacts = [
+        Contact.new(:name => 'David', :age => 39),
+        Contact.new(:name => 'Mary', :age => 14)
+      ]
+    end
+
+    should "allow attribute filtering with only" do
+      xml = @contacts.to_xml(:only => :name)
+      assert_match %r{<name>David</name>}, xml
+      assert_match %r{<name>Mary</name>},  xml
+    end
+
+    should "allow attribute filtering with except" do
+      xml = @contacts.to_xml(:except => [:name, :preferences, :awesome, :created_at, :updated_at])
+      assert_match %r{<age type="integer">39</age>}, xml
+      assert_match %r{<age type="integer">14</age>}, xml
+      assert_no_match %r{name},        xml
+      assert_no_match %r{preferences}, xml
+      assert_no_match %r{awesome},     xml
+      assert_no_match %r{created-at},  xml
+      assert_no_match %r{updated-at},  xml
+    end
+  end
+
+  should "include embedded attributes" do
+    contact = Contact.new(:name => 'John', :age => 27)
+    contact.tags = [Tag.new(:name => 'awesome'), Tag.new(:name => 'ruby')]
+    xml = contact.to_xml
+    assert_match %r{<tags type="array">}, xml
+    assert_match %r{<id>#{contact.tags[0].id}</id>}, xml
+    assert_match %r{<id>#{contact.tags[1].id}</id>}, xml
+    assert_match %r{<name>awesome</name>}, xml
+    assert_match %r{<name>ruby</name>}, xml
+  end
+
+  should "include dynamic attributes" do
+    contact = Contact.new(:name => 'John', :age => 27, :foo => 'bar')
+    contact['smell'] = 'stinky'
+    assert_match %r{<smell>stinky</smell>}, contact.to_xml
+  end
+end

data/test/unit/test_document.rb

@@ -152,7 +152,7 @@ class DocumentTest < Test::Unit::TestCase
 
       should "be true if id but using custom id and not saved yet" do
         @document.key :_id, String
-        doc = @document.new
+        doc = silence_stderr { @document.new }
         doc.id = '1234'
         doc.new?.should be_true
       end

data/test/unit/test_equality.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class EqualityTest < Test::Unit::TestCase
+  context "Case equality" do
+    setup do
+      @klass = Class.new do
+        include MongoMapper::Plugins::Equality
+      end
+      @subklass = Class.new(@klass)
+
+      @faker = Class.new do
+        def initialize(faked)
+          @faked = faked
+        end
+
+        def is_a?(klass)
+          @faked.is_a? klass
+        end
+      end
+    end
+
+    should "work with regular instance" do
+      @klass.should === @klass.new
+    end
+
+    should "work with instances of subclasses" do
+      @klass.should === @subklass.new
+    end
+
+    should "work with a faker class" do
+      @klass.should === @faker.new(@klass.new)
+    end
+
+    should "not work with other instances" do
+      @klass.should_not === 1
+    end
+  end
+end

data/test/unit/test_keys.rb

@@ -9,7 +9,7 @@ class KeyTest < Test::Unit::TestCase
           key :_id, Integer
         end
         # No sensible default id for integer, people better pass them in if they user this
-        klass.new.id.should be_nil
+        silence_stderr { klass.new.id.should be_nil }
       }.should_not raise_error
     end
   end
@@ -20,7 +20,7 @@ class KeyTest < Test::Unit::TestCase
         klass = Doc() do
           key :_id, String
         end
-        klass.new.id.should_not be_nil
+        silence_stderr { klass.new.id.should_not be_nil }
       }.should_not raise_error
     end
   end
@@ -31,7 +31,7 @@ class KeyTest < Test::Unit::TestCase
         klass = Doc() do
           key :_id, ObjectId
         end
-        klass.new.should_not be_nil
+        silence_stderr { klass.new.should_not be_nil }
       }.should_not raise_error
     end
   end

data/test/unit/test_rails.rb

@@ -13,6 +13,16 @@ class TestRails < Test::Unit::TestCase
         @klass.should respond_to(:has_many)
       end
 
+      should 'pass on block given in has_many' do
+        @klass.class_eval do
+          has_many :posts do
+            def foo_bars; true; end
+          end
+        end
+
+        @klass.new.posts.should respond_to(:foo_bars)
+      end
+
       should "alias has_one to one" do
         @klass.should respond_to(:has_one)
       end
@@ -20,10 +30,6 @@ class TestRails < Test::Unit::TestCase
       should "have column names" do
         @klass.column_names.sort.should == ['_id', 'foo']
       end
-
-      should "implement human_name" do
-        @klass.human_name.should == 'Post'
-      end
     end
 
     context "Instance methods" do
@@ -107,10 +113,6 @@ class TestRails < Test::Unit::TestCase
       should "have column names" do
         @klass.column_names.sort.should == ['_id', 'foo']
       end
-
-      should "implement human_name" do
-        @klass.human_name.should == 'Post'
-      end
     end
 
     context "Instance methods" do
@@ -178,4 +180,4 @@ class TestRails < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/unit/test_rails_compatibility.rb

@@ -1,10 +1,6 @@
 require 'test_helper'
 
 class TestRailsCompatibility < Test::Unit::TestCase
-  class BigStuff
-    include MongoMapper::Document
-  end
-
   class Item
     include MongoMapper::EmbeddedDocument
     key :for_all, String
@@ -38,15 +34,5 @@ class TestRailsCompatibility < Test::Unit::TestCase
       instance = Item.new
       instance.new_record?.should == instance.new?
     end
-
-    should "implement human_name" do
-      Item.human_name.should == 'Item'
-    end
-  end
-
-  context "Document" do
-    should "implement human_name" do
-      BigStuff.human_name.should == 'Big Stuff'
-    end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 57
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -04:00
-default_executable: mmconsole
+date: 2011-05-17 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -28,12 +28,11 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
-  name: activemodel
+        version: "3.0"
   prerelease: false
-  type: :runtime
   version_requirements: *id001
+  type: :runtime
+  name: activemodel
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,161 +43,27 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
-  name: activesupport
+        version: "3.0"
   prerelease: false
-  type: :runtime
   version_requirements: *id002
+  type: :runtime
+  name: activesupport
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  name: plucky
-  prerelease: false
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  prerelease: false
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: tzinfo
-  prerelease: false
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: json
-  prerelease: false
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 0
-        version: "0"
-  name: log_buddy
-  prerelease: false
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  name: jnunemaker-matchy
-  prerelease: false
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
-  name: shoulda
-  prerelease: false
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
         - 3
-        - 1
-        version: 0.3.1
-  name: timecop
-  prerelease: false
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
         - 8
-        version: 0.9.8
-  name: mocha
+        version: 0.3.8
   prerelease: false
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rack-test
-  prerelease: false
-  type: :development
-  version_requirements: *id012
+  version_requirements: *id003
+  type: :runtime
+  name: plucky
 description: 
 email: 
 - nunemaker@gmail.com
@@ -325,6 +190,7 @@ files:
 - test/functional/test_document.rb
 - test/functional/test_dynamic_querying.rb
 - test/functional/test_embedded_document.rb
+- test/functional/test_equality.rb
 - test/functional/test_identity_map.rb
 - test/functional/test_indexes.rb
 - test/functional/test_logger.rb
@@ -348,11 +214,13 @@ files:
 - test/unit/associations/test_one_association.rb
 - test/unit/associations/test_proxy.rb
 - test/unit/serializers/test_json_serializer.rb
+- test/unit/serializers/test_xml_serializer.rb
 - test/unit/test_clone.rb
 - test/unit/test_descendant_appends.rb
 - test/unit/test_document.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb
+- test/unit/test_equality.rb
 - test/unit/test_extensions.rb
 - test/unit/test_identity_map_middleware.rb
 - test/unit/test_inspect.rb
@@ -400,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Ruby Object Mapper for Mongo