mongo_mapper 0.13.0 → 0.15.1

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

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

@@ -80,63 +80,70 @@ module MongoMapper
           load_target.each(&block)
         end
 
-        protected
-          def query(options={})
-            klass.
-              query(association.query_options).
-              amend(options).amend(criteria)
-          end
+      protected
 
-          def method_missing(method, *args, &block)
-            if klass.respond_to?(method)
-              result = klass.send(method, *args, &block)
-              case result
-              when Plucky::Query
-                query.merge result
-
-              # If we got a single record of this classas a result, return it
-              when klass
-                result
-
-              # If we got an array of this class as a result, return it
-              when Array
-                if result[0].is_a? klass
-                  result
-                else
-                  super
-                end
-              else
-                super
-              end
-            else
-              super
-            end
-          end
+        def query(options={})
+          klass.
+            query(association.query_options).
+            amend(options).
+            amend(criteria)
+        end
 
-          def criteria
-            {self.foreign_key => proxy_owner.id}
-          end
+        def criteria
+          {self.foreign_key => proxy_owner.id}
+        end
 
-          def find_target
-            all
-          end
+        def find_target
+          all
+        end
 
-          def ensure_owner_saved
-            proxy_owner.save unless proxy_owner.persisted?
-          end
+        def ensure_owner_saved
+          proxy_owner.save unless proxy_owner.persisted?
+        end
 
-          def prepare(doc)
-            klass === doc ? apply_scope(doc) : build(doc)
-          end
+        def prepare(doc)
+          klass === doc ? apply_scope(doc) : build(doc)
+        end
 
-          def apply_scope(doc)
-            criteria.each { |key, value| doc[key] = value }
-            doc
+        def apply_scope(doc)
+          criteria.each { |key, value| doc[key] = value }
+          doc
+        end
+
+        def foreign_key
+          options[:foreign_key] || proxy_owner.class.name.foreign_key
+        end
+
+      private
+
+        def method_missing(method, *args, &block)
+          return super unless klass.respond_to?(method)
+
+          result = nil
+
+          query.with_scope(query.criteria_hash) do
+            result = klass.send(method, *args, &block)
           end
 
-          def foreign_key
-            options[:foreign_key] || proxy_owner.class.name.foreign_key
+          case result
+          when Plucky::Query
+            query.merge result
+
+          # If we got a single record of this class as a result, return it
+          when klass
+            result
+
+          # If we got an array of this class as a result, return it
+          when Array
+            if result[0].is_a? klass
+              result
+            else
+              super
+            end
+          else
+            super
           end
+        end
       end
     end
   end

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

@@ -10,22 +10,23 @@ module MongoMapper
           reset
         end
 
-        protected
-          def find_target
-            (@_values || []).map do |hash|
-              child = polymorphic_class(hash).load(hash, true)
-              assign_references(child)
-              child
-            end
+      protected
+
+        def find_target
+          (@_values || []).map do |hash|
+            child = polymorphic_class(hash).load(hash, true)
+            assign_references(child)
+            child
           end
+        end
 
-          def polymorphic_class(doc)
-            if class_name = doc[association.type_key_name]
-              class_name.constantize
-            else
-              klass
-            end
+        def polymorphic_class(doc)
+          if class_name = doc[association.type_key_name]
+            class_name.constantize
+          else
+            klass
           end
+        end
       end
     end
   end

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

@@ -10,14 +10,15 @@ module MongoMapper
           reset
         end
 
-        private
-          def find_target
-            (@_values ||= []).map do |attrs|
-              klass.load(attrs, true).tap do |child|
-                assign_references(child)
-              end
+      private
+
+        def find_target
+          (@_values ||= []).map do |attrs|
+            klass.load(attrs, true).tap do |child|
+              assign_references(child)
             end
           end
+        end
       end
     end
   end

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

@@ -3,11 +3,13 @@ module MongoMapper
   module Plugins
     module Associations
       class ManyPolymorphicProxy < ManyDocumentsProxy
-        private
-          def apply_scope(doc)
-            doc[association.type_key_name] = doc.class.name
-            super
-          end
+
+      private
+
+        def apply_scope(doc)
+          doc[association.type_key_name] = doc.class.name
+          super
+        end
       end
     end
   end

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

@@ -3,19 +3,22 @@ module MongoMapper
   module Plugins
     module Associations
       class OneAsProxy < OneProxy
-        protected
-          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
+      protected
 
-          def id_key_name
-            "#{options[:as]}_id"
-          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 id_key_name
+          "#{options[:as]}_id"
+        end
       end
     end
   end

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

@@ -8,22 +8,23 @@ module MongoMapper
           reset
         end
 
-        protected
-          def find_target
-            if @value
-              child = polymorphic_class(@value).load(@value, true)
-              assign_references(child)
-              child
-            end
+      protected
+
+        def find_target
+          if @value
+            child = polymorphic_class(@value).load(@value, true)
+            assign_references(child)
+            child
           end
+        end
 
-          def polymorphic_class(doc)
-            if class_name = doc[association.type_key_name]
-              class_name.constantize
-            else
-              klass
-            end
+        def polymorphic_class(doc)
+          if class_name = doc[association.type_key_name]
+            class_name.constantize
+          else
+            klass
           end
+        end
       end
     end
   end

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

@@ -25,19 +25,19 @@ module MongoMapper
           @target.persist(options) if @target
         end
 
-        protected
+      protected
 
-          def find_target
-            if @value
-              klass.load(@value, true).tap do |child|
-                assign_references(child)
-              end
+        def find_target
+          if @value
+            klass.load(@value, true).tap do |child|
+              assign_references(child)
             end
           end
+        end
 
-          def assign_references(doc)
-            doc._parent_document = proxy_owner if doc
-          end
+        def assign_references(doc)
+          doc._parent_document = proxy_owner if doc
+        end
       end
     end
   end

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

@@ -57,38 +57,39 @@ module MongoMapper
           reset
         end
 
-        protected
-          def find_target
-            target_class.first(association.query_options.merge(criteria))
-          end
+      protected
 
-          def instantiate_target(instantiator, attrs={}, &block)
-            @target = target_class.send(instantiator, attrs.update(criteria), &block)
-            loaded
-            @target
-          end
+        def find_target
+          target_class.first(association.query_options.merge(criteria))
+        end
 
-          def target_class
-            @target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
-          end
+        def instantiate_target(instantiator, attrs={}, &block)
+          @target = target_class.send(instantiator, attrs.update(criteria), &block)
+          loaded
+          @target
+        end
 
-          def foreign_key
-            options[:foreign_key] || proxy_owner.class.name.foreign_key
-          end
+        def target_class
+          @target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
+        end
 
-          def criteria
-            {self.foreign_key => proxy_owner.id}
-          end
+        def foreign_key
+          options[:foreign_key] || proxy_owner.class.name.foreign_key
+        end
 
-          def nullify_scope(doc)
-            criteria.each { |key, value| doc[key] = nil }
-            doc
-          end
+        def criteria
+          {self.foreign_key => proxy_owner.id}
+        end
 
-          def apply_scope(doc)
-            criteria.each { |key, value| doc[key] = value }
-            doc
-          end
+        def nullify_scope(doc)
+          criteria.each { |key, value| doc[key] = nil }
+          doc
+        end
+
+        def apply_scope(doc)
+          criteria.each { |key, value| doc[key] = value }
+          doc
+        end
       end
     end
   end

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

@@ -13,7 +13,6 @@ module MongoMapper
 
         attr_reader :proxy_owner, :association, :target
 
-        alias :proxy_target :target
         alias :proxy_association :association
 
         def_delegators :proxy_association, :klass, :options
@@ -91,47 +90,55 @@ module MongoMapper
           proxy_respond_to?(*args) || (load_target && target.respond_to?(*args))
         end
 
-        def send(method, *args)
+        def send(method, *args, &block)
           if proxy_respond_to?(method, true)
             super
           else
             load_target
-            target.send(method, *args)
+            target.send(method, *args, &block)
           end
         end
 
-        protected
-          def method_missing(method, *args, &block)
-            if load_target
-              target.send(method, *args, &block)
-            end
-          end
+        def read
+          load_target
+          @target
+        end
 
-          def load_target
-            unless loaded?
-              if @target.is_a?(Array) && @target.any?
-                @target = find_target + @target.find_all { |record| !record.persisted? }
-              else
-                @target = find_target
-              end
-              loaded
+      protected
+
+        def load_target
+          unless loaded?
+            if @target.is_a?(Array) && @target.any?
+              @target = find_target + @target.find_all { |record| !record.persisted? }
+            else
+              @target = find_target
             end
-            @target
-          rescue MongoMapper::DocumentNotFound
-            reset
+            loaded
           end
+          @target
+        rescue MongoMapper::DocumentNotFound
+          reset
+        end
 
-          # :nocov:
-          def find_target
-            raise NotImplementedError
-          end
-          # :nocov:
+        # :nocov:
+        def find_target
+          raise NotImplementedError
+        end
+        # :nocov:
 
-          def flatten_deeper(array)
-            array.collect do |element|
-              (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element
-            end.flatten
+        def flatten_deeper(array)
+          array.collect do |element|
+            (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element
+          end.flatten
+        end
+
+      private
+
+        def method_missing(method, *args, &block)
+          if load_target
+            target.send(method, *args, &block)
           end
+        end
       end
     end
   end