jnunemaker-mongomapper 0.3.3 → 0.3.4

data/test/unit/serializers/test_json_serializer.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 
 class JsonSerializationTest < Test::Unit::TestCase
+  class Tag
+    include MongoMapper::EmbeddedDocument
+    key :name, String
+  end
+  
   class Contact
     include MongoMapper::Document
     key :name, String
@@ -8,6 +13,8 @@ class JsonSerializationTest < Test::Unit::TestCase
     key :created_at, Time
     key :awesome, Boolean
     key :preferences, Hash
+    
+    many :tags, :class_name => 'JsonSerializationTest::Tag'
   end
   
   def setup
@@ -136,12 +143,20 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
 
     should "allow attribute filtering with only" do
-      assert_equal %([{"name":"David"},{"name":"Mary"}]), @contacts.to_json(:only => :name)
+      json = @contacts.to_json(:only => :name)
+      assert_match %r{\{"name":"David"\}}, json
+      assert_match %r{\{"name":"Mary"\}}, json
     end
     
     should "allow attribute filtering with except" do
       json = @contacts.to_json(:except => [:name, :preferences, :awesome, :created_at, :updated_at])
-      assert_equal %([{"id":null,"age":39},{"id":null,"age":14}]), json
+      assert_match %r{"age":39},          json
+      assert_match %r{"age":14},          json
+      assert_no_match %r{"name":},        json
+      assert_no_match %r{"preferences":}, json
+      assert_no_match %r{"awesome":},     json
+      assert_no_match %r{"created_at":},  json
+      assert_no_match %r{"updated_at":},  json
     end
   end
   
@@ -150,8 +165,25 @@ class JsonSerializationTest < Test::Unit::TestCase
       1 => Contact.new(:name => 'David', :age => 39),
       2 => Contact.new(:name => 'Mary', :age => 14)
     }
-
-    assert_equal %({"1":{"name":"David"}}), contacts.to_json(:only => [1, :name])
+    json = contacts.to_json(:only => [1, :name])
+    assert_match %r{"1":},               json
+    assert_match %r{\{"name":"David"\}}, json
+    assert_no_match %r{"2":},            json
+  end
+  
+  should "include embedded attributes" do
+    contact = Contact.new(:name => 'John', :age => 27)
+    contact.tags = [Tag.new(:name => 'awesome'), Tag.new(:name => 'ruby')]
+    json = contact.to_json
+    assert_match %r{"tags":}, json
+    assert_match %r{"name":"awesome"}, json
+    assert_match %r{"name":"ruby"}, json
   end
   
+  should "include dynamic attributes" do
+    contact = Contact.new(:name => 'John', :age => 27, :foo => 'bar')
+    contact['smell'] = 'stinky'
+    json = contact.to_json
+    assert_match %r{"smell":"stinky"}, json
+  end
 end

data/test/unit/test_association_base.rb

@@ -78,8 +78,16 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
-  should "have belongs_to_key_name" do
-    Base.new(:belongs_to, :foo).belongs_to_key_name.should == 'foo_id'
+  context "foreign_key" do
+    should "default to assocation_name_id" do
+      base = Base.new(:belongs_to, :foo)
+      base.foreign_key.should == 'foo_id'
+    end
+    
+    should "be overridable with :foreign_key option" do
+      base = Base.new(:belongs_to, :foo, :foreign_key => 'foobar_id')
+      base.foreign_key.should == 'foobar_id'
+    end
   end
   
   should "have ivar that is association name" do

data/test/unit/test_document.rb

@@ -83,14 +83,6 @@ class DocumentTest < Test::Unit::TestCase
       doc.collection.should == @document.collection
     end
 
-    should "automatically have a created_at key" do
-      @document.keys.keys.should include('created_at')
-    end
-
-    should "automatically have an updated_at key" do
-      @document.keys.keys.should include('updated_at')
-    end
-
     should "use default values if defined for keys" do
       @document.key :active, Boolean, :default => true
 

data/test/unit/test_embedded_document.rb

@@ -15,8 +15,20 @@ class Child < Parent
   key :child, String
 end
 
+module KeyOverride
+  def other_child
+    read_attribute(:other_child) || "special result"
+  end
+  
+  def other_child=(value)
+    super(value + " modified")
+  end
+end
+
 class OtherChild < Parent
   include MongoMapper::EmbeddedDocument
+  include KeyOverride
+  
   key :other_child, String
 end
 
@@ -41,6 +53,21 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
       document.parent_model.should be_nil
     end
+
+    should "work when other modules have been included" do
+      grandparent = Class.new
+      parent = Class.new grandparent do
+        include MongoMapper::EmbeddedDocument
+      end
+      
+      example_module = Module.new
+      document = Class.new(parent) do
+        include MongoMapper::EmbeddedDocument
+        include example_module
+      end
+      
+      document.parent_model.should == parent
+    end
     
     should "find parent" do
       Parent.parent_model.should == Grandparent
@@ -134,6 +161,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       Parent.keys.keys.sort.should      == ['_id', '_type', 'grandparent', 'parent']
       Child.keys.keys.sort.should       == ['_id', '_type', 'child', 'grandparent', 'parent']
     end
+
+    should "not add anonymous objects to the ancestor tree" do
+      OtherChild.ancestors.any? { |a| a.name.blank? }.should be_false
+    end
+
+    should "not include descendant keys" do
+      lambda { Parent.new.other_child }.should raise_error
+    end
   end
   
   context "subclasses" do
@@ -364,6 +399,21 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc.foo
         doc.instance_variable_get("@foo").should be_nil
       end
+      
+      should "be overrideable by modules" do
+        @document = Class.new do
+          include MongoMapper::Document
+          key :other_child, String
+        end
+        
+        child = @document.new
+        child.other_child.should be_nil
+        
+        @document.send :include, KeyOverride
+        
+        overriden_child = @document.new
+        overriden_child.other_child.should == 'special result'
+      end
     end
 
     context "reading an attribute before typcasting" do
@@ -424,6 +474,21 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc.name.should == 'Frank'
         doc.age.should == 62
       end
+      
+      should "be overrideable by modules" do
+        @document = Class.new do
+          include MongoMapper::Document
+          key :other_child, String
+        end
+        
+        child = @document.new(:other_child => 'foo')
+        child.other_child.should == 'foo'
+        
+        @document.send :include, KeyOverride
+        
+        overriden_child = @document.new(:other_child => 'foo')
+        overriden_child.other_child.should == 'foo modified'
+      end
     end # writing an attribute
     
     context "checking if an attributes value is present" do

data/test/unit/test_key.rb

@@ -117,6 +117,13 @@ class KeyTest < Test::Unit::TestCase
         key.set(a).should == 21
       end
     end
+    
+    should "work fine with long integers" do
+      key = Key.new(:foo, Integer)
+      [9223372036854775807, '9223372036854775807'].each do |value|
+        key.set(value).should == 9223372036854775807
+      end
+    end
 
     should "correctly typecast Floats" do
       key = Key.new(:foo, Float)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-08-28 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - lib/mongomapper/associations/base.rb
 - lib/mongomapper/associations/belongs_to_polymorphic_proxy.rb
 - lib/mongomapper/associations/belongs_to_proxy.rb
+- lib/mongomapper/associations/many_documents_as_proxy.rb
 - lib/mongomapper/associations/many_documents_proxy.rb
 - lib/mongomapper/associations/many_embedded_polymorphic_proxy.rb
 - lib/mongomapper/associations/many_embedded_proxy.rb
@@ -109,6 +110,7 @@ files:
 - test/NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
@@ -135,7 +137,6 @@ files:
 - test/unit/test_validations.rb
 has_rdoc: false
 homepage: http://github.com/jnunemaker/mongomapper
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -156,13 +157,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomapper
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb