mongo_mapper-unstable 2009.12.29 → 2009.12.30

data/VERSION

@@ -1 +1 @@
-2009.12.29
+2009.12.30

data/lib/mongo_mapper/finder_options.rb

@@ -8,10 +8,18 @@ module MongoMapper
   # useful for understanding how MongoMapper handles the parsing of finder 
   # conditions and options.
   #
-  # @private  
   class FinderOptions
     OptionKeys = [:fields, :select, :skip, :offset, :limit, :sort, :order]
-
+    
+    def self.normalized_field(field)
+      field.to_s == 'id' ? :_id : field
+    end
+    
+    def self.normalized_order_direction(direction)
+      direction ||= 'ASC'
+      direction.upcase == 'ASC' ? 1 : -1
+    end
+    
     def initialize(model, options)
       raise ArgumentError, "Options must be a hash" unless options.is_a?(Hash)
       options = options.symbolize_keys
@@ -58,14 +66,14 @@ module MongoMapper
         criteria = {}
 
         conditions.each_pair do |field, value|
-          field = normalized_field(field)
+          field = self.class.normalized_field(field)
           
           if @model.object_id_key?(field) && value.is_a?(String)
             value = Mongo::ObjectID.from_string(value)
           end
           
           if field.is_a?(FinderOperator)
-            criteria.merge!(field.to_criteria(value))
+            criteria.update(field.to_criteria(value))
             next
           end
           
@@ -86,10 +94,6 @@ module MongoMapper
         field.to_s =~ /^\$/
       end
 
-      def normalized_field(field)
-        field.to_s == 'id' ? :_id : field
-      end
-
       # adds _type single collection inheritance scope for models that need it
       def add_sci_scope
         if @model.single_collection_inherited?
@@ -109,14 +113,20 @@ module MongoMapper
 
       def convert_order_to_sort(sort)
         return if sort.blank?
-        pieces = sort.split(',')
-        pieces.map { |s| to_mongo_sort_piece(s) }
+        
+        if sort.respond_to?(:all?) && sort.all? { |s| s.respond_to?(:to_order) }
+          sort.map { |s| s.to_order }
+        elsif sort.respond_to?(:to_order)
+          [sort.to_order]
+        else
+          pieces = sort.split(',')
+          pieces.map { |s| to_mongo_sort_piece(s) }
+        end
       end
 
       def to_mongo_sort_piece(str)
         field, direction = str.strip.split(' ')
-        direction ||= 'ASC'
-        direction = direction.upcase == 'ASC' ? 1 : -1
+        direction = FinderOptions.normalized_order_direction(direction)
         [field, direction]
       end
   end
@@ -127,7 +137,17 @@ module MongoMapper
     end
     
     def to_criteria(value)
-      {@field => {@operator => value}}
+      {FinderOptions.normalized_field(@field) => {@operator => value}}
+    end
+  end
+  
+  class OrderOperator
+    def initialize(field, direction)
+      @field, @direction = field, direction
+    end
+    
+    def to_order
+      [@field.to_s, FinderOptions.normalized_order_direction(@direction)]
     end
   end
 end

data/lib/mongo_mapper/support.rb

@@ -160,6 +160,9 @@ class Symbol
       MongoMapper::FinderOperator.new(self, "$#{operator}")
     end
   end
+  
+  def asc;  MongoMapper::OrderOperator.new(self, 'asc') end
+  def desc; MongoMapper::OrderOperator.new(self, 'desc') end
 end
 
 class Time  

data/lib/mongo_mapper/validations.rb

@@ -31,9 +31,7 @@ module MongoMapper
 
       def where_conditions(instance)
         conditions = {}
-        unless case_sensitive
-          conditions.merge!({'$where' => "this.#{attribute}.toLowerCase() == '#{instance[attribute].to_s.downcase}'"})
-        end
+        conditions[attribute] = /#{instance[attribute].to_s}/i unless case_sensitive
         conditions
       end
     end

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -134,8 +134,8 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       
       @hall = Room.create(:name => 'Hall')
       @hm1 = Message.create(:body => 'Do not fall in the hall', :position => 1)
-      @hm2 = Message.create(:body => 'Hall the king!', :position => 2)
       @hm3 = Message.create(:body => 'Loungin!', :position => 3)
+      @hm2 = Message.create(:body => 'Hall the king!', :position => 2)
       @hall.messages = [@hm1, @hm2, @hm3]
       @hall.save
     end
@@ -270,7 +270,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "allow overriding the order provided to the association" do
-        @lounge.messages.all(:order => 'position desc').should == [@lm2, @lm1]
+        @lounge.messages.all(:order => 'position').should == [@lm1, @lm2]
       end
       
       should "allow using conditions on association" do

data/test/support/timing.rb

@@ -5,7 +5,7 @@ class Test::Unit::TestCase
     end_time = Time.now
  
     duration = end_time - begin_time
-    threshold = 0.5
+    threshold = 0.75
     
     if duration > threshold
       puts "\nSLOW TEST: #{duration} - #{self.name}"

data/test/unit/test_finder_options.rb

@@ -61,6 +61,13 @@ class FinderOptionsTest < Test::Unit::TestCase
       FinderOptions.new(Room, :id => id).criteria.should == {:_id => id}
     end
     
+    should "convert id with symbol operator to _id with modifier" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :id.ne => id).criteria.should == {
+        :_id => {'$ne' => id}
+      }
+    end
+    
     should "make sure that _id's are object ids" do
       id = Mongo::ObjectID.new
       FinderOptions.new(Room, :_id => id.to_s).criteria.should == {:_id => id}
@@ -121,6 +128,15 @@ class FinderOptionsTest < Test::Unit::TestCase
       FinderOptions.new(Room, :order => 'foo DESC').options[:sort].should == sort
     end
     
+    should "convert order operators to mongo sort" do
+      FinderOptions.new(Room, :order => :foo.asc).options[:sort].should == [['foo', 1]]
+      FinderOptions.new(Room, :order => :foo.desc).options[:sort].should == [['foo', -1]]
+    end
+    
+    should "convert array of order operators to mongo sort" do
+      FinderOptions.new(Room, :order => [:foo.asc, :bar.desc]).options[:sort].should == [['foo', 1], ['bar', -1]]
+    end
+    
     should "convert field without direction to ascending" do
       sort = [['foo', 1]]
       FinderOptions.new(Room, :order => 'foo').options[:sort].should == sort

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2009.12.29
+  version: 2009.12.30
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2009-12-30 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency