mongo_mapper 0.7.5 → 0.7.6

data/lib/mongo_mapper.rb

@@ -1,10 +1,8 @@
-# Make sure you have the following libs in your load path or you could have issues:
-#   gem 'activesupport', '>= 2.3.4'
-#   gem 'mongo', '1.0'
-#   gem 'jnunemaker-validatable', '1.8.4'
+# Make sure you have the correct versions of the gems (see gemspec) in your load path.
 require 'set'
 require 'uri'
 require 'mongo'
+require 'plucky'
 require 'validatable'
 require 'active_support/all'
 
@@ -71,7 +69,7 @@ module MongoMapper
   def self.config_for_environment(environment)
     env = config[environment]
     return env if env['uri'].blank?
-    
+
     uri = URI.parse(env['uri'])
     raise InvalidScheme.new('must be mongodb') unless uri.scheme == 'mongodb'
     {

data/lib/mongo_mapper/document.rb

@@ -45,34 +45,31 @@ module MongoMapper
       end
 
       def find(*args)
-        assert_no_first_last_or_all(args)
         options = args.extract_options!
         return nil if args.size == 0
 
         if args.first.is_a?(Array) || args.size > 1
           find_some(args, options)
         else
-          find_one(options.merge({:_id => args[0]}))
+          query = query(options).update(:_id => args[0])
+          find_one(query.to_hash)
         end
       end
 
       def find!(*args)
-        assert_no_first_last_or_all(args)
         options = args.extract_options!
         raise DocumentNotFound, "Couldn't find without an ID" if args.size == 0
 
         if args.first.is_a?(Array) || args.size > 1
           find_some!(args, options)
         else
-          find_one(options.merge({:_id => args[0]})) || raise(DocumentNotFound, "Document match #{options.inspect} does not exist in #{collection.name} collection")
+          query = query(options).update(:_id => args[0])
+          find_one(query.to_hash) || raise(DocumentNotFound, "Document match #{options.inspect} does not exist in #{collection.name} collection")
         end
       end
 
       def find_each(options={})
-        criteria, options = to_query(options)
-        collection.find(criteria, options).each do |doc|
-          yield load(doc)
-        end
+        query(options).find().each { |doc| yield load(doc) }
       end
 
       def find_by_id(id)
@@ -93,7 +90,7 @@ module MongoMapper
 
       def last(options={})
         raise ':order option must be provided when using last' if options[:order].blank?
-        find_one(options.merge(:order => invert_order_clause(options[:order])))
+        find_one(query(options).reverse.to_hash)
       end
 
       def all(options={})
@@ -101,7 +98,7 @@ module MongoMapper
       end
 
       def count(options={})
-        collection.find(to_criteria(options)).count
+        query(options).count
       end
 
       def exists?(options={})
@@ -126,11 +123,11 @@ module MongoMapper
       end
 
       def delete(*ids)
-        collection.remove(to_criteria(:_id => ids.flatten))
+        query(:_id => ids.flatten).remove
       end
 
       def delete_all(options={})
-        collection.remove(to_criteria(options))
+        query(options).remove
       end
 
       def destroy(*ids)
@@ -153,6 +150,11 @@ module MongoMapper
         superclass.respond_to?(:keys) && superclass.keys.key?(:_type)
       end
 
+      # @api private for now
+      def query(options={})
+        Query.new(self, options)
+      end
+
       private
         def initialize_each(*docs)
           instances = []
@@ -165,15 +167,9 @@ module MongoMapper
           instances.size == 1 ? instances[0] : instances
         end
 
-        def assert_no_first_last_or_all(args)
-          if args[0] == :first || args[0] == :last || args[0] == :all
-            raise ArgumentError, "#{self}.find(:#{args}) is no longer supported, use #{self}.#{args} instead."
-          end
-        end
-
         def find_some(ids, options={})
-          ids = ids.flatten.compact.uniq
-          find_many(options.merge(:_id => ids)).compact
+          query = query(options).update(:_id => ids.flatten.compact.uniq)
+          find_many(query.to_hash).compact
         end
 
         def find_some!(ids, options={})
@@ -189,30 +185,12 @@ module MongoMapper
 
         # All query methods that load documents pass through find_one or find_many
         def find_one(options={})
-          criteria, options = to_query(options)
-          if doc = collection.find_one(criteria, options)
-            load(doc)
-          end
+          load(query(options).first)
         end
 
         # All query methods that load documents pass through find_one or find_many
         def find_many(options)
-          criteria, options = to_query(options)
-          collection.find(criteria, options).to_a.map do |doc|
-            load(doc)
-          end
-        end
-
-        def invert_order_clause(order)
-          order.split(',').map do |order_segment|
-            if order_segment =~ /\sasc/i
-              order_segment.sub /\sasc/i, ' desc'
-            elsif order_segment =~ /\sdesc/i
-              order_segment.sub /\sdesc/i, ' asc'
-            else
-              "#{order_segment.strip} desc"
-            end
-          end.join(',')
+          query(options).all().map { |doc| load(doc) }
         end
 
         def update_single(id, attrs)
@@ -220,9 +198,9 @@ module MongoMapper
             raise ArgumentError, "Updating a single document requires an id and a hash of attributes"
           end
 
-          doc = find(id)
-          doc.update_attributes(attrs)
-          doc
+          find(id).tap do |doc|
+            doc.update_attributes(attrs)
+          end
         end
 
         def update_multiple(docs)
@@ -234,14 +212,6 @@ module MongoMapper
           docs.each_pair { |id, attrs| instances << update(id, attrs) }
           instances
         end
-
-        def to_criteria(options={})
-          Query.new(self, options).criteria
-        end
-
-        def to_query(options={})
-          Query.new(self, options).to_a
-        end
     end
 
     module InstanceMethods
@@ -274,9 +244,9 @@ module MongoMapper
       end
 
       def reload
-        if attrs = collection.find_one({:_id => _id})
+        if doc = self.class.query(:_id => id).first
           self.class.associations.each { |name, assoc| send(name).reset if respond_to?(name) }
-          self.attributes = attrs
+          self.attributes = doc
           self
         else
           raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"

data/lib/mongo_mapper/plugins/associations.rb

@@ -84,7 +84,7 @@ module MongoMapper
 
           proxy
         end
-        
+
         def save_to_collection(options = {})
           super
           associations.each do |association_name, association|

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

@@ -16,8 +16,8 @@ module MongoMapper
 
         def class_name
           return @class_name if defined?(@class_name)
-          
-          @class_name = 
+
+          @class_name =
             if cn = options[:class_name]
               cn
             elsif many?
@@ -78,8 +78,8 @@ module MongoMapper
         # hate this, need to revisit
         def proxy_class
           return @proxy_class if defined?(@proxy_class)
-          
-          @proxy_class = 
+
+          @proxy_class =
             if many?
               if klass.embeddable?
                 polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy

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

@@ -3,7 +3,7 @@ module MongoMapper
     module Associations
       class BelongsToPolymorphicProxy < Proxy
         undef_method :object_id
-        
+
         def replace(doc)
           if doc
             doc.save if doc.new?

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

@@ -3,7 +3,7 @@ module MongoMapper
     module Associations
       class BelongsToProxy < Proxy
         undef_method :object_id
-        
+
         def replace(doc)
           if doc
             doc.save if doc.new?

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

@@ -88,7 +88,7 @@ module MongoMapper
           end
           reset
         end
-        
+
         def save_to_collection(options = {})
           @target.each { |doc| doc.save(options) } if @target
         end

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

@@ -3,7 +3,7 @@ module MongoMapper
     module Associations
       class OneProxy < Proxy
         undef_method :object_id
-        
+
         def build(attrs={})
           instantiate_target(:new, attrs)
         end

data/lib/mongo_mapper/plugins/equality.rb

@@ -5,15 +5,15 @@ module MongoMapper
         def ==(other)
           other.is_a?(self.class) && _id == other._id
         end
-        
+
         def eql?(other)
           self == other
         end
-        
+
         def equal?(other)
           object_id === other.object_id
         end
-        
+
         def hash
           _id.hash
         end

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -8,7 +8,7 @@ module MongoMapper
       def self.clear
         models.each { |m| m.identity_map.clear }
       end
-      
+
       def self.configure(model)
         IdentityMap.models << model
       end
@@ -28,27 +28,28 @@ module MongoMapper
         end
 
         def find_one(options={})
-          criteria, query_options = to_query(options)
-
+          query = query(options)
+          criteria = query.criteria.to_hash
+          
           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?(query_options)
+              remove_documents_from_map(document) if selecting_fields?(query.options)
             end
           end
         end
 
         def find_many(options)
-          criteria, query_options = to_query(options)
           super.tap do |documents|
-            remove_documents_from_map(documents) if selecting_fields?(query_options)
+            remove_documents_from_map(documents) if selecting_fields?(query(options).options)
           end
         end
 
         def load(attrs)
+          return nil if attrs.nil?
           document = identity_map[attrs['_id']]
-          
+
           if document.nil? || identity_map_off?
             document = super
             identity_map[document._id] = document if identity_map_on?

data/lib/mongo_mapper/plugins/keys.rb

@@ -1,6 +1,8 @@
 module MongoMapper
   module Plugins
     module Keys
+      autoload :Key, 'mongo_mapper/plugins/keys/key'
+
       def self.configure(model)
         model.key :_id, ObjectId
       end
@@ -17,15 +19,13 @@ module MongoMapper
         end
 
         def key(*args)
-          key = Key.new(*args)
-          keys[key.name] = key
-
-          create_accessors_for(key)
-          create_key_in_descendants(*args)
-          create_indexes_for(key)
-          create_validations_for(key)
-
-          key
+          Key.new(*args).tap do |key|
+            keys[key.name] = key
+            create_accessors_for(key)
+            create_key_in_descendants(*args)
+            create_indexes_for(key)
+            create_validations_for(key)
+          end
         end
 
         def key?(key)
@@ -36,9 +36,12 @@ module MongoMapper
           object_id_key?(:_id)
         end
 
+        def object_id_keys
+          keys.keys.select { |key| keys[key].type == ObjectId }.map(&:to_sym)
+        end
+
         def object_id_key?(name)
-          key = keys[name.to_s]
-          key && key.type == ObjectId
+          object_id_keys.include?(name.to_sym)
         end
 
         def to_mongo(instance)
@@ -53,6 +56,7 @@ module MongoMapper
 
         # load is overridden in identity map to ensure same objects are loaded
         def load(attrs)
+          return nil if attrs.nil?
           begin
             klass = attrs['_type'].present? ? attrs['_type'].constantize : self
             klass.new(attrs, true)
@@ -62,14 +66,16 @@ module MongoMapper
         end
 
         private
-          def accessors_module
-            module_defined =  if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
-                                const_defined?('MongoMapperKeys')
-                              else
-                                const_defined?('MongoMapperKeys', false)
-                              end
+          def key_accessors_module_defined?
+            if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
+              const_defined?('MongoMapperKeys')
+            else
+              const_defined?('MongoMapperKeys', false)
+            end
+          end
 
-            if module_defined
+          def accessors_module
+            if key_accessors_module_defined?
               const_get 'MongoMapperKeys'
             else
               const_set 'MongoMapperKeys', Module.new
@@ -154,7 +160,7 @@ module MongoMapper
 
           if from_database
             @new = false
-            self.attributes = attrs
+            load_from_database(attrs)
           else
             @new = true
             assign(attrs)
@@ -170,13 +176,11 @@ module MongoMapper
         def attributes=(attrs)
           return if attrs.blank?
 
-          attrs.each_pair do |name, value|
-            writer_method = "#{name}="
-
-            if respond_to?(writer_method)
-              self.send(writer_method, value)
+          attrs.each_pair do |key, value|
+            if respond_to?(:"#{key}=")
+              self.send(:"#{key}=", value)
             else
-              self[name.to_s] = value
+              self[key] = value
             end
           end
         end
@@ -255,6 +259,17 @@ module MongoMapper
         end
 
         private
+          def load_from_database(attrs)
+            return if attrs.blank?
+            attrs.each do |key, value|
+              if respond_to?(:"#{key}=") && !self.class.key?(key)
+                self.send(:"#{key}=", value)
+              else
+                self[key] = value
+              end
+            end
+          end
+
           def default_id_value(attrs)
             unless attrs.nil?
               provided_keys = attrs.keys.map { |k| k.to_s }
@@ -278,68 +293,29 @@ module MongoMapper
             end
           end
 
-          def read_key(name)
-            if key = keys[name]
-              var_name = "@#{name}"
-              value = key.get(instance_variable_get(var_name))
+          def read_key(key_name)
+            if key = keys[key_name]
+              value = key.get(instance_variable_get(:"@#{key_name}"))
               set_parent_document(key, value)
-              instance_variable_set(var_name, value)
+              instance_variable_set(:"@#{key_name}", value)
             else
-              raise KeyNotFound, "Could not find key: #{name.inspect}"
+              raise KeyNotFound, "Could not find key: #{key_name.inspect}"
             end
           end
 
           def read_key_before_typecast(name)
-            instance_variable_get("@#{name}_before_typecast")
+            instance_variable_get(:"@#{name}_before_typecast")
           end
 
           def write_key(name, value)
-            key = keys[name]
-
+            key = keys[name.to_s]
             set_parent_document(key, value)
-            instance_variable_set "@#{name}_before_typecast", value
-            instance_variable_set "@#{name}", key.set(value)
+            instance_variable_set :"@#{name}_before_typecast", value
+            instance_variable_set :"@#{name}", key.set(value)
           end
       end
 
-      class Key
-        attr_accessor :name, :type, :options, :default_value
-
-        def initialize(*args)
-          options = args.extract_options!
-          @name, @type = args.shift.to_s, args.shift
-          self.options = (options || {}).symbolize_keys
-          self.default_value = self.options.delete(:default)
-        end
-
-        def ==(other)
-          @name == other.name && @type == other.type
-        end
-
-        def embeddable?
-          type.respond_to?(:embeddable?) && type.embeddable? ? true : false
-        end
-
-        def number?
-          [Integer, Float].include?(type)
-        end
 
-        def get(value)
-          if value.nil? && !default_value.nil?
-            if default_value.respond_to?(:call)
-              return default_value.call
-            else
-              return default_value
-            end
-          end
-
-          type.from_mongo(value)
-        end
-
-        def set(value)
-          type.to_mongo(value)
-        end
-      end
     end
   end
 end