mongo_mapper_ign 0.7.7 → 0.7.8

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

@@ -1,31 +1,31 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class BelongsToPolymorphicProxy < Proxy
-        undef_method :object_id
-
-        def replace(doc)
-          if doc
-            doc.save if doc.new?
-            id, type = doc.id, doc.class.name
-          end
-
-          owner[association.foreign_key] = id
-          owner[association.type_key_name] = type
-          reset
-        end
-
-        protected
-          def find_target
-            return nil if association_class.nil? || owner[association.foreign_key].nil?
-            association_class.find_by_id(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
-end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class BelongsToPolymorphicProxy < Proxy
+        undef_method :object_id
+
+        def replace(doc)
+          if doc
+            doc.save if doc.new?
+            id, type = doc.id, doc.class.name
+          end
+
+          owner[association.foreign_key] = id
+          owner[association.type_key_name] = type
+          reset
+        end
+
+        protected
+          def find_target
+            return nil if association_class.nil? || owner[association.foreign_key].nil?
+            association_class.find_by_id(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
+end

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

@@ -1,26 +1,26 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class BelongsToProxy < Proxy
-        undef_method :object_id
-
-        def replace(doc)
-          if doc
-            doc.save if doc.new?
-            id = doc.id
-          end
-
-          owner[association.foreign_key] = id
-          reset
-        end
-
-        protected
-          def find_target
-            return nil if owner[association.foreign_key].nil?
-            klass.find_by_id(owner[association.foreign_key])
-          end
-      end
-    end
-  end
-end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class BelongsToProxy < Proxy
+        undef_method :object_id
+
+        def replace(doc)
+          if doc
+            doc.save if doc.new?
+            id = doc.id
+          end
+
+          owner[association.foreign_key] = id
+          reset
+        end
+
+        protected
+          def find_target
+            return nil if owner[association.foreign_key].nil?
+            klass.find_by_id(owner[association.foreign_key])
+          end
+      end
+    end
+  end
+end

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

@@ -1,22 +1,22 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class Collection < Proxy
-        def to_ary
-          load_target
-          if target.is_a?(Array)
-            target.to_ary
-          else
-            Array(target)
-          end
-        end
-
-        def reset
-          super
-          target = []
-        end
-      end
-    end
-  end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class Collection < Proxy
+        def to_ary
+          load_target
+          if target.is_a?(Array)
+            target.to_ary
+          else
+            Array(target)
+          end
+        end
+
+        def reset
+          super
+          target = []
+        end
+      end
+    end
+  end
 end

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

@@ -1,40 +1,40 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class EmbeddedCollection < Collection
-        def build(attributes={})
-          doc = klass.new(attributes)
-          assign_references(doc)
-          self << doc
-          doc
-        end
-
-        def find(id)
-          load_target
-          target.detect { |item| item.id.to_s == id || item.id == id }
-        end
-
-        def count
-          load_target
-          target.size
-        end
-
-        def <<(*docs)
-          load_target
-          docs.each do |doc|
-            assign_references(doc)
-            target << doc
-          end
-        end
-        alias_method :push, :<<
-        alias_method :concat, :<<
-
-        private
-          def assign_references(*docs)
-            docs.each { |doc| doc._parent_document = owner }
-          end
-      end
-    end
-  end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class EmbeddedCollection < Collection
+        def build(attributes={})
+          doc = klass.new(attributes)
+          assign_references(doc)
+          self << doc
+          doc
+        end
+
+        def find(id)
+          load_target
+          target.detect { |item| item.id.to_s == id || item.id == id }
+        end
+
+        def count
+          load_target
+          target.size
+        end
+
+        def <<(*docs)
+          load_target
+          docs.each do |doc|
+            assign_references(doc)
+            target << doc
+          end
+        end
+        alias_method :push, :<<
+        alias_method :concat, :<<
+
+        private
+          def assign_references(*docs)
+            docs.each { |doc| doc._parent_document = owner }
+          end
+      end
+    end
+  end
 end

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

@@ -1,145 +1,161 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class InArrayProxy < Collection
-        include Support::Find
-
-        def find(*args)
-          options = args.extract_options!
-
-          case args.first
-            when :first
-              first(options)
-            when :last
-              last(options)
-            when :all
-              all(options)
-            else
-              klass.find(*scoped_ids(args) << scoped_options(options))
-          end
-        end
-
-        def find!(*args)
-          options = args.extract_options!
-
-          case args.first
-            when :first
-              first(options)
-            when :last
-              last(options)
-            when :all
-              all(options)
-            else
-              klass.find!(*scoped_ids(args) << scoped_options(options))
-          end
-        end
-
-        def paginate(options)
-          klass.paginate(scoped_options(options))
-        end
-
-        def all(options={})
-          klass.all(scoped_options(options))
-        end
-
-        def first(options={})
-          klass.first(scoped_options(options))
-        end
-
-        def last(options={})
-          klass.last(scoped_options(options))
-        end
-
-        def count(options={})
-          options.blank? ? ids.size : klass.count(scoped_options(options))
-        end
-
-        def destroy_all(options={})
-          all(options).each do |doc|
-            ids.delete(doc.id)
-            doc.destroy
-          end
-          reset
-        end
-
-        def delete_all(options={})
-          docs = all(options.merge(:select => ['_id']))
-          docs.each { |doc| ids.delete(doc.id) }
-          klass.delete(docs.map(&:id))
-          reset
-        end
-
-        def nullify
-          replace([])
-          reset
-        end
-
-        def create(attrs={})
-          doc = klass.create(attrs)
-          unless doc.new?
-            ids << doc.id
-            owner.save
-            reset
-          end
-          doc
-        end
-
-        def create!(attrs={})
-          doc = klass.create!(attrs)
-          unless doc.new?
-            ids << doc.id
-            owner.save
-            reset
-          end
-          doc
-        end
-
-        def <<(*docs)
-          flatten_deeper(docs).each do |doc|
-            doc.save if doc.new?
-            unless ids.include?(doc.id)
-              ids << doc.id
-            end
-          end
-          reset
-        end
-        alias_method :push, :<<
-        alias_method :concat, :<<
-
-        def replace(docs)
-          doc_ids = docs.map do |doc|
-            doc.save if doc.new?
-            doc.id
-          end
-          ids.replace(doc_ids.uniq)
-          reset
-        end
-
-        private
-          def scoped_conditions
-            {:_id => ids}
-          end
-
-          def scoped_options(options)
-            association.query_options.merge(options).merge(scoped_conditions)
-          end
-
-          def scoped_ids(args)
-            args.flatten.select do |id|
-              id = ObjectId.to_mongo(id) if klass.using_object_id?
-              ids.include?(id)
-            end
-          end
-
-          def find_target
-            ids.blank? ? [] : all
-          end
-
-          def ids
-            owner[options[:in]]
-          end
-      end
-    end
-  end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class InArrayProxy < Collection
+        include Support::Find
+
+        def find(*args)
+          options = args.extract_options!
+
+          case args.first
+            when :first
+              first(options)
+            when :last
+              last(options)
+            when :all
+              all(options)
+            else
+              klass.find(*scoped_ids(args) << scoped_options(options))
+          end
+        end
+
+        def find!(*args)
+          options = args.extract_options!
+
+          case args.first
+            when :first
+              first(options)
+            when :last
+              last(options)
+            when :all
+              all(options)
+            else
+              klass.find!(*scoped_ids(args) << scoped_options(options))
+          end
+        end
+
+        def paginate(options)
+          klass.paginate(scoped_options(options))
+        end
+
+        def all(options={})
+          random_order = klass.all(scoped_conditions)
+
+          if (scoped_options(options)[:preserve_order])
+            preserve_order = Array.new
+            scoped_conditions[:_id].each do |id|
+              random_order.each do |element|
+                if (id.eql?(element._id))
+                  preserve_order << element
+                  break
+                end
+              end
+            end
+            return_value = preserve_order
+          else
+            return_value = random_order
+          end
+          return return_value
+        end
+
+        def first(options={})
+          klass.first(scoped_options(options))
+        end
+
+        def last(options={})
+          klass.last(scoped_options(options))
+        end
+
+        def count(options={})
+          options.blank? ? ids.size : klass.count(scoped_options(options))
+        end
+
+        def destroy_all(options={})
+          all(options).each do |doc|
+            ids.delete(doc.id)
+            doc.destroy
+          end
+          reset
+        end
+
+        def delete_all(options={})
+          docs = all(options.merge(:select => ['_id']))
+          docs.each { |doc| ids.delete(doc.id) }
+          klass.delete(docs.map(&:id))
+          reset
+        end
+
+        def nullify
+          replace([])
+          reset
+        end
+
+        def create(attrs={})
+          doc = klass.create(attrs)
+          unless doc.new?
+            ids << doc.id
+            owner.save
+            reset
+          end
+          doc
+        end
+
+        def create!(attrs={})
+          doc = klass.create!(attrs)
+          unless doc.new?
+            ids << doc.id
+            owner.save
+            reset
+          end
+          doc
+        end
+
+        def <<(*docs)
+          flatten_deeper(docs).each do |doc|
+            doc.save if doc.new?
+            unless ids.include?(doc.id)
+              ids << doc.id
+            end
+          end
+          reset
+        end
+        alias_method :push, :<<
+        alias_method :concat, :<<
+
+        def replace(docs)
+          doc_ids = docs.map do |doc|
+            doc.save if doc.new?
+            doc.id
+          end
+          ids.replace(doc_ids.uniq)
+          reset
+        end
+
+        private
+          def scoped_conditions
+            {:_id => ids}
+          end
+
+          def scoped_options(options)
+            association.query_options.merge(options).merge(scoped_conditions)
+          end
+
+          def scoped_ids(args)
+            args.flatten.select do |id|
+              id = ObjectId.to_mongo(id) if klass.using_object_id?
+              ids.include?(id)
+            end
+          end
+
+          def find_target
+            ids.blank? ? [] : all
+          end
+
+          def ids
+            owner[options[:in]]
+          end
+      end
+    end
+  end
 end