djsun-mongo_mapper 0.5.6.6 → 0.5.8.1

data/test/test_helper.rb

@@ -1,9 +1,9 @@
-require File.join(File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper'))
+require File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper')
 
 gem 'jnunemaker-matchy', '>= 0.4.0'
 gem 'shoulda', '>= 2.10.2'
-gem 'timecop', '>= 0.3.1'
-gem 'mocha', '>= 0.9.4'
+gem 'timecop', '>= 0.3.2'
+gem 'mocha', '>= 0.9.8'
 
 require 'matchy'
 require 'shoulda'
@@ -12,21 +12,16 @@ require 'mocha'
 require 'pp'
 
 require 'support/custom_matchers'
-require 'support/test_timing'
+require 'support/timing'
 
 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)
-
 test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')
 FileUtils.mkdir_p(test_dir) unless File.exist?(test_dir)
 
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => Logger.new(test_dir + '/test.log'))
-MongoMapper.database = DefaultDatabase
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, {
+  :logger => Logger.new(test_dir + '/test.log')
+})
+MongoMapper.database = 'test'

data/test/unit/serializers/test_json_serializer.rb

@@ -13,7 +13,6 @@ class JsonSerializationTest < Test::Unit::TestCase
     key :created_at, Time
     key :awesome, Boolean
     key :preferences, Hash
-    key :hiding, String
     
     many :tags, :class_name => 'JsonSerializationTest::Tag'
   end
@@ -43,7 +42,6 @@ class JsonSerializationTest < Test::Unit::TestCase
     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
@@ -55,7 +53,6 @@ class JsonSerializationTest < Test::Unit::TestCase
     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
@@ -67,7 +64,6 @@ class JsonSerializationTest < Test::Unit::TestCase
     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

data/test/unit/test_association_base.rb

@@ -26,22 +26,21 @@ class AssociationBaseTest < Test::Unit::TestCase
       Base.new(:many, :smart_people).class_name.should == 'SmartPerson'
     end
     
-    should "be changeable using class_name option with a string" do
+    should "be changeable using class_name option" do
       base = Base.new(:many, :smart_people, :class_name => 'IntelligentPerson')
       base.class_name.should == 'IntelligentPerson'
     end
-
-    should "be changeable using class_name option with a constant" do
-      class IntelligentPerson; end
-      base = Base.new(:many, :smart_people, :class_name => IntelligentPerson)
-      base.class_name.should == IntelligentPerson
-    end
   end
   
   context "klass" do
-    should "be class_name constantized" do
+    should "default to class_name constantized" do
       Base.new(:belongs_to, :foo_monster).klass.should == FooMonster
     end
+    
+    should "be the specified class" do
+      anonnymous_class = Class.new
+      Base.new(:belongs_to, :foo_monster, :class => anonnymous_class).klass.should == anonnymous_class
+    end
   end
   
   context "many?" do
@@ -54,6 +53,23 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
+  context "finder_options" do
+    should "default to empty hash" do
+      base = Base.new(:many, :foos)
+      base.finder_options.should == {}
+    end
+    
+    should "work with order" do
+      base = Base.new(:many, :foos, :order => 'position')
+      base.finder_options.should == {:order => 'position'}
+    end
+    
+    should "correctly parse from options" do
+      base = Base.new(:many, :foos, :order => 'position', :somekey => 'somevalue')
+      base.finder_options.should == {:order => 'position', :somekey => 'somevalue'}
+    end
+  end
+  
   context "belongs_to?" do
     should "be true if belongs_to" do
       Base.new(:belongs_to, :foo).belongs_to?.should be_true

data/test/unit/test_document.rb

@@ -8,7 +8,7 @@ class DocumentTest < Test::Unit::TestCase
         include MongoMapper::Document
         set_collection_name 'test'
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "have logger method" do
@@ -36,8 +36,9 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "allow setting a different database without affecting the default" do
-      @document.database AlternateDatabase
-      @document.database.name.should == AlternateDatabase
+      @document.set_database_name 'test2'
+      @document.database_name.should == 'test2'
+      @document.database.name.should == 'test2'
 
       another_document = Class.new do
         include MongoMapper::Document
@@ -47,13 +48,24 @@ class DocumentTest < Test::Unit::TestCase
     end
     
     should "default collection name to class name tableized" do
-      class Item
+      class ::Item
         include MongoMapper::Document
       end
       
       Item.collection.should be_instance_of(Mongo::Collection)
       Item.collection.name.should == 'items'
     end
+    
+    should "default collection name of namespaced class to tableized with dot separation" do
+      module ::BloggyPoo
+        class Post
+          include MongoMapper::Document
+        end
+      end
+
+      BloggyPoo::Post.collection.should be_instance_of(Mongo::Collection)
+      BloggyPoo::Post.collection.name.should == 'bloggy_poo.posts'
+    end
 
     should "allow setting the collection name" do
       @document.set_collection_name('foobar')
@@ -91,7 +103,7 @@ class DocumentTest < Test::Unit::TestCase
         key :name, String
         key :age, Integer
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "have access to logger" do
@@ -102,7 +114,7 @@ class DocumentTest < Test::Unit::TestCase
 
     should "have access to the class's collection" do
       doc = @document.new
-      doc.collection.should == @document.collection
+      doc.collection.name.should == @document.collection.name
     end
 
     should "use default values if defined for keys" do
@@ -124,13 +136,18 @@ class DocumentTest < Test::Unit::TestCase
         @document.new._root_document.should be_nil
       end
 
-      should "set self to the root document on embedded documents" do
-        document = Class.new(RealPerson) do
-          many :pets
+      should "set self to the root document on embedded documents" do        
+        klass = Class.new do
+          include MongoMapper::Document
         end
-
-        doc = document.new 'pets' => [{}]
-        doc.pets.first._root_document.should == doc
+        
+        pets = Class.new do
+          include MongoMapper::EmbeddedDocument
+        end
+        klass.many :pets, :class => pets
+        
+        doc = klass.new(:pets => [{}])
+        doc.pets.first._root_document.should == doc        
       end
     end
 
@@ -160,72 +177,24 @@ class DocumentTest < Test::Unit::TestCase
         clone.age.should == 27
       end
     end
+
     
-    context "==" do
-      should "be == if key values are the same" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 1")
-        doc_1.should == doc_2
+    context "equality" do
+      should "be equal if id and class are the same" do
+        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
       end
 
-      should "not be == if key values are different" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 2")
-        doc_1.should_not == doc_2
+      should "not be equal if class same but id different" do
+        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
       end
-      
-      should "not be == when comparing other object types" do
-        doc = @document.new('name' => "Doc")
-        doc.should_not == nil
-        doc.should_not == false
-        doc.should_not == { 'name' => "Doc" }
-      end
-
-      should "not care about document type" do
-        @person = Class.new do
-          include MongoMapper::EmbeddedDocument
 
-          key :name, String
-          key :age, Integer
+      should "not be equal if id same but class different" do
+        @another_document = Class.new do
+          include MongoMapper::Document
+          set_collection_name 'test'
         end
-        doc = @document.new('name' => "Doc 1")
-        person = @person.new('name' => "Doc 1")
-        doc.should == person
-        person.should == doc # test commutativity
-      end
-    end
-
-    context "eql?" do
-      should "be eql? if type matches and key values are the same" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 1")
-        doc_1.should eql?(doc_2)
-      end
-
-      should "not be eql? if type matches but key values are different" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 2")
-        doc_1.should_not eql?(doc_2)
-      end
-
-      should "not be eql? when comparing other object types" do
-        doc = @document.new('name' => "Doc")
-        doc.should_not eql?(nil)
-        doc.should_not eql?(false)
-        doc.should_not eql?({ 'name' => "Doc" })
-      end
 
-      should "not be eql? if document types are different even if values are the same" do
-        @person = Class.new do
-          include MongoMapper::EmbeddedDocument
-
-          key :name, String
-          key :age, Integer
-        end
-        doc = @document.new('name' => "Doc 1")
-        person = @person.new('name' => "Doc 1")
-        doc.should_not eql?(person)
-        person.should_not eql?(doc) # test commutativity
+        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
       end
     end
   end # instance of a document

data/test/unit/test_embedded_document.rb

@@ -430,12 +430,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     context "to_mongo" do
       should "default to hash with _id key" do
         doc = @document.new
-        doc.to_mongo.keys.sort.should == %w(_id age name)
+        doc.to_mongo.keys.should == ['_id']
       end
       
-      should "return all keys" do
+      should "return all keys with non nil values" do
         doc = @document.new(:name => 'string', :age => nil)
-        doc.to_mongo.keys.sort.should == %w(_id age name)
+        doc.to_mongo.keys.sort.should == ['_id', 'name']
+        doc.to_mongo.values.should include('string')
+        doc.to_mongo.values.should_not include(nil)
       end
     end
     
@@ -463,11 +465,20 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         clone.age.should == 27
       end
     end
-
+    
     context "key shorcut access" do
-      should "be able to read key with []" do
-        doc = @document.new(:name => 'string')
-        doc[:name].should == 'string'
+      context "[]" do
+        should "work when key found" do
+          doc = @document.new(:name => 'string')
+          doc[:name].should == 'string'
+        end
+        
+        should "raise exception when key not found" do
+          doc = @document.new(:name => 'string')
+          lambda {
+            doc[:not_here]
+          }.should raise_error(MongoMapper::KeyNotFound)
+        end
       end
       
       context "[]=" do
@@ -644,73 +655,22 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
-    context "==" do
-      should "be == if key values are the same" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 1")
-        doc_1.should == doc_2
-      end
-
-      should "not be == if key values are different" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 2")
-        doc_1.should_not == doc_2
+    context "equality" do
+      should "be equal if id and class are the same" do
+        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
       end
 
-      should "not be == when comparing other object types" do
-        doc = @document.new('name' => "Doc")
-        doc.should_not == nil
-        doc.should_not == false
-        doc.should_not == { 'name' => "Doc" }
+      should "not be equal if class same but id different" do
+        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
       end
 
-      should "not care about document type" do
-        @person = Class.new do
-          include MongoMapper::EmbeddedDocument
-
-          key :name, String
-          key :age, Integer
+      should "not be equal if id same but class different" do
+        @another_document = Class.new do
+          include MongoMapper::Document
         end
-        doc = @document.new('name' => "Doc 1")
-        person = @person.new('name' => "Doc 1")
-        doc.should == person
-        person.should == doc # test commutativity
-      end
-    end
-
-    context "eql?" do
-      should "be eql? if type matches and key values are the same" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 1")
-        doc_1.should eql?(doc_2)
-      end
-
-      should "not be eql? if type matches but key values are different" do
-        doc_1 = @document.new('name' => "Doc 1")
-        doc_2 = @document.new('name' => "Doc 2")
-        doc_1.should_not eql?(doc_2)
-      end
 
-      should "not be eql? when comparing other object types" do
-        doc = @document.new('name' => "Doc")
-        doc.should_not eql?(nil)
-        doc.should_not eql?(false)
-        doc.should_not eql?({ 'name' => "Doc" })
-      end
-
-      should "not be eql? if types are different even if values are the same" do
-        @person = Class.new do
-          include MongoMapper::EmbeddedDocument
-
-          key :name, String
-          key :age, Integer
-        end
-        doc = @document.new('name' => "Doc 1")
-        person = @person.new('name' => "Doc 1")
-        doc.should_not eql?(person)
-        person.should_not eql?(doc) # check commutativity
+        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
       end
     end
-
   end # instance of a embedded document
 end

data/test/unit/test_finder_options.rb

@@ -22,6 +22,22 @@ class FinderOptionsTest < Test::Unit::TestCase
       }
     end
     
+    should "not add _type to nested conditions" do
+      FinderOptions.new(Enter, :foo => 'bar', :age => {'$gt' => 21}).criteria.should == {
+        :foo => 'bar',
+        :age => {'$gt' => 21},
+        :_type => 'Enter'
+      }
+    end
+    
+    %w{gt lt gte lte ne in nin mod size where exists}.each do |operator|
+      should "convert #{operator} conditions" do
+        FinderOptions.new(Room, :age.send(operator) => 21).criteria.should == {
+          :age => {"$#{operator}" => 21}
+        }
+      end
+    end
+    
     should "automatically add _type to query if model is single collection inherited" do
       FinderOptions.new(Enter, :foo => 'bar').criteria.should == {
         :foo => 'bar',

data/test/unit/test_key.rb

@@ -148,7 +148,7 @@ class KeyTest < Test::Unit::TestCase
     end
   end
   
-  context "string key with 'baz' default" do
+  context "getting a value with a default set" do
     setup do
       @key = Key.new(:foo, String, :default => 'baz')
     end
@@ -157,27 +157,15 @@ class KeyTest < Test::Unit::TestCase
       @key.get(nil).should == 'baz'
     end
 
-    should "return value if not nil" do
+    should "return value if not blank" do
       @key.get('foobar').should == 'foobar'
     end
-  end
-  
-  context "string key with '' default" do
-    setup do
-      @key = Key.new(:foo, String, :default => '')
-    end
-
-    should "return default value if value nil" do
-      @key.get(nil).should == ''
-    end
-  end
-  
-  context "boolean key" do
-    should "with false default" do
+    
+    should "work with Boolean type and false value" do
       Key.new(:active, Boolean, :default => false).get(nil).should be_false
     end
 
-    should "with true default" do
+    should "work with Boolean type and true value" do
       Key.new(:active, Boolean, :default => true).get(nil).should be_true
     end
   end

data/test/unit/test_mongomapper.rb

@@ -15,9 +15,9 @@ class MongoMapperTest < Test::Unit::TestCase
   end
   
   should "be able to write and read default database" do
-    MongoMapper.database = DefaultDatabase
+    MongoMapper.database = 'test'
     MongoMapper.database.should be_instance_of(Mongo::DB)
-    MongoMapper.database.name.should == DefaultDatabase
+    MongoMapper.database.name.should == 'test'
   end
   
   should "have document not found error" do

data/test/unit/test_pagination.rb

@@ -58,6 +58,10 @@ class PaginationTest < Test::Unit::TestCase
     should "know how many records to skip" do
       PaginationProxy.new(25, 2, 10).skip.should == 10
     end
+    
+    should "alias offset to skip" do
+      PaginationProxy.new(25, 2, 10).offset.should == 10
+    end
         
     context "previous_page" do
       should "be nil if current page 1" do

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: djsun-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.6.6
+  version: 0.5.8.1
 platform: ruby
 authors: 
 - John Nunemaker
+- David James
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -30,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.15.1
+        version: "0.16"
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -40,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
@@ -70,7 +71,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.3.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -80,9 +81,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.8
     version: 
-description: Awesome gem for modeling your domain and storing it in mongo
+description: 
 email: nunemaker@gmail.com
 executables: 
 - mmconsole
@@ -126,7 +127,6 @@ files:
 - lib/mongo_mapper/serializers/json_serializer.rb
 - lib/mongo_mapper/support.rb
 - lib/mongo_mapper/validations.rb
-- mongo_mapper.gemspec
 - specs.watchr
 - test/NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
@@ -136,7 +136,6 @@ files:
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
 - test/functional/associations/test_many_proxy.rb
-- test/functional/associations/test_namespace.rb
 - test/functional/test_associations.rb
 - test/functional/test_binary.rb
 - test/functional/test_callbacks.rb
@@ -149,7 +148,7 @@ files:
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb
-- test/support/test_timing.rb
+- test/support/timing.rb
 - test/test_helper.rb
 - test/unit/serializers/test_json_serializer.rb
 - test/unit/test_association_base.rb
@@ -193,7 +192,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Awesome gem for modeling your domain and storing it in mongo
+summary: Model your domain, store it in MongoDB
 test_files: 
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
@@ -202,7 +201,6 @@ test_files:
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
 - test/functional/associations/test_many_proxy.rb
-- test/functional/associations/test_namespace.rb
 - test/functional/test_associations.rb
 - test/functional/test_binary.rb
 - test/functional/test_callbacks.rb
@@ -215,7 +213,7 @@ test_files:
 - test/functional/test_validations.rb
 - test/models.rb
 - test/support/custom_matchers.rb
-- test/support/test_timing.rb
+- test/support/timing.rb
 - test/test_helper.rb
 - test/unit/serializers/test_json_serializer.rb
 - test/unit/test_association_base.rb