mongo_mapper 0.7.6 → 0.8.0

data/lib/mongo_mapper/plugins/scopes.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Scopes
+      module ClassMethods
+        def scope(name, scope_options={})
+          scopes[name] = lambda do |*args|
+            result = scope_options.is_a?(Proc) ? scope_options.call(*args) : scope_options
+            result = self.query(result) if result.is_a?(Hash)
+            self.query.merge(result)
+          end
+          singleton_class.send :define_method, name, &scopes[name]
+        end
+
+        def scopes
+          read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'active_support/json'
 
 module MongoMapper

data/lib/mongo_mapper/plugins/timestamps.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Timestamps

data/lib/mongo_mapper/plugins/userstamps.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Userstamps

data/lib/mongo_mapper/plugins/validations.rb

@@ -1,8 +1,12 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Validations
       def self.configure(model)
-        model.class_eval { include Validatable }
+        model.class_eval do
+          include Validatable
+          extend Plugins::Validations::DocumentMacros
+        end
       end
 
       module DocumentMacros

data/lib/mongo_mapper/support/descendant_appends.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+require 'set'
+
 module MongoMapper
   module Support
     module DescendantAppends
@@ -14,9 +17,7 @@ module MongoMapper
 
       # @api public
       def append_extensions(*extensions)
-        extra_extensions.concat extensions
-
-        # Add the extension to existing descendants
+        extra_extensions.concat(extensions)
         descendants.each do |model|
           extensions.each { |extension| model.extend(extension) }
         end
@@ -24,9 +25,7 @@ module MongoMapper
 
       # @api public
       def append_inclusions(*inclusions)
-        extra_inclusions.concat inclusions
-
-        # Add the inclusion to existing descendants
+        extra_inclusions.concat(inclusions)
         descendants.each do |model|
           inclusions.each { |inclusion| model.send(:include, inclusion) }
         end

data/lib/mongo_mapper/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
-  Version = '0.7.6'
+  Version = '0.8.0'
 end

data/test/NOTE_ON_TESTING

@@ -0,0 +1 @@
+I am doing my best to keep unit and functional tests separate. As I see them, functional tests hit the database and should never care about internals. Unit tests do not hit the database.

data/test/active_model_lint_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+# For testing against edge rails also.
+# $:.unshift '/Users/jnunemaker/dev/ruby/rails/activemodel/lib'
+require 'active_model'
+require 'models'
+
+class ActiveModelLintTest < ActiveModel::TestCase
+  include ActiveModel::Lint::Tests
+
+  def setup
+    @model = Post.new
+  end
+end

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+require 'models'
+
+class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
+  def setup
+    Status.collection.remove
+    Project.collection.remove
+  end
+
+  should "default to nil" do
+    status = Status.new
+    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!')
+    project = Project.new(:name => "mongomapper")
+    status.target = project
+    status.save.should be_true
+
+    status = status.reload
+    status.target.nil?.should be_false
+    status.target_id.should == project._id
+    status.target_type.should == "Project"
+    status.target.name.should == "mongomapper"
+  end
+
+  should "unset the association" do
+    status = Status.new(:name => 'Foo!')
+    project = Project.new(:name => "mongomapper")
+    status.target = project
+    status.save.should be_true
+
+    status = status.reload
+    status.target = nil
+    status.target_type.nil?.should be_true
+    status.target_id.nil?.should be_true
+    status.target.nil?.should be_true
+  end
+
+  context "association id set but document not found" do
+    setup do
+      @status = Status.new(:name => 'Foo!')
+      project = Project.new(:name => "mongomapper")
+      @status.target = project
+      @status.save.should be_true
+      project.destroy
+    end
+
+    should "return nil instead of raising error" do
+      @status.target.nil?.should be_true
+    end
+  end
+end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -0,0 +1,93 @@
+require 'test_helper'
+require 'models'
+
+class BelongsToProxyTest < Test::Unit::TestCase
+  def setup
+    @post_class = Doc()
+    @comment_class = Doc do
+      key :post_id, String
+    end
+
+    @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)
+    comment.save.should be_true
+
+    comment = comment.reload
+    comment.post.should == post
+    comment.post.nil?.should be_false
+  end
+
+  should "unset the association" do
+    post = @post_class.new(:name => 'mongomapper')
+    comment = @comment_class.new(:name => 'Foo!', :post => post)
+    comment.save.should be_true
+
+    comment = comment.reload
+    comment.post = nil
+    comment.post.nil?.should be_true
+  end
+
+  should "return nil if id set but document not found" do
+    id = BSON::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.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,319 @@
+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
+
+      should "reset cache" do
+        @user.lists.size.should == 1
+        @user.lists.create(:name => 'Moo!')
+        @user.lists.size.should == 2
+      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
+
+      should "reset cache" do
+        @user.lists.size.should == 1
+        @user.lists.create!(:name => 'Moo!')
+        @user.lists.size.should == 2
+      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.all(:order => :position.asc).should == [@list1, @list2]
+        end
+
+        should "work with conditions" do
+          @user.lists.all(:name => 'Foo 1').should == [@list1]
+        end
+      end
+
+      context "first" do
+        should "work" do
+          @user.lists.first(:order => 'position').should == @list1
+        end
+
+        should "work with conditions" do
+          @user.lists.first(:position => 2).should == @list2
+        end
+      end
+
+      context "last" do
+        should "work" do
+          @user.lists.last(:order => 'position').should == @list2
+        end
+
+        should "work with conditions" do
+          @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 "work with string ids" do
+          @user.lists.find(@list1.id.to_s).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