mongo_mapper 0.10.1 → 0.11.0

data/lib/mongo_mapper/railtie/database.rake

@@ -55,7 +55,7 @@ namespace :db do
     end
   end
 
-  desc 'Load the seed data from db/seeds.rb'
+  desc 'Load indexes from db/indexes.rb'
   task :index => :environment do
     indexes = File.join(Rails.root, 'db', 'indexes.rb')
     load(indexes) if File.exist?(indexes)

data/lib/mongo_mapper/version.rb

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

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

@@ -14,7 +14,7 @@ module MongoMapper
       end
 
       def create_model_file
-        template 'model.rb', File.join('app/models', "#{file_name}.rb")
+        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
       end
 
       hook_for :test_framework

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

@@ -1,3 +1,4 @@
+<% module_namespacing do -%>
 class <%= class_name %>
   include MongoMapper::Document
 
@@ -9,3 +10,4 @@ class <%= class_name %>
 <% end -%>
 
 end
+<% end -%>

data/test/functional/associations/test_many_embedded_polymorphic_proxy.rb

@@ -30,6 +30,69 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
     catalog.medias[0].new?.should == false
   end
 
+  context "associating objects of non-SCI class" do
+    should "work on replacement" do
+      catalog = Catalog.new
+      catalog.medias = [Human.new(:name => 'Frank'), Robot.new(:serial_number => '1B')]
+
+      catalog.medias.size.should == 2
+      catalog.medias[0].name.should == 'Frank'
+      catalog.medias[0].class.should == Human
+      catalog.medias[1].serial_number.should == '1B'
+      catalog.medias[1].class.should == Robot
+
+      catalog.save.should be_true
+      catalog.reload
+
+      catalog.medias.size.should == 2
+      catalog.medias[0].name.should == 'Frank'
+      catalog.medias[0].class.should == Human
+      catalog.medias[1].serial_number.should == '1B'
+      catalog.medias[1].class.should == Robot
+    end
+
+    should "work on replacement with hashes" do
+      catalog = Catalog.new
+      catalog.medias = [{:name => 'Frank', '_type' => 'Human'}, {:serial_number => '1B', '_type' => 'Robot'}]
+
+      catalog.medias.size.should == 2
+      catalog.medias[0].name.should == 'Frank'
+      catalog.medias[0].class.should == Human
+      catalog.medias[1].serial_number.should == '1B'
+      catalog.medias[1].class.should == Robot
+
+      catalog.save.should be_true
+      catalog.reload
+
+      catalog.medias.size.should == 2
+      catalog.medias[0].name.should == 'Frank'
+      catalog.medias[0].class.should == Human
+      catalog.medias[1].serial_number.should == '1B'
+      catalog.medias[1].class.should == Robot
+    end
+
+    should "work with concatination" do
+      catalog = Catalog.new
+      catalog.medias << Human.new(:name => 'Frank')
+      catalog.medias << Robot.new(:serial_number => '1B')
+
+      catalog.medias.size.should == 2
+      catalog.medias[0].name.should == 'Frank'
+      catalog.medias[0].class.should == Human
+      catalog.medias[1].serial_number.should == '1B'
+      catalog.medias[1].class.should == Robot
+
+      catalog.save.should be_true
+      catalog.reload
+
+      catalog.medias.size.should == 2
+      catalog.medias[0].name.should == 'Frank'
+      catalog.medias[0].class.should == Human
+      catalog.medias[1].serial_number.should == '1B'
+      catalog.medias[1].class.should == Robot
+    end
+  end
+
   context "count" do
     should "default to 0" do
       Catalog.new.medias.count.should == 0

data/test/functional/associations/test_one_embedded_polymorphic_proxy.rb

@@ -0,0 +1,208 @@
+require 'test_helper'
+require 'models'
+
+class OneEmbeddedPolymorhpicProxyTest < Test::Unit::TestCase
+  def setup
+    @post_class = Doc('Post') do
+      key :title, String
+    end
+  end
+
+  should "default to nil" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+    @post_class.new.author.should be_nil
+  end
+
+  should "return nil instead of a proxy" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+    nil.should === @post_class.new.author
+  end
+
+  should "be able to build" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+    post = @post_class.create
+    author = post.build_author(:serial_number => "1B")
+    post.author.should be_instance_of(Robot)
+    post.author.should be_new
+    post.author.serial_number.should == '1B'
+    post.author.should == author
+    post.author.post.should == post
+  end
+
+  should "allow assignment of associated document using a hash" do
+    @post_class.one :author, :polymorphic => :true, :class => Robot
+  
+    post = @post_class.new('author' => { 'name' => 'Frank', '_type' => 'Human' })
+    post.author.name.should == 'Frank'
+    post.author.class.should == Human
+  
+    post.save.should be_true
+    post.reload
+  
+    post.author.name.should == 'Frank'
+    post.author.class.should == Human
+  end
+
+  context "replacing the association" do
+    context "with an object" do
+      setup do
+        @post_class.one :author, :polymorphic => true, :class => Robot
+        @post = @post_class.create
+        @human = Human.new(:name => 'Frank')
+      end
+
+      should "work" do
+        @post.author = @human
+        @post.save
+        @post.reload
+
+        @post.author.should == @human
+        @post.author.nil?.should be_false
+        @post.author.class.should == Human
+
+        new_human = Human.new(:name => 'Emily')
+        @post.author = new_human
+        @post.author.should == new_human
+      end
+
+      should "generate a new proxy instead of modifying the existing one" do
+        @post.author = @human
+        @post.save
+        @post.reload
+
+        @post.author.should == @human
+        @post.author.nil?.should be_false
+
+        original_author = @post.author
+        original_author.name.should == 'Frank'
+        new_human = Human.new(:name => 'Emily')
+        @post.author = new_human
+        @post.author.should == new_human
+
+        original_author.name.should == 'Frank'
+      end
+
+      should "assign _type" do
+        @post.author = @human
+        @post.author._type.should == "Human"
+      end
+    end
+
+    context "with a Hash" do
+      setup do
+        @post_class.one :author, :polymorphic => true, :class => Robot
+        @post = @post_class.create
+      end
+
+      should "convert to an object of the class and work" do
+        @post.author = {'serial_number' => '1B'}
+        @post.save
+        @post.reload
+
+        @post.author.serial_number.should == '1B'
+        @post.author.nil?.should be_false
+
+        @post.author = {'serial_number' => '2C'}
+        @post.author.serial_number.should == '2C'
+      end
+
+      should "convert to an object of _type if given" do
+        @post.author = {'name' => 'Frank', '_type' => 'Human'}
+        @post.author.name.should == 'Frank'
+        @post.author.class.should == Human
+        @post.save
+        @post.reload
+
+        @post.author.name.should == 'Frank'
+        @post.author.class.should == Human
+      end
+
+      should "assign _type" do
+        @post.author = {'name' => 'Frank', '_type' => 'Human'}
+        @post.save
+        @post.reload
+        @post.author._type.should == "Human"
+      end
+    end
+  end
+
+  should "unset the association" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+    post = @post_class.create
+    human = Human.new
+    post.update_attributes!(:author => human)
+    post.reload
+    post.author = nil
+    post.author.should == nil
+  end
+
+  should "set modularized associated models correctly" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+
+    post = @post_class.new('author' => {'_type' => 'TrModels::Ambulance', 'license_plate' => 'GGG123', 'icu' => true})
+
+    post.author.class.should == TrModels::Ambulance
+    post.author.license_plate.should == 'GGG123'
+    post.author.icu.should be_true
+    post.save.should be_true
+
+    post = post.reload
+    post.author.class.should == TrModels::Ambulance
+    post.author.license_plate.should == 'GGG123'
+    post.author.icu.should be_true
+  end
+
+  should "not have problem loading root document if embedded one is nil" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+    post = @post_class.create
+
+    lambda {
+      @post_class.find(post.id)
+    }.should_not raise_error
+  end
+
+  should "load the parent and root documents for nested embedded documents" do
+    @address_class = EDoc('Address') do
+      key :city, String
+      key :state, String
+    end
+    @author_class = EDoc('EmbeddedAuthor')
+    @author_class.one :address, :polymorphic => true, :class => @address_class
+    @post_class.one :author, :polymorphic => true, :class => @author_class
+  
+    post = @post_class.create(:title => 'Post Title', :author => { :name => 'Frank', :address => { :city => 'Boston', :state => 'MA' } })
+  
+    post.author.address._parent_document.should == post.author
+    post.author.address._root_document.should == post
+  end
+  
+  should "have boolean method for testing presence" do
+    @post_class.one :author, :polymorphic => true, :class => Robot
+  
+    post = @post_class.new
+    post.author?.should be_false
+  
+    post.author = Human.new(:name => 'Frank')
+    post.author?.should be_true
+  end
+
+  should "initialize id for nested embedded document created from hash" do
+    @address_class = EDoc('Address') do
+      key :city, String
+      key :state, String
+    end
+    @author_class = EDoc('EmbeddedAuthor')
+    @author_class.one :address, :polymorphic => true, :class => @address_class
+    @post_class.one :author, :polymorphic => true, :class => @author_class  
+
+    post = @post_class.create(:title => 'Post Title', :author => {
+      :name => 'Frank',
+      :address => {
+        :city => 'Boston',
+        :state => 'MA'
+      }
+    })
+  
+    post.author.address.id.should_not be_nil
+  end
+end

data/test/functional/test_accessible.rb

@@ -68,6 +68,11 @@ class AccessibleTest < Test::Unit::TestCase
       doc.name.should == 'John'
     end
 
+    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
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'

data/test/functional/test_embedded_document.rb

@@ -241,6 +241,18 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     person.pets.first.crazy_key.should == 'crazy'
   end
 
+  should "be able to update_attribute" do
+    pet = @pet_klass.new(:name => 'sparky')
+    person = @klass.create(:pets => [pet])
+    person.reload
+    pet = person.pets.first
+
+    pet.update_attribute('name', 'koda').should be_true
+    person.reload
+    person.pets.first._id.should == pet._id
+    person.pets.first.name.should == 'koda'
+  end
+
   should "be able to update_attributes" do
     pet = @pet_klass.new(:name => 'sparky')
     person = @klass.create(:pets => [pet])

data/test/functional/test_modifiers.rb

@@ -156,7 +156,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(foo)
 
         @page2.reload
-        @page.tags.should == %w(foo)
+        @page2.tags.should == %w(foo)
       end
 
       should "work with ids and modifier hash" do
@@ -166,7 +166,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(foo)
 
         @page2.reload
-        @page.tags.should == %w(foo)
+        @page2.tags.should == %w(foo)
       end
     end
 
@@ -184,7 +184,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == @tags
 
         @page2.reload
-        @page.tags.should == @tags
+        @page2.tags.should == @tags
       end
 
       should "work with ids and modifier hash" do
@@ -194,7 +194,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == @tags
 
         @page2.reload
-        @page.tags.should == @tags
+        @page2.tags.should == @tags
       end
     end
 
@@ -211,7 +211,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(bar)
 
         @page2.reload
-        @page.tags.should == %w(bar)
+        @page2.tags.should == %w(bar)
       end
 
       should "be able to pull with ids and modifier hash" do
@@ -221,7 +221,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(bar)
 
         @page2.reload
-        @page.tags.should == %w(bar)
+        @page2.tags.should == %w(bar)
       end
     end
 
@@ -238,7 +238,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(baz)
 
         @page2.reload
-        @page.tags.should == %w(baz)
+        @page2.tags.should == %w(baz)
       end
 
       should "work with ids and modifier hash" do
@@ -248,7 +248,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(baz)
 
         @page2.reload
-        @page.tags.should == %w(baz)
+        @page2.tags.should == %w(baz)
       end
     end
 
@@ -265,7 +265,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(foo)
 
         @page2.reload
-        @page.tags.should == %w(foo)
+        @page2.tags.should == %w(foo)
       end
 
       should "be able to add to set with ids and modifier hash" do
@@ -275,7 +275,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(foo)
 
         @page2.reload
-        @page.tags.should == %w(foo)
+        @page2.tags.should == %w(foo)
       end
     end
 
@@ -292,7 +292,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(foo)
 
         @page2.reload
-        @page.tags.should == %w(foo)
+        @page2.tags.should == %w(foo)
       end
 
       should "be able to push uniq with ids and modifier hash" do
@@ -302,7 +302,7 @@ class ModifierTest < Test::Unit::TestCase
         @page.tags.should == %w(foo)
 
         @page2.reload
-        @page.tags.should == %w(foo)
+        @page2.tags.should == %w(foo)
       end
     end
 
@@ -325,7 +325,7 @@ class ModifierTest < Test::Unit::TestCase
     end
   end
 
-  context "InstanceMethods" do
+  context "instance methods" do
     should "be able to unset with keys" do
       page = @page_class.create(:title => 'Foo', :tags => %w(foo))
       page.unset(:title, :tags)
@@ -368,7 +368,7 @@ class ModifierTest < Test::Unit::TestCase
       page.reload
       page.tags.should == %w(foo)
     end
-    
+
     should "be able to push_all with modifier hashes" do
       page = @page_class.create
       page.push_all(:tags => %w(foo bar))
@@ -384,7 +384,7 @@ class ModifierTest < Test::Unit::TestCase
       page.reload
       page.tags.should == %w(bar)
     end
-    
+
     should "be able to pull_all with criteria and modifier hashes" do
       page = @page_class.create(:tags => %w(foo bar baz))
       page.pull_all(:tags => %w(foo bar))
@@ -398,13 +398,13 @@ class ModifierTest < Test::Unit::TestCase
       page2 = @page_class.create
 
       page.add_to_set(:tags => 'foo')
-      page.add_to_set(:tags => 'foo')
+      page2.add_to_set(:tags => 'foo')
 
       page.reload
       page.tags.should == %w(foo)
 
       page2.reload
-      page.tags.should == %w(foo)
+      page2.tags.should == %w(foo)
     end
 
     should "be able to push uniq with criteria and modifier hash" do
@@ -412,13 +412,13 @@ class ModifierTest < Test::Unit::TestCase
       page2 = @page_class.create
 
       page.push_uniq(:tags => 'foo')
-      page.push_uniq(:tags => 'foo')
+      page2.push_uniq(:tags => 'foo')
 
       page.reload
       page.tags.should == %w(foo)
 
       page2.reload
-      page.tags.should == %w(foo)
+      page2.tags.should == %w(foo)
     end
 
     should "be able to pop with modifier hashes" do