mongo_mapper 0.6.10 → 0.7.0

data/test/unit/test_rails.rb

@@ -0,0 +1,123 @@
+require 'test_helper'
+
+class TestRails < Test::Unit::TestCase
+  context "Document" do
+    setup do
+      @klass = Doc('Post') do
+        key :foo, String
+      end
+    end
+    
+    context "Class methods" do
+      should "alias has_many to many" do
+        @klass.should respond_to(:has_many)
+      end
+
+      should "alias has_one to one" do
+        @klass.should respond_to(:has_one)
+      end
+      
+      should "have column names" do
+        @klass.column_names.sort.should == ['_id', 'foo']
+      end
+
+      should "implement human_name" do
+        @klass.human_name.should == 'Post'
+      end
+    end
+    
+    context "Instance methods" do
+      setup do
+        @klass.class_eval do
+          def bar=(value)
+            write_attribute(:foo, value)
+          end
+          
+          def bar_before_typecast
+            read_attribute_before_typecast(:foo)
+          end
+          
+          def bar
+            read_attribute(:foo)
+          end
+        end
+      end
+      
+      should "alias new_record? to new?" do
+        @klass.new.should be_new_record
+      end
+      
+      should "be able to read key with read_attribute" do
+        @klass.new(:foo => 'Bar').bar.should == 'Bar'
+      end
+      
+      should "be able to read key before typecast with read_attribute_before_typecast" do
+        @klass.new(:foo => 21).bar_before_typecast.should == 21
+        @klass.new(:foo => 21).bar.should == '21'
+      end
+      
+      should "be able to write key with write_attribute" do
+        @klass.new(:bar => 'Setting Foo').foo.should == 'Setting Foo'
+      end
+    end
+  end
+  
+  context "EmbeddedDocument" do
+    setup do
+      @klass = EDoc('Post') { key :foo, String }
+    end
+    
+    context "Class methods" do
+      should "alias has_many to many" do
+        @klass.should respond_to(:has_many)
+      end
+
+      should "alias has_one to one" do
+        @klass.should respond_to(:has_one)
+      end
+      
+      should "have column names" do
+        @klass.column_names.sort.should == ['_id', 'foo']
+      end
+
+      should "implement human_name" do
+        @klass.human_name.should == 'Post'
+      end
+    end
+    
+    context "Instance methods" do
+      setup do
+        @klass.class_eval do
+          def bar=(value)
+            write_attribute(:foo, value)
+          end
+          
+          def bar_before_typecast
+            read_attribute_before_typecast(:foo)
+          end
+          
+          def bar
+            read_attribute(:foo)
+          end
+        end
+      end
+      
+      should "alias new_record? to new?" do
+        @klass.new.should be_new_record
+      end
+      
+      should "be able to read key with read_attribute" do
+        @klass.new(:foo => 'Bar').bar.should == 'Bar'
+      end
+      
+      should "be able to read key before typecast with read_attribute_before_typecast" do
+        @klass.new(:foo => 21).bar_before_typecast.should == 21
+        @klass.new(:foo => 21).bar.should == '21'
+      end
+      
+      should "be able to write key with write_attribute" do
+        @klass.new(:bar => 'Setting Foo').foo.should == 'Setting Foo'
+      end
+    end
+  end
+end

data/test/unit/{test_serializations.rb → test_serialization.rb}

@@ -2,8 +2,7 @@ require 'test_helper'
 
 class SerializationTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::EmbeddedDocument
+    @document = EDoc do
       key :name, String
       key :age, Integer
       key :awesome, Boolean

data/test/unit/test_support.rb

@@ -90,6 +90,10 @@ class SupportTest < Test::Unit::TestCase
       Date.to_mongo(Date.new(2009, 10, 1)).should == Time.utc(2009, 10, 1)
     end
     
+    should "be date if time" do
+      Date.to_mongo(Time.parse("2009-10-1T12:30:00")).should == Time.utc(2009, 10, 1)
+    end
+    
     should "be nil if bogus string" do
       Date.to_mongo('jdsafop874').should be_nil
     end
@@ -263,9 +267,17 @@ class SupportTest < Test::Unit::TestCase
     end
   end
   
+  context "Symbol" do
+    %w(gt lt gte lte ne in nin mod all size where exists asc desc).each do |operator|
+      should "have $#{operator} operator" do
+        :foo.respond_to?(operator)
+      end
+    end
+  end
+  
   context "Time#to_mongo without Time.zone" do
-    should "be time if string" do
-      Time.to_mongo('2000-01-01 01:01:01.123456').should == Time.local(2000, 1, 1, 1, 1, 1, 123456).utc
+    should "be time to milliseconds if string" do
+      Time.to_mongo('2000-01-01 01:01:01.123456').should == Time.local(2000, 1, 1, 1, 1, 1, 123000).utc
     end
     
     should "be time in utc if time" do
@@ -282,15 +294,15 @@ class SupportTest < Test::Unit::TestCase
   end
   
   context "Time#to_mongo with Time.zone" do
-    should "be time if time" do
+    should "be time to milliseconds if time" do
       Time.zone = 'Hawaii'
-      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0)).should == Time.utc(2009, 8, 16, 0, 0, 0)
+      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).should == Time.utc(2009, 8, 16, 0, 0, 0, 123000)
       Time.zone = nil
     end
 
-    should "be time if string" do
+    should "be time to milliseconds if string" do
       Time.zone = 'Hawaii'
-      Time.to_mongo('2009-08-15 14:00:00').should == Time.utc(2009, 8, 16, 0, 0, 0)
+      Time.to_mongo('2009-08-15 14:00:00.123456').should == Time.utc(2009, 8, 16, 0, 0, 0, 123000)
       Time.zone = nil
     end
     
@@ -341,6 +353,10 @@ class SupportTest < Test::Unit::TestCase
       id = Mongo::ObjectID.new
       id.to_json.should == %Q("#{id}")
     end
+    
+    should "support ruby driver syntax also" do
+      id = Mongo::ObjectID.new
+      id.original_to_json.should == %Q({"$oid": "#{id}"})
+    end
   end
-  
 end

data/test/unit/test_time_zones.rb

@@ -3,8 +3,7 @@ require 'test_helper'
 class TimeZonesTest < Test::Unit::TestCase
   context "An instance of an embedded document" do
     setup do      
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
+      @document = EDoc do
         key :name, String
         key :created_at, Time
       end
@@ -27,10 +26,10 @@ class TimeZonesTest < Test::Unit::TestCase
       Time.zone = nil
     end
     
-    should_eventually "work with timezones that are not UTC" do
+    should "work with timezones that are not UTC" do
       Time.zone = 'Hawaii'
       
-      doc = @document.new(:created_at => @original_time)
+      doc = @document.new(:created_at => "2009-08-15 14:00:00")
       doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_true
       doc.created_at.should == Time.utc(2009, 8, 16)
       

data/test/unit/test_validations.rb

@@ -2,14 +2,9 @@ require 'test_helper'
 
 class ValidationsTest < Test::Unit::TestCase
   context "Validations" do
-    
     context "on a Document" do
-    
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-        end
+        @document = Doc()
       end
 
       context "Validating acceptance of" do
@@ -180,7 +175,20 @@ class ValidationsTest < Test::Unit::TestCase
           doc.action = 'kick'
           doc.should have_error_on(:action, 'is reserved')
         end
-      
+
+        should "work with :not_in shortcut on key definition" do
+          @document.key :action, String, :not_in => %w(kick run)
+        
+          doc = @document.new
+          doc.should_not have_error_on(:action)
+        
+          doc.action = 'fart'
+          doc.should_not have_error_on(:action)
+        
+          doc.action = 'kick'
+          doc.should have_error_on(:action, 'is reserved')
+        end
+
         should "not have error if allow nil is true and value is nil" do
           @document.key :action, String
           @document.validates_exclusion_of :action, :within => %w(kick run), :allow_nil => true
@@ -219,6 +227,19 @@ class ValidationsTest < Test::Unit::TestCase
           doc.action = 'kick'
           doc.should_not have_error_on(:action)
         end
+
+        should "work with :in shortcut on key definition" do
+          @document.key :action, String, :in => %w(kick run)
+        
+          doc = @document.new
+          doc.should have_error_on(:action, 'is not in the list')
+        
+          doc.action = 'fart'
+          doc.should have_error_on(:action, 'is not in the list')
+        
+          doc.action = 'kick'
+          doc.should_not have_error_on(:action)
+        end
       
         should "not have error if allow nil is true and value is nil" do
           @document.key :action, String
@@ -240,11 +261,8 @@ class ValidationsTest < Test::Unit::TestCase
     end # End on a Document
     
     context "On an EmbeddedDocument" do
-
       setup do
-        @embedded_doc = Class.new do
-          include MongoMapper::EmbeddedDocument
-        end
+        @embedded_doc = EDoc()
       end
 
       context "Validating acceptance of" do
@@ -415,6 +433,19 @@ class ValidationsTest < Test::Unit::TestCase
           doc.action = 'kick'
           doc.should have_error_on(:action, 'is reserved')
         end
+
+        should "work with :not_in shortcut on key definition" do
+          @embedded_doc.key :action, String, :not_in => %w(kick run)
+        
+          doc = @embedded_doc.new
+          doc.should_not have_error_on(:action)
+        
+          doc.action = 'fart'
+          doc.should_not have_error_on(:action)
+        
+          doc.action = 'kick'
+          doc.should have_error_on(:action, 'is reserved')
+        end
       
         should "not have error if allow nil is true and value is nil" do
           @embedded_doc.key :action, String
@@ -454,7 +485,20 @@ class ValidationsTest < Test::Unit::TestCase
           doc.action = 'kick'
           doc.should_not have_error_on(:action)
         end
-      
+
+        should "work with :in shortcut on key definition" do
+          @embedded_doc.key :action, String, :in => %w(kick run)
+        
+          doc = @embedded_doc.new
+          doc.should have_error_on(:action, 'is not in the list')
+        
+          doc.action = 'fart'
+          doc.should have_error_on(:action, 'is not in the list')
+        
+          doc.action = 'kick'
+          doc.should_not have_error_on(:action)
+        end
+
         should "not have error if allow nil is true and value is nil" do
           @embedded_doc.key :action, String
           @embedded_doc.validates_inclusion_of :action, :within => %w(kick run), :allow_nil => true
@@ -478,10 +522,7 @@ class ValidationsTest < Test::Unit::TestCase
    
   context "Adding validation errors" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :action, String
         def action_present
           errors.add(:action, 'is invalid') if action.blank?
@@ -500,4 +541,4 @@ class ValidationsTest < Test::Unit::TestCase
       doc.should_not have_error_on(:action)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.10
+  version: 0.7.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.18.2
+        version: 0.18.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -99,35 +99,44 @@ files:
 - VERSION
 - bin/mmconsole
 - lib/mongo_mapper.rb
-- lib/mongo_mapper/associations.rb
-- lib/mongo_mapper/associations/base.rb
-- lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb
-- lib/mongo_mapper/associations/belongs_to_proxy.rb
-- lib/mongo_mapper/associations/collection.rb
-- lib/mongo_mapper/associations/in_array_proxy.rb
-- lib/mongo_mapper/associations/many_documents_as_proxy.rb
-- lib/mongo_mapper/associations/many_documents_proxy.rb
-- lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb
-- lib/mongo_mapper/associations/many_embedded_proxy.rb
-- lib/mongo_mapper/associations/many_polymorphic_proxy.rb
-- lib/mongo_mapper/associations/one_proxy.rb
-- lib/mongo_mapper/associations/proxy.rb
-- lib/mongo_mapper/callbacks.rb
-- lib/mongo_mapper/dirty.rb
 - lib/mongo_mapper/document.rb
-- lib/mongo_mapper/dynamic_finder.rb
 - lib/mongo_mapper/embedded_document.rb
-- lib/mongo_mapper/finder_options.rb
-- lib/mongo_mapper/key.rb
-- lib/mongo_mapper/mongo_mapper.rb
-- lib/mongo_mapper/pagination.rb
-- lib/mongo_mapper/rails_compatibility/document.rb
-- lib/mongo_mapper/rails_compatibility/embedded_document.rb
-- lib/mongo_mapper/serialization.rb
-- lib/mongo_mapper/serializers/json_serializer.rb
+- lib/mongo_mapper/plugins.rb
+- lib/mongo_mapper/plugins/associations.rb
+- lib/mongo_mapper/plugins/associations/base.rb
+- lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb
+- lib/mongo_mapper/plugins/associations/collection.rb
+- lib/mongo_mapper/plugins/associations/embedded_collection.rb
+- lib/mongo_mapper/plugins/associations/in_array_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_documents_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/one_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy.rb
+- lib/mongo_mapper/plugins/callbacks.rb
+- lib/mongo_mapper/plugins/clone.rb
+- lib/mongo_mapper/plugins/descendants.rb
+- lib/mongo_mapper/plugins/dirty.rb
+- lib/mongo_mapper/plugins/equality.rb
+- lib/mongo_mapper/plugins/identity_map.rb
+- lib/mongo_mapper/plugins/inspect.rb
+- lib/mongo_mapper/plugins/keys.rb
+- lib/mongo_mapper/plugins/logger.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/validations.rb
+- lib/mongo_mapper/query.rb
 - lib/mongo_mapper/support.rb
-- lib/mongo_mapper/validations.rb
+- lib/mongo_mapper/support/descendant_appends.rb
+- lib/mongo_mapper/support/find.rb
 - mongo_mapper.gemspec
+- performance/read_write.rb
 - specs.watchr
 - test/NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
@@ -145,10 +154,11 @@ files:
 - test/functional/test_dirty.rb
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
+- test/functional/test_identity_map.rb
 - test/functional/test_logger.rb
 - test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
-- test/functional/test_rails_compatibility.rb
+- test/functional/test_protected.rb
 - test/functional/test_string_id_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
@@ -158,15 +168,18 @@ files:
 - test/unit/associations/test_base.rb
 - test/unit/associations/test_proxy.rb
 - test/unit/serializers/test_json_serializer.rb
+- test/unit/test_descendant_appends.rb
 - test/unit/test_document.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb
-- test/unit/test_finder_options.rb
-- test/unit/test_key.rb
+- test/unit/test_keys.rb
 - test/unit/test_mongo_mapper.rb
 - test/unit/test_pagination.rb
+- test/unit/test_plugins.rb
+- test/unit/test_query.rb
+- test/unit/test_rails.rb
 - test/unit/test_rails_compatibility.rb
-- test/unit/test_serializations.rb
+- test/unit/test_serialization.rb
 - test/unit/test_support.rb
 - test/unit/test_time_zones.rb
 - test/unit/test_validations.rb
@@ -214,10 +227,11 @@ test_files:
 - test/functional/test_dirty.rb
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
+- test/functional/test_identity_map.rb
 - test/functional/test_logger.rb
 - test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
-- test/functional/test_rails_compatibility.rb
+- test/functional/test_protected.rb
 - test/functional/test_string_id_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
@@ -227,15 +241,18 @@ test_files:
 - test/unit/associations/test_base.rb
 - test/unit/associations/test_proxy.rb
 - test/unit/serializers/test_json_serializer.rb
+- test/unit/test_descendant_appends.rb
 - test/unit/test_document.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb
-- test/unit/test_finder_options.rb
-- test/unit/test_key.rb
+- test/unit/test_keys.rb
 - test/unit/test_mongo_mapper.rb
 - test/unit/test_pagination.rb
+- test/unit/test_plugins.rb
+- test/unit/test_query.rb
+- test/unit/test_rails.rb
 - test/unit/test_rails_compatibility.rb
-- test/unit/test_serializations.rb
+- test/unit/test_serialization.rb
 - test/unit/test_support.rb
 - test/unit/test_time_zones.rb
 - test/unit/test_validations.rb