mongo_mapper 0.10.1 → 0.11.0

data/test/functional/test_protected.rb

@@ -74,6 +74,11 @@ class ProtectedTest < Test::Unit::TestCase
       doc.name.should == 'John'
     end
 
+    should "ignore protected attribute on #update_attribute" do
+      @doc.update_attribute('admin', true)
+      @doc.admin.should be_true
+    end
+
     should "ignore protected attribute on #update_attributes" do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'
@@ -176,6 +181,11 @@ class ProtectedTest < Test::Unit::TestCase
       @edoc.admin.should be_true
     end
 
+    should "not ignore protected attribute on #update_attribute" do
+      @edoc.update_attribute('admin', true)
+      @edoc.admin.should be_true
+    end
+
     should "ignore protected attribute on #update_attributes" do
       @edoc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @edoc.name.should == 'Ren Hoek'

data/test/functional/test_querying.rb

@@ -682,10 +682,24 @@ class QueryingTesting < Test::Unit::TestCase
       @doc = @document.create(:first_name => 'John', :age => '27')
     end
 
-    should "update the attribute" do
+    should "accept symbols as keys" do
       @doc.update_attribute(:first_name, 'Chris').should be_true
       @doc.reload.first_name.should == 'Chris'
     end
+
+    should "update the attribute" do
+      @doc.update_attribute('first_name', 'Chris').should be_true
+      @doc.reload.first_name.should == 'Chris'
+    end
+
+    should "update the attribute without invoking validations" do
+      @document.key :name, String, :required => true
+
+      @doc.expects(:valid?).never
+      @doc.update_attribute('name', '').should be_true
+      @doc.reload.name.should == ''
+      @document.count.should == 1
+    end
   end
 
   context "#save (new document)" do

data/test/functional/test_validations.rb

@@ -350,6 +350,39 @@ class ValidationsTest < Test::Unit::TestCase
       doc.children.build
       doc.should have_error_on(:children, 'are invalid')
     end
+
+  end
+
+  context "validating associated docs with custom context" do
+    setup do
+      @child_class = EDoc do
+        key :name
+
+        validates_length_of :name, :minimum => 5, :on => :custom_context
+      end
+
+      @root_class = Doc { }
+      @root_class.many :children, :class => @child_class
+      @root_class.validates_associated :children, :context => :custom_context
+    end
+
+    should "pass if there are no associated docs" do
+      doc = @root_class.new
+      doc.valid?(:custom_context).should be_true
+    end
+
+    should "pass if the associated doc is valid" do
+      doc = @root_class.new
+      doc.children.build(:name => 'George')
+      doc.valid?(:custom_context).should be_true
+    end
+
+    should "fail if the associated doc is invalid" do
+      doc = @root_class.new
+      doc.children.build(:name => 'Bob')
+      doc.valid?(:custom_context).should_not be_true
+    end
+
   end
   # context "validates uniqueness of with :unique shortcut" do
   #   should "work" do

data/test/models.rb

@@ -245,3 +245,17 @@ end
 class AltUser
   include MongoMapper::Document
 end
+
+class Human
+  include MongoMapper::EmbeddedDocument
+
+  key :name, String
+  embedded_in :post
+end
+
+class Robot
+  include MongoMapper::EmbeddedDocument
+
+  key :serial_number, String
+  embedded_in :post
+end

data/test/unit/associations/test_one_association.rb

@@ -4,6 +4,12 @@ require 'models'
 class OneAssociationTest < Test::Unit::TestCase
   include MongoMapper::Plugins::Associations
 
+  context "type_key_name" do
+    should "be _type" do
+      OneAssociation.new(:foo).type_key_name.should == '_type'
+    end
+  end
+
   context "embeddable?" do
     should "be true if class is embeddable" do
       base = OneAssociation.new(:media)
@@ -31,6 +37,11 @@ class OneAssociationTest < Test::Unit::TestCase
       base = OneAssociation.new(:media)
       base.proxy_class.should == OneEmbeddedProxy
     end
+
+    should "be OneEmbeddedPolymorphicProxy for polymorphic one embedded" do
+      base = OneAssociation.new(:media, :polymorphic => true)
+      base.proxy_class.should == OneEmbeddedPolymorphicProxy
+    end
   end
 
 end

data/test/unit/test_mongo_mapper.rb

@@ -65,6 +65,15 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.connect('development', :logger => logger)
     end
 
+    should "work with options from config" do
+      MongoMapper.config = {
+        'development' => {'host' => '192.168.1.1', 'port' => 2222, 'database' => 'test', 'options' => {'safe' => true}}
+      }
+      connection, logger = mock('connection'), mock('logger')
+      Mongo::Connection.expects(:new).with('192.168.1.1', 2222, :logger => logger, :safe => true)
+      MongoMapper.connect('development', :logger => logger)
+    end
+
     should "work with options using uri" do
       MongoMapper.config = {
         'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}

data/test/unit/test_plugins.rb

@@ -19,10 +19,8 @@ class PluginsTest < Test::Unit::TestCase
         end
       end
 
-      module InstanceMethods
-        def instance_foo
-          'instance_foo'
-        end
+      def instance_foo
+        'instance_foo'
       end
     end
 

data/test/unit/test_rails_reflect_on_association.rb

@@ -0,0 +1,118 @@
+require 'test_helper'
+
+module ReflectOnAssociationTestModels
+  class Tree
+    include MongoMapper::Document
+    many :birds, :class_name => "ReflectOnAssociationTestModels::Bird"
+  end
+
+  class Bird
+    include MongoMapper::Document
+    belongs_to :tree, :class_name => "ReflectOnAssociationTestModels::Tree"
+  end
+
+  class Book
+    include MongoMapper::Document
+    many :authors, :class_name => "ReflectOnAssociationTestModels::Author", :in => :author_ids
+  end
+
+  class Author
+    include MongoMapper::Document
+  end
+
+  class Employee
+    include MongoMapper::Document
+    one :desk, :class_name => "ReflectOnAssociationTestModels::Desk"
+  end
+
+  class Desk
+    include MongoMapper::Document
+    belongs_to :employee, :class_name => "ReflectOnAssociationTestModels::Employee"
+  end
+
+  class Order
+    include MongoMapper::Document
+    many :line_items, :class_name => "ReflectOnAssociationTestModels::LineItem"
+  end
+
+  class LineItem
+    include MongoMapper::EmbeddedDocument
+  end
+
+  class Body
+    include MongoMapper::Document
+    one :heart, :class_name => "ReflectOnAssociationTestModels::Heart"
+  end
+
+  class Heart
+    include MongoMapper::EmbeddedDocument
+  end
+end
+
+class ReflectOnAssociationTest < Test::Unit::TestCase
+  context "one-to-many association" do
+    should "return :has_many association for Tree#birds" do
+      association = ReflectOnAssociationTestModels::Tree.reflect_on_association(:birds)
+      association.klass.should == ReflectOnAssociationTestModels::Bird
+      association.macro.should == :has_many
+      association.name.should == :birds
+      association.options.should == {}
+    end
+
+    should "return :belongs_to association for Bird#tree" do
+      association = ReflectOnAssociationTestModels::Bird.reflect_on_association(:tree)
+      association.klass.should == ReflectOnAssociationTestModels::Tree
+      association.macro.should == :belongs_to
+      association.name.should == :tree
+      association.options.should == {}
+    end
+  end
+
+  context "many-to-many association" do
+    should "return :has_many association for Book#authors" do
+      association = ReflectOnAssociationTestModels::Book.reflect_on_association(:authors)
+      association.klass.should == ReflectOnAssociationTestModels::Author
+      association.macro.should == :has_many
+      association.name.should == :authors
+      association.options.should == {}
+    end
+  end
+
+  context "one-to-one association" do
+    should "return :has_one association for Employee#desk" do
+      association = ReflectOnAssociationTestModels::Employee.reflect_on_association(:desk)
+      association.klass.should == ReflectOnAssociationTestModels::Desk
+      association.macro.should == :has_one
+      association.name.should == :desk
+      association.options.should == {}
+    end
+
+    should "return :belongs_to association for Desk#employee" do
+      association = ReflectOnAssociationTestModels::Desk.reflect_on_association(:employee)
+      association.klass.should == ReflectOnAssociationTestModels::Employee
+      association.macro.should == :belongs_to
+      association.name.should == :employee
+      association.options.should == {}
+    end
+  end
+
+  context "embeds one" do
+    should "return :has_one association for Body#heart" do
+      association = ReflectOnAssociationTestModels::Body.reflect_on_association(:heart)
+      association.klass.should == ReflectOnAssociationTestModels::Heart
+      association.macro.should == :has_one
+      association.name.should == :heart
+      association.options.should == {}
+    end
+  end
+
+  context "embeds many" do
+    should "return :has_many association for Order#line_items" do
+      association = ReflectOnAssociationTestModels::Order.reflect_on_association(:line_items)
+      association.klass.should == ReflectOnAssociationTestModels::LineItem
+      association.macro.should == :has_many
+      association.name.should == :line_items
+      association.options.should == {}
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 1
-  version: 0.10.1
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,11 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 -05:00
+date: 2012-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: activemodel
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +32,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: activesupport
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +47,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: plucky
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,8 +63,6 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  prerelease: false
-  type: :runtime
   requirement: *id003
 description: 
 email: 
@@ -125,6 +125,7 @@ files:
 - lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_as_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_association.rb
+- lib/mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_proxy.rb
 - lib/mongo_mapper/plugins/associations/proxy.rb
@@ -153,6 +154,7 @@ files:
 - lib/mongo_mapper/plugins/querying/decorator.rb
 - lib/mongo_mapper/plugins/querying/plucky_methods.rb
 - lib/mongo_mapper/plugins/querying.rb
+- lib/mongo_mapper/plugins/rails/active_record_association_adapter.rb
 - lib/mongo_mapper/plugins/rails.rb
 - lib/mongo_mapper/plugins/safe.rb
 - lib/mongo_mapper/plugins/sci.rb
@@ -181,6 +183,7 @@ files:
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
 - test/functional/associations/test_one_as_proxy.rb
+- test/functional/associations/test_one_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_one_embedded_proxy.rb
 - test/functional/associations/test_one_proxy.rb
 - test/functional/test_accessible.rb
@@ -235,6 +238,7 @@ files:
 - test/unit/test_plugins.rb
 - test/unit/test_rails.rb
 - test/unit/test_rails_compatibility.rb
+- test/unit/test_rails_reflect_on_association.rb
 - test/unit/test_railtie.rb
 - test/unit/test_serialization.rb
 - test/unit/test_time_zones.rb