mongo_mapper 0.8.6 → 0.9.0

data/lib/mongo_mapper/translation.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+module MongoMapper
+  module Translation
+    include ActiveModel::Translation
+
+    def i18n_scope
+      :mongo_mapper
+    end
+  end
+end

data/lib/mongo_mapper/version.rb

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

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

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+module MongoMapper
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      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
+      end
+
+      def create_config_file
+        template 'mongo.yml', File.join('config', "mongo.yml")
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+defaults: &defaults
+  host: 127.0.0.1
+  port: 27017
+
+development:
+  <<: *defaults
+  database: <%= database_name || app_name %>_development
+
+test:
+  <<: *defaults
+  database: <%= database_name || app_name %>_test
+
+# set these environment variables on your prod server
+production:
+  <<: *defaults
+  database: <%= database_name || app_name %>
+  username: <%%= ENV['MONGO_USERNAME'] %>
+  password: <%%= ENV['MONGO_PASSWORD'] %>

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

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+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
+
+      def self.source_root
+        @source_root ||= File.expand_path("../templates", __FILE__)
+      end
+
+      def create_model_file
+        template 'model.rb', File.join('app/models', "#{file_name}.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+class <%= class_name %>
+  include MongoMapper::Document
+
+<% attributes.each do |attribute| -%>
+  key :<%= attribute.name %>, <%= attribute.type.to_s.camelcase %>
+<% end -%>
+<% if options[:timestamps] %>
+  timestamps!
+<% end -%>
+
+end

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -54,6 +54,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
       @status.target = project
       @status.save.should be_true
       project.destroy
+      @status.reload
     end
 
     should "return nil instead of raising error" do

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -5,7 +5,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   def setup
     @post_class = Doc()
     @comment_class = Doc do
-      key :post_id, String
+      key :post_id, ObjectId
     end
 
     @comment_class.belongs_to :post, :class => @post_class
@@ -15,6 +15,10 @@ class BelongsToProxyTest < Test::Unit::TestCase
     @comment_class.new.post.nil?.should be_true
   end
 
+  should "return nil instead of a proxy" do
+    nil.should === @comment_class.new.post
+  end
+
   should "have boolean presence method" do
     comment = @comment_class.new(:name => 'Foo!')
     comment.post?.should be_false
@@ -23,6 +27,19 @@ class BelongsToProxyTest < Test::Unit::TestCase
     comment.post?.should be_true
   end
 
+  should "allow overriding association methods" do
+    @comment_class.class_eval do
+      def post?
+        super
+      end
+    end
+
+    instance = @comment_class.new
+    instance.post?.should be_false
+    instance.post = @post_class.new
+    instance.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)
@@ -32,6 +49,43 @@ class BelongsToProxyTest < Test::Unit::TestCase
     comment.post.should == post
     comment.post.nil?.should be_false
   end
+  
+  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
+    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
+    post1 = @post_class.create(:name => 'post1')
+    post2 = @post_class.create(:name => 'post2')
+
+    comment = @comment_class.new(:name => 'Foo!', :post => post1)
+    comment.save.should be_true
+
+
+    comment = comment.reload
+    comment.post.should == post1
+    comment.post.nil?.should be_false
+
+    original_post = comment.post
+    original_post.name.should == 'post1'
+
+    comment.post = post2
+    comment.post.name.should == 'post2'
+    original_post.name.should == 'post1'
+  end
 
   should "unset the association" do
     post = @post_class.new(:name => 'mongomapper')
@@ -90,4 +144,80 @@ class BelongsToProxyTest < Test::Unit::TestCase
       end
     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 "#create!" do
+    setup 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!
+      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
+    end
+  end
+
+  context 'autosave' do
+    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
+      @comment_class.associations[:post].options[:autosave] = true
+
+      comment = @comment_class.create
+      post = comment.create_post(:title => 'Hello, world!')
+
+      comment.post.attributes = {:title => 'Hi, world.'}
+      comment.save
+
+      post.reload.title.should == 'Hi, world.'
+    end
+
+    should 'not save parent changes when false' do
+      comment = @comment_class.create
+      post = comment.create_post(:title => 'Hello, world!')
+
+      comment.post.attributes = {:title => 'Hi, world.'}
+      comment.save
+
+      post.reload.title.should == 'Hello, world!'
+    end
+  end
 end

data/test/functional/associations/test_in_array_proxy.rb

@@ -141,6 +141,12 @@ class InArrayProxyTest < Test::Unit::TestCase
         should "work with conditions" do
           @user.lists.all(:name => 'Foo 1').should == [@list1]
         end
+
+        should "not hit the database if ids key is empty" do
+          @user.list_ids = []
+          @user.lists.expects(:query).never
+          @user.lists.all.should == []
+        end
       end
 
       context "first" do
@@ -151,6 +157,12 @@ class InArrayProxyTest < Test::Unit::TestCase
         should "work with conditions" do
           @user.lists.first(:position => 2).should == @list2
         end
+
+        should "not hit the database if ids key is empty" do
+          @user.list_ids = []
+          @user.lists.expects(:query).never
+          @user.lists.first.should be_nil
+        end
       end
 
       context "last" do
@@ -161,6 +173,12 @@ class InArrayProxyTest < Test::Unit::TestCase
         should "work with conditions" do
           @user.lists.last(:position => 2, :order => 'position').should == @list2
         end
+
+        should "not hit the database if ids key is empty" do
+          @user.list_ids = []
+          @user.lists.expects(:query).never
+          @user.lists.last.should be_nil
+        end
       end
 
       context "with one id" do
@@ -209,6 +227,12 @@ class InArrayProxyTest < Test::Unit::TestCase
         should "return the subject" do
           @lists.collect(&:name).should == ['Foo 1']
         end
+
+        should "not hit the database if ids key is empty" do
+          @user.list_ids = []
+          @user.lists.expects(:query).never
+          @user.lists.paginate(:page => 1).should == []
+        end
       end
 
       context "dynamic finders" do
@@ -266,6 +290,12 @@ class InArrayProxyTest < Test::Unit::TestCase
         @user.lists.count(:name => 'Foo 1').should == 1
         @user2.lists.count(:name => 'Foo 1').should == 0
       end
+
+      should "not hit the database if ids key is empty" do
+        @user.list_ids = []
+        @user.lists.expects(:query).never
+        @user.lists.count(:name => 'Foo 1').should == 0
+      end
     end
 
     context "Removing documents" do

data/test/functional/associations/test_many_documents_proxy.rb

@@ -22,6 +22,19 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     project.statuses.should == []
   end
 
+  should "allow overriding association methods" do
+    @owner_class.class_eval do
+      def pets
+        super
+      end
+    end
+
+    instance = @owner_class.new
+    instance.pets.should == []
+    instance.pets.build
+    instance.pets.should_not be_empty
+  end
+
   should "allow assignment of many associated documents using a hash" do
     person_attributes = {
       'name' => 'Mr. Pet Lover',
@@ -248,7 +261,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     should "work on association" do
       project = Project.create
       3.times { |i| project.statuses.create(:name => i.to_s) }
-      
+
       JSON.parse(project.statuses.to_json).collect{|status| status["name"] }.sort.should == ["0","1","2"]
     end
   end
@@ -257,7 +270,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     should "work on association" do
       project = Project.create
       3.times { |i| project.statuses.create(:name => i.to_s) }
-      
+
       project.statuses.as_json.collect{|status| status["name"] }.sort.should == ["0","1","2"]
     end
   end
@@ -612,4 +625,19 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "namespaced foreign keys" do
+    setup do
+      News::Paper.many :articles, :class_name => 'News::Article'
+      News::Article.belongs_to :paper, :class_name => 'News::Paper'
+
+      @paper = News::Paper.create
+    end
+
+    should "properly infer the foreign key" do
+      article = @paper.articles.create
+      article.should respond_to(:paper_id)
+      article.paper_id.should == @paper.id
+    end
+  end
 end

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -83,8 +83,10 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
 
     owner = @owner_class.new(person_attributes)
     owner.name.should == 'Mr. Pet Lover'
+    owner.pets[0].id.class.should == BSON::ObjectId
     owner.pets[0].name.should == 'Jimmy'
     owner.pets[0].species.should == 'Cocker Spainel'
+    owner.pets[1].id.class.should == BSON::ObjectId
     owner.pets[1].name.should == 'Sasha'
     owner.pets[1].species.should == 'Siberian Husky'
 
@@ -92,12 +94,43 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     owner.reload
 
     owner.name.should == 'Mr. Pet Lover'
+    owner.pets[0].id.class.should == BSON::ObjectId
     owner.pets[0].name.should == 'Jimmy'
     owner.pets[0].species.should == 'Cocker Spainel'
+    owner.pets[1].id.class.should == BSON::ObjectId
     owner.pets[1].name.should == 'Sasha'
     owner.pets[1].species.should == 'Siberian Husky'
   end
 
+  context "passing documents between versions of code" do
+    setup do
+      @old_klass = Doc do
+        set_collection_name 'generic_parents'
+        key :name, String
+      end
+
+      @updated_klass = Doc do
+        set_collection_name 'generic_parents'
+        key :name, String
+      end
+      @updated_klass.many :pets, :class => @pet_class
+    end
+
+    should "not break many embedded proxy" do
+      @old_klass.collection.drop
+      created_by_new_code = @updated_klass.create!
+      created_by_new_code.pets.should == []
+
+      @old_klass.first # ensure_key_exists calls @old_klass.key(:embedded_docs) (not @old_klass.many(:embedded_docs))
+      @old_klass.create!(:name => 'created in old code') # creates doc with {embedded_docs : null}
+
+      lambda {
+        loaded_in_new_code = @updated_klass.find_by_name('created in old code')
+        loaded_in_new_code.pets.should == []
+      }.should_not raise_error
+    end
+  end
+
   context "embedding many embedded documents" do
     setup do
       @klass = Doc()