mongo_mapper-unstable 2009.12.14 → 2009.12.16

data/Rakefile

@@ -12,7 +12,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors     = ["John Nunemaker"]
   
   gem.add_dependency('activesupport', '>= 2.3')
-  gem.add_dependency('mongo', '0.18')
+  gem.add_dependency('mongo', '0.18.1')
   gem.add_dependency('jnunemaker-validatable', '1.8.1')
   
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')

data/VERSION

@@ -1 +1 @@
-2009.12.14
+2009.12.16

data/lib/mongo_mapper.rb

@@ -1,3 +1,13 @@
+# if Gem is defined i'll assume you are using rubygems and lock specific versions
+# call me crazy but a plain old require will just get the latest version you have installed
+# so i want to make sure that if you are using gems you do in fact have the correct versions
+# if there is a better way to do this, please enlighten me!
+if self.class.const_defined?(:Gem)
+  gem 'activesupport', '>= 2.3'
+  gem 'mongo', '0.18.1'
+  gem 'jnunemaker-validatable', '1.8.1'
+end
+
 require 'active_support'
 require 'mongo'
 require 'validatable'

data/lib/mongo_mapper/associations.rb

@@ -1,140 +1,34 @@
 module MongoMapper
   module Associations
     module ClassMethods
-      ##
-      # This macro allows you define a "belongs-to" relationship between one 
-      # document and some other document.
-      #
-      # == Requirements
-      #
-      # Usage of this macro requires that your document define a key that can 
-      # be used to store the ID of the target document that is the parent of 
-      # this document.
-      #
-      # == Conventions
-      # 
-      # The following is a list of the conventions used by MongoMapper in 
-      # defining a belongs-to relationship. Each can likely be overridden via 
-      # the +options+ parameter.
-      #
-      # * The name of your belongs-to association is the lowercase, singular 
-      #   name of the target class
-      # * A key with the name of your association exists with an "_id" suffix 
-      #   to store the ID of the target of this relationship
-      #
-      # @param [Symbol] association_id The name of this association
-      # @param [Hash] options Optional parameters that define the 
-      #   characteristics of this relationship. These are often used to 
-      #   override MongoMapper conventions.
-      # @option options [Boolean] :polymorphic (false) Set this option to 
-      #   <code>true</code> to define a relationship that can be between this 
-      #   document and any other type of document. Note that you *must* also 
-      #   have a key on your document to store the type of document in this 
-      #   relationship.
-      # @option options [String] :class_name If your relationship doesn't use 
-      #   the name of some class, you *must* use this option to indicate the 
-      #   target class for this relationship.
-      # @option options [Symbol] :foreign_key Use this option to specify a 
-      #   non-conventional key that stores the ID of the parent in this 
-      #   relationship
-      #
-      # @example Conventional, and simple, usage of <code>belongs_to</code>
-      #   class Novel
-      #     include MongoMapper::Document
-      #
-      #     key :author_id, String # our "foreign key"
-      #
-      #     belongs_to :author
-      #   end
-      #
-      # @example Using :foreign_key and :class_name
-      #   class Pet
-      #     include MongoMapper::Document
-      #
-      #     key :person_id, String
-      #
-      #     belongs_to :owner,
-      #       :foreign_key => :person_id,
-      #       :class_name  => "Person"
-      #   end
-      #
-      # @example Defining a polymorphic belongs-to relationship
-      #   class Vehicle
-      #     include MongoMapper::Document
-      #
-      #     key :owner_id,   String
-      #     key :owner_type, String
-      #
-      #     belongs_to :owner,
-      #       :polymorphic => true
-      #   end
-      #
-      # @example Non-standard polymorphic belongs-to relationship
-      #   class Vehicle
-      #     include MongoMapper::Document
-      #
-      #     key :person_id,   String
-      #     key :person_type, String
-      #
-      #     belongs_to :owner,
-      #       :polymorphic   => true,
-      #       :foreign_key   => "person_id",
-      #       :type_key_name => "person_type"
-      #   end
       def belongs_to(association_id, options={}, &extension)
         create_association(:belongs_to, association_id, options, &extension)
         self
       end
 
-      ##
-      # This macro allows you to define a "has-many" relationship between a 
-      # document, and numerous child documents.
-      #
-      # == Conventions
-      #
-      # The following is a list of the conventions used by MongoMapper in 
-      # defining this relationship. Each can likely be overridden via the 
-      # +options+ parameter.
-      #
-      # * The name of your association is the lowercase, *plural* name of the 
-      #   target class
-      # * Your target class must have a "foreign key" bearing the name of this 
-      #   class suffixed by "_id"
-      #
-      # @param [Symbol] association_id The name of this association
-      # @param [Hash] options Optional parameters that define the 
-      #   characteristics of this relationship. These are often used to 
-      #   override MongoMapper conventions.
-      # @option options [String] :class_name If your relationship doesn't use 
-      #   the name of some class, you *must* use this option to indicate the 
-      #   target class for this relationship.
-      # @option options [Symbol] :foreign_key Use this option to specify a 
-      #   non-conventional key that stores the ID of the parent in this 
-      #   relationship
-      # @option options [#to_s] :as Used when the target relationship is 
-      #   polymorphic (i.e. the +belongs_to+ has set <tt>:polymorphic</tt> to 
-      #   +true+). See examples for usage.
       def many(association_id, options={}, &extension)
         create_association(:many, association_id, options, &extension)
         self
       end
-
+      
       def associations
-        @associations ||= self.superclass.respond_to?(:associations) ? 
-                            self.superclass.associations : 
-                            HashWithIndifferentAccess.new
+        @associations ||= HashWithIndifferentAccess.new
+      end
+      
+      def associations=(hash)
+        @associations = hash
+      end
+      
+      def inherited(subclass)
+        subclass.associations = associations.dup
+        super
       end
 
       private
         def create_association(type, name, options, &extension)
           association = Associations::Base.new(type, name, options, &extension)
           associations[association.name] = association
-          define_association_methods(association)
-          define_dependent_callback(association)
-          association
-        end
-
-        def define_association_methods(association)
+          
           define_method(association.name) do
             get_proxy(association)
           end
@@ -143,39 +37,32 @@ module MongoMapper
             get_proxy(association).replace(value)
             value
           end
-        end
-
-        def define_dependent_callback(association)
-          if association.options[:dependent]
-            if association.many?
-              define_dependent_callback_for_many(association)
-            end
-          end
-        end
-
-        def define_dependent_callback_for_many(association)
-          after_destroy do |doc|
-            if !association.embeddable?
+          
+          if association.options[:dependent] && association.many? && !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
+                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
     end
-
+    
     module InstanceMethods
+      def associations
+        self.class.associations
+      end
+
       def get_proxy(association)
         unless proxy = self.instance_variable_get(association.ivar)
           proxy = association.proxy_class.new(self, association)
           self.instance_variable_set(association.ivar, proxy) if !frozen?
         end
-
         proxy
       end
     end

data/lib/mongo_mapper/dirty.rb

@@ -67,8 +67,8 @@ module MongoMapper
     end
 
     # <tt>reload</tt> the record and clears changed keys.
-    # def reload_with_dirty(*args) #:nodoc:
-    #   record = reload_without_dirty(*args)
+    # def reload(*args) #:nodoc:
+    #   record = super
     #   changed_keys.clear
     #   record
     # end

data/lib/mongo_mapper/document.rb

@@ -427,7 +427,7 @@ module MongoMapper
 
       def reload
         doc = self.class.find(_id)
-        self.class.associations.each { |name, assoc| send(name).reset }
+        self.class.associations.each { |name, assoc| send(name).reset if respond_to?(name) }
         self.attributes = doc.attributes
         self
       end

data/lib/mongo_mapper/embedded_document.rb

@@ -1,12 +1,10 @@
-require 'observer'
-
 module MongoMapper
   module EmbeddedDocument
     def self.included(model)
       model.class_eval do
         extend ClassMethods
         include InstanceMethods
-
+        
         extend Associations::ClassMethods
         include Associations::InstanceMethods
 
@@ -81,14 +79,9 @@ module MongoMapper
         instance.to_mongo
       end
       
-      def from_mongo(instance_or_hash)
-        return nil if instance_or_hash.nil?
-        
-        if instance_or_hash.is_a?(self)
-          instance_or_hash
-        else
-          initialize_doc(instance_or_hash)
-        end
+      def from_mongo(value)
+        return nil if value.nil?
+        value.is_a?(self) ? value : initialize_doc(value)
       end
       
     private
@@ -179,13 +172,9 @@ module MongoMapper
     end
 
     module InstanceMethods
-      def logger
-        self.class.logger
-      end
-      
       def initialize(attrs={})
         unless attrs.nil?
-          self.class.associations.each_pair do |name, association|
+          associations.each do |name, association|
             if collection = attrs.delete(name)
               if association.many? && association.klass.embeddable?
                 root_document = attrs[:_root_document] || self
@@ -337,6 +326,10 @@ module MongoMapper
         self.attributes = attrs
         save!
       end
+      
+      def logger
+        self.class.logger
+      end
 
       private
         def _keys
@@ -380,7 +373,7 @@ module MongoMapper
         end
         
         def embedded_associations
-          self.class.associations.select do |name, association|
+          associations.select do |name, association|
             association.embeddable?
           end.map do |name, association|
             association

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-12-13}
+  s.date = %q{2009-12-15}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -145,7 +145,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.18"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.1"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -153,7 +153,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.18"])
+      s.add_dependency(%q<mongo>, ["= 0.18.1"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -162,7 +162,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18"])
+    s.add_dependency(%q<mongo>, ["= 0.18.1"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])

data/test/functional/test_dirty.rb

@@ -54,15 +54,15 @@ class DirtyTest < Test::Unit::TestCase
     
     should "not happen when loading from database" do
       doc = @document.create(:phrase => 'Foo')
-      
-      doc = doc.reload
+      doc.phrase = 'Fart'
+      doc.changed?.should be_true
+      doc.reload
       doc.changed?.should be_false
     end
     
     should "happen if changed after loading from database" do
       doc = @document.create(:phrase => 'Foo')
-      
-      doc = doc.reload
+      doc.reload
       doc.changed?.should be_false
       doc.phrase = 'Bar'
       doc.changed?.should be_true

data/test/functional/test_document.rb

@@ -962,6 +962,8 @@ class DocumentTest < Test::Unit::TestCase
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end
       class ::DocGrandSon < ::DocSon; end
+      
+      DocSon.many :children, :class_name => 'DocGrandSon'
 
       @parent = DocParent.new({:name => "Daddy Warbucks"})
       @daughter = DocDaughter.new({:name => "Little Orphan Annie"})
@@ -1100,6 +1102,13 @@ class DocumentTest < Test::Unit::TestCase
         DocParent.delete_all
       }.should change { DocParent.count }.by(-2)
     end
+    
+    should "be able to reload parent inherited class" do
+      brian = DocParent.create(:name => 'Brian')
+      brian.name = 'B-Dawg'
+      brian.reload
+      brian.name.should == 'Brian'
+    end
   end
 
   context "timestamping" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2009.12.14
+  version: 2009.12.16
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2009-12-16 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"
+        version: 0.18.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable