djsun-mongomapper 0.3.5.5 → 0.4.1.2

data/test/models.rb

@@ -1,169 +1,169 @@
-class Post
-  include MongoMapper::Document
-
-  key :title, String
-  key :body, String
-
-  has_many :comments, :as => :commentable, :class_name => 'PostComment'
-
-  timestamps!
-end
-
-class PostComment
-  include MongoMapper::Document
-
-  key :username, String, :default => 'Anonymous'
-  key :body, String
-
-  key :commentable_id, String
-  key :commentable_type, String
-  belongs_to :commentable, :polymorphic => true
-
-  timestamps!
-end
-
-class Address
-  include MongoMapper::EmbeddedDocument
-
-  key :address, String
-  key :city,    String
-  key :state,   String
-  key :zip,     Integer
-end
-
-class Message
-  include MongoMapper::Document
-
-  key :body, String
-  key :position, Integer
-  key :_type, String
-  key :room_id, String
-
-  belongs_to :room
-end
-
-class Answer
-  include MongoMapper::Document
-
-  key :body, String
-end
-
-class Enter < Message; end
-class Exit < Message;  end
-class Chat < Message;  end
-
-class Room
-  include MongoMapper::Document
-
-  key :name, String
-  many :messages, :polymorphic => true
-end
-
-class Project
-  include MongoMapper::Document
-
-  key :name, String
-  many :statuses
-  many :addresses
-end
-
-class Status
-  include MongoMapper::Document
-
-  key :project_id, String
-  key :target_id, String
-  key :target_type, String
-  key :name, String
-  key :position, Integer
-
-  belongs_to :project
-  belongs_to :target, :polymorphic => true
-end
-
-class RealPerson
-  include MongoMapper::Document
-  
-  many :pets
-  key :name, String
-
-  def realname=(n)
-    self.name = n
-  end
-end
-
-class Person
-  include MongoMapper::EmbeddedDocument
-
-  key :name, String
-  key :child, Person
-
-  many :pets
-end
-
-class Pet
-  include MongoMapper::EmbeddedDocument
-
-  key :name, String
-  key :species, String
-end
-
-class Media
-  include MongoMapper::EmbeddedDocument
-
-  key :_type, String
-  key :file, String
-end
-
-class Video < Media
-  key :length, Integer
-end
-
-class Image < Media
-  key :width, Integer
-  key :height, Integer
-end
-
-class Music < Media
-  key :bitrate, String
-end
-
-class Catalog
-  include MongoMapper::Document
-
-  many :medias, :polymorphic => true
-end
-
-module TrModels
-  class Transport
-    include MongoMapper::EmbeddedDocument
-
-    key :_type, String
-    key :license_plate, String
-  end
-
-  class Car < TrModels::Transport
-    include MongoMapper::EmbeddedDocument
-
-    key :model, String
-    key :year, Integer
-  end
-
-  class Bus < TrModels::Transport
-    include MongoMapper::EmbeddedDocument
-
-    key :max_passengers, Integer
-  end
-
-  class Ambulance < TrModels::Transport
-    include MongoMapper::EmbeddedDocument
-
-    key :icu, Boolean
-  end
-
-  class Fleet
-    include MongoMapper::Document
-
-    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
-    key :name, String
-  end
-end
+class Post
+  include MongoMapper::Document
+
+  key :title, String
+  key :body, String
+
+  has_many :comments, :as => :commentable, :class_name => 'PostComment'
+
+  timestamps!
+end
+
+class PostComment
+  include MongoMapper::Document
+
+  key :username, String, :default => 'Anonymous'
+  key :body, String
+
+  key :commentable_id, String
+  key :commentable_type, String
+  belongs_to :commentable, :polymorphic => true
+
+  timestamps!
+end
+
+class Address
+  include MongoMapper::EmbeddedDocument
+
+  key :address, String
+  key :city,    String
+  key :state,   String
+  key :zip,     Integer
+end
+
+class Message
+  include MongoMapper::Document
+
+  key :body, String
+  key :position, Integer
+  key :_type, String
+  key :room_id, String
+
+  belongs_to :room
+end
+
+class Answer
+  include MongoMapper::Document
+
+  key :body, String
+end
+
+class Enter < Message; end
+class Exit < Message;  end
+class Chat < Message;  end
+
+class Room
+  include MongoMapper::Document
+
+  key :name, String
+  many :messages, :polymorphic => true
+end
+
+class Project
+  include MongoMapper::Document
+
+  key :name, String
+  many :statuses
+  many :addresses
+end
+
+class Status
+  include MongoMapper::Document
+
+  key :project_id, String
+  key :target_id, String
+  key :target_type, String
+  key :name, String
+  key :position, Integer
+
+  belongs_to :project
+  belongs_to :target, :polymorphic => true
+end
+
+class RealPerson
+  include MongoMapper::Document
+
+  many :pets
+  key :name, String
+
+  def realname=(n)
+    self.name = n
+  end
+end
+
+class Person
+  include MongoMapper::EmbeddedDocument
+
+  key :name, String
+  key :child, Person
+
+  many :pets
+end
+
+class Pet
+  include MongoMapper::EmbeddedDocument
+
+  key :name, String
+  key :species, String
+end
+
+class Media
+  include MongoMapper::EmbeddedDocument
+
+  key :_type, String
+  key :file, String
+end
+
+class Video < Media
+  key :length, Integer
+end
+
+class Image < Media
+  key :width, Integer
+  key :height, Integer
+end
+
+class Music < Media
+  key :bitrate, String
+end
+
+class Catalog
+  include MongoMapper::Document
+
+  many :medias, :polymorphic => true
+end
+
+module TrModels
+  class Transport
+    include MongoMapper::EmbeddedDocument
+
+    key :_type, String
+    key :license_plate, String
+  end
+
+  class Car < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+
+    key :model, String
+    key :year, Integer
+  end
+
+  class Bus < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+
+    key :max_passengers, Integer
+  end
+
+  class Ambulance < TrModels::Transport
+    include MongoMapper::EmbeddedDocument
+
+    key :icu, Boolean
+  end
+
+  class Fleet
+    include MongoMapper::Document
+
+    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
+    key :name, String
+  end
+end

data/test/test_helper.rb

@@ -1,67 +1,29 @@
-require 'pathname'
-require 'pp'
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-gem 'mocha', '0.9.4'
-gem 'jnunemaker-matchy', '0.4.0'
-
-require 'matchy'
-require 'mocha'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-dir = (Pathname(__FILE__).dirname +  '..' + 'lib').expand_path
-require dir + 'mongomapper'
-
-class Test::Unit::TestCase  
-  def clear_all_collections
-    MongoMapper::Document.descendants.map(&:delete_all)
-  end
-  
-  custom_matcher :be_nil do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be nil but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be nil but it was"
-    receiver.nil?
-  end
-  
-  custom_matcher :be_true do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"
-    receiver.eql?(true)
-  end
-  
-  custom_matcher :be_false do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be false but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be false but it was"
-    receiver.eql?(false)
-  end
-
-  custom_matcher :be_valid do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected to be valid but it was invalid #{receiver.errors.inspect}"
-    matcher.negative_failure_message = "Expected to be invalid but it was valid #{receiver.errors.inspect}"
-    receiver.valid?
-  end
-
-  custom_matcher :have_error_on do |receiver, matcher, args|
-    receiver.valid?
-    attribute = args[0]
-    expected_message = args[1]
-    
-    if expected_message.nil?
-      matcher.positive_failure_message = "#{receiver} had no errors on #{attribute}"
-      matcher.negative_failure_message = "#{receiver} had errors on #{attribute} #{receiver.errors.inspect}"
-      !receiver.errors.on(attribute).blank?
-    else
-      actual = receiver.errors.on(attribute)
-      matcher.positive_failure_message = %Q(Expected error on #{attribute} to be "#{expected_message}" but was "#{actual}")
-      matcher.negative_failure_message = %Q(Expected error on #{attribute} not to be "#{expected_message}" but was "#{actual}")
-      actual == expected_message
-    end
-  end
-end
-
-DefaultDatabase = 'test' unless defined?(DefaultDatabase)
-AlternateDatabase = 'test2' unless defined?(AlternateDatabase)
-
+require 'pathname'
+require 'pp'
+require 'rubygems'
+require 'shoulda'
+
+gem 'mocha', '0.9.4'
+gem 'jnunemaker-matchy', '0.4.0'
+
+require 'matchy'
+require 'mocha'
+require 'custom_matchers'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+dir = (Pathname(__FILE__).dirname +  '..' + 'lib').expand_path
+require dir + 'mongomapper'
+
+class Test::Unit::TestCase
+  include CustomMatchers
+  
+  def clear_all_collections
+    MongoMapper::Document.descendants.map { |d| d.collection.clear }
+  end
+end
+
+DefaultDatabase = 'test' unless defined?(DefaultDatabase)
+AlternateDatabase = 'test2' unless defined?(AlternateDatabase)
+
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
 MongoMapper.database = DefaultDatabase

data/test/unit/serializers/test_json_serializer.rb

@@ -1,193 +1,193 @@
-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
-    key :age, Integer
-    key :created_at, Time
-    key :awesome, Boolean
-    key :preferences, Hash
-    key :hiding, String
-    
-    many :tags, :class_name => 'JsonSerializationTest::Tag'
-  end
-  
-  def setup
-    Contact.include_root_in_json = false
-    @contact = Contact.new(
-      :name        => 'Konata Izumi',
-      :age         => 16,
-      :created_at  => Time.utc(2006, 8, 1),
-      :awesome     => true,
-      :preferences => { :shows => 'anime' }
-    )
-  end
-  
-  should "include demodulized root" do
-    Contact.include_root_in_json = true
-    assert_match %r{^\{"contact": \{}, @contact.to_json
-  end
-  
-  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))}))
-    assert_match %r{"awesome":true}, json
-    assert_match %r{"preferences":\{"shows":"anime"\}}, json
-    assert_match %r{"hiding":null}, json
-  end
-  
-  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
-    assert_no_match %r{"created_at"}, json
-    assert_no_match %r{"preferences"}, json
-    assert_no_match %r{"hiding"}, json
-  end
-  
-  should "allow attribute filtering with except" do
-    json = @contact.to_json(:except => [:name, :age])
-
-    assert_no_match %r{"_id"}, json
-    assert_no_match %r{"name"}, json
-    assert_no_match %r{"age"}, json
-    assert_match %r{"awesome"}, json
-    assert_match %r{"created_at"}, json
-    assert_match %r{"preferences"}, json
-    assert_match %r{"hiding"}, json
-  end
-  
-  context "_id key" do
-    should "not be included by default" do
-      json = @contact.to_json
-      assert_no_match %r{"_id":}, json
-    end
-    
-    should "not be included even if :except is used" do
-      json = @contact.to_json(:except => :name)
-      assert_no_match %r{"_id":}, json
-    end
-  end
-  
-  context "id method" do
-    setup do
-      def @contact.label; "Has cheezburger"; end
-      def @contact.favorite_quote; "Constraints are liberating"; end
-    end
-    
-    should "be included by default" do
-      json = @contact.to_json
-      assert_match %r{"id"}, json
-    end
-    
-    should "be included when single method included" do
-      json = @contact.to_json(:methods => :label)
-      assert_match %r{"id"}, json
-      assert_match %r{"label":"Has cheezburger"}, json
-      assert_match %r{"name":"Konata Izumi"}, json
-      assert_no_match %r{"favorite_quote":"Constraints are liberating"}, json
-    end
-    
-    should "be included when multiple methods included" do
-      json = @contact.to_json(: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
-      assert_match %r{"name":"Konata Izumi"}, json
-    end
-    
-    should "not be included if :only is present" do
-      json = @contact.to_json(:only => :name)
-      assert_no_match %r{"id":}, json
-    end
-  end  
-  
-  context "including methods" do
-    setup do
-      def @contact.label; "Has cheezburger"; end
-      def @contact.favorite_quote; "Constraints are liberating"; end
-    end
-    
-    should "include single method" do
-      json = @contact.to_json(: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])
-      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
-  
-  context "array of records" do
-    setup do
-      @contacts = [
-        Contact.new(:name => 'David', :age => 39),
-        Contact.new(:name => 'Mary', :age => 14)
-      ]
-    end
-  
-    should "allow attribute filtering with only" do
-      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_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
-  
-  should "allow options for hash of records" do
-    contacts = {
-      1 => Contact.new(:name => 'David', :age => 39),
-      2 => Contact.new(:name => 'Mary', :age => 14)
-    }
-    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
+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
+    key :age, Integer
+    key :created_at, Time
+    key :awesome, Boolean
+    key :preferences, Hash
+    key :hiding, String
+    
+    many :tags, :class_name => 'JsonSerializationTest::Tag'
+  end
+  
+  def setup
+    Contact.include_root_in_json = false
+    @contact = Contact.new(
+      :name        => 'Konata Izumi',
+      :age         => 16,
+      :created_at  => Time.utc(2006, 8, 1),
+      :awesome     => true,
+      :preferences => { :shows => 'anime' }
+    )
+  end
+  
+  should "include demodulized root" do
+    Contact.include_root_in_json = true
+    assert_match %r{^\{"contact": \{}, @contact.to_json
+  end
+  
+  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))}))
+    assert_match %r{"awesome":true}, json
+    assert_match %r{"preferences":\{"shows":"anime"\}}, json
+    assert_match %r{"hiding":null}, json
+  end
+  
+  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
+    assert_no_match %r{"created_at"}, json
+    assert_no_match %r{"preferences"}, json
+    assert_no_match %r{"hiding"}, json
+  end
+  
+  should "allow attribute filtering with except" do
+    json = @contact.to_json(:except => [:name, :age])
+
+    assert_no_match %r{"_id"}, json
+    assert_no_match %r{"name"}, json
+    assert_no_match %r{"age"}, json
+    assert_match %r{"awesome"}, json
+    assert_match %r{"created_at"}, json
+    assert_match %r{"preferences"}, json
+    assert_match %r{"hiding"}, json
+  end
+  
+  context "_id key" do
+    should "not be included by default" do
+      json = @contact.to_json
+      assert_no_match %r{"_id":}, json
+    end
+    
+    should "not be included even if :except is used" do
+      json = @contact.to_json(:except => :name)
+      assert_no_match %r{"_id":}, json
+    end
+  end
+  
+  context "id method" do
+    setup do
+      def @contact.label; "Has cheezburger"; end
+      def @contact.favorite_quote; "Constraints are liberating"; end
+    end
+    
+    should "be included by default" do
+      json = @contact.to_json
+      assert_match %r{"id"}, json
+    end
+    
+    should "be included when single method included" do
+      json = @contact.to_json(:methods => :label)
+      assert_match %r{"id"}, json
+      assert_match %r{"label":"Has cheezburger"}, json
+      assert_match %r{"name":"Konata Izumi"}, json
+      assert_no_match %r{"favorite_quote":"Constraints are liberating"}, json
+    end
+    
+    should "be included when multiple methods included" do
+      json = @contact.to_json(: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
+      assert_match %r{"name":"Konata Izumi"}, json
+    end
+    
+    should "not be included if :only is present" do
+      json = @contact.to_json(:only => :name)
+      assert_no_match %r{"id":}, json
+    end
+  end  
+  
+  context "including methods" do
+    setup do
+      def @contact.label; "Has cheezburger"; end
+      def @contact.favorite_quote; "Constraints are liberating"; end
+    end
+    
+    should "include single method" do
+      json = @contact.to_json(: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])
+      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
+  
+  context "array of records" do
+    setup do
+      @contacts = [
+        Contact.new(:name => 'David', :age => 39),
+        Contact.new(:name => 'Mary', :age => 14)
+      ]
+    end
+
+    should "allow attribute filtering with only" do
+      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_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
+  
+  should "allow options for hash of records" do
+    contacts = {
+      1 => Contact.new(:name => 'David', :age => 39),
+      2 => Contact.new(:name => 'Mary', :age => 14)
+    }
+    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