mongo_mapper-unstable 2010.2.9 → 2010.2.10

data/VERSION

@@ -1 +1 @@
-2010.02.09
+2010.02.10

data/lib/mongo_mapper/document.rb

@@ -71,7 +71,7 @@ module MongoMapper
       end
 
       def find_each(options={})
-        criteria, options = to_finder_options(options)
+        criteria, options = to_query(options)
         collection.find(criteria, options).each do |doc|
           yield load(doc)
         end
@@ -294,7 +294,7 @@ module MongoMapper
 
         # All query methods that load documents pass through find_one or find_many
         def find_one(options={})
-          criteria, options = to_finder_options(options)
+          criteria, options = to_query(options)
           if doc = collection.find_one(criteria, options)
             load(doc)
           end
@@ -302,7 +302,7 @@ module MongoMapper
 
         # All query methods that load documents pass through find_one or find_many
         def find_many(options)
-          criteria, options = to_finder_options(options)
+          criteria, options = to_query(options)
           collection.find(criteria, options).to_a.map do |doc|
             load(doc)
           end
@@ -341,11 +341,11 @@ module MongoMapper
         end
 
         def to_criteria(options={})
-          FinderOptions.new(self, options).criteria
+          Query.new(self, options).criteria
         end
 
-        def to_finder_options(options={})
-          FinderOptions.new(self, options).to_a
+        def to_query(options={})
+          Query.new(self, options).to_a
         end
     end
 

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

@@ -2,28 +2,22 @@ module MongoMapper
   module Plugins
     module Associations
       class Base
-        attr_reader :type, :name, :options, :finder_options
+        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]
 
         def initialize(type, name, options={}, &extension)
-          @type, @name, @options, @finder_options = type, name, {}, {}
+          @type, @name, @options, @query_options, @original_options = type, name, {}, {}, options
           options.symbolize_keys!
-
-          options[:extend] = modulized_extensions(extension, options[:extend])
-
-          options.each_pair do |key, value|
-            if AssociationOptions.include?(key)
-              @options[key] = value
-            else
-              @finder_options[key] = value
-            end
-          end
+          options[:extend] = modularized_extensions(extension, options[:extend])
+          separate_options_and_conditions
         end
 
         def class_name
-          @class_name ||= begin
+          return @class_name if defined?(@class_name)
+          
+          @class_name = 
             if cn = options[:class_name]
               cn
             elsif many?
@@ -31,7 +25,6 @@ module MongoMapper
             else
               name.to_s.camelize
             end
-          end
         end
 
         def klass
@@ -39,15 +32,15 @@ module MongoMapper
         end
 
         def many?
-          @many_type ||= @type == :many
+          @type == :many
         end
 
         def belongs_to?
-          @belongs_to_type ||= @type == :belongs_to
+          @type == :belongs_to
         end
 
         def one?
-          @one_type ||= @type == :one
+          @type == :one
         end
 
         def polymorphic?
@@ -67,7 +60,7 @@ module MongoMapper
         end
 
         def type_key_name
-          @type_key_name ||= many? ? '_type' : "#{as}_type"
+          many? ? '_type' : "#{as}_type"
         end
 
         def as
@@ -82,10 +75,13 @@ module MongoMapper
           @ivar ||= "@_#{name}"
         end
 
+        # hate this, need to revisit
         def proxy_class
-          @proxy_class ||= begin
+          return @proxy_class if defined?(@proxy_class)
+          
+          @proxy_class = 
             if many?
-              if self.klass.embeddable?
+              if klass.embeddable?
                 polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy
               else
                 if polymorphic?
@@ -103,14 +99,20 @@ module MongoMapper
             else
               polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
             end
-          end
         end
 
         private
+          def separate_options_and_conditions
+            @original_options.each_pair do |key, value|
+              if AssociationOptions.include?(key)
+                @options[key] = value
+              else
+                @query_options[key] = value
+              end
+            end
+          end
 
-          # @param [Array<Module, Proc>] extensions a collection of Modules or 
-          #   Procs that extend the behaviour of this association.
-          def modulized_extensions(*extensions)
+          def modularized_extensions(*extensions)
             extensions.flatten.compact.map do |extension|
               Proc === extension ? Module.new(&extension) : extension
             end

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

@@ -10,19 +10,19 @@ module MongoMapper
             id, type = doc.id, doc.class.name
           end
 
-          owner[reflection.foreign_key] = id
-          owner[reflection.type_key_name] = type
+          owner[association.foreign_key] = id
+          owner[association.type_key_name] = type
           reset
         end
 
         protected
           def find_target
-            return nil if association_class.nil? || owner[reflection.foreign_key].nil?
-            association_class.find_by_id(owner[reflection.foreign_key])
+            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[reflection.type_key_name] ? proxy_owner[reflection.type_key_name].constantize : nil
+            proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
           end
       end
     end

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

@@ -10,14 +10,14 @@ module MongoMapper
             id = doc.id
           end
 
-          owner[reflection.foreign_key] = id
+          owner[association.foreign_key] = id
           reset
         end
 
         protected
           def find_target
-            return nil if owner[reflection.foreign_key].nil?
-            klass.find_by_id(owner[reflection.foreign_key])
+            return nil if owner[association.foreign_key].nil?
+            klass.find_by_id(owner[association.foreign_key])
           end
       end
     end

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

@@ -119,7 +119,7 @@ module MongoMapper
           end
 
           def scoped_options(options)
-            reflection.finder_options.merge(options).merge(scoped_conditions)
+            association.query_options.merge(options).merge(scoped_conditions)
           end
 
           def scoped_ids(args)

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

@@ -78,7 +78,7 @@ module MongoMapper
         end
 
         def nullify
-          criteria = FinderOptions.new(klass, scoped_conditions).criteria
+          criteria = Query.new(klass, scoped_conditions).criteria
           all(criteria).each do |doc|
             doc.update_attributes(self.foreign_key => nil)
           end
@@ -91,7 +91,7 @@ module MongoMapper
           end
 
           def scoped_options(options)
-            reflection.finder_options.merge(options).merge(scoped_conditions)
+            association.query_options.merge(options).merge(scoped_conditions)
           end
 
           def find_target

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

@@ -4,7 +4,7 @@ module MongoMapper
       class ManyEmbeddedPolymorphicProxy < EmbeddedCollection
         def replace(values)
           @_values = values.map do |v|
-            v.respond_to?(:attributes) ? v.attributes.merge(reflection.type_key_name => v.class.name) : v
+            v.respond_to?(:attributes) ? v.attributes.merge(association.type_key_name => v.class.name) : v
           end
           reset
         end
@@ -19,7 +19,7 @@ module MongoMapper
           end
 
           def polymorphic_class(doc)
-            if class_name = doc[reflection.type_key_name]
+            if class_name = doc[association.type_key_name]
               class_name.constantize
             else
               klass

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

@@ -4,7 +4,7 @@ module MongoMapper
       class ManyPolymorphicProxy < ManyDocumentsProxy
         private
           def apply_scope(doc)
-            doc[reflection.type_key_name] = doc.class.name
+            doc[association.type_key_name] = doc.class.name
             super
           end
       end

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

@@ -46,7 +46,7 @@ module MongoMapper
 
         protected
           def find_target
-            target_class.first(reflection.finder_options.merge(foreign_key => owner.id))
+            target_class.first(association.query_options.merge(foreign_key => owner.id))
           end
 
           def instantiate_target(instantiator, attrs={})
@@ -56,7 +56,7 @@ module MongoMapper
           end
 
           def target_class
-            @target_class ||= options[:class] || (options[:class_name] || reflection.name.to_s.camelize).constantize
+            @target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
           end
 
           def foreign_key

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

@@ -7,19 +7,19 @@ module MongoMapper
 
         instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
 
-        attr_reader :owner, :reflection, :target
+        attr_reader :owner, :association, :target
 
         alias :proxy_owner :owner
         alias :proxy_target :target
-        alias :proxy_reflection :reflection
+        alias :proxy_association :association
 
-        delegate :klass, :to => :proxy_reflection
-        delegate :options, :to => :proxy_reflection
+        delegate :klass, :to => :proxy_association
+        delegate :options, :to => :proxy_association
         delegate :collection, :to => :klass
 
-        def initialize(owner, reflection)
-          @owner, @reflection, @loaded = owner, reflection, false
-          Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
+        def initialize(owner, association)
+          @owner, @association, @loaded = owner, association, false
+          Array(association.options[:extend]).each { |ext| proxy_extend(ext) }
           reset
         end
 

data/lib/mongo_mapper/plugins/associations.rb

@@ -66,7 +66,7 @@ module MongoMapper
         def associations
           self.class.associations
         end
-        
+
         # @api private?
         def embedded_associations
           associations.select do |name, association|
@@ -81,24 +81,25 @@ module MongoMapper
             proxy = association.proxy_class.new(self, association)
             self.instance_variable_set(association.ivar, proxy)
           end
-          
+
           proxy
         end
       end
+
+      autoload :Base,                         'mongo_mapper/plugins/associations/base'
+      autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
+      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
+      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'
+      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/belongs_to_proxy'
+      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
+      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/many_polymorphic_proxy'
+      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/many_embedded_proxy'
+      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
+      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/many_documents_as_proxy'
+      autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
+      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
   end
 end
 
-require 'mongo_mapper/plugins/associations/base'
-require 'mongo_mapper/plugins/associations/proxy'
-require 'mongo_mapper/plugins/associations/collection'
-require 'mongo_mapper/plugins/associations/embedded_collection'
-require 'mongo_mapper/plugins/associations/many_documents_proxy'
-require 'mongo_mapper/plugins/associations/belongs_to_proxy'
-require 'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
-require 'mongo_mapper/plugins/associations/many_polymorphic_proxy'
-require 'mongo_mapper/plugins/associations/many_embedded_proxy'
-require 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
-require 'mongo_mapper/plugins/associations/many_documents_as_proxy'
-require 'mongo_mapper/plugins/associations/one_proxy'
-require 'mongo_mapper/plugins/associations/in_array_proxy'
+require 'mongo_mapper/plugins/associations/proxy'

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -28,21 +28,21 @@ module MongoMapper
         end
 
         def find_one(options={})
-          criteria, finder_options = to_finder_options(options)
+          criteria, query_options = to_query(options)
 
           if simple_find?(criteria) && identity_map.key?(criteria[:_id])
             identity_map[criteria[:_id]]
           else
             super.tap do |document|
-              remove_documents_from_map(document) if selecting_fields?(finder_options)
+              remove_documents_from_map(document) if selecting_fields?(query_options)
             end
           end
         end
 
         def find_many(options)
-          criteria, finder_options = to_finder_options(options)
+          criteria, query_options = to_query(options)
           super.tap do |documents|
-            remove_documents_from_map(documents) if selecting_fields?(finder_options)
+            remove_documents_from_map(documents) if selecting_fields?(query_options)
           end
         end
 

data/lib/mongo_mapper/plugins/pagination/proxy.rb

@@ -0,0 +1,68 @@
+module MongoMapper
+  module Plugins
+    module Pagination
+      class Proxy
+        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