mongo_mapper 0.12.0 → 0.13.0.beta1

data/lib/mongo_mapper/plugins/timestamps.rb

@@ -4,6 +4,11 @@ module MongoMapper
     module Timestamps
       extend ActiveSupport::Concern
 
+      included do
+        class_attribute :record_timestamps
+        self.record_timestamps = true
+      end
+
       module ClassMethods
         def timestamps!
           key :created_at, Time
@@ -13,10 +18,12 @@ module MongoMapper
       end
 
       def update_timestamps
-        now = Time.now.utc
-        self[:created_at] = now if !persisted? && !created_at?
-        self[:updated_at] = now
+        if self.record_timestamps
+          now = Time.now.utc
+          self[:created_at] = now if !persisted? && !created_at?
+          self[:updated_at] = now
+        end
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/validations.rb

@@ -18,7 +18,7 @@ module MongoMapper
       end
 
       def save(options = {})
-        options.reverse_merge!(:validate => true)
+        options = options.reverse_merge(:validate => true)
         !options[:validate] || valid? ? super : false
       end
 

data/lib/mongo_mapper/utils.rb

@@ -0,0 +1,12 @@
+module MongoMapper
+  module Utils
+    def self.get_safe_options(options)
+      return {} unless options and options.key? :safe
+      safe = options[:safe]
+      safe = {:w => 1} if safe == true
+      safe = {:w => 0} if safe == false
+      safe = {:w => safe} if safe.is_a? Fixnum
+      safe
+    end
+  end
+end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.12.0'
+  Version = '0.13.0.beta1'
 end

data/lib/rails/generators/mongo_mapper/config/config_generator.rb

@@ -3,22 +3,35 @@
 module MongoMapper
   module Generators
     class ConfigGenerator < Rails::Generators::Base
-      desc "creates the MongoMapper configuration at config/mongo.yml"
+      desc 'creates the MongoMapper configuration at config/mongo.yml'
 
       argument :database_name, :type => :string, :optional => true
 
       def self.source_root
-        @source_root ||= File.expand_path("../templates", __FILE__)
-      end
-
-      def app_name
-        Rails::Application.subclasses.first.parent.to_s.underscore
+        @source_root ||= File.expand_path('../templates', __FILE__)
       end
 
       def create_config_file
-        template 'mongo.yml', File.join('config', "mongo.yml")
+        template 'mongo.yml', File.join('config', 'mongo.yml')
       end
 
+      protected
+
+        def app_name
+          @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
+        end
+
+        def defined_app_name
+          defined_app_const_base.underscore
+        end
+
+        def defined_app_const_base
+          Rails.respond_to?(:application) && defined?(Rails::Application) &&
+            Rails.application.is_a?(Rails::Application) && Rails.application.class.name.sub(/::Application$/, '')
+        end
+
+        alias :defined_app_const_base? :defined_app_const_base
+
     end
   end
 end

data/lib/rails/generators/mongo_mapper/config/templates/mongo.yml

@@ -1,6 +1,11 @@
 defaults: &defaults
   host: 127.0.0.1
   port: 27017
+  options:
+    w: 1
+    pool_size: 1
+    slave_ok: false
+    ssl: false
 
 development:
   <<: *defaults
@@ -9,6 +14,7 @@ development:
 test:
   <<: *defaults
   database: <%= database_name || app_name %>_test
+  w: 0
 
 # set these environment variables on your prod server
 production:

data/lib/rails/generators/mongo_mapper/model/model_generator.rb

@@ -4,11 +4,15 @@ module MongoMapper
   module Generators
     class ModelGenerator < Rails::Generators::NamedBase
       desc 'Creates a mongomapper model'
+
       argument :name, :type => :string
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :timestamps, :type => :boolean
+
       check_class_collision
 
+      class_option :timestamps, :type => :boolean
+      class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
+
       def self.source_root
         @source_root ||= File.expand_path("../templates", __FILE__)
       end
@@ -18,6 +22,19 @@ module MongoMapper
       end
 
       hook_for :test_framework
+
+      protected
+
+        def parent_class_name
+          options[:parent]
+        end
+
+        # Rails 3.0.X compatibility
+        unless methods.include?(:module_namespacing)
+          def module_namespacing(&block)
+            yield if block
+          end
+        end
     end
   end
 end

data/lib/rails/generators/mongo_mapper/model/templates/model.rb

@@ -1,13 +1,17 @@
-<% module_namespacing do -%>
+<%- module_namespacing do -%>
+<%- if parent_class_name.present? -%>
+class <%= class_name %> < <%= parent_class_name.classify %>
+<%- else -%>
 class <%= class_name %>
   include MongoMapper::Document
+<%- end -%>
 
-<% attributes.each do |attribute| -%>
+<%- attributes.each do |attribute| -%>
   key :<%= attribute.name %>, <%= attribute.type.to_s.camelcase %>
 <% end -%>
-<% if options[:timestamps] %>
+<%- if options[:timestamps] -%>
   timestamps!
-<% end -%>
+<%- end -%>
 
 end
-<% end -%>
+<%- end -%>

data/{test/functional/test_accessible.rb → spec/functional/accessible_spec.rb}

@@ -1,8 +1,8 @@
-require 'test_helper'
+require 'spec_helper'
 
-class AccessibleTest < Test::Unit::TestCase
+describe "Accessible" do
   context 'A document with accessible attributes' do
-    setup do
+    before do
       @doc_class = Doc do
         key :name, String
         key :admin, Boolean, :default => false
@@ -13,42 +13,42 @@ class AccessibleTest < Test::Unit::TestCase
       @doc = @doc_class.create(:name => 'Steve Sloan')
     end
 
-    should 'have accessible attributes class method' do
+    it 'should have accessible attributes class method' do
       @doc_class.accessible_attributes.should == [:name].to_set
     end
 
-    should "default accessible attributes to nil" do
+    it "should default accessible attributes to nil" do
       Doc().accessible_attributes.should be_nil
     end
 
-    should "have accessible_attributes instance method" do
+    it "should have accessible_attributes instance method" do
       @doc.accessible_attributes.should equal(@doc_class.accessible_attributes)
     end
 
-    should "raise error if there are protected attributes" do
+    it "should raise error if there are protected attributes" do
       doc = Doc('Post')
       doc.attr_protected :admin
       lambda { doc.attr_accessible :name }.
         should raise_error(/Declare either attr_protected or attr_accessible for Post/)
     end
 
-    should "know if using accessible attributes" do
+    it "should know if using accessible attributes" do
       @doc_class.accessible_attributes?.should be(true)
       Doc().accessible_attributes?.should be(false)
     end
 
-    should "assign inaccessible attribute through accessor" do
+    it "should assign inaccessible attribute through accessor" do
       @doc.admin = true
       @doc.admin.should be_true
     end
 
-    should "ignore inaccessible attribute on #initialize" do
+    it "should ignore inaccessible attribute on #initialize" do
       doc = @doc_class.new(:name => 'John', :admin => true)
       doc.admin.should be_false
       doc.name.should == 'John'
     end
 
-    should "not ignore inaccessible attributes on #initialize from the database" do
+    it "should not ignore inaccessible attributes on #initialize from the database" do
       doc = @doc_class.new(:name => 'John')
       doc.admin = true
       doc.save!
@@ -58,7 +58,7 @@ class AccessibleTest < Test::Unit::TestCase
       doc.name.should == 'John'
     end
 
-    should "not ignore inaccessible attributes on #reload" do
+    it "should not ignore inaccessible attributes on #reload" do
       doc = @doc_class.new(:name => 'John')
       doc.admin = true
       doc.save!
@@ -68,40 +68,40 @@ class AccessibleTest < Test::Unit::TestCase
       doc.name.should == 'John'
     end
 
-    should "not ignore inaccessible attribute on #update_attribute" do
+    it "should not ignore inaccessible attribute on #update_attribute" do
       @doc.update_attribute('admin', true)
       @doc.admin.should be_true
     end
 
-    should "ignore inaccessible attribute on #update_attributes" do
+    it "should ignore inaccessible attribute on #update_attributes" do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'
       @doc.admin.should be_false
     end
 
-    should "ignore inaccessible attribute on #update_attributes!" do
+    it "should ignore inaccessible attribute on #update_attributes!" do
       @doc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
       @doc.name.should == 'Stimpson J. Cat'
       @doc.admin.should be_false
     end
 
-    should "ignore inaccessible attribute on #attributes=" do
+    it "should ignore inaccessible attribute on #attributes=" do
       @doc.attributes = {:name => 'Ren Hoek', :admin => true}
       @doc.name.should == 'Ren Hoek'
       @doc.admin.should be_false
     end
 
-    should "be indifferent to whether the accessible keys are strings or symbols" do
+    it "should be indifferent to whether the accessible keys are strings or symbols" do
       @doc.update_attributes!("name" => 'Stimpson J. Cat', "admin" => true)
       @doc.name.should == 'Stimpson J. Cat'
       @doc.admin.should be_false
     end
 
-    should "accept nil as constructor's argument without raising exception" do
+    it "should accept nil as constructor's argument without raising exception" do
       lambda { @doc_class.new(nil) }.should_not raise_error
     end
 
-    should "ignore all attributes if called with no args" do
+    it "should ignore all attributes if called with no args" do
       @doc_class = Doc do
         key :name
         attr_accessible
@@ -112,7 +112,7 @@ class AccessibleTest < Test::Unit::TestCase
   end
 
   context "Single collection inherited accessible attributes" do
-    setup do
+    before do
       class ::GrandParent
         include MongoMapper::Document
         attr_accessible :name
@@ -135,14 +135,14 @@ class AccessibleTest < Test::Unit::TestCase
       end
     end
 
-    teardown do
+    after do
       Object.send :remove_const, 'GrandParent' if defined?(::GrandParent)
       Object.send :remove_const, 'Child'       if defined?(::Child)
       Object.send :remove_const, 'GrandChild'  if defined?(::GrandChild)
       Object.send :remove_const, 'OtherChild'  if defined?(::OtherChild)
     end
 
-    should "share keys down the inheritance trail" do
+    it "should share keys down the inheritance trail" do
       GrandParent.accessible_attributes.should == [:name].to_set
       Child.accessible_attributes.should == [:name, :position].to_set
       GrandChild.accessible_attributes.should == [:name, :position].to_set
@@ -151,7 +151,7 @@ class AccessibleTest < Test::Unit::TestCase
   end
 
   context "An embedded document with accessible attributes" do
-    setup do
+    before do
       @doc_class = Doc('Project')
       @edoc_class = EDoc('Person') do
         key :name, String
@@ -166,30 +166,30 @@ class AccessibleTest < Test::Unit::TestCase
       @doc.people << @edoc
     end
 
-    should "have accessible attributes class method" do
+    it "should have accessible attributes class method" do
       @edoc_class.accessible_attributes.should == [:name].to_set
     end
 
-    should "default accessible attributes to nil" do
+    it "should default accessible attributes to nil" do
       EDoc().accessible_attributes.should be_nil
     end
 
-    should "have accessible attributes instance method" do
+    it "should have accessible attributes instance method" do
       @edoc.accessible_attributes.should equal(@edoc_class.accessible_attributes)
     end
 
-    should "assign inaccessible attribute through accessor" do
+    it "should assign inaccessible attribute through accessor" do
       @edoc.admin = true
       @edoc.admin.should be_true
     end
 
-    should "ignore inaccessible attribute on #update_attributes" do
+    it "should ignore inaccessible attribute on #update_attributes" do
       @edoc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @edoc.name.should == 'Ren Hoek'
       @edoc.admin.should be_false
     end
 
-    should "ignore inaccessible attribute on #update_attributes!" do
+    it "should ignore inaccessible attribute on #update_attributes!" do
       @edoc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
       @edoc.name.should == 'Stimpson J. Cat'
       @edoc.admin.should be_false

data/{test/functional/associations/test_belongs_to_polymorphic_proxy.rb → spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb}

@@ -1,19 +1,19 @@
-require 'test_helper'
-require 'models'
+require 'spec_helper'
 
-class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
-  def setup
+
+describe "BelongsToPolymorphicProxy" do
+  before do
     Status.collection.remove
     Project.collection.remove
   end
 
-  should "default to nil" do
+  it "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
+  it "should have boolean presence method" do
     status = Status.new
     status.target?.should be_false
 
@@ -21,7 +21,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target?.should be_true
   end
 
-  should "be able to replace the association" do
+  it "should be able to replace the association" do
     status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
@@ -34,7 +34,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target.name.should == "mongomapper"
   end
 
-  should "unset the association" do
+  it "should unset the association" do
     status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
@@ -48,7 +48,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   end
 
   context "association id set but document not found" do
-    setup do
+    before do
       @status = Status.new(:name => 'Foo!')
       project = Project.new(:name => "mongomapper")
       @status.target = project
@@ -57,7 +57,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
       @status.reload
     end
 
-    should "return nil instead of raising error" do
+    it "should return nil instead of raising error" do
       @status.target.nil?.should be_true
     end
   end

data/{test/functional/associations/test_belongs_to_proxy.rb → spec/functional/associations/belongs_to_proxy_spec.rb}

@@ -1,25 +1,24 @@
-require 'test_helper'
-require 'models'
+require 'spec_helper'
 
-class BelongsToProxyTest < Test::Unit::TestCase
-  def setup
+
+describe "BelongsToProxy" do
+  before do
     @post_class = Doc()
     @comment_class = Doc do
       key :post_id, ObjectId
     end
-
     @comment_class.belongs_to :post, :class => @post_class
   end
 
-  should "default to nil" do
+  it "should default to nil" do
     @comment_class.new.post.nil?.should be_true
   end
 
-  should "return nil instead of a proxy" do
+  it "should return nil instead of a proxy" do
     nil.should === @comment_class.new.post
   end
 
-  should "have boolean presence method" do
+  it "should have boolean presence method" do
     comment = @comment_class.new(:name => 'Foo!')
     comment.post?.should be_false
 
@@ -27,7 +26,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
     comment.post?.should be_true
   end
 
-  should "allow overriding association methods" do
+  it "should allow overriding association methods" do
     @comment_class.class_eval do
       def post?
         super
@@ -40,7 +39,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
     instance.post?.should be_true
   end
 
-  should "be able to replace the association" do
+  it "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
@@ -49,25 +48,25 @@ class BelongsToProxyTest < Test::Unit::TestCase
     comment.post.should == post
     comment.post.nil?.should be_false
   end
-  
-  should "not reload the association when replacing" do
+
+  it "should not reload the association when replacing" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
     comment.post.proxy_target.object_id.should == post.object_id
   end
 
-  should "properly assign the associated object when assigning the association with create" do
+  it "should properly assign the associated object when assigning the association with create" do
     child_class = Doc('Child')
     parent_class = Doc('Parent')
-    
+
     parent_class.one :child, :class => child_class
     child_class.belongs_to :parent, :class => parent_class
-    
+
     child = child_class.create(:parent => parent_class.create)
     child.parent.child.should == child
   end
 
-  should "generate a new proxy when replacing the association" do
+  it "should generate a new proxy when replacing the association" do
     post1 = @post_class.create(:name => 'post1')
     post2 = @post_class.create(:name => 'post2')
 
@@ -87,7 +86,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
     original_post.name.should == 'post1'
   end
 
-  should "unset the association" do
+  it "should unset the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
     comment.save.should be_true
@@ -97,19 +96,19 @@ class BelongsToProxyTest < Test::Unit::TestCase
     comment.post.nil?.should be_true
   end
 
-  should "return nil if id set but document not found" do
+  it "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
 
-  should "define foreign key if it doesn't exist" do
+  it "should define foreign key if it doesn't exist" do
     @category_class = Doc()
     @post_class.belongs_to :category, :class => @category_class
 
     @post_class.key?(:category_id).should be_true
   end
 
-  should "not define foreign key if it already exists" do
+  it "should not define foreign key if it already exists" do
     @category_class = Doc()
     @post_class.key :category_id, String
     @post_class.belongs_to :category, :class => @category_class
@@ -118,7 +117,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   end
 
   context ":dependent" do
-    setup do
+    before do
       # FIXME: make use of already defined models
       class ::Property
         include MongoMapper::Document
@@ -132,13 +131,13 @@ class BelongsToProxyTest < Test::Unit::TestCase
       Thing.collection.remove
     end
 
-    teardown do
+    after do
       Object.send :remove_const, 'Property' if defined?(::Property)
       Object.send :remove_const, 'Thing' if defined?(::Thing)
     end
 
     context "=> destroy" do
-      setup do
+      before do
         Property.key :thing_id, ObjectId
         Property.belongs_to :thing, :dependent => :destroy
         Thing.many :properties
@@ -152,7 +151,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
         @thing.properties << @property3
       end
 
-      should "not execute on a belongs_to association" do
+      it "should not execute on a belongs_to association" do
         Thing.count.should == 1
         @property1.destroy
         Thing.count.should == 1
@@ -160,60 +159,79 @@ class BelongsToProxyTest < Test::Unit::TestCase
     end
   end
 
-  should "be able to build" do
-    @comment_class.belongs_to :post, :class => @post_class
-
-    comment = @comment_class.create
-    post = comment.build_post(:title => 'Hello, world!')
-    comment.post.should be_instance_of(@post_class)
-    comment.post.should be_new
-    comment.post.title.should == 'Hello, world!'
-    comment.post.should == post
-    comment.post_id.should == post.id
-  end
-
-  should "be able to create" do
-    @comment_class.belongs_to :post, :class => @post_class
-
-    comment = @comment_class.create
-    post = comment.create_post(:title => 'Hello, world!')
-    comment.post.should be_instance_of(@post_class)
-    comment.post.should_not be_new
-    comment.post.title.should == 'Hello, world!'
-    comment.post.should == post
-    comment.post_id.should == post.id
-  end
+  context "when creating documents" do
+    let(:comment) { @comment_class.create }
 
-  context "#create!" do
-    setup do
+    before do
       @post_class.key :title, String, :required => true
       @comment_class.belongs_to :post, :class => @post_class
     end
 
-    should "raise exception if invalid" do
-      comment = @comment_class.create
-      assert_raises(MongoMapper::DocumentNotValid) do
-        comment.create_post!
+    context "#build" do
+      it "should work" do
+        post = comment.build_post(:title => 'Hello, world!')
+        comment.post.should be_instance_of(@post_class)
+        comment.post.should be_new
+        comment.post.title.should == 'Hello, world!'
+        comment.post.should == post
+        comment.post_id.should == post.id
+      end
+
+      it "should accept a block" do
+        comment.build_post(:title => 'Hello, world!') do |post|
+          post.title = "Hello world!"
+        end
+        comment.post.title.should == "Hello world!"
       end
     end
 
-    should "work if valid" do
-      comment = @comment_class.create
-      post = comment.create_post!(:title => 'Hello, world!')
-      comment.post.should be_instance_of(@post_class)
-      comment.post.should_not be_new
-      comment.post.title.should == 'Hello, world!'
-      comment.post.should == post
-      comment.post_id.should == post.id
+    context "#create" do
+      it "should work" do
+        post = comment.create_post(:title => 'Hello, world!')
+        comment.post.should be_instance_of(@post_class)
+        comment.post.should_not be_new
+        comment.post.title.should == 'Hello, world!'
+        comment.post.should == post
+        comment.post_id.should == post.id
+      end
+
+      it "should accept a block" do
+        comment.create_post(:title => 'Hello, world!') do |post|
+          post.title = "Hello world!"
+        end
+        comment.post.title.should == "Hello world!"
+      end
+    end
+
+    context "#create!" do
+      it "should accept a block" do
+        comment.create_post! do |post|
+          post.title = "Hello world!"
+        end
+        comment.post.title.should == "Hello world!"
+      end
+
+      it "should raise exception if invalid" do
+        expect { comment.create_post! }.to raise_error(MongoMapper::DocumentNotValid)
+      end
+
+      it "should work if valid" do
+        post = comment.create_post!(:title => 'Hello, world!')
+        comment.post.should be_instance_of(@post_class)
+        comment.post.should_not be_new
+        comment.post.title.should == 'Hello, world!'
+        comment.post.should == post
+        comment.post_id.should == post.id
+      end
     end
   end
 
   context 'autosave' do
-    should 'not be true by default' do
+    it 'should not be true by default' do
       @comment_class.associations[:post].options[:autosave].should_not be_true
     end
 
-    should 'save parent changes when true' do
+    it 'should save parent changes when true' do
       @comment_class.associations[:post].options[:autosave] = true
 
       comment = @comment_class.create
@@ -225,7 +243,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
       post.reload.title.should == 'Hi, world.'
     end
 
-    should 'not save parent changes when false' do
+    it 'should not save parent changes when false' do
       comment = @comment_class.create
       post = comment.create_post(:title => 'Hello, world!')