mongo_mapper-unstable 2010.2.28 → 2010.3.3

data/test/unit/serializers/test_json_serializer.rb

@@ -1,6 +1,14 @@
 require 'test_helper'
+require 'active_support/version'
 
 class JsonSerializationTest < Test::Unit::TestCase
+  
+  # Helper function in case things change in the future 
+  # - replacing all those to_json calls was a nightmare
+  def convert_to_json object, options = {}
+    ActiveSupport::JSON.encode(object, options)
+  end
+  
   class Tag
     include MongoMapper::EmbeddedDocument
     key :name, String
@@ -30,11 +38,11 @@ class JsonSerializationTest < Test::Unit::TestCase
   
   should "include demodulized root" do
     Contact.include_root_in_json = true
-    assert_match %r{^\{"contact": \{}, @contact.to_json
+    assert_match %r{^\{"contact":\s?\{}, convert_to_json(@contact)
   end
   
   should "encode all encodable attributes" do
-    json = @contact.to_json
+    json = convert_to_json(@contact)
 
     assert_no_match %r{"_id"}, json
     assert_match %r{"name":"Konata Izumi"}, json
@@ -45,7 +53,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   end
   
   should "allow attribute filtering with only" do
-    json = @contact.to_json(:only => [:name, :age])
+    json = convert_to_json(@contact, :only => [:name, :age])
 
     assert_no_match %r{"_id"}, json
     assert_match %r{"name":"Konata Izumi"}, json
@@ -56,7 +64,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   end
   
   should "allow attribute filtering with except" do
-    json = @contact.to_json(:except => [:name, :age])
+    json = convert_to_json(@contact, :except => [:name, :age])
 
     assert_no_match %r{"_id"}, json
     assert_no_match %r{"name"}, json
@@ -68,12 +76,12 @@ class JsonSerializationTest < Test::Unit::TestCase
   
   context "_id key" do
     should "not be included by default" do
-      json = @contact.to_json
+      json = convert_to_json(@contact)
       assert_no_match %r{"_id":}, json
     end
     
     should "not be included even if :except is used" do
-      json = @contact.to_json(:except => :name)
+      json = convert_to_json(@contact, :except => :name)
       assert_no_match %r{"_id":}, json
     end
   end
@@ -85,12 +93,12 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "be included by default" do
-      json = @contact.to_json
+      json = convert_to_json(@contact)
       assert_match %r{"id"}, json
     end
     
     should "be included when single method included" do
-      json = @contact.to_json(:methods => :label)
+      json = convert_to_json(@contact, :methods => :label)
       assert_match %r{"id"}, json
       assert_match %r{"label":"Has cheezburger"}, json
       assert_match %r{"name":"Konata Izumi"}, json
@@ -98,7 +106,7 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "be included when multiple methods included" do
-      json = @contact.to_json(:methods => [:label, :favorite_quote])
+      json = convert_to_json(@contact, :methods => [:label, :favorite_quote])
       assert_match %r{"id"}, json
       assert_match %r{"label":"Has cheezburger"}, json
       assert_match %r{"favorite_quote":"Constraints are liberating"}, json
@@ -106,9 +114,14 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "not be included if :only is present" do
-      json = @contact.to_json(:only => :name)
+      json = convert_to_json(@contact, :only => :name)
       assert_no_match %r{"id":}, json
     end
+    
+    should "be represented by a string" do
+      json = convert_to_json(@contact)
+      assert_match %r{"id":"}, json
+    end      
   end  
   
   context "including methods" do
@@ -118,12 +131,12 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "include single method" do
-      json = @contact.to_json(:methods => :label)
+      json = convert_to_json(@contact, :methods => :label)
       assert_match %r{"label":"Has cheezburger"}, json
     end
     
     should "include multiple methods" do
-      json = @contact.to_json(:only => :name, :methods => [:label, :favorite_quote])
+      json = convert_to_json(@contact, :only => :name, :methods => [:label, :favorite_quote])
       assert_match %r{"label":"Has cheezburger"}, json
       assert_match %r{"favorite_quote":"Constraints are liberating"}, json
       assert_match %r{"name":"Konata Izumi"}, json
@@ -143,13 +156,13 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
 
     should "allow attribute filtering with only" do
-      json = @contacts.to_json(:only => :name)
+      json =convert_to_json(@contacts, :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])
+      json = convert_to_json(@contacts, :except => [:name, :preferences, :awesome, :created_at, :updated_at])
       assert_match %r{"age":39},          json
       assert_match %r{"age":14},          json
       assert_no_match %r{"name":},        json
@@ -165,7 +178,7 @@ class JsonSerializationTest < Test::Unit::TestCase
       1 => Contact.new(:name => 'David', :age => 39),
       2 => Contact.new(:name => 'Mary', :age => 14)
     }
-    json = contacts.to_json(:only => [1, :name])
+    json = convert_to_json(contacts, :only => [1, :name])
     assert_match %r{"1":},               json
     assert_match %r{\{"name":"David"\}}, json
     assert_no_match %r{"2":},            json
@@ -174,7 +187,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   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
+    json = convert_to_json(contact)
     assert_match %r{"tags":}, json
     assert_match %r{"name":"awesome"}, json
     assert_match %r{"name":"ruby"}, json
@@ -183,7 +196,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "include dynamic attributes" do
     contact = Contact.new(:name => 'John', :age => 27, :foo => 'bar')
     contact['smell'] = 'stinky'
-    json = contact.to_json
+    json = convert_to_json(contact)
     assert_match %r{"smell":"stinky"}, json
   end
 end

data/test/unit/test_serialization.rb

@@ -23,14 +23,14 @@ class SerializationTest < Test::Unit::TestCase
     context format do
       should "be reversable" do
         serialized = @instance.send("to_#{format}")
-        unserialized = @document.new.send("from_#{format}", serialized)
+        unserialized = @document.send("from_#{format}", serialized)
 
         assert_equal @instance, unserialized
       end
       
       should "allow attribute only filtering" do
         serialized = @instance.send("to_#{format}", :only => [ :age, :name ])
-        unserialized = @document.new.send("from_#{format}", serialized)
+        unserialized = @document.send("from_#{format}", serialized)
 
         assert_equal @instance.name, unserialized.name
         assert_equal @instance.age, unserialized.age
@@ -40,7 +40,7 @@ class SerializationTest < Test::Unit::TestCase
       
       should "allow attribute except filtering" do
         serialized = @instance.send("to_#{format}", :except => [ :age, :name ])
-        unserialized = @document.new.send("from_#{format}", serialized)
+        unserialized = @document.send("from_#{format}", serialized)
         
         assert_nil unserialized.name
         assert_nil unserialized.age

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.2.28
+  prerelease: false
+  segments: 
+  - 2010
+  - 3
+  - 3
+  version: 2010.3.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,79 +14,106 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -05:00
+date: 2010-03-03 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.18.3
-    version: 
+        segments: 
+        - 0
+        - 19
+        - 1
+        version: 0.19.1
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.8.1
-    version: 
+        segments: 
+        - 1
+        - 8
+        - 3
+        version: 1.8.3
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: timecop
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id007
 description: 
 email: nunemaker@gmail.com
 executables: 
@@ -125,11 +157,14 @@ files:
 - lib/mongo_mapper/plugins/inspect.rb
 - lib/mongo_mapper/plugins/keys.rb
 - lib/mongo_mapper/plugins/logger.rb
+- lib/mongo_mapper/plugins/modifiers.rb
 - lib/mongo_mapper/plugins/pagination.rb
 - lib/mongo_mapper/plugins/pagination/proxy.rb
 - lib/mongo_mapper/plugins/protected.rb
 - lib/mongo_mapper/plugins/rails.rb
 - lib/mongo_mapper/plugins/serialization.rb
+- lib/mongo_mapper/plugins/timestamps.rb
+- lib/mongo_mapper/plugins/userstamps.rb
 - lib/mongo_mapper/plugins/validations.rb
 - lib/mongo_mapper/query.rb
 - lib/mongo_mapper/support.rb
@@ -139,6 +174,7 @@ files:
 - performance/read_write.rb
 - specs.watchr
 - test/NOTE_ON_TESTING
+- test/active_model_lint_test.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_in_array_proxy.rb
@@ -155,11 +191,14 @@ files:
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
 - test/functional/test_identity_map.rb
+- test/functional/test_indexing.rb
 - test/functional/test_logger.rb
 - test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
 - test/functional/test_protected.rb
 - test/functional/test_string_id_compatibility.rb
+- test/functional/test_timestamps.rb
+- test/functional/test_userstamps.rb
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb
@@ -196,18 +235,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby Object Mapper for Mongo
@@ -233,10 +274,12 @@ test_files:
 - test/test_helper.rb
 - test/support/custom_matchers.rb
 - test/support/timing.rb
+- test/functional/test_timestamps.rb
 - test/functional/test_modifiers.rb
 - test/functional/test_embedded_document.rb
 - test/functional/test_protected.rb
 - test/functional/test_string_id_compatibility.rb
+- test/functional/test_indexing.rb
 - test/functional/test_associations.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_in_array_proxy.rb
@@ -251,8 +294,10 @@ test_files:
 - test/functional/test_binary.rb
 - test/functional/test_dirty.rb
 - test/functional/test_callbacks.rb
+- test/functional/test_userstamps.rb
 - test/functional/test_validations.rb
 - test/functional/test_logger.rb
 - test/functional/test_document.rb
 - test/functional/test_pagination.rb
 - test/models.rb
+- test/active_model_lint_test.rb