mongo_mapper-unstable 2010.1.6 → 2010.1.12

data/test/unit/test_pagination.rb

@@ -1,8 +1,16 @@
 require 'test_helper'
 
-class PaginationTest < Test::Unit::TestCase  
+class PaginationTest < Test::Unit::TestCase
+  should "default per_page to 25" do
+    Doc().per_page.should == 25
+  end
+  
+  should "allow overriding per_page" do
+    Doc() { def self.per_page; 1 end }.per_page.should == 1
+  end
+  
   context "Pagination proxy" do
-    include MongoMapper::Pagination
+    include MongoMapper::Plugins::Pagination
     
     should "should have accessors for subject" do
       subject = [1,2,3,4,5]

data/test/unit/test_plugins.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+module MyPlugin
+  module ClassMethods
+    def class_foo
+      'class_foo'
+    end
+  end
+  
+  module InstanceMethods
+    def instance_foo
+      'instance_foo'
+    end
+  end
+end
+
+class PluginsTest < Test::Unit::TestCase
+  context "plugin" do
+    setup do
+      @document = Class.new do
+        extend MongoMapper::Plugins
+        plugin MyPlugin
+      end
+    end
+
+    should "include instance methods" do
+      @document.new.instance_foo.should == 'instance_foo'
+    end
+    
+    should "extend class methods" do
+      @document.class_foo.should == 'class_foo'
+    end
+    
+    should "default plugins to empty array" do
+      Class.new { extend MongoMapper::Plugins }.plugins.should == []
+    end
+    
+    should "add plugin to plugins" do
+      @document.plugins.should include(MyPlugin)
+    end
+  end
+end

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_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
@@ -264,8 +268,8 @@ class SupportTest < Test::Unit::TestCase
   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 +286,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
     

data/test/unit/test_time_zones.rb

@@ -26,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)
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.1.6
+  version: 2010.1.12
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -05:00
+date: 2010-01-12 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,35 +99,42 @@ 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/descendant_appends.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/rails.rb
+- lib/mongo_mapper/plugins/serialization.rb
+- lib/mongo_mapper/plugins/validations.rb
 - lib/mongo_mapper/support.rb
-- lib/mongo_mapper/validations.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 +152,10 @@ 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_string_id_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
@@ -158,15 +165,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_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
@@ -200,18 +210,21 @@ specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
 - test/unit/test_embedded_document.rb
-- test/unit/test_serializations.rb
-- test/unit/test_key.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/serializers/test_json_serializer.rb
 - test/unit/test_support.rb
 - test/unit/test_finder_options.rb
+- test/unit/test_keys.rb
 - test/unit/associations/test_proxy.rb
 - test/unit/associations/test_base.rb
 - test/unit/test_time_zones.rb
+- test/unit/test_serialization.rb
+- test/unit/test_rails.rb
 - test/unit/test_rails_compatibility.rb
 - test/unit/test_validations.rb
 - test/unit/test_mongo_mapper.rb
+- test/unit/test_descendant_appends.rb
+- test/unit/test_plugins.rb
 - test/unit/test_document.rb
 - test/unit/test_pagination.rb
 - test/test_helper.rb
@@ -230,10 +243,10 @@ test_files:
 - test/functional/associations/test_many_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_one_proxy.rb
+- test/functional/test_identity_map.rb
 - test/functional/test_binary.rb
 - test/functional/test_dirty.rb
 - test/functional/test_callbacks.rb
-- test/functional/test_rails_compatibility.rb
 - test/functional/test_validations.rb
 - test/functional/test_logger.rb
 - test/functional/test_document.rb

data/lib/mongo_mapper/associations/base.rb

@@ -1,119 +0,0 @@
-module MongoMapper
-  module Associations
-    class Base
-      attr_reader :type, :name, :options, :finder_options
-
-      # Options that should not be considered MongoDB query options/criteria
-      AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic]
-
-      def initialize(type, name, options={}, &extension)
-        @type, @name, @options, @finder_options = type, name, {}, {}
-        options.symbolize_keys!
-
-        options[:extend] = modulized_extensions(extension, options[:extend])
-
-        options.each_pair do |key, value|
-          if AssociationOptions.include?(key)
-            @options[key] = value
-          else
-            @finder_options[key] = value
-          end
-        end
-      end
-
-      def class_name
-        @class_name ||= begin
-          if cn = options[:class_name]
-            cn
-          elsif many?
-            name.to_s.singularize.camelize
-          else
-            name.to_s.camelize
-          end
-        end
-      end
-
-      def klass
-        @klass ||= options[:class] || class_name.constantize
-      end
-
-      def many?
-        @many_type ||= @type == :many
-      end
-
-      def belongs_to?
-        @belongs_to_type ||= @type == :belongs_to
-      end
-      
-      def one?
-        @one_type ||= @type == :one
-      end
-
-      def polymorphic?
-        !!@options[:polymorphic]
-      end
-
-      def as?
-        !!@options[:as]
-      end
-      
-      def in_array?
-        !!@options[:in]
-      end
-
-      def embeddable?
-        many? && klass.embeddable?
-      end
-
-      def type_key_name
-        @type_key_name ||= many? ? '_type' : "#{as}_type"
-      end
-
-      def as
-        @options[:as] || self.name
-      end
-
-      def foreign_key
-        @options[:foreign_key] || "#{name}_id"
-      end
-
-      def ivar
-        @ivar ||= "@_#{name}"
-      end
-
-      def proxy_class
-        @proxy_class ||= begin
-          if many?
-            if self.klass.embeddable?
-              polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy
-            else
-              if polymorphic?
-                ManyPolymorphicProxy
-              elsif as?
-                ManyDocumentsAsProxy
-              elsif in_array?
-                InArrayProxy
-              else
-                ManyDocumentsProxy
-              end
-            end
-          elsif one?
-            OneProxy
-          else
-            polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
-          end
-        end
-      end
-
-      private
-
-        # @param [Array<Module, Proc>] extensions a collection of Modules or 
-        #   Procs that extend the behaviour of this association.
-        def modulized_extensions(*extensions)
-          extensions.flatten.compact.map do |extension|
-            Proc === extension ? Module.new(&extension) : extension
-          end
-        end
-    end
-  end
-end

data/lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb

@@ -1,26 +0,0 @@
-module MongoMapper
-  module Associations
-    class BelongsToPolymorphicProxy < Proxy
-      def replace(doc)
-        if doc
-          doc.save if doc.new?
-          id, type = doc.id, doc.class.name
-        end
-        
-        owner[reflection.foreign_key] = id
-        owner[reflection.type_key_name] = type
-        reset
-      end
-      
-      protected
-        def find_target
-          return nil if association_class.nil? || owner[reflection.foreign_key].nil?
-          association_class.first(:id => owner[reflection.foreign_key])
-        end
-        
-        def association_class
-          proxy_owner[reflection.type_key_name] ? proxy_owner[reflection.type_key_name].constantize : nil
-        end
-    end
-  end
-end

data/lib/mongo_mapper/associations/belongs_to_proxy.rb

@@ -1,21 +0,0 @@
-module MongoMapper
-  module Associations
-    class BelongsToProxy < Proxy
-      def replace(doc)
-        if doc
-          doc.save if doc.new?
-          id = doc.id
-        end
-        
-        owner[reflection.foreign_key] = id
-        reset
-      end
-
-      protected
-        def find_target
-          return nil if owner[reflection.foreign_key].nil?
-          klass.first(:id => owner[reflection.foreign_key])
-        end
-    end
-  end
-end

data/lib/mongo_mapper/associations/collection.rb

@@ -1,19 +0,0 @@
-module MongoMapper
-  module Associations
-    class Collection < Proxy
-      def to_ary
-        load_target
-        if target.is_a?(Array)
-          target.to_ary
-        else
-          Array(target)
-        end
-      end
-      
-      def reset
-        super
-        target = []
-      end
-    end
-  end
-end