mongo_mapper-unstable 2010.2.9 → 2010.2.10

data/lib/mongo_mapper/plugins/pagination.rb

@@ -5,81 +5,20 @@ module MongoMapper
         def per_page
           25
         end
-        
+
         def paginate(options)
           per_page      = options.delete(:per_page) || self.per_page
           page          = options.delete(:page)
           total_entries = count(options)
-          pagination    = Pagination::PaginationProxy.new(total_entries, page, per_page)
+          pagination    = Pagination::Proxy.new(total_entries, page, per_page)
 
-          options.merge!(:limit => pagination.limit, :skip => pagination.skip)
+          options.update(:limit => pagination.limit, :skip => pagination.skip)
           pagination.subject = find_many(options)
           pagination
         end
       end
-      
-      class PaginationProxy
-        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
-
-        attr_accessor :subject
-        attr_reader :total_entries, :per_page, :current_page
-        alias limit per_page
-
-        def initialize(total_entries, current_page, per_page=nil)
-          @total_entries    = total_entries.to_i
-          self.per_page     = per_page
-          self.current_page = current_page
-        end
-
-        def total_pages
-          (total_entries / per_page.to_f).ceil
-        end
-
-        def out_of_bounds?
-          current_page > total_pages
-        end
-
-        def previous_page
-          current_page > 1 ? (current_page - 1) : nil
-        end
-
-        def next_page
-          current_page < total_pages ? (current_page + 1) : nil
-        end
-
-        def skip
-          (current_page - 1) * per_page
-        end
-        alias offset skip # for will paginate support
-
-        def send(method, *args, &block)
-          if respond_to?(method)
-            super
-          else
-            subject.send(method, *args, &block)
-          end
-        end
-
-        def ===(other)
-          other === subject
-        end
-
-        def method_missing(name, *args, &block)
-          @subject.send(name, *args, &block)
-        end
-
-        private
-          def per_page=(value)
-            value = 25 if value.blank?
-            @per_page = value.to_i
-          end
-
-          def current_page=(value)
-            value = value.to_i
-            value = 1 if value < 1
-            @current_page = value
-          end
-      end
     end
   end
-end
+end
+
+require 'mongo_mapper/plugins/pagination/proxy'

data/lib/mongo_mapper/plugins.rb

@@ -3,28 +3,29 @@ module MongoMapper
     def plugins
       @plugins ||= []
     end
-    
+
     def plugin(mod)
       extend mod::ClassMethods     if mod.const_defined?(:ClassMethods)
       include mod::InstanceMethods if mod.const_defined?(:InstanceMethods)
       mod.configure(self)          if mod.respond_to?(:configure)
       plugins << mod
     end
+
+    autoload :Callbacks,      'mongo_mapper/plugins/callbacks'
+    autoload :Clone,          'mongo_mapper/plugins/clone'
+    autoload :Descendants,    'mongo_mapper/plugins/descendants'
+    autoload :Dirty,          'mongo_mapper/plugins/dirty'
+    autoload :Equality,       'mongo_mapper/plugins/equality'
+    autoload :IdentityMap,    'mongo_mapper/plugins/identity_map'
+    autoload :Inspect,        'mongo_mapper/plugins/inspect'
+    autoload :Keys,           'mongo_mapper/plugins/keys'
+    autoload :Logger,         'mongo_mapper/plugins/logger'
+    autoload :Protected,      'mongo_mapper/plugins/protected'
+    autoload :Rails,          'mongo_mapper/plugins/rails'
+    autoload :Serialization,  'mongo_mapper/plugins/serialization'
+    autoload :Validations,    'mongo_mapper/plugins/validations'
   end
 end
 
 require 'mongo_mapper/plugins/associations'
-require 'mongo_mapper/plugins/callbacks'
-require 'mongo_mapper/plugins/clone'
-require 'mongo_mapper/plugins/descendants'
-require 'mongo_mapper/plugins/dirty'
-require 'mongo_mapper/plugins/equality'
-require 'mongo_mapper/plugins/identity_map'
-require 'mongo_mapper/plugins/inspect'
-require 'mongo_mapper/plugins/keys'
-require 'mongo_mapper/plugins/logger'
 require 'mongo_mapper/plugins/pagination'
-require 'mongo_mapper/plugins/protected'
-require 'mongo_mapper/plugins/rails'
-require 'mongo_mapper/plugins/serialization'
-require 'mongo_mapper/plugins/validations'

data/lib/mongo_mapper/query.rb

@@ -0,0 +1,130 @@
+module MongoMapper
+  # IMPORTANT
+  # This class is private to MongoMapper and should not be considered part of MongoMapper's public API.
+  #
+  class Query
+    OptionKeys = [:fields, :select, :skip, :offset, :limit, :sort, :order]
+
+    attr_reader :model
+
+    def initialize(model, options)
+      raise ArgumentError, "Options must be a hash" unless options.is_a?(Hash)
+      @model, @options, @conditions, @original_options = model, {}, {}, options
+      separate_options_and_conditions
+      add_sci_condition
+    end
+
+    def criteria
+      to_criteria(@conditions)
+    end
+
+    def options
+      fields = @options[:fields] || @options[:select]
+      skip   = @options[:skip]   || @options[:offset] || 0
+      limit  = @options[:limit]  || 0
+      sort   = @options[:sort]   || normalized_sort(@options[:order])
+
+      {:fields => to_fields(fields), :skip => skip.to_i, :limit => limit.to_i, :sort => sort}
+    end
+
+    def to_a
+      [criteria, options]
+    end
+
+    private
+      def separate_options_and_conditions
+        @original_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.update(value)
+          else
+            @conditions[key] = value
+          end
+        end
+      end
+
+      # adds _type single collection inheritance scope for models that need it
+      def add_sci_condition
+        @conditions[:_type] = model.to_s if model.single_collection_inherited?
+      end
+
+      def modifier?(field)
+        field.to_s =~ /^\$/
+      end
+
+      def symbol_operator?(object)
+        object.respond_to?(:field, :operator)
+      end
+
+      def to_criteria(conditions, parent_key=nil)
+        criteria = {}
+
+        conditions.each_pair do |key, value|
+          key = normalized_key(key)
+
+          if model.object_id_key?(key) && value.is_a?(String)
+            value = Mongo::ObjectID.from_string(value)
+          end
+
+          if symbol_operator?(key)
+            value = {"$#{key.operator}" => value}
+            key = normalized_key(key.field)
+          end
+
+          criteria[key] = normalized_value(key, value)
+        end
+
+        criteria
+      end
+
+      def to_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 to_order(field, direction=nil)
+        direction ||= 'ASC'
+        direction = direction.upcase == 'ASC' ? 1 : -1
+        [field.to_s, direction]
+      end
+
+      def normalized_key(field)
+        field.to_s == 'id' ? :_id : field
+      end
+
+      def normalized_value(field, value)
+        case value
+          when Array
+            modifier?(field) ? value : {'$in' => value}
+          when Hash
+            to_criteria(value, field)
+          when Time
+            value.utc
+          else
+            value
+        end
+      end
+
+      def normalized_sort(sort)
+        return if sort.blank?
+
+        if sort.respond_to?(:all?) && sort.all? { |s| symbol_operator?(s) }
+          sort.map { |s| to_order(s.field, s.operator) }
+        elsif symbol_operator?(sort)
+          [to_order(sort.field, sort.operator)]
+        else
+          sort.split(',').map do |str|
+            to_order(*str.strip.split(' '))
+          end
+        end
+      end
+  end
+end

data/lib/mongo_mapper/support.rb

@@ -164,21 +164,15 @@ class String
 end
 
 class SymbolOperator
+  attr_reader :field, :operator
+
   def initialize(field, operator, options={})
     @field, @operator = field, operator
   end unless method_defined?(:initialize)
-  
-  def to_mm_criteria(value)
-    {MongoMapper::FinderOptions.normalized_field(@field) => {"$#{@operator}" => value}}
-  end
-  
-  def to_mm_order
-    [@field.to_s, MongoMapper::FinderOptions.normalized_order_direction(@operator)]
-  end
 end
 
 class Symbol
-  %w(gt lt gte lte ne in nin mod size where exists asc desc).each do |operator|
+  %w(gt lt gte lte ne in nin mod all size where exists asc desc).each do |operator|
     define_method(operator) do
       SymbolOperator.new(self, operator)
     end unless method_defined?(operator)
@@ -213,5 +207,9 @@ class Mongo::ObjectID
   end
 end
 
-require 'mongo_mapper/support/descendant_appends'
-require 'mongo_mapper/support/find'
+module MongoMapper
+  module Support
+    autoload :DescendantAppends, 'mongo_mapper/support/descendant_appends'
+    autoload :Find,              'mongo_mapper/support/find'
+  end
+end

data/lib/mongo_mapper.rb

@@ -108,11 +108,11 @@ module MongoMapper
   def self.normalize_object_id(value)
     value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
   end
+  
+  autoload :Query,            'mongo_mapper/query'
+  autoload :Document,         'mongo_mapper/document'
+  autoload :EmbeddedDocument, 'mongo_mapper/embedded_document'
 end
 
 require 'mongo_mapper/support'
-require 'mongo_mapper/finder_options'
-require 'mongo_mapper/plugins'
-
-require 'mongo_mapper/document'
-require 'mongo_mapper/embedded_document'
+require 'mongo_mapper/plugins'

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.10"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-02-10}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -25,35 +25,44 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/mmconsole",
      "lib/mongo_mapper.rb",
-     "lib/mongo_mapper/associations.rb",
-     "lib/mongo_mapper/associations/base.rb",
-     "lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/belongs_to_proxy.rb",
-     "lib/mongo_mapper/associations/collection.rb",
-     "lib/mongo_mapper/associations/in_array_proxy.rb",
-     "lib/mongo_mapper/associations/many_documents_as_proxy.rb",
-     "lib/mongo_mapper/associations/many_documents_proxy.rb",
-     "lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/many_embedded_proxy.rb",
-     "lib/mongo_mapper/associations/many_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/one_proxy.rb",
-     "lib/mongo_mapper/associations/proxy.rb",
-     "lib/mongo_mapper/callbacks.rb",
-     "lib/mongo_mapper/dirty.rb",
      "lib/mongo_mapper/document.rb",
-     "lib/mongo_mapper/dynamic_finder.rb",
      "lib/mongo_mapper/embedded_document.rb",
-     "lib/mongo_mapper/finder_options.rb",
-     "lib/mongo_mapper/key.rb",
-     "lib/mongo_mapper/mongo_mapper.rb",
-     "lib/mongo_mapper/pagination.rb",
-     "lib/mongo_mapper/rails_compatibility/document.rb",
-     "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
-     "lib/mongo_mapper/serialization.rb",
-     "lib/mongo_mapper/serializers/json_serializer.rb",
+     "lib/mongo_mapper/plugins.rb",
+     "lib/mongo_mapper/plugins/associations.rb",
+     "lib/mongo_mapper/plugins/associations/base.rb",
+     "lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/collection.rb",
+     "lib/mongo_mapper/plugins/associations/embedded_collection.rb",
+     "lib/mongo_mapper/plugins/associations/in_array_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_documents_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/one_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/proxy.rb",
+     "lib/mongo_mapper/plugins/callbacks.rb",
+     "lib/mongo_mapper/plugins/clone.rb",
+     "lib/mongo_mapper/plugins/descendants.rb",
+     "lib/mongo_mapper/plugins/dirty.rb",
+     "lib/mongo_mapper/plugins/equality.rb",
+     "lib/mongo_mapper/plugins/identity_map.rb",
+     "lib/mongo_mapper/plugins/inspect.rb",
+     "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/validations.rb",
+     "lib/mongo_mapper/support/descendant_appends.rb",
+     "lib/mongo_mapper/support/find.rb",
      "mongo_mapper.gemspec",
+     "performance/read_write.rb",
      "specs.watchr",
      "test/NOTE_ON_TESTING",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
@@ -71,10 +80,11 @@ Gem::Specification.new do |s|
      "test/functional/test_dirty.rb",
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
+     "test/functional/test_identity_map.rb",
      "test/functional/test_logger.rb",
      "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
-     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_protected.rb",
      "test/functional/test_string_id_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
@@ -84,15 +94,18 @@ Gem::Specification.new do |s|
      "test/unit/associations/test_base.rb",
      "test/unit/associations/test_proxy.rb",
      "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_descendant_appends.rb",
      "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_key.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_serializations.rb",
+     "test/unit/test_serialization.rb",
      "test/unit/test_support.rb",
      "test/unit/test_time_zones.rb",
      "test/unit/test_validations.rb"
@@ -118,10 +131,11 @@ Gem::Specification.new do |s|
      "test/functional/test_dirty.rb",
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
+     "test/functional/test_identity_map.rb",
      "test/functional/test_logger.rb",
      "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
-     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_protected.rb",
      "test/functional/test_string_id_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
@@ -131,15 +145,18 @@ Gem::Specification.new do |s|
      "test/unit/associations/test_base.rb",
      "test/unit/associations/test_proxy.rb",
      "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_descendant_appends.rb",
      "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_key.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_serializations.rb",
+     "test/unit/test_serialization.rb",
      "test/unit/test_support.rb",
      "test/unit/test_time_zones.rb",
      "test/unit/test_validations.rb"
@@ -151,7 +168,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.18.2"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.3"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -159,7 +176,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.18.2"])
+      s.add_dependency(%q<mongo>, ["= 0.18.3"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -168,7 +185,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18.2"])
+    s.add_dependency(%q<mongo>, ["= 0.18.3"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])