mongo_mapper-unstable 2009.12.30 → 2010.1.4

data/lib/mongo_mapper/rails_compatibility/embedded_document.rb

@@ -10,6 +10,7 @@ module MongoMapper
 
         class << model
           alias has_many many
+          alias has_one one
         end
       end
 

data/lib/mongo_mapper/serialization.rb

@@ -1,8 +1,8 @@
 require 'active_support/json'
 
-module MongoMapper #:nodoc:
+module MongoMapper
   module Serialization
-    class Serializer #:nodoc:
+    class Serializer
       attr_reader :options
 
       def initialize(record, options={})

data/lib/mongo_mapper/serializers/json_serializer.rb

@@ -1,54 +1,10 @@
-module MongoMapper #:nodoc:
+module MongoMapper
   module Serialization
     def self.included(base)
       base.cattr_accessor :include_root_in_json, :instance_writer => false
       base.extend ClassMethods
     end
 
-    # Returns a JSON string representing the model. Some configuration is
-    # available through +options+.
-    #
-    # The option <tt>include_root_in_json</tt> controls the top-level behavior of
-    # to_json. When it is <tt>true</tt>, to_json will emit a single root node named
-    # after the object's type. For example:
-    #
-    #   konata = User.find(1)
-    #   User.include_root_in_json = true
-    #   konata.to_json
-    #   # => { "user": {"id": 1, "name": "Konata Izumi", "age": 16,
-    #                   "created_at": "2006/08/01", "awesome": true} }
-    #
-    #   User.include_root_in_json = false
-    #   konata.to_json
-    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-    #         "created_at": "2006/08/01", "awesome": true}
-    #
-    # The remainder of the examples in this section assume include_root_in_json is set to
-    # <tt>false</tt>.
-    #
-    # Without any +options+, the returned JSON string will include all
-    # the model's attributes. For example:
-    #
-    #   konata = User.find(1)
-    #   konata.to_json
-    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-    #         "created_at": "2006/08/01", "awesome": true}
-    #
-    # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the attributes
-    # included, and work similar to the +attributes+ method. For example:
-    #
-    #   konata.to_json(:only => [ :id, :name ])
-    #   # => {"id": 1, "name": "Konata Izumi"}
-    #
-    #   konata.to_json(:except => [ :id, :created_at, :age ])
-    #   # => {"name": "Konata Izumi", "awesome": true}
-    #
-    # To include any methods on the model, use <tt>:methods</tt>.
-    #
-    #   konata.to_json(:methods => :permalink)
-    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-    #         "created_at": "2006/08/01", "awesome": true,
-    #         "permalink": "1-konata-izumi"}
     def to_json(options={})
       apply_to_json_defaults(options)
 
@@ -64,7 +20,7 @@ module MongoMapper #:nodoc:
       self
     end
 
-    class JsonSerializer < MongoMapper::Serialization::Serializer #:nodoc:
+    class JsonSerializer < MongoMapper::Serialization::Serializer
       def serialize
         serializable_record.to_json
       end

data/lib/mongo_mapper/support.rb

@@ -120,7 +120,7 @@ end
 
 class ObjectId
   def self.to_mongo(value)
-    if value.nil?
+    if value.blank?
       nil
     elsif value.is_a?(Mongo::ObjectID)
       value
@@ -165,7 +165,7 @@ class Symbol
   def desc; MongoMapper::OrderOperator.new(self, 'desc') end
 end
 
-class Time  
+class Time
   def self.to_mongo(value)
     if value.nil? || value == ''
       nil

data/lib/mongo_mapper.rb

@@ -4,7 +4,7 @@
 # if there is a better way to do this, please enlighten me!
 if self.class.const_defined?(:Gem)
   gem 'activesupport', '>= 2.3'
-  gem 'mongo', '0.18.1'
+  gem 'mongo', '0.18.2'
   gem 'jnunemaker-validatable', '1.8.1'
 end
 
@@ -64,6 +64,11 @@ module MongoMapper
     @@ensured_indexes ||= []
   end
   
+  # @api private
+  def self.ensured_indexes=(value)
+    @@ensured_indexes = value
+  end
+  
   # @api private
   def self.ensure_index(klass, keys, options={})
     ensured_indexes << {:klass => klass, :keys => keys, :options => options}
@@ -99,7 +104,6 @@ require 'mongo_mapper/finder_options'
 require 'mongo_mapper/dirty'
 require 'mongo_mapper/dynamic_finder'
 require 'mongo_mapper/key'
-require 'mongo_mapper/observing'
 require 'mongo_mapper/pagination'
 require 'mongo_mapper/serialization'
 require 'mongo_mapper/validations'
@@ -118,3 +122,5 @@ require 'mongo_mapper/associations/many_polymorphic_proxy'
 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/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.10"
 
   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-02}
   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/specs.watchr

@@ -15,11 +15,9 @@ def related_test_files(path)
   Dir['test/**/*.rb'].select { |file| file =~ /test_#{File.basename(path)}/ }
 end
 
-watch('test/test_helper\.rb') { run_all_tests }
-watch('test/.*/test_.*\.rb')  { |m| run_test_file(m[0]) }
-watch('lib/.*') do |m|
-  related_test_files(m[0]).each { |file| run_test_file(file) }
-end
+watch('test/test_helper\.rb') { system('clear'); run_all_tests }
+watch('test/.*/test_.*\.rb') { |m| system('clear'); run_test_file(m[0]) }
+watch('lib/.*') { |m| related_test_files(m[0]).each { |file| system('clear'); run_test_file(file) } }
 
 # Ctrl-\
 Signal.trap('QUIT') do

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -12,6 +12,14 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target.nil?.should be_true
     status.target.inspect.should == "nil"
   end
+  
+  should "have boolean presence method" do
+    status = Status.new
+    status.target?.should be_false
+    
+    status.target = Project.new(:name => 'mongomapper')
+    status.target?.should be_true
+  end
 
   should "be able to replace the association" do
     status = Status.new(:name => 'Foo!')

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -3,24 +3,26 @@ require 'models'
 
 class BelongsToProxyTest < Test::Unit::TestCase
   def setup    
-    @post_class = Class.new do
-      include MongoMapper::Document
-    end
-    
-    @comment_class = Class.new do
-      include MongoMapper::Document
+    @post_class = Doc()
+    @comment_class = Doc do
       key :post_id, String
     end
-    @comment_class.belongs_to :post, :class => @post_class
     
-    @post_class.collection.remove
-    @comment_class.collection.remove
+    @comment_class.belongs_to :post, :class => @post_class
   end
   
   should "default to nil" do
     @comment_class.new.post.nil?.should be_true
   end
   
+  should "have boolean presence method" do
+    comment = @comment_class.new(:name => 'Foo!')
+    comment.post?.should be_false
+    
+    comment.post = @post_class.new(:name => 'mongomapper')
+    comment.post?.should be_true
+  end
+  
   should "be able to replace the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
@@ -45,4 +47,47 @@ class BelongsToProxyTest < Test::Unit::TestCase
     id = Mongo::ObjectID.new
     @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
   end
+  
+  context ":dependent" do
+    setup do
+      # FIXME: make use of already defined models
+      class ::Property
+        include MongoMapper::Document
+      end
+      Property.collection.remove
+
+      class ::Thing
+        include MongoMapper::Document
+        key :name, String
+      end
+      Thing.collection.remove
+    end
+
+    teardown do
+      Object.send :remove_const, 'Property' if defined?(::Property)
+      Object.send :remove_const, 'Thing' if defined?(::Thing)
+    end
+    
+    context "=> destroy" do
+      setup do
+        Property.key :thing_id, ObjectId
+        Property.belongs_to :thing, :dependent => :destroy
+        Thing.has_many :properties
+
+        @thing = Thing.create(:name => "Tree")
+        @property1 = Property.create
+        @property2 = Property.create
+        @property3 = Property.create
+        @thing.properties << @property1
+        @thing.properties << @property2
+        @thing.properties << @property3
+      end
+
+      should "not execute on a belongs_to association" do
+        Thing.count.should == 1
+        @property1.destroy
+        Thing.count.should == 1
+      end
+    end
+  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