ign-mongo_mapper 0.8.6.1 → 0.8.6.2

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

@@ -6,7 +6,7 @@ module MongoMapper
         attr_reader :type, :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, :preserve_order]
 
         def initialize(type, name, options={}, &extension)
           @type, @name, @options, @query_options, @original_options = type, name, {}, {}, options

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

@@ -22,21 +22,21 @@ module MongoMapper
 
           return [] if ids.blank?
 
-          # preserve order if options[:preserve_order]
-          random_order = query(options).all
-          if options[:preserve_order]
-            preserve_order = Array.new
+	        # IGN: preserve order if association.options[:preserve_order]
+          default_results = query(options).all
+          if association.options[:preserve_order]
+            ordered_results = Array.new
             criteria[:_id].each do |id|
-              random_order.each do |element|
-                if (id.eql?(element._id))
-                  preserve_order << element
+              default_results.each do |element|
+                if id.eql?(element._id)
+                  ordered_results << element
                   break
                 end
               end
             end
-            preserve_order
+            ordered_results
           else
-            random_order
+            default_results
           end
 
         end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.8.6.1'
+  Version = '0.8.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ign-mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 8
   - 6
-  - 1
-  version: 0.8.6.1
+  - 2
+  version: 0.8.6.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -08:00
+date: 2011-01-28 00:00:00 -08:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency