djsun-mongomapper 0.3.1 → 0.3.1.1

data/lib/mongomapper/serializers/json_serializer.rb

@@ -50,7 +50,17 @@ module MongoMapper #:nodoc:
     #         "created_at": "2006/08/01", "awesome": true,
     #         "permalink": "1-konata-izumi"}
     def to_json(options = {})
-      options.merge!(:methods => :id) unless options[:only]
+      unless options[:only]
+        o = options[:methods]
+        if o && o.is_a?(Array)
+          o << :id
+        elsif o
+          o = [o, :id]
+        else
+          o = :id
+        end
+        options[:methods] = o
+      end
       options.reverse_merge!(:except => :_id)
       if include_root_in_json
         "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"

data/mongomapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.1"
+  s.version = "0.3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-08-04}
+  s.date = %q{2009-08-06}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mongomapper}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",

data/test/unit/serializers/test_json_serializer.rb

@@ -29,6 +29,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "encode all encodable attributes" do
     json = @contact.to_json
 
+    assert_no_match %r{"_id"}, json
     assert_match %r{"name":"Konata Izumi"}, json
     assert_match %r{"age":16}, json
     assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
@@ -39,6 +40,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "allow attribute filtering with only" do
     json = @contact.to_json(:only => [:name, :age])
 
+    assert_no_match %r{"_id"}, json
     assert_match %r{"name":"Konata Izumi"}, json
     assert_match %r{"age":16}, json
     assert_no_match %r{"awesome"}, json
@@ -49,6 +51,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "allow attribute filtering with except" do
     json = @contact.to_json(:except => [:name, :age])
 
+    assert_match %r{"_id"}, json
     assert_no_match %r{"name"}, json
     assert_no_match %r{"age"}, json
     assert_match %r{"awesome"}, json
@@ -62,14 +65,31 @@ class JsonSerializationTest < Test::Unit::TestCase
       def @contact.favorite_quote; "Constraints are liberating"; end
     end
     
-    should "include single method" do
-      assert_match %r{"label":"Has cheezburger"}, @contact.to_json(:only => :name, :methods => :label)
+    should "include label method" do
+      json = @contact.to_json(:methods => :label)
+      assert_match %r{"label":"Has cheezburger"}, json
+    end
+    
+    should "include name and label method" do
+      json = @contact.to_json(:only => :name, :methods => :label)
+
+      assert_match %r{"label":"Has cheezburger"}, json
+      assert_match %r{"name":"Konata Izumi"}, json
+      assert_no_match %r{"age":16}, json
+      assert_no_match %r{"awesome"}, json
+      assert_no_match %r{"created_at"}, json
+      assert_no_match %r{"preferences"}, json
     end
     
     should "include multiple methods" do
       json = @contact.to_json(: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
+      assert_no_match %r{"age":16}, json
+      assert_no_match %r{"awesome"}, json
+      assert_no_match %r{"created_at"}, json
+      assert_no_match %r{"preferences"}, json
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djsun-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.1.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency