mrkurt-mongo_mapper 0.6.8 → 0.6.9

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

data/lib/mongo_mapper.rb

@@ -137,3 +137,4 @@ require 'mongo_mapper/associations/many_embedded_proxy'
 require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
 require 'mongo_mapper/associations/many_documents_as_proxy'
 require 'mongo_mapper/associations/one_proxy'
+require 'mongo_mapper/associations/in_array_proxy'

data/lib/mongo_mapper/associations/base.rb

@@ -4,7 +4,7 @@ module MongoMapper
       attr_reader :type, :name, :options, :finder_options
 
       # Options that should not be considered MongoDB query options/criteria
-      AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :polymorphic]
+      AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic]
 
       def initialize(type, name, options={}, &extension)
         @type, @name, @options, @finder_options = type, name, {}, {}
@@ -56,6 +56,14 @@ module MongoMapper
       def as?
         !!@options[:as]
       end
+      
+      def in_array?
+        !!@options[:in]
+      end
+
+      def embeddable?
+        many? && klass.embeddable?
+      end
 
       def type_key_name
         @type_key_name ||= many? ? '_type' : "#{as}_type"
@@ -73,10 +81,6 @@ module MongoMapper
         @ivar ||= "@_#{name}"
       end
 
-      def embeddable?
-        many? && klass.embeddable?
-      end
-
       def proxy_class
         @proxy_class ||= begin
           if many?
@@ -87,6 +91,8 @@ module MongoMapper
                 ManyPolymorphicProxy
               elsif as?
                 ManyDocumentsAsProxy
+              elsif in_array?
+                InArrayProxy
               else
                 ManyDocumentsProxy
               end
@@ -96,8 +102,8 @@ module MongoMapper
           else
             polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
           end
-        end # end begin
-      end # end proxy_class
+        end
+      end
 
       private
 

data/lib/mongo_mapper/associations/in_array_proxy.rb

@@ -0,0 +1,137 @@
+module MongoMapper
+  module Associations
+    class InArrayProxy < Collection
+      include ::MongoMapper::Finders
+      
+      def find(*args)
+        options = args.extract_options!
+        
+        case args.first
+          when :first
+            first(options)
+          when :last
+            last(options)
+          when :all
+            all(options)
+          else
+            klass.find(*scoped_ids(args) << scoped_options(options))
+        end
+      end
+      
+      def find!(*args)
+        options = args.extract_options!
+        
+        case args.first
+          when :first
+            first(options)
+          when :last
+            last(options)
+          when :all
+            all(options)
+          else
+            klass.find!(*scoped_ids(args) << scoped_options(options))
+        end
+      end
+
+      def paginate(options)
+        klass.paginate(scoped_options(options))
+      end
+
+      def all(options={})
+        klass.all(scoped_options(options))
+      end
+
+      def first(options={})
+        klass.first(scoped_options(options))
+      end
+
+      def last(options={})
+        klass.last(scoped_options(options))
+      end
+      
+      def count(options={})
+        options.blank? ? ids.size : klass.count(scoped_options(options))
+      end
+      
+      def destroy_all(options={})
+        all(options).each do |doc|
+          ids.delete(doc.id)
+          doc.destroy
+        end
+        reset
+      end
+
+      def delete_all(options={})
+        docs = all(options.merge(:select => ['_id']))
+        docs.each { |doc| ids.delete(doc.id) }
+        klass.delete(docs.map(&:id))
+        reset
+      end
+      
+      def nullify
+        replace([])
+        reset
+      end
+      
+      def create(attrs={})
+        doc = klass.create(attrs)
+        unless doc.new?
+          ids << doc.id
+          owner.save
+        end
+        doc
+      end
+      
+      def create!(attrs={})
+        doc = klass.create!(attrs)
+        unless doc.new?
+          ids << doc.id
+          owner.save
+        end
+        doc
+      end
+      
+      def <<(*docs)
+        flatten_deeper(docs).each do |doc|
+          doc.save if doc.new?
+          unless ids.include?(doc.id)
+            ids << doc.id
+          end
+        end
+        reset
+      end
+      alias_method :push, :<<
+      alias_method :concat, :<<
+      
+      def replace(docs)
+        doc_ids = docs.map do |doc|
+          doc.save if doc.new?
+          doc.id
+        end
+        ids.replace(doc_ids.uniq)
+        reset
+      end
+      
+      private
+        def scoped_conditions
+          {:_id => ids}
+        end
+        
+        def scoped_options(options)
+          reflection.finder_options.merge(options).merge(scoped_conditions)
+        end
+        
+        def scoped_ids(args)
+          args.flatten.reject { |id| !ids.include?(id) }
+        end
+        
+        def find_target
+          ids.blank? ? [] : all
+        end
+        
+        def ids
+          owner[options[:in]]
+        end
+    end
+  end
+end

data/lib/mongo_mapper/document.rb

@@ -123,7 +123,7 @@ module MongoMapper
       end
 
       def find_by_id(id)
-        find_one(:_id => id)
+        find(id)
       end
 
       def count(options={})

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2010-01-01}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -30,11 +30,13 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb",
      "lib/mongo_mapper/associations/belongs_to_proxy.rb",
      "lib/mongo_mapper/associations/collection.rb",
+     "lib/mongo_mapper/associations/in_array_proxy.rb",
      "lib/mongo_mapper/associations/many_documents_as_proxy.rb",
      "lib/mongo_mapper/associations/many_documents_proxy.rb",
      "lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb",
      "lib/mongo_mapper/associations/many_embedded_proxy.rb",
      "lib/mongo_mapper/associations/many_polymorphic_proxy.rb",
+     "lib/mongo_mapper/associations/one_proxy.rb",
      "lib/mongo_mapper/associations/proxy.rb",
      "lib/mongo_mapper/callbacks.rb",
      "lib/mongo_mapper/dirty.rb",
@@ -43,7 +45,7 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/embedded_document.rb",
      "lib/mongo_mapper/finder_options.rb",
      "lib/mongo_mapper/key.rb",
-     "lib/mongo_mapper/observing.rb",
+     "lib/mongo_mapper/mongo_mapper.rb",
      "lib/mongo_mapper/pagination.rb",
      "lib/mongo_mapper/rails_compatibility/document.rb",
      "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
@@ -56,11 +58,13 @@ Gem::Specification.new do |s|
      "test/NOTE_ON_TESTING",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_in_array_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_documents_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
      "test/functional/test_callbacks.rb",
@@ -68,6 +72,7 @@ Gem::Specification.new do |s|
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
      "test/functional/test_logger.rb",
+     "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_string_id_compatibility.rb",
@@ -85,7 +90,6 @@ Gem::Specification.new do |s|
      "test/unit/test_finder_options.rb",
      "test/unit/test_key.rb",
      "test/unit/test_mongo_mapper.rb",
-     "test/unit/test_observing.rb",
      "test/unit/test_pagination.rb",
      "test/unit/test_rails_compatibility.rb",
      "test/unit/test_serializations.rb",
@@ -101,11 +105,13 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_in_array_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_documents_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
      "test/functional/test_callbacks.rb",
@@ -113,6 +119,7 @@ Gem::Specification.new do |s|
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
      "test/functional/test_logger.rb",
+     "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_string_id_compatibility.rb",
@@ -130,7 +137,6 @@ Gem::Specification.new do |s|
      "test/unit/test_finder_options.rb",
      "test/unit/test_key.rb",
      "test/unit/test_mongo_mapper.rb",
-     "test/unit/test_observing.rb",
      "test/unit/test_pagination.rb",
      "test/unit/test_rails_compatibility.rb",
      "test/unit/test_serializations.rb",
@@ -145,7 +151,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.18.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.2"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -153,7 +159,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.18.1"])
+      s.add_dependency(%q<mongo>, ["= 0.18.2"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -162,7 +168,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18.1"])
+    s.add_dependency(%q<mongo>, ["= 0.18.2"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])

data/mrkurt-mongo_mapper.gemspec

@@ -0,0 +1,180 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mrkurt-mongo_mapper}
+  s.version = "0.6.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Nunemaker", "Kurt Mackey"]
+  s.date = %q{2010-01-02}
+  s.default_executable = %q{mmconsole}
+  s.email = %q{mrkurt@gmail.com}
+  s.executables = ["mmconsole"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/mmconsole",
+     "lib/mongo_mapper.rb",
+     "lib/mongo_mapper/associations.rb",
+     "lib/mongo_mapper/associations/base.rb",
+     "lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb",
+     "lib/mongo_mapper/associations/belongs_to_proxy.rb",
+     "lib/mongo_mapper/associations/collection.rb",
+     "lib/mongo_mapper/associations/in_array_proxy.rb",
+     "lib/mongo_mapper/associations/many_documents_as_proxy.rb",
+     "lib/mongo_mapper/associations/many_documents_proxy.rb",
+     "lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb",
+     "lib/mongo_mapper/associations/many_embedded_proxy.rb",
+     "lib/mongo_mapper/associations/many_polymorphic_proxy.rb",
+     "lib/mongo_mapper/associations/one_proxy.rb",
+     "lib/mongo_mapper/associations/proxy.rb",
+     "lib/mongo_mapper/callbacks.rb",
+     "lib/mongo_mapper/dirty.rb",
+     "lib/mongo_mapper/document.rb",
+     "lib/mongo_mapper/dynamic_finder.rb",
+     "lib/mongo_mapper/embedded_document.rb",
+     "lib/mongo_mapper/finder_options.rb",
+     "lib/mongo_mapper/key.rb",
+     "lib/mongo_mapper/mongo_mapper.rb",
+     "lib/mongo_mapper/pagination.rb",
+     "lib/mongo_mapper/rails_compatibility/document.rb",
+     "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
+     "lib/mongo_mapper/serialization.rb",
+     "lib/mongo_mapper/serializers/json_serializer.rb",
+     "lib/mongo_mapper/support.rb",
+     "lib/mongo_mapper/validations.rb",
+     "mongo_mapper.gemspec",
+     "mrkurt-mongo_mapper.gemspec",
+     "specs.watchr",
+     "test/NOTE_ON_TESTING",
+     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+     "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_in_array_proxy.rb",
+     "test/functional/associations/test_many_documents_as_proxy.rb",
+     "test/functional/associations/test_many_documents_proxy.rb",
+     "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
+     "test/functional/associations/test_many_embedded_proxy.rb",
+     "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_proxy.rb",
+     "test/functional/test_associations.rb",
+     "test/functional/test_binary.rb",
+     "test/functional/test_callbacks.rb",
+     "test/functional/test_dirty.rb",
+     "test/functional/test_document.rb",
+     "test/functional/test_embedded_document.rb",
+     "test/functional/test_logger.rb",
+     "test/functional/test_modifiers.rb",
+     "test/functional/test_pagination.rb",
+     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_string_id_compatibility.rb",
+     "test/functional/test_validations.rb",
+     "test/models.rb",
+     "test/support/custom_matchers.rb",
+     "test/support/timing.rb",
+     "test/test_helper.rb",
+     "test/unit/associations/test_base.rb",
+     "test/unit/associations/test_proxy.rb",
+     "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_document.rb",
+     "test/unit/test_dynamic_finder.rb",
+     "test/unit/test_embedded_document.rb",
+     "test/unit/test_finder_options.rb",
+     "test/unit/test_key.rb",
+     "test/unit/test_mongo_mapper.rb",
+     "test/unit/test_pagination.rb",
+     "test/unit/test_rails_compatibility.rb",
+     "test/unit/test_serializations.rb",
+     "test/unit/test_support.rb",
+     "test/unit/test_time_zones.rb",
+     "test/unit/test_validations.rb"
+  ]
+  s.homepage = %q{http://github.com/mrkurt/mongomapper}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
+  s.test_files = [
+    "test/test_helper.rb",
+     "test/functional/test_document.rb",
+     "test/functional/test_pagination.rb",
+     "test/functional/test_dirty.rb",
+     "test/functional/test_validations.rb",
+     "test/functional/test_callbacks.rb",
+     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_associations.rb",
+     "test/functional/test_string_id_compatibility.rb",
+     "test/functional/test_binary.rb",
+     "test/functional/test_logger.rb",
+     "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+     "test/functional/associations/test_many_embedded_proxy.rb",
+     "test/functional/associations/test_many_documents_as_proxy.rb",
+     "test/functional/associations/test_many_documents_proxy.rb",
+     "test/functional/associations/test_one_proxy.rb",
+     "test/functional/associations/test_in_array_proxy.rb",
+     "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
+     "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/test_modifiers.rb",
+     "test/functional/test_embedded_document.rb",
+     "test/models.rb",
+     "test/support/timing.rb",
+     "test/support/custom_matchers.rb",
+     "test/unit/test_document.rb",
+     "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_finder_options.rb",
+     "test/unit/test_pagination.rb",
+     "test/unit/test_validations.rb",
+     "test/unit/test_rails_compatibility.rb",
+     "test/unit/test_dynamic_finder.rb",
+     "test/unit/test_support.rb",
+     "test/unit/test_serializations.rb",
+     "test/unit/test_key.rb",
+     "test/unit/test_time_zones.rb",
+     "test/unit/test_mongo_mapper.rb",
+     "test/unit/associations/test_proxy.rb",
+     "test/unit/associations/test_base.rb",
+     "test/unit/test_embedded_document.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    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"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.2"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
+      s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
+      s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 2.3"])
+      s.add_dependency(%q<mongo>, ["= 0.18.2"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
+      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.2"])
+      s.add_dependency(%q<timecop>, ["= 0.3.1"])
+      s.add_dependency(%q<mocha>, ["= 0.9.8"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 2.3"])
+    s.add_dependency(%q<mongo>, ["= 0.18.2"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
+    s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.2"])
+    s.add_dependency(%q<timecop>, ["= 0.3.1"])
+    s.add_dependency(%q<mocha>, ["= 0.9.8"])
+  end
+end
+

data/test/functional/associations/test_in_array_proxy.rb

@@ -0,0 +1,309 @@
+require 'test_helper'
+
+class InArrayProxyTest < Test::Unit::TestCase
+  context "description" do
+    setup do
+      class ::List
+        include MongoMapper::Document
+        key :name, String, :required => true
+      end
+
+      class ::User
+        include MongoMapper::Document
+        key :name, String, :required => true
+        key :list_ids, Array
+        many :lists, :in => :list_ids
+      end
+      User.collection.remove
+      List.collection.remove
+    end
+
+    teardown do
+      Object.send :remove_const, 'List' if defined?(::List)
+      Object.send :remove_const, 'User' if defined?(::User)
+    end
+    
+    should "default reader to empty array" do
+      User.new.lists.should == []
+    end
+
+    should "allow adding to association like it was an array" do
+      user = User.new(:name => 'John')
+      user.lists <<     List.new(:name => 'Foo1!')
+      user.lists.push   List.new(:name => 'Foo2!')
+      user.lists.concat List.new(:name => 'Foo3!')
+      user.lists.size.should == 3
+    end
+    
+    should "ignore adding duplicate ids" do
+      user = User.create(:name => 'John')
+      list = List.create(:name => 'Foo')
+      user.lists << list
+      user.lists << list
+      user.lists << list
+      
+      user.list_ids.should == [list.id]
+      user.lists.count.should == 1
+    end
+
+    should "be able to replace the association" do
+      user = User.new(:name => 'John')
+      list = List.new(:name => 'Foo')
+      user.lists = [list]
+      user.save.should be_true
+
+      user.reload
+      user.list_ids.should == [list.id]
+      user.lists.size.should == 1
+      user.lists[0].name.should == 'Foo'
+    end
+
+    context "create" do
+      setup do
+        @user = User.create(:name => 'John')
+        @list = @user.lists.create(:name => 'Foo!')
+      end
+
+      should "add id to key" do
+        @user.list_ids.should include(@list.id)
+      end
+
+      should "persist id addition to key in database" do
+        @user.reload
+        @user.list_ids.should include(@list.id)
+      end
+
+      should "add doc to association" do
+        @user.lists.should include(@list)
+      end
+
+      should "save doc" do
+        @list.should_not be_new
+      end
+    end
+
+    context "create!" do
+      setup do
+        @user = User.create(:name => 'John')
+        @list = @user.lists.create!(:name => 'Foo!')
+      end
+
+      should "add id to key" do
+        @user.list_ids.should include(@list.id)
+      end
+
+      should "persist id addition to key in database" do
+        @user.reload
+        @user.list_ids.should include(@list.id)
+      end
+
+      should "add doc to association" do
+        @user.lists.should include(@list)
+      end
+
+      should "save doc" do
+        @list.should_not be_new
+      end
+
+      should "raise exception if invalid" do
+        assert_raises(MongoMapper::DocumentNotValid) do
+          @user.lists.create!
+        end
+      end
+    end
+
+    context "Finding scoped to association" do
+      setup do
+        @user = User.create(:name => 'John')
+        @user2 = User.create(:name => 'Brandon')
+        @list1 = @user.lists.create!(:name => 'Foo 1', :position => 1)
+        @list2 = @user.lists.create!(:name => 'Foo 2', :position => 2)
+        @list3 = @user2.lists.create!(:name => 'Foo 3', :position => 1)
+      end
+
+      context "all" do
+        should "work" do
+          @user.lists.find(:all, :order => :position.asc).should == [@list1, @list2]
+          @user.lists.all(:order => :position.asc).should == [@list1, @list2]
+        end
+
+        should "work with conditions" do
+          @user.lists.find(:all, :name => 'Foo 1').should == [@list1]
+          @user.lists.all(:name => 'Foo 1').should == [@list1]
+        end
+      end
+
+      context "first" do
+        should "work" do
+          @user.lists.find(:first, :order => 'position').should == @list1
+          @user.lists.first(:order => 'position').should == @list1
+        end
+
+        should "work with conditions" do
+          @user.lists.find(:first, :position => 2).should == @list2
+          @user.lists.first(:position => 2).should == @list2
+        end
+      end
+
+      context "last" do
+        should "work" do
+          @user.lists.find(:last, :order => 'position').should == @list2
+          @user.lists.last(:order => 'position').should == @list2
+        end
+
+        should "work with conditions" do
+          @user.lists.find(:last, :position => 2, :order => 'position').should == @list2
+          @user.lists.last(:position => 2, :order => 'position').should == @list2
+        end
+      end
+
+      context "with one id" do
+        should "work for id in association" do
+          @user.lists.find(@list1.id).should == @list1
+        end
+
+        should "not work for id not in association" do
+          @user.lists.find(@list3.id).should be_nil
+        end
+
+        should "raise error when using ! and not found" do
+          assert_raises MongoMapper::DocumentNotFound do
+            @user.lists.find!(@list3.id)
+          end
+        end
+      end
+
+      context "with multiple ids" do
+        should "work for ids in association" do
+          @user.lists.find(@list1.id, @list2.id).should == [@list1, @list2]
+        end
+
+        should "not work for ids not in association" do
+          @user.lists.find(@list1.id, @list2.id, @list3.id).should == [@list1, @list2]
+        end
+      end
+
+      context "with #paginate" do
+        setup do
+          @lists = @user.lists.paginate(:per_page => 1, :page => 1, :order => 'position')
+        end
+
+        should "return total pages" do
+          @lists.total_pages.should == 2
+        end
+
+        should "return total entries" do
+          @lists.total_entries.should == 2
+        end
+
+        should "return the subject" do
+          @lists.collect(&:name).should == ['Foo 1']
+        end
+      end
+
+      context "dynamic finders" do
+        should "work with single key" do
+          @user.lists.find_by_name('Foo 1').should == @list1
+          @user.lists.find_by_name!('Foo 1').should == @list1
+          @user.lists.find_by_name('Foo 3').should be_nil
+        end
+
+        should "work with multiple keys" do
+          @user.lists.find_by_name_and_position('Foo 1', 1).should == @list1
+          @user.lists.find_by_name_and_position!('Foo 1', 1).should == @list1
+          @user.lists.find_by_name_and_position('Foo 3', 1).should be_nil
+        end
+
+        should "raise error when using ! and not found" do
+          assert_raises(MongoMapper::DocumentNotFound) do
+            @user.lists.find_by_name!('Foo 3')
+          end
+        end
+
+        context "find_or_create_by" do
+          should "not create document if found" do
+            lambda {
+              list = @user.lists.find_or_create_by_name('Foo 1')
+              list.should == @list1
+            }.should_not change { List.count }
+          end
+
+          should "create document if not found" do
+            lambda {
+              list = @user.lists.find_or_create_by_name('Home')
+              @user.lists.should include(list)
+            }.should change { List.count }
+          end
+        end
+      end
+    end
+
+    context "count" do
+      setup do
+        @user = User.create(:name => 'John')
+        @user2 = User.create(:name => 'Brandon')
+        @list1 = @user.lists.create!(:name => 'Foo 1')
+        @list2 = @user.lists.create!(:name => 'Foo 2')
+        @list3 = @user2.lists.create!(:name => 'Foo 3')
+      end
+
+      should "return number of ids" do
+        @user.lists.count.should == 2
+        @user2.lists.count.should == 1
+      end
+
+      should "return correct count when given criteria" do
+        @user.lists.count(:name => 'Foo 1').should == 1
+        @user2.lists.count(:name => 'Foo 1').should == 0
+      end
+    end
+
+    context "Removing documents" do
+      setup do
+        @user = User.create(:name => 'John')
+        @user2 = User.create(:name => 'Brandon')
+        @list1 = @user.lists.create!(:name => 'Foo 1', :position => 1)
+        @list2 = @user.lists.create!(:name => 'Foo 2', :position => 2)
+        @list3 = @user2.lists.create!(:name => 'Foo 3', :position => 1)
+      end
+
+      context "destroy_all" do
+        should "work" do
+          @user.lists.count.should == 2
+          @user.lists.destroy_all
+          @user.lists.count.should == 0
+        end
+
+        should "work with conditions" do
+          @user.lists.count.should == 2
+          @user.lists.destroy_all(:name => 'Foo 1')
+          @user.lists.count.should == 1
+        end
+      end
+
+      context "delete_all" do
+        should "work" do
+          @user.lists.count.should == 2
+          @user.lists.delete_all
+          @user.lists.count.should == 0
+        end
+
+        should "work with conditions" do
+          @user.lists.count.should == 2
+          @user.lists.delete_all(:name => 'Foo 1')
+          @user.lists.count.should == 1
+        end
+      end
+
+      should "work with nullify" do
+        @user.lists.count.should == 2
+
+        lambda {
+          @user.lists.nullify
+        }.should_not change { List.count }
+
+        @user.lists.count.should == 0
+      end
+    end
+  end
+end

data/test/functional/associations/test_many_documents_proxy.rb

@@ -22,10 +22,10 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
 
   should "be able to replace the association" do
     project = Project.new
-    project.statuses = [Status.new("name" => "ready")]
+    project.statuses = [Status.new(:name => "ready")]
     project.save.should be_true
 
-    project = project.reload
+    project.reload
     project.statuses.size.should == 1
     project.statuses[0].name.should == "ready"
   end
@@ -36,7 +36,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     project.statuses.push   Status.new(:name => 'push')
     project.statuses.concat Status.new(:name => 'concat')
     
-    project = project.reload
+    project.reload
     project.statuses[0].project_id.should == project.id
     project.statuses[1].project_id.should == project.id
     project.statuses[2].project_id.should == project.id
@@ -235,84 +235,44 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
           lambda {
             status = @project1.statuses.find_or_create_by_name('Delivered')
             status.project.should == @project1
-          }.should change { Status.count }.by(1)
+          }.should change { Status.count }
         end
       end
     end
     
-    context "with :all" do
+    context "all" do
       should "work" do
         @project1.statuses.find(:all, :order => "position asc").should == [@brand_new, @complete]
-      end
-      
-      should "work with conditions" do
-        statuses = @project1.statuses.find(:all, :name => 'Complete')
-        statuses.should == [@complete]
-      end
-      
-      should "work with order" do
-        statuses = @project1.statuses.find(:all, :order => 'name asc')
-        statuses.should == [@complete, @brand_new]
-      end
-    end
-
-    context "with #all" do
-      should "work" do
         @project1.statuses.all(:order => "position asc").should == [@brand_new, @complete]
       end
       
       should "work with conditions" do
-        statuses = @project1.statuses.all(:name => 'Complete')
-        statuses.should == [@complete]
-      end
-      
-      should "work with order" do
-        statuses = @project1.statuses.all(:order => 'name asc')
-        statuses.should == [@complete, @brand_new]
+        @project1.statuses.find(:all, :name => 'Complete').should == [@complete]
+        @project1.statuses.all(:name => 'Complete').should == [@complete]
       end
     end
     
-    context "with :first" do
+    context "first" do
       should "work" do
         @project1.statuses.find(:first, :order => 'name').should == @complete
-      end
-      
-      should "work with conditions" do
-        status = @project1.statuses.find(:first, :name => 'Complete')
-        status.should == @complete
-      end
-    end
-    
-    context "with #first" do
-      should "work" do
         @project1.statuses.first(:order => 'name').should == @complete
       end
       
       should "work with conditions" do
-        status = @project1.statuses.first(:name => 'Complete')
-        status.should == @complete
+        @project1.statuses.find(:first, :name => 'Complete').should == @complete
+        @project1.statuses.first(:name => 'Complete').should == @complete
       end
     end
     
-    context "with :last" do
+    context "last" do
       should "work" do
         @project1.statuses.find(:last, :order => "position asc").should == @complete
-      end
-      
-      should "work with conditions" do
-        status = @project1.statuses.find(:last, :order => 'position', :name => 'New')
-        status.should == @brand_new
-      end
-    end
-    
-    context "with #last" do
-      should "work" do
         @project1.statuses.last(:order => "position asc").should == @complete
       end
       
       should "work with conditions" do
-        status = @project1.statuses.last(:order => 'position', :name => 'New')
-        status.should == @brand_new
+        @project1.statuses.find(:last, :order => 'position', :name => 'New').should == @brand_new
+        @project1.statuses.last(:order => 'position', :name => 'New').should == @brand_new
       end
     end
     

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -326,10 +326,11 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     end
   
     should "work using many's :extend option" do
+      
       room = Room.new(:name => "Amazing Room")
       accounts = room.accounts = [
         Bot.new(:last_logged_in => 3.weeks.ago),
-        User.new(:last_logged_in => nil),
+        AccountUser.new(:last_logged_in => nil),
         Bot.new(:last_logged_in => 1.week.ago)
       ]
       room.save

data/test/models.rb

@@ -100,7 +100,7 @@ class Account
   
   belongs_to :room
 end
-class User < Account; end
+class AccountUser < Account; end
 class Bot < Account; end
 
 class Answer

data/test/unit/associations/test_base.rb

@@ -64,23 +64,6 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
-  context "finder_options" do
-    should "default to empty hash" do
-      base = Base.new(:many, :foos)
-      base.finder_options.should == {}
-    end
-    
-    should "work with order" do
-      base = Base.new(:many, :foos, :order => 'position')
-      base.finder_options.should == {:order => 'position'}
-    end
-    
-    should "correctly parse from options" do
-      base = Base.new(:many, :foos, :order => 'position', :somekey => 'somevalue')
-      base.finder_options.should == {:order => 'position', :somekey => 'somevalue'}
-    end
-  end
-  
   context "belongs_to?" do
     should "be true if belongs_to" do
       Base.new(:belongs_to, :foo).belongs_to?.should be_true
@@ -101,6 +84,43 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
+  context "as?" do
+    should "be true if one" do
+      Base.new(:one, :foo, :as => :commentable).as?.should be_true
+    end
+    
+    should "be false if not one" do
+      Base.new(:many, :foo).as?.should be_false
+    end
+  end
+  
+  context "in_array?" do
+    should "be true if one" do
+      Base.new(:one, :foo, :in => :list_ids).in_array?.should be_true
+    end
+    
+    should "be false if not one" do
+      Base.new(:many, :foo).in_array?.should be_false
+    end
+  end
+  
+  context "finder_options" do
+    should "default to empty hash" do
+      base = Base.new(:many, :foos)
+      base.finder_options.should == {}
+    end
+    
+    should "work with order" do
+      base = Base.new(:many, :foos, :order => 'position')
+      base.finder_options.should == {:order => 'position'}
+    end
+    
+    should "correctly parse from options" do
+      base = Base.new(:many, :foos, :order => 'position', :somekey => 'somevalue')
+      base.finder_options.should == {:order => 'position', :somekey => 'somevalue'}
+    end
+  end
+  
   context "type_key_name" do
     should "be _type for many" do
       Base.new(:many, :foos).type_key_name.should == '_type'
@@ -177,6 +197,11 @@ class AssociationBaseTest < Test::Unit::TestCase
       base = Base.new(:one, :target, :polymorphic => true)
       base.proxy_class.should == OneProxy
     end
+    
+    should "be InArrayProxy for many with :in option" do
+      base = Base.new(:many, :messages, :in => :message_ids)
+      base.proxy_class.should == InArrayProxy
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mrkurt-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: 
 - John Nunemaker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -06:00
+date: 2010-01-02 00:00:00 -06:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb
 - lib/mongo_mapper/associations/belongs_to_proxy.rb
 - lib/mongo_mapper/associations/collection.rb
+- lib/mongo_mapper/associations/in_array_proxy.rb
 - lib/mongo_mapper/associations/many_documents_as_proxy.rb
 - lib/mongo_mapper/associations/many_documents_proxy.rb
 - lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb
@@ -128,10 +129,12 @@ files:
 - lib/mongo_mapper/support.rb
 - lib/mongo_mapper/validations.rb
 - mongo_mapper.gemspec
+- mrkurt-mongo_mapper.gemspec
 - specs.watchr
 - test/NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_in_array_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_documents_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
@@ -215,6 +218,7 @@ test_files:
 - test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_documents_proxy.rb
 - test/functional/associations/test_one_proxy.rb
+- test/functional/associations/test_in_array_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/test_modifiers.rb