mongo_mapper-unstable 2010.2.9 → 2010.2.10

data/test/unit/test_support.rb

@@ -267,6 +267,14 @@ class SupportTest < Test::Unit::TestCase
     end
   end
   
+  context "Symbol" do
+    %w(gt lt gte lte ne in nin mod all size where exists asc desc).each do |operator|
+      should "have $#{operator} operator" do
+        :foo.respond_to?(operator)
+      end
+    end
+  end
+  
   context "Time#to_mongo without Time.zone" do
     should "be time to milliseconds if string" do
       Time.to_mongo('2000-01-01 01:01:01.123456').should == Time.local(2000, 1, 1, 1, 1, 1, 123000).utc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.2.9
+  version: 2010.2.10
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,6 @@ files:
 - lib/mongo_mapper.rb
 - lib/mongo_mapper/document.rb
 - lib/mongo_mapper/embedded_document.rb
-- lib/mongo_mapper/finder_options.rb
 - lib/mongo_mapper/plugins.rb
 - lib/mongo_mapper/plugins/associations.rb
 - lib/mongo_mapper/plugins/associations/base.rb
@@ -127,10 +126,12 @@ files:
 - lib/mongo_mapper/plugins/keys.rb
 - lib/mongo_mapper/plugins/logger.rb
 - lib/mongo_mapper/plugins/pagination.rb
+- lib/mongo_mapper/plugins/pagination/proxy.rb
 - lib/mongo_mapper/plugins/protected.rb
 - lib/mongo_mapper/plugins/rails.rb
 - lib/mongo_mapper/plugins/serialization.rb
 - lib/mongo_mapper/plugins/validations.rb
+- lib/mongo_mapper/query.rb
 - lib/mongo_mapper/support.rb
 - lib/mongo_mapper/support/descendant_appends.rb
 - lib/mongo_mapper/support/find.rb
@@ -171,11 +172,11 @@ files:
 - test/unit/test_document.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb
-- test/unit/test_finder_options.rb
 - test/unit/test_keys.rb
 - test/unit/test_mongo_mapper.rb
 - test/unit/test_pagination.rb
 - test/unit/test_plugins.rb
+- test/unit/test_query.rb
 - test/unit/test_rails.rb
 - test/unit/test_rails_compatibility.rb
 - test/unit/test_serialization.rb
@@ -215,13 +216,13 @@ test_files:
 - test/unit/test_dynamic_finder.rb
 - test/unit/serializers/test_json_serializer.rb
 - test/unit/test_support.rb
-- test/unit/test_finder_options.rb
 - test/unit/test_keys.rb
 - test/unit/associations/test_proxy.rb
 - test/unit/associations/test_base.rb
 - test/unit/test_time_zones.rb
 - test/unit/test_serialization.rb
 - test/unit/test_rails.rb
+- test/unit/test_query.rb
 - test/unit/test_rails_compatibility.rb
 - test/unit/test_validations.rb
 - test/unit/test_mongo_mapper.rb

data/lib/mongo_mapper/finder_options.rb

@@ -1,127 +0,0 @@
-module MongoMapper
-  # = Important Note
-  # This class is private to MongoMapper and should not be considered part of 
-  # MongoMapper's public API.
-  #
-  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)
-
-      @model      = model
-      @options    = {}
-      @conditions = {}
-
-      options.each_pair do |key, value|
-        key = key.respond_to?(:to_sym) ? key.to_sym : key
-        if OptionKeys.include?(key)
-          @options[key] = value
-        elsif key == :conditions
-          @conditions.merge!(value)
-        else
-          @conditions[key] = value
-        end
-      end
-
-      add_sci_scope
-    end
-
-    def criteria
-      to_mongo_criteria(@conditions)
-    end
-
-    def options
-      fields = @options[:fields] || @options[:select]
-      skip   = @options[:skip]   || @options[:offset] || 0
-      limit  = @options[:limit]  || 0
-      sort   = @options[:sort]   || convert_order_to_sort(@options[:order])
-
-      {:fields => to_mongo_fields(fields), :skip => skip.to_i, :limit => limit.to_i, :sort => sort}
-    end
-
-    def to_a
-      [criteria, options]
-    end
-
-    private
-      def to_mongo_criteria(conditions, parent_key=nil)
-        criteria = {}
-
-        conditions.each_pair do |field, value|
-          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?(SymbolOperator)
-            criteria.update(field.to_mm_criteria(value))
-            next
-          end
-          
-          case value
-            when Array
-              criteria[field] = operator?(field) ? value : {'$in' => value}
-            when Hash
-              criteria[field] = to_mongo_criteria(value, field)
-            when Time
-              criteria[field] = value.utc
-            else            
-              criteria[field] = value
-          end
-        end
-
-        criteria
-      end
-
-      def operator?(field)
-        field.to_s =~ /^\$/
-      end
-
-      # adds _type single collection inheritance scope for models that need it
-      def add_sci_scope
-        if @model.single_collection_inherited?
-          @conditions[:_type] = @model.to_s
-        end
-      end
-
-      def to_mongo_fields(fields)
-        return if fields.blank?
-
-        if fields.respond_to?(:flatten, :compact)
-          fields.flatten.compact
-        else
-          fields.split(',').map { |field| field.strip }
-        end
-      end
-
-      def convert_order_to_sort(sort)
-        return if sort.blank?
-        
-        if sort.respond_to?(:all?) && sort.all? { |s| s.respond_to?(:to_mm_order) }
-          sort.map { |s| s.to_mm_order }
-        elsif sort.respond_to?(:to_mm_order)
-          [sort.to_mm_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 = FinderOptions.normalized_order_direction(direction)
-        [field, direction]
-      end
-  end
-end