mongo_mapper 0.13.1 → 0.15.2

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

@@ -6,7 +6,7 @@ module MongoMapper
         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, :autosave, :touch, :counter_cache]
+        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :from, :polymorphic, :autosave, :touch, :counter_cache, :ordered]
 
         def initialize(name, options={}, &extension)
           @name, @options, @query_options, @original_options = name.to_sym, {}, {}, options
@@ -28,13 +28,17 @@ module MongoMapper
         end
 
         def as?
-          !!@options[:as]
+          !in_foreign_array? && !!@options[:as]
         end
 
         def in_array?
           !!@options[:in]
         end
 
+        def in_foreign_array?
+          !!@options[:from]
+        end
+
         def embeddable?
           klass.embeddable?
         end
@@ -47,6 +51,10 @@ module MongoMapper
           !!@options[:counter_cache]
         end
 
+        def ordered?
+          !!@options[:ordered]
+        end
+
         def type_key_name
           "_type"
         end
@@ -76,22 +84,23 @@ module MongoMapper
         def setup(model)
         end
 
-        private
-          def separate_options_and_conditions
-            @original_options.each_pair do |key, value|
-              if AssociationOptions.include?(key)
-                @options[key] = value
-              else
-                @query_options[key] = value
-              end
+      private
+
+        def separate_options_and_conditions
+          @original_options.each_pair do |key, value|
+            if AssociationOptions.include?(key)
+              @options[key] = value
+            else
+              @query_options[key] = value
             end
           end
+        end
 
-          def modularized_extensions(*extensions)
-            extensions.flatten.compact.map do |extension|
-              Proc === extension ? Module.new(&extension) : extension
-            end
+        def modularized_extensions(*extensions)
+          extensions.flatten.compact.map do |extension|
+            Proc === extension ? Module.new(&extension) : extension
           end
+        end
       end
     end
   end

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

@@ -29,7 +29,7 @@ module MongoMapper
 
         def add_touch_callbacks
           name        = self.name
-          method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
+          method_name = :"belongs_to_touch_after_save_or_destroy_for_#{name}"
           touch       = options.fetch(:touch)
 
           @model.send(:define_method, method_name) do

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

@@ -19,15 +19,16 @@ module MongoMapper
           @target
         end
 
-        protected
-          def find_target
-            return nil if association_class.nil? || proxy_owner[association.foreign_key].nil?
-            association_class.find_by_id(proxy_owner[association.foreign_key])
-          end
+      protected
 
-          def association_class
-            proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
-          end
+        def find_target
+          return nil if association_class.nil? || proxy_owner[association.foreign_key].nil?
+          association_class.find_by_id(proxy_owner[association.foreign_key])
+        end
+
+        def association_class
+          proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
+        end
       end
     end
   end

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

@@ -34,18 +34,25 @@ module MongoMapper
           @target.save(options) if @target
         end
 
-        protected
-          def find_target
-            return nil if proxy_owner[association.foreign_key].nil?
-            klass.find_by_id(proxy_owner[association.foreign_key])
-          end
+      protected
 
-          def instantiate_target(instantiator, attrs={}, &block)
-            @target = klass.send(instantiator, attrs, &block)
-            proxy_owner[association.foreign_key] = @target.id
-            loaded
-            @target
-          end
+        def find_target
+          return nil if proxy_owner[association.foreign_key].nil?
+          klass.find_by_id(proxy_owner[association.foreign_key])
+        end
+
+        def instantiate_target(instantiator, attrs={}, &block)
+          @target = klass.send(instantiator, attrs, &block)
+          proxy_owner[association.foreign_key] = @target.id
+          loaded
+          @target
+        end
+
+      private
+
+        def stale_target?
+          loaded? && @target && proxy_owner[association.foreign_key] != @target.id
+        end
       end
     end
   end

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

@@ -34,10 +34,10 @@ module MongoMapper
           @target.each { |doc| doc.persist(options) } if @target
         end
 
-        private
-          def assign_references(*docs)
-            docs.each { |doc| doc._parent_document = proxy_owner }
-          end
+      private
+        def assign_references(*docs)
+          docs.each { |doc| doc._parent_document = proxy_owner }
+        end
       end
     end
   end

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

@@ -6,11 +6,11 @@ module MongoMapper
         include DynamicQuerying::ClassMethods
 
         def find(*args)
-          query.find(*scoped_ids(args))
+          order_results(query.find(*scoped_ids(args)))
         end
 
         def find!(*args)
-          query.find!(*scoped_ids(args))
+          order_results(query.find!(*scoped_ids(args)))
         end
 
         def paginate(options)
@@ -20,17 +20,29 @@ module MongoMapper
 
         def all(options={})
           return [] if ids.blank?
-          query(options).all
+          order_results(query(options).all)
         end
 
         def first(options={})
           return nil if ids.blank?
-          query(options).first
+
+          if ordered?
+            ids = find_ordered_ids(options)
+            find!(ids.first) if ids.any?
+          else
+            query(options).first
+          end
         end
 
         def last(options={})
           return nil if ids.blank?
-          query(options).last
+
+          if ordered?
+            ids = find_ordered_ids(options)
+            find!(ids.last) if ids.any?
+          else
+            query(options).last
+          end
         end
 
         def count(options={})
@@ -99,35 +111,54 @@ module MongoMapper
           reset
         end
 
-        private
-          def query(options={})
-            klass.
-              query(association.query_options).
-              amend(options).
-              amend(criteria)
-          end
+      private
 
-          def criteria
-            {:_id => ids}
-          end
+        def query(options={})
+          klass.
+            query(association.query_options).
+            amend(options).
+            amend(criteria)
+        end
 
-          def scoped_ids(args)
-            valid = args.flatten.select do |id|
-              id = ObjectId.to_mongo(id) if klass.using_object_id?
-              ids.include?(id)
-            end
-            valid.empty? ? nil : valid
-          end
+        def criteria
+          {:_id => ids}
+        end
 
-          def find_target
-            return [] if ids.blank?
-            all
+        def scoped_ids(args)
+          valid = args.flatten.select do |id|
+            id = ObjectId.to_mongo(id) if klass.using_object_id?
+            ids.include?(id)
           end
+          valid.empty? ? nil : valid
+        end
+
+        def find_ordered_ids(options={})
+          return ids if options.empty?
+
+          matched_ids = klass.collection.distinct(:_id, query(options).criteria.to_hash)
+          matched_ids.sort_by! { |matched_id| ids.index(matched_id) }
+        end
+
+        def find_target
+          return [] if ids.blank?
+          all
+        end
+
+        def ids
+          proxy_owner[options[:in]]
+        end
+
+        def order_results(objects)
+          return objects if !ordered?
+          return objects unless objects.respond_to?(:to_a) && objects.respond_to?(:sort_by)
+          objects.sort_by { |obj| ids.index(obj.id) }
+        end
+
+        def ordered?
+          association.ordered?
+        end
 
-          def ids
-            proxy_owner[options[:in]]
-          end
       end
     end
   end
-end
+end

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

@@ -0,0 +1,136 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class InForeignArrayProxy < Collection
+        include DynamicQuerying::ClassMethods
+
+        def find(*args)
+          query.find(*scoped_ids(args))
+        end
+
+        def find!(*args)
+          query.find!(*scoped_ids(args))
+        end
+
+        def paginate(options)
+          query.paginate(options)
+        end
+
+        def all(options={})
+          query(options).all
+        end
+
+        def first(options={})
+          query(options).first
+        end
+
+        def last(options={})
+          query(options).last
+        end
+
+        def count(options={})
+          query(options).count
+        end
+
+        def destroy_all(options={})
+          all(options).each do |doc|
+            doc.destroy
+          end
+          reset
+        end
+
+        def delete_all(options={})
+          docs = query(options).fields(:_id).all
+          klass.delete(docs.map { |d| d.id })
+          reset
+        end
+
+        def nullify
+          replace([])
+          reset
+        end
+
+        def create(attrs={})
+          doc = klass.create(attrs)
+          if doc.persisted?
+            inverse_association(doc) << proxy_owner
+            doc.save
+            reset
+          end
+          doc
+        end
+
+        def create!(attrs={})
+          doc = klass.create!(attrs)
+
+          if doc.persisted?
+            inverse_association(doc) << proxy_owner
+            doc.save
+            reset
+          end
+          doc
+        end
+
+        def <<(*docs)
+          flatten_deeper(docs).each do |doc|
+            inverse_association(doc) << proxy_owner
+            doc.save
+          end
+          reset
+        end
+        alias_method :push, :<<
+        alias_method :concat, :<<
+
+        def replace(docs)
+          doc_ids = docs.map do |doc|
+            doc.save unless doc.persisted?
+            inverse_association(doc) << proxy_owner
+            doc.save
+            doc.id
+          end
+
+          replace_selector =  { options[:from] => proxy_owner.id }
+          unless doc_ids.empty?
+            replace_selector[:_id] = {"$not" => {"$in" => doc_ids}}
+          end
+
+          klass.collection.update_many(replace_selector, {
+            "$pull" => { options[:from] => proxy_owner.id }
+          })
+
+          reset
+        end
+
+        private
+
+          def query(options={})
+            klass.query({}.
+              merge(association.query_options).
+              merge(options).
+              merge(criteria))
+          end
+
+          def criteria
+            {options[:from] => proxy_owner.id}
+          end
+
+          def scoped_ids(args)
+            valid = args.flatten.map do |id|
+              id = ObjectId.to_mongo(id) if klass.using_object_id?
+              id
+            end
+            valid.empty? ? nil : valid
+          end
+
+          def find_target
+            all
+          end
+
+          def inverse_association(doc)
+            doc.send(options[:as].to_s.pluralize)
+          end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,8 @@ module MongoMapper
               ManyPolymorphicProxy
             elsif as?
               ManyDocumentsAsProxy
+            elsif in_foreign_array?
+              InForeignArrayProxy
             elsif in_array?
               InArrayProxy
             else
@@ -26,7 +28,7 @@ module MongoMapper
         end
 
         def setup(model)
-          model.associations_module.module_eval <<-end_eval
+          model.associations_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
             def #{name}
               get_proxy(associations[#{name.inspect}])
             end
@@ -60,4 +62,4 @@ module MongoMapper
       end
     end
   end
-end
+end

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

@@ -3,25 +3,27 @@ module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsAsProxy < ManyDocumentsProxy
-        protected
-          def criteria
-            {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
-          end
+      protected
 
-          def apply_scope(doc)
-            ensure_owner_saved
-            criteria.each { |key, value| doc[key] = value }
-            doc
-          end
+        def criteria
+          {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
+        end
 
-        private
-          def type_key_name
-            "#{options[:as]}_type"
-          end
+        def apply_scope(doc)
+          ensure_owner_saved
+          criteria.each { |key, value| doc[key] = value }
+          doc
+        end
 
-          def id_key_name
-            "#{options[:as]}_id"
-          end
+      private
+
+        def type_key_name
+          "#{options[:as]}_type"
+        end
+
+        def id_key_name
+          "#{options[:as]}_id"
+        end
       end
     end
   end