djsun-mongo_mapper 0.5.4.1 → 0.5.5.2

data/Rakefile

@@ -11,12 +11,14 @@ begin
     gem.authors = ["John Nunemaker"]
     gem.rubyforge_project = "mongomapper"
     
-    gem.add_dependency('activesupport')
+    gem.add_dependency('activesupport', '>= 2.3')
     gem.add_dependency('mongo', '0.15.1')
     gem.add_dependency('jnunemaker-validatable', '1.7.4')
     
-    gem.add_development_dependency('mocha', '0.9.4')
     gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
+    gem.add_development_dependency('shoulda', '2.10.2')
+    gem.add_development_dependency('timecop', '0.3.1')
+    gem.add_development_dependency('mocha', '0.9.4')
   end
   
   Jeweler::RubyforgeTasks.new do |rubyforge|

data/VERSION

@@ -1 +1 @@
-0.5.4.1
+0.5.5.2

data/djsun-mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djsun-mongo_mapper}
-  s.version = "0.5.4.1"
+  s.version = "0.5.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-12}
+  s.date = %q{2009-10-16}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -48,7 +48,6 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/pagination.rb",
      "lib/mongo_mapper/rails_compatibility/document.rb",
      "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
-     "lib/mongo_mapper/save_with_validation.rb",
      "lib/mongo_mapper/serialization.rb",
      "lib/mongo_mapper/serializers/json_serializer.rb",
      "lib/mongo_mapper/support.rb",
@@ -56,7 +55,6 @@ Gem::Specification.new do |s|
      "mongo_mapper.gemspec",
      "specs.watchr",
      "test/NOTE_ON_TESTING",
-     "test/custom_matchers.rb",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
@@ -64,6 +62,7 @@ Gem::Specification.new do |s|
      "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",
@@ -75,6 +74,8 @@ Gem::Specification.new do |s|
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
+     "test/support/custom_matchers.rb",
+     "test/support/test_timing.rb",
      "test/test_helper.rb",
      "test/unit/serializers/test_json_serializer.rb",
      "test/unit/test_association_base.rb",
@@ -99,14 +100,14 @@ Gem::Specification.new do |s|
   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/custom_matchers.rb",
-     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+    "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "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",
@@ -118,6 +119,8 @@ Gem::Specification.new do |s|
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
+     "test/support/custom_matchers.rb",
+     "test/support/test_timing.rb",
      "test/test_helper.rb",
      "test/unit/serializers/test_json_serializer.rb",
      "test/unit/test_association_base.rb",
@@ -141,23 +144,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
-      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
+      s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3"])
       s.add_dependency(%q<mongo>, ["= 0.15.1"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
-      s.add_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.2"])
+      s.add_dependency(%q<timecop>, ["= 0.3.1"])
+      s.add_dependency(%q<mocha>, ["= 0.9.4"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3"])
     s.add_dependency(%q<mongo>, ["= 0.15.1"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
-    s.add_dependency(%q<mocha>, ["= 0.9.4"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.2"])
+    s.add_dependency(%q<timecop>, ["= 0.3.1"])
+    s.add_dependency(%q<mocha>, ["= 0.9.4"])
   end
 end

data/lib/mongo_mapper/associations/base.rb

@@ -1,3 +1,32 @@
+module ConstantHelper
+  def self.lookup(class_name, scope)
+    if namespaced?(class_name)
+      class_name.constantize
+    else
+      lookup_in_parent(class_name, scope)
+    end
+  end
+  
+  def self.namespaced?(class_name)
+    class_name.include?("::")
+  end
+  
+  def self.lookup_in_parent(class_name, scope)
+    parent = parent_scope(scope)
+    return nil unless parent.const_defined?(class_name)
+    parent.const_get(class_name)
+  end
+    
+  def self.parent_scope(scope)
+    chain = scope.to_s.split("::")[0 ... -1]
+    chain.reduce(Object) { |m, o| m.const_get(o) }
+  end
+  
+  def self.leaf(constant_name)
+    constant_name.split("::").last
+  end
+end
+
 module MongoMapper
   module Associations
     class Base
@@ -18,9 +47,9 @@ module MongoMapper
           end
         end
       end
-
+      
       def klass
-        @klass ||= class_name.constantize
+        @klass ||= ConstantHelper.lookup(class_name, options[:scope])
       end
 
       def many?

data/lib/mongo_mapper/associations/many_documents_proxy.rb

@@ -109,7 +109,9 @@ module MongoMapper
         end
 
         def foreign_key
-          @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
+          @association.options[:foreign_key] || 
+            (ConstantHelper.leaf(@owner.class.name).
+              underscore.gsub("/", "_") + "_id")
         end
     end
   end

data/lib/mongo_mapper/associations.rb

@@ -2,12 +2,12 @@ module MongoMapper
   module Associations
     module ClassMethods
       def belongs_to(association_id, options = {})
-        create_association(:belongs_to, association_id, options)
+        create_association(:belongs_to, association_id, options, self)
         self
       end
 
       def many(association_id, options = {})
-        create_association(:many, association_id, options)
+        create_association(:many, association_id, options, self)
         self
       end
 
@@ -18,7 +18,8 @@ module MongoMapper
       end
 
       private
-        def create_association(type, name, options)
+        def create_association(type, name, options, scope)
+          options[:scope] = scope
           association = Associations::Base.new(type, name, options)
           associations[association.name] = association
           define_association_methods(association)
@@ -48,16 +49,16 @@ module MongoMapper
         end
 
         def define_dependent_callback_for_many(association)
-          return if association.embeddable?
-
           after_destroy do |doc|
-            case association.options[:dependent]
-            when :destroy
-              doc.get_proxy(association).destroy_all
-            when :delete_all
-              doc.get_proxy(association).delete_all
-            when :nullify
-              doc.get_proxy(association).nullify
+            if !association.embeddable?
+              case association.options[:dependent]
+              when :destroy
+                doc.get_proxy(association).destroy_all
+              when :delete_all
+                doc.get_proxy(association).delete_all
+              when :nullify
+                doc.get_proxy(association).nullify
+              end
             end
           end
         end

data/lib/mongo_mapper/callbacks.rb

@@ -1,87 +1,50 @@
 module MongoMapper
-  module Callbacks    
+  module Callbacks
     def self.included(model) #:nodoc:
       model.class_eval do
         extend Observable
         include ActiveSupport::Callbacks
-        
-        define_callbacks *%w(
-          before_save after_save before_create after_create before_update after_update before_validation
-          after_validation before_validation_on_create after_validation_on_create before_validation_on_update
-          after_validation_on_update before_destroy after_destroy
+
+        callbacks = %w(
+          before_save
+          after_save
+          before_create
+          after_create
+          before_update
+          after_update
+          before_validation
+          after_validation
+          before_validation_on_create
+          after_validation_on_create
+          before_validation_on_update
+          after_validation_on_update
+          before_destroy
+          after_destroy
         )
-        
-        [:create_or_update, :valid?, :create, :update, :destroy].each do |method|
-          alias_method_chain method, :callbacks
-        end
-      end
-    end
 
-    def before_save() end
+        define_callbacks(*callbacks)
 
-    def after_save()  end
-    def create_or_update_with_callbacks #:nodoc:
-      return false if callback(:before_save) == false
-      if result = create_or_update_without_callbacks
-        callback(:after_save)
+        callbacks.each do |callback|
+          define_method(callback.to_sym) {}
+        end
       end
-      result
     end
-    private :create_or_update_with_callbacks
-
-    def before_create() end
-
-    def after_create() end
-    def create_with_callbacks #:nodoc:
-      return false if callback(:before_create) == false
-      result = create_without_callbacks
-      callback(:after_create)
-      result
-    end
-    private :create_with_callbacks
-
-    def before_update() end
-
-    def after_update() end
-
-    def update_with_callbacks(*args) #:nodoc:
-      return false if callback(:before_update) == false
-      result = update_without_callbacks(*args)
-      callback(:after_update)
-      result
-    end
-    private :update_with_callbacks
-
-    def before_validation() end
-
-    def after_validation() end
 
-    def before_validation_on_create() end
-
-    def after_validation_on_create()  end
-
-    def before_validation_on_update() end
-
-    def after_validation_on_update()  end
-
-    def valid_with_callbacks? #:nodoc:
+    def valid? #:nodoc:
       return false if callback(:before_validation) == false
       result = new? ? callback(:before_validation_on_create) : callback(:before_validation_on_update)
       return false if false == result
-      
-      result = valid_without_callbacks?
+
+      result = super
       callback(:after_validation)
-      
+
       new? ? callback(:after_validation_on_create) : callback(:after_validation_on_update)
       return result
     end
 
-    def before_destroy() end
-
-    def after_destroy()  end
-    def destroy_with_callbacks #:nodoc:
+    def destroy #:nodoc:
       return false if callback(:before_destroy) == false
-      result = destroy_without_callbacks
+      result = super
       callback(:after_destroy)
       result
     end
@@ -89,18 +52,40 @@ module MongoMapper
     private
       def callback(method)
         result = run_callbacks(method) { |result, object| false == result }
-        
+
         if result != false && respond_to?(method)
           result = send(method)
         end
-        
+
         notify(method)
         return result
       end
-      
+
       def notify(method) #:nodoc:
         self.class.changed
         self.class.notify_observers(method, self)
       end
+
+      def create_or_update #:nodoc:
+        return false if callback(:before_save) == false
+        if result = super
+          callback(:after_save)
+        end
+        result
+      end
+
+      def create #:nodoc:
+        return false if callback(:before_create) == false
+        result = super
+        callback(:after_create)
+        result
+      end
+
+      def update(*args) #:nodoc:
+        return false if callback(:before_update) == false
+        result = super
+        callback(:after_update)
+        result
+      end
   end
 end

data/lib/mongo_mapper/dirty.rb

@@ -2,13 +2,6 @@ module MongoMapper
   module Dirty
     DIRTY_SUFFIXES = ['_changed?', '_change', '_will_change!', '_was']
     
-    def self.included(base)
-      base.alias_method_chain :initialize, :dirty
-      base.alias_method_chain :write_attribute, :dirty
-      base.alias_method_chain :save,            :dirty
-      base.alias_method_chain :save!,           :dirty
-    end
-    
     def method_missing(method, *args, &block)
       if method.to_s =~ /(_changed\?|_change|_will_change!|_was)$/
         method_suffix = $1
@@ -53,26 +46,26 @@ module MongoMapper
       changed.inject({}) { |h, attribute| h[attribute] = key_change(attribute); h }
     end
     
-    def initialize_with_dirty(attrs={})
-      initialize_without_dirty(attrs)
+    def initialize(attrs={})
+      super(attrs)
       changed_keys.clear unless new?
     end
-    
+
     # Attempts to +save+ the record and clears changed keys if successful.
-    def save_with_dirty(*args) #:nodoc:
-      if status = save_without_dirty(*args)
+    def save(*args)
+      if status = super
         changed_keys.clear
       end
       status
     end
 
     # Attempts to <tt>save!</tt> the record and clears changed keys if successful.
-    def save_with_dirty!(*args) #:nodoc:
-      status = save_without_dirty!(*args)
+    def save!(*args)
+      status = super
       changed_keys.clear
       status
     end
-    
+
     # <tt>reload</tt> the record and clears changed keys.
     # def reload_with_dirty(*args) #:nodoc:
     #   record = reload_without_dirty(*args)
@@ -114,7 +107,7 @@ module MongoMapper
       end
 
       # Wrap write_attribute to remember original key value.
-      def write_attribute_with_dirty(attribute, value)
+      def write_attribute(attribute, value)
         attribute = attribute.to_s
 
         # The key already has an unsaved change.
@@ -127,7 +120,7 @@ module MongoMapper
         end
 
         # Carry on.
-        write_attribute_without_dirty(attribute, value)
+        super(attribute, value)
       end
       
       def value_changed?(key_name, old, value)
@@ -140,4 +133,4 @@ module MongoMapper
         old != value
       end
   end
-end
+end

data/lib/mongo_mapper/document.rb

@@ -8,7 +8,6 @@ module MongoMapper
         include InstanceMethods
         include Observing
         include Callbacks
-        include SaveWithValidation
         include Dirty
         include RailsCompatibility::Document
         extend Validations::Macros
@@ -111,13 +110,11 @@ module MongoMapper
       end
 
       def create(*docs)
-        instances = []
-        docs = [{}] if docs.blank?
-        docs.flatten.each do |attrs|
-          doc = new(attrs); doc.save
-          instances << doc
-        end
-        instances.size == 1 ? instances[0] : instances
+        initialize_each(*docs) { |doc| doc.save }
+      end
+
+      def create!(*docs)
+        initialize_each(*docs) { |doc| doc.save! }
       end
 
       # For updating single document
@@ -207,6 +204,18 @@ module MongoMapper
         end
 
       private
+        # Initializes each document and yields each initialized document
+        def initialize_each(*docs)
+          instances = []
+          docs = [{}] if docs.blank?
+          docs.flatten.each do |attrs|
+            doc = new(attrs)
+            yield(doc)
+            instances << doc
+          end
+          instances.size == 1 ? instances[0] : instances
+        end
+
         def create_indexes_for(key)
           ensure_index key.name if key.options[:index]
         end
@@ -285,11 +294,11 @@ module MongoMapper
       end
 
       def save
-        create_or_update
+        valid? ? create_or_update : false
       end
 
       def save!
-        create_or_update || raise(DocumentNotValid.new(self))
+        valid? ? create_or_update : raise(DocumentNotValid.new(self))
       end
 
       def destroy

data/lib/mongo_mapper/embedded_document.rb

@@ -198,6 +198,10 @@ module MongoMapper
       def new?
         !!@new_document
       end
+      
+      def to_param
+        id
+      end
 
       def attributes=(attrs)
         return if attrs.blank?
@@ -308,7 +312,7 @@ module MongoMapper
 
       private
         def _keys
-          self.class.keys
+          self.metaclass.keys
         end
         
         def key_names
@@ -324,7 +328,7 @@ module MongoMapper
         end
         
         def ensure_key_exists(name)
-          self.class.key(name) unless respond_to?("#{name}=")
+          self.metaclass.key(name) unless respond_to?("#{name}=")
         end
 
         def read_attribute(name)

data/lib/mongo_mapper/rails_compatibility/document.rb

@@ -6,10 +6,6 @@ module MongoMapper
           alias_method :new_record?, :new?
         end
       end
-            
-      def to_param
-        id
-      end
     end
   end
 end

data/lib/mongo_mapper/rails_compatibility/embedded_document.rb

@@ -18,10 +18,6 @@ module MongoMapper
           keys.keys
         end
       end
-
-      def to_param
-        raise "Missing to_param method in #{self.class}. You should implement it to return the unique identifier of this embedded document within a document."
-      end
     end
   end
 end

data/lib/mongo_mapper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'activesupport'
+gem 'activesupport', '>= 2.3'
 gem 'mongo', '0.15.1'
 gem 'jnunemaker-validatable', '1.7.4'
 
@@ -102,10 +102,9 @@ require 'mongo_mapper/dynamic_finder'
 require 'mongo_mapper/key'
 require 'mongo_mapper/observing'
 require 'mongo_mapper/pagination'
-require 'mongo_mapper/save_with_validation'
 require 'mongo_mapper/serialization'
 require 'mongo_mapper/validations'
 require 'mongo_mapper/rails_compatibility/document'
 require 'mongo_mapper/rails_compatibility/embedded_document'
 require 'mongo_mapper/embedded_document'
-require 'mongo_mapper/document'
+require 'mongo_mapper/document'

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-11}
+  s.date = %q{2009-10-16}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/pagination.rb",
      "lib/mongo_mapper/rails_compatibility/document.rb",
      "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
-     "lib/mongo_mapper/save_with_validation.rb",
      "lib/mongo_mapper/serialization.rb",
      "lib/mongo_mapper/serializers/json_serializer.rb",
      "lib/mongo_mapper/support.rb",
@@ -55,7 +54,6 @@ Gem::Specification.new do |s|
      "mongo_mapper.gemspec",
      "specs.watchr",
      "test/NOTE_ON_TESTING",
-     "test/custom_matchers.rb",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
@@ -74,6 +72,8 @@ Gem::Specification.new do |s|
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
+     "test/support/custom_matchers.rb",
+     "test/support/test_timing.rb",
      "test/test_helper.rb",
      "test/unit/serializers/test_json_serializer.rb",
      "test/unit/test_association_base.rb",
@@ -98,8 +98,7 @@ Gem::Specification.new do |s|
   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/custom_matchers.rb",
-     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+    "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
@@ -117,6 +116,8 @@ Gem::Specification.new do |s|
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
+     "test/support/custom_matchers.rb",
+     "test/support/test_timing.rb",
      "test/test_helper.rb",
      "test/unit/serializers/test_json_serializer.rb",
      "test/unit/test_association_base.rb",
@@ -140,23 +141,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
-      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
+      s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3"])
       s.add_dependency(%q<mongo>, ["= 0.15.1"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
-      s.add_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.2"])
+      s.add_dependency(%q<timecop>, ["= 0.3.1"])
+      s.add_dependency(%q<mocha>, ["= 0.9.4"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3"])
     s.add_dependency(%q<mongo>, ["= 0.15.1"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
-    s.add_dependency(%q<mocha>, ["= 0.9.4"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.2"])
+    s.add_dependency(%q<timecop>, ["= 0.3.1"])
+    s.add_dependency(%q<mocha>, ["= 0.9.4"])
   end
 end

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -149,7 +149,8 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
 
     context "with #all" do
       should "work" do
-        @post.comments.all.should == [@comment1, @comment2]
+        @post.comments.all.should include(@comment1)
+        @post.comments.all.should include(@comment2)
       end
 
       should "work with conditions" do

data/test/functional/associations/test_namespace.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+require 'models'
+
+class NamespaceTest < Test::Unit::TestCase
+  include Hollywood
+
+  def setup
+    Movie.collection.clear
+    Actor.collection.clear
+    Role.collection.clear
+  end
+  
+  context "Hollywood namespace" do
+    setup do
+      @movie = Movie.create
+      @actor = Actor.create
+      @role = Role.create(
+        :movie_id => @movie.id,
+        :actor_id => @actor.id
+      )
+    end
+
+    should "belongs_to associations" do
+      @role.actor.should == @actor
+      @role.movie.should == @movie
+    end
+
+    should "many associations" do
+      @movie.roles.should == [@role]
+      @actor.roles.should == [@role]
+    end
+  end
+end

data/test/functional/test_document.rb

@@ -669,7 +669,7 @@ class DocumentTest < Test::Unit::TestCase
             @thing.properties << @property3
           end
 
-          should "destroy the thing" do
+          should_eventually "destroy the thing" do
             Thing.count.should == 1
             @property1.destroy
             Thing.count.should == 0
@@ -1012,8 +1012,11 @@ class DocumentTest < Test::Unit::TestCase
       old_created_at = doc.created_at
       old_updated_at = doc.updated_at
       doc.first_name = 'Johnny'
-      sleep 1 # this annoys me
-      doc.save
+      
+      Timecop.freeze(Time.now + 5.seconds) do
+        doc.save
+      end
+      
       doc.created_at.should == old_created_at
       doc.updated_at.should_not == old_updated_at
     end
@@ -1022,12 +1025,14 @@ class DocumentTest < Test::Unit::TestCase
       doc = @document.create(:first_name => 'John', :age => 27)
       old_created_at = doc.created_at
       old_updated_at = doc.updated_at
-      sleep 1 # this annoys me
-      @document.update(doc._id, { :first_name => 'Johnny' })
+      
+      Timecop.freeze(Time.now + 5.seconds) do
+        @document.update(doc._id, { :first_name => 'Johnny' })
+      end
 
       from_db = @document.find(doc.id)
-      from_db.created_at.to_i.should == old_created_at.to_i
-      from_db.updated_at.to_i.should_not == old_updated_at.to_i
+      from_db.created_at.should == old_created_at
+      from_db.updated_at.should_not == old_updated_at
     end
   end
 

data/test/functional/test_embedded_document.rb

@@ -74,6 +74,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       doc = RealPerson.find(person.id)
       doc.pets.first.should == pet
     end
+    
+    should "save new keys" do
+      person = RealPerson.new
+      person[:new_attribute] = 'foobar'
+      person.save
+      from_db = RealPerson.find(person.id)
+      person.new_attribute.should == 'foobar'
+    end
   end
   
   context "update_attributes" do
@@ -94,4 +102,4 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       embedded.name.should == 'koda'
     end
   end  
-end
+end

data/test/functional/test_rails_compatibility.rb

@@ -16,11 +16,6 @@ class TestRailsCompatibility < Test::Unit::TestCase
     setup do
       Order.collection.clear
     end
-  
-    should "have to_param that returns id" do
-      instance = Order.create('_id' => 1234)
-      instance.to_param.should == '1234'
-    end
 
     should "alias new to new_record?" do
       instance = Order.new

data/test/functional/test_validations.rb

@@ -40,6 +40,26 @@ class ValidationsTest < Test::Unit::TestCase
       lambda { doc.save! }.should raise_error(MongoMapper::DocumentNotValid)
     end
   end
+
+  context "Creating a document that is invalid (destructive)" do
+    setup do
+      @document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+        key :name, String, :required => true
+      end
+      @document.collection.clear
+    end
+    
+    should "raise error" do
+      lambda { @document.create! }.should raise_error(MongoMapper::DocumentNotValid)
+    end
+
+    should "create a new document" do
+      instance = @document.create!(:name => "James")
+      instance.new_record?.should be_false
+    end
+  end
   
   context "Saving an existing document that is invalid" do
     setup do

data/test/models.rb

@@ -193,3 +193,27 @@ module TrModels
     key :name, String
   end
 end
+
+module Hollywood
+  class Movie
+    include MongoMapper::Document
+    
+    many :roles
+  end
+
+  class Actor
+    include MongoMapper::Document
+    
+    many :roles
+  end
+  
+  class Role
+    include MongoMapper::Document
+
+    key :movie_id, String
+    key :actor_id, String
+    
+    belongs_to :movie
+    belongs_to :actor
+  end
+end

data/test/support/test_timing.rb

@@ -0,0 +1,16 @@
+class Test::Unit::TestCase
+  def run_with_test_timing(*args, &block)    
+    begin_time = Time.now
+    run_without_test_timing(*args, &block)
+    end_time = Time.now
+ 
+    duration = end_time - begin_time
+    threshold = 0.3
+    
+    if duration > threshold
+      puts "\nSLOW TEST: #{duration} - #{self.name}"
+    end
+  end
+  
+  alias_method_chain :run, :test_timing unless method_defined?(:run_without_test_timing)
+end

data/test/test_helper.rb

@@ -1,18 +1,18 @@
-require 'pathname'
-require 'pp'
-require 'rubygems'
-require 'shoulda'
+require File.join(File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper'))
 
-gem 'mocha', '0.9.4'
 gem 'jnunemaker-matchy', '0.4.0'
+gem 'shoulda', '2.10.2'
+gem 'timecop', '0.3.1'
+gem 'mocha', '0.9.4'
 
 require 'matchy'
+require 'shoulda'
+require 'timecop'
 require 'mocha'
-require 'custom_matchers'
+require 'pp'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-dir = (Pathname(__FILE__).dirname +  '..' + 'lib').expand_path
-require dir + 'mongo_mapper'
+require 'support/custom_matchers'
+require 'support/test_timing'
 
 class Test::Unit::TestCase
   include CustomMatchers

data/test/unit/test_embedded_document.rb

@@ -289,6 +289,11 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
+    should "have to_param that is id" do
+      doc = @document.new
+      doc.to_param.should == doc.id
+    end
+    
     should "have access to class logger" do
       doc = @document.new
       doc.logger.should == @document.logger
@@ -475,9 +480,15 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         should "create key and write value for missing key" do
           doc = @document.new
           doc[:foo] = 'string'
-          @document.keys.keys.include?('foo').should be_true
+          doc.metaclass.keys.include?('foo').should be_true
           doc[:foo].should == 'string'
         end
+
+         should "not share the new key" do
+           doc = @document.new
+           doc[:foo] = 'string'
+           @document.keys.should_not include('foo')
+         end
       end
     end
     

data/test/unit/test_rails_compatibility.rb

@@ -15,11 +15,7 @@ class TestRailsCompatibility < Test::Unit::TestCase
     key :second_only, String
   end
   
-  context "EmbeddedDocument" do
-    should "raise error for to_param as embedded do not have id's" do
-      lambda { Item.new.to_param }.should raise_error
-    end
-    
+  context "EmbeddedDocument" do    
     should "alias many to has_many" do
       FirstItem.should respond_to(:has_many)
       FirstItem.method(:has_many).should == FirstItem.method(:many)

data/test/unit/test_serializations.rb

@@ -1,52 +1,52 @@
-require 'test_helper'
-
-class SerializationTest < Test::Unit::TestCase
-  def setup
-    @document = Class.new do
-      include MongoMapper::EmbeddedDocument
-      key :name, String
-      key :age, Integer
-      key :awesome, Boolean
-      key :preferences, Hash
-      key :created_at, Time
-    end
-    
-    @instance = @document.new(
-      :name        => 'John Doe',
-      :age         => 25,
-      :awesome     => true,
-      :preferences => {:language => 'Ruby'},
-      :created_at  => Time.now.change(:usec => 0)
-    )
-  end
-  
-  [:json].each do |format|
-    context format do
-      should "be reversable" do
-        serialized = @instance.send("to_#{format}")
-        unserialized = @document.new.send("from_#{format}", serialized)
-
-        assert_equal @instance, unserialized
-      end
-      
-      should "allow attribute only filtering" do
-        serialized = @instance.send("to_#{format}", :only => [ :age, :name ])
-        unserialized = @document.new.send("from_#{format}", serialized)
-
-        assert_equal @instance.name, unserialized.name
-        assert_equal @instance.age, unserialized.age
-        assert ! unserialized.awesome
-        assert_nil unserialized.created_at
-      end
-      
-      should "allow attribute except filtering" do
-        serialized = @instance.send("to_#{format}", :except => [ :age, :name ])
-        unserialized = @document.new.send("from_#{format}", serialized)
-        
-        assert_nil unserialized.name
-        assert_nil unserialized.age
-        assert_equal @instance.awesome, unserialized.awesome
-      end
-    end
-  end
-end
+require 'test_helper'
+
+class SerializationTest < Test::Unit::TestCase
+  def setup
+    @document = Class.new do
+      include MongoMapper::EmbeddedDocument
+      key :name, String
+      key :age, Integer
+      key :awesome, Boolean
+      key :preferences, Hash
+      key :created_at, Time
+    end
+    
+    @instance = @document.new(
+      :name        => 'John Doe',
+      :age         => 25,
+      :awesome     => true,
+      :preferences => {:language => 'Ruby'},
+      :created_at  => Time.now.change(:usec => 0)
+    )
+  end
+  
+  [:json].each do |format|
+    context format do
+      should "be reversable" do
+        serialized = @instance.send("to_#{format}")
+        unserialized = @document.new.send("from_#{format}", serialized)
+
+        assert_equal @instance, unserialized
+      end
+      
+      should "allow attribute only filtering" do
+        serialized = @instance.send("to_#{format}", :only => [ :age, :name ])
+        unserialized = @document.new.send("from_#{format}", serialized)
+
+        assert_equal @instance.name, unserialized.name
+        assert_equal @instance.age, unserialized.age
+        assert ! unserialized.awesome
+        assert_nil unserialized.created_at
+      end
+      
+      should "allow attribute except filtering" do
+        serialized = @instance.send("to_#{format}", :except => [ :age, :name ])
+        unserialized = @document.new.send("from_#{format}", serialized)
+        
+        assert_nil unserialized.name
+        assert_nil unserialized.age
+        assert_equal @instance.awesome, unserialized.awesome
+      end
+    end
+  end
+end

data/test/unit/test_time_zones.rb

@@ -1,40 +1,40 @@
-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
-        key :name, String
-        key :created_at, Time
-      end
-    end
-    
-    should "work without Time.zone" do
-      Time.zone = nil
-      
-      doc = @document.new(:created_at => "2009-08-15 14:00:00")
-      doc.created_at.should == Time.local(2009, 8, 15, 14, 0, 0).utc
-    end
-    
-    should "work with Time.zone set to the (default) UTC" do
-      Time.zone = 'UTC'
-      
-      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, 15, 14)
-      
-      Time.zone = nil
-    end
-    
-    should_eventually "work with timezones that are not UTC" do
-      Time.zone = 'Hawaii'
-      
-      doc = @document.new(:created_at => @original_time)
-      doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_true
-      doc.created_at.should == Time.utc(2009, 8, 16)
-      
-      Time.zone = nil
-    end
-  end
+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
+        key :name, String
+        key :created_at, Time
+      end
+    end
+    
+    should "work without Time.zone" do
+      Time.zone = nil
+      
+      doc = @document.new(:created_at => "2009-08-15 14:00:00")
+      doc.created_at.should == Time.local(2009, 8, 15, 14, 0, 0).utc
+    end
+    
+    should "work with Time.zone set to the (default) UTC" do
+      Time.zone = 'UTC'
+      
+      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, 15, 14)
+      
+      Time.zone = nil
+    end
+    
+    should_eventually "work with timezones that are not UTC" do
+      Time.zone = 'Hawaii'
+      
+      doc = @document.new(:created_at => @original_time)
+      doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_true
+      doc.created_at.should == Time.utc(2009, 8, 16)
+      
+      Time.zone = nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djsun-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.4.1
+  version: 0.5.5.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -04:00
+date: 2009-10-16 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "2.3"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongo
@@ -43,24 +43,44 @@ dependencies:
         version: 1.7.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: jnunemaker-matchy
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 2.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: timecop
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.3.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
     version: 
 description: 
 email: nunemaker@gmail.com
@@ -102,7 +122,6 @@ files:
 - lib/mongo_mapper/pagination.rb
 - lib/mongo_mapper/rails_compatibility/document.rb
 - lib/mongo_mapper/rails_compatibility/embedded_document.rb
-- lib/mongo_mapper/save_with_validation.rb
 - lib/mongo_mapper/serialization.rb
 - lib/mongo_mapper/serializers/json_serializer.rb
 - lib/mongo_mapper/support.rb
@@ -110,7 +129,6 @@ files:
 - mongo_mapper.gemspec
 - specs.watchr
 - test/NOTE_ON_TESTING
-- test/custom_matchers.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
@@ -118,6 +136,7 @@ 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
@@ -129,6 +148,8 @@ files:
 - test/functional/test_rails_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
+- test/support/custom_matchers.rb
+- test/support/test_timing.rb
 - test/test_helper.rb
 - test/unit/serializers/test_json_serializer.rb
 - test/unit/test_association_base.rb
@@ -174,7 +195,6 @@ signing_key:
 specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
-- test/custom_matchers.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
@@ -182,6 +202,7 @@ 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
@@ -193,6 +214,8 @@ test_files:
 - test/functional/test_rails_compatibility.rb
 - test/functional/test_validations.rb
 - test/models.rb
+- test/support/custom_matchers.rb
+- test/support/test_timing.rb
 - test/test_helper.rb
 - test/unit/serializers/test_json_serializer.rb
 - test/unit/test_association_base.rb

data/lib/mongo_mapper/save_with_validation.rb

@@ -1,19 +0,0 @@
-module MongoMapper
-  module SaveWithValidation
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :save, :validation
-        alias_method_chain :save!, :validation
-      end
-    end
-    
-    private
-      def save_with_validation
-        valid? ? save_without_validation : false
-      end
-      
-      def save_with_validation!
-        valid? ? save_without_validation! : raise(DocumentNotValid.new(self))
-      end
-  end  
-end