mongo_mapper 0.8.6 → 0.9.0

data/lib/mongo_mapper/plugins/associations/base.rb

@@ -3,47 +3,26 @@ module MongoMapper
   module Plugins
     module Associations
       class Base
-        attr_reader :type, :name, :options, :query_options
+        attr_reader :name, :options, :query_options
 
         # Options that should not be considered MongoDB query options/criteria
-        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic]
+        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave]
 
-        def initialize(type, name, options={}, &extension)
-          @type, @name, @options, @query_options, @original_options = type, name, {}, {}, options
+        def initialize(name, options={}, &extension)
+          @name, @options, @query_options, @original_options = name.to_sym, {}, {}, options
           options.symbolize_keys!
           options[:extend] = modularized_extensions(extension, options[:extend])
           separate_options_and_conditions
         end
 
         def class_name
-          return @class_name if defined?(@class_name)
-
-          @class_name =
-            if cn = options[:class_name]
-              cn
-            elsif many?
-              name.to_s.singularize.camelize
-            else
-              name.to_s.camelize
-            end
+          @class_name ||= options[:class_name] || name.to_s.camelize
         end
 
         def klass
           @klass ||= options[:class] || class_name.constantize
         end
 
-        def many?
-          @type == :many
-        end
-
-        def belongs_to?
-          @type == :belongs_to
-        end
-
-        def one?
-          @type == :one
-        end
-
         def polymorphic?
           !!@options[:polymorphic]
         end
@@ -57,11 +36,11 @@ module MongoMapper
         end
 
         def embeddable?
-          (one? || many?) && klass.embeddable?
+          klass.embeddable?
         end
 
         def type_key_name
-          many? ? '_type' : "#{as}_type"
+          "#{as}_type"
         end
 
         def as
@@ -76,30 +55,15 @@ module MongoMapper
           @ivar ||= "@_#{name}"
         end
 
-        # hate this, need to revisit
         def proxy_class
-          return @proxy_class if defined?(@proxy_class)
+          raise NotImplementedError
+        end
 
-          @proxy_class =
-            if many?
-              if klass.embeddable?
-                polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy
-              else
-                if polymorphic?
-                  ManyPolymorphicProxy
-                elsif as?
-                  ManyDocumentsAsProxy
-                elsif in_array?
-                  InArrayProxy
-                else
-                  ManyDocumentsProxy
-                end
-              end
-            elsif one?
-              klass.embeddable? ? OneEmbeddedProxy : OneProxy
-            else
-              polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
-            end
+        def setup(model)
+        end
+
+        def autosave?
+          raise NotImplementedError
         end
 
         private

data/lib/mongo_mapper/plugins/associations/belongs_to_association.rb

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class BelongsToAssociation < Base
+
+        def embeddable?
+          false
+        end
+
+        def proxy_class
+          @proxy_class ||= polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
+        end
+
+        def setup(model)
+          model.associations_module.module_eval <<-end_eval
+            def #{name}
+              proxy = get_proxy(associations[#{name.inspect}])
+              proxy.nil? ? nil : proxy
+            end
+
+            def #{name}=(value)
+              association = associations[#{name.inspect}]
+              proxy = get_proxy(association)
+
+              if proxy.nil? || proxy.target != value
+                proxy = build_proxy(association)
+              end
+
+              proxy.replace(value)
+              value
+            end
+
+            def #{name}?
+              get_proxy(associations[#{name.inspect}]).present?
+            end
+
+            def build_#{name}(attrs={})
+              get_proxy(associations[#{name.inspect}]).build(attrs)
+            end
+
+            def create_#{name}(attrs={})
+              get_proxy(associations[#{name.inspect}]).create(attrs)
+            end
+
+            def create_#{name}!(attrs={})
+              get_proxy(associations[#{name.inspect}]).create!(attrs)
+            end
+          end_eval
+        end
+
+        def autosave?
+          options.fetch(:autosave, false)
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb

@@ -5,13 +5,18 @@ module MongoMapper
       class BelongsToPolymorphicProxy < Proxy
         def replace(doc)
           if doc
-            doc.save if doc.new?
+            doc.save unless doc.persisted?
             id, type = doc.id, doc.class.name
           end
 
           proxy_owner[association.foreign_key] = id
           proxy_owner[association.type_key_name] = type
           reset
+          unless doc.nil?
+            loaded
+            @target = doc
+          end
+          @target
         end
 
         protected

data/lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb

@@ -5,12 +5,33 @@ module MongoMapper
       class BelongsToProxy < Proxy
         def replace(doc)
           if doc
-            doc.save if doc.new?
+            doc.save if !doc.persisted?
             id = doc.id
           end
 
+          reset
           proxy_owner[association.foreign_key] = id
-          reload
+          unless doc.nil?
+            loaded
+            @target = doc
+          end
+          @target
+        end
+
+        def build(attrs={})
+          instantiate_target(:new, attrs)
+        end
+
+        def create(attrs={})
+          instantiate_target(:create, attrs)
+        end
+
+        def create!(attrs={})
+          instantiate_target(:create!, attrs)
+        end
+
+        def save_to_collection(options={})
+          @target.save(options) if @target
         end
 
         protected
@@ -18,6 +39,13 @@ module MongoMapper
             return nil if proxy_owner[association.foreign_key].nil?
             klass.find_by_id(proxy_owner[association.foreign_key])
           end
+
+          def instantiate_target(instantiator, attrs={})
+            @target = klass.send(instantiator, attrs)
+            proxy_owner[association.foreign_key] = @target.id
+            loaded
+            @target
+          end
       end
     end
   end

data/lib/mongo_mapper/plugins/associations/embedded_collection.rb

@@ -30,6 +30,10 @@ module MongoMapper
         alias_method :push, :<<
         alias_method :concat, :<<
 
+        def save_to_collection(options={})
+          @target.each { |doc| doc.persist(options) } if @target
+        end
+
         private
           def assign_references(*docs)
             docs.each { |doc| doc._parent_document = proxy_owner }

data/lib/mongo_mapper/plugins/associations/in_array_proxy.rb

@@ -14,22 +14,27 @@ module MongoMapper
         end
 
         def paginate(options)
+          return [] if ids.blank?
           query.paginate(options)
         end
 
         def all(options={})
+          return [] if ids.blank?
           query(options).all
         end
 
         def first(options={})
+          return nil if ids.blank?
           query(options).first
         end
 
         def last(options={})
+          return nil if ids.blank?
           query(options).last
         end
 
         def count(options={})
+          return 0 if ids.blank?
           options.blank? ? ids.size : query(options).count
         end
 
@@ -44,7 +49,7 @@ module MongoMapper
         def delete_all(options={})
           docs = query(options).fields(:_id).all
           docs.each { |doc| ids.delete(doc.id) }
-          klass.delete(docs.map(&:id))
+          klass.delete(docs.map { |d| d.id })
           reset
         end
 
@@ -55,7 +60,7 @@ module MongoMapper
 
         def create(attrs={})
           doc = klass.create(attrs)
-          unless doc.new?
+          if doc.persisted?
             ids << doc.id
             proxy_owner.save
             reset
@@ -65,7 +70,7 @@ module MongoMapper
 
         def create!(attrs={})
           doc = klass.create!(attrs)
-          unless doc.new?
+          if doc.persisted?
             ids << doc.id
             proxy_owner.save
             reset
@@ -75,7 +80,7 @@ module MongoMapper
 
         def <<(*docs)
           flatten_deeper(docs).each do |doc|
-            doc.save if doc.new?
+            doc.save unless doc.persisted?
             unless ids.include?(doc.id)
               ids << doc.id
             end
@@ -87,7 +92,7 @@ module MongoMapper
 
         def replace(docs)
           doc_ids = docs.map do |doc|
-            doc.save if doc.new?
+            doc.save unless doc.persisted?
             doc.id
           end
           ids.replace(doc_ids.uniq)
@@ -115,7 +120,8 @@ module MongoMapper
           end
 
           def find_target
-            ids.blank? ? [] : all
+            return [] if ids.blank?
+            all
           end
 
           def ids

data/lib/mongo_mapper/plugins/associations/many_association.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class ManyAssociation < Base
+
+        def class_name
+          @class_name ||= options[:class_name] || name.to_s.singularize.camelize
+        end
+
+        def type_key_name
+          "_type"
+        end
+
+        # hate this, need to revisit
+        def proxy_class
+          @proxy_class ||= if klass.embeddable?
+            polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy
+          else
+            if polymorphic?
+              ManyPolymorphicProxy
+            elsif as?
+              ManyDocumentsAsProxy
+            elsif in_array?
+              InArrayProxy
+            else
+              ManyDocumentsProxy
+            end
+          end
+        end
+
+        def setup(model)
+          model.associations_module.module_eval <<-end_eval
+            def #{name}
+              get_proxy(associations[#{name.inspect}])
+            end
+
+            def #{name}=(value)
+              get_proxy(associations[#{name.inspect}]).replace(value)
+              value
+            end
+          end_eval
+
+          if options[:dependent] && !embeddable?
+            association = self
+            options = self.options
+
+            model.after_destroy do
+              case options[:dependent]
+                when :destroy
+                  self.get_proxy(association).destroy_all
+                when :delete_all
+                  self.get_proxy(association).delete_all
+                when :nullify
+                  self.get_proxy(association).nullify
+              end
+            end
+          end
+        end
+
+        def autosave?
+          options.fetch(:autosave, true)
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -8,7 +8,7 @@ module MongoMapper
 
         def replace(docs)
           load_target
-          target.map(&:destroy)
+          target.each { |t| t.destroy }
           docs.each { |doc| prepare(doc).save }
           reset
         end
@@ -44,7 +44,7 @@ module MongoMapper
         end
 
         def destroy_all(options={})
-          all(options).map(&:destroy)
+          all(options).each { |doc| doc.destroy }
           reset
         end
 
@@ -72,7 +72,7 @@ module MongoMapper
           def method_missing(method, *args, &block)
             if klass.respond_to?(method)
               result = klass.send(method, *args, &block)
-              result.is_a?(Plucky::Query) ? 
+              result.is_a?(Plucky::Query) ?
                 query.merge(result) : super
             else
               super
@@ -88,7 +88,7 @@ module MongoMapper
           end
 
           def ensure_owner_saved
-            proxy_owner.save if proxy_owner.new?
+            proxy_owner.save unless proxy_owner.persisted?
           end
 
           def prepare(doc)
@@ -101,7 +101,7 @@ module MongoMapper
           end
 
           def foreign_key
-            options[:foreign_key] || proxy_owner.class.name.to_s.underscore.gsub("/", "_") + "_id"
+            options[:foreign_key] || proxy_owner.class.name.foreign_key
           end
       end
     end

data/lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb

@@ -4,7 +4,7 @@ module MongoMapper
     module Associations
       class ManyEmbeddedProxy < EmbeddedCollection
         def replace(values)
-          @_values = values.map do |v|
+          @_values = (values || []).map do |v|
             v.respond_to?(:attributes) ? v.attributes : v
           end
           reset