mongo_mapper_ign 0.7.4 → 0.7.6

data/README.rdoc

@@ -14,7 +14,7 @@ Releases are tagged on github and released on gemcutter. Master is pushed to whe
 
 == Install
 
- $ gem install mongo_mapper
+ $ gem install mongo_mapper_ign
 
 == Config Rails environment.rb
 

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', '0.20.1'
-#   gem 'jnunemaker-validatable', '1.8.4'
+# encoding: UTF-8
+# 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'
     {
@@ -92,8 +90,7 @@ module MongoMapper
   end
 
   def self.setup(config, environment, options={})
-    using_passenger = options.delete(:passenger)
-    handle_passenger_forking if using_passenger
+    handle_passenger_forking
     self.config = config
     connect(environment, options)
   end

data/lib/mongo_mapper/document.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Document
     extend Support::DescendantAppends
@@ -45,34 +46,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 +91,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 +99,7 @@ module MongoMapper
       end
 
       def count(options={})
-        collection.find(to_criteria(options)).count
+        query(options).count
       end
 
       def exists?(options={})
@@ -126,11 +124,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 +151,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 +168,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 +186,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 +199,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 +213,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 +245,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/embedded_document.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module EmbeddedDocument
     extend Support::DescendantAppends

data/lib/mongo_mapper/plugins.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     def plugins

data/lib/mongo_mapper/plugins/associations.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -84,7 +85,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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -16,8 +17,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 +79,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

@@ -1,9 +1,10 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     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

@@ -1,9 +1,10 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     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/collection.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -88,7 +89,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/many_embedded_polymorphic_proxy.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,9 +1,10 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class OneProxy < Proxy
         undef_method :object_id
-        
+
         def build(attrs={})
           instantiate_target(:new, attrs)
         end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Almost all of this callback stuff is pulled directly from ActiveSupport
 # in the interest of support rails 2 and 3 at the same time and is the
 # same copyright as rails.

data/lib/mongo_mapper/plugins/clone.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Clone

data/lib/mongo_mapper/plugins/descendants.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Descendants

data/lib/mongo_mapper/plugins/dirty.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Dirty

data/lib/mongo_mapper/plugins/equality.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Equality
@@ -5,15 +6,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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module IdentityMap
@@ -8,7 +9,7 @@ module MongoMapper
       def self.clear
         models.each { |m| m.identity_map.clear }
       end
-      
+
       def self.configure(model)
         IdentityMap.models << model
       end
@@ -28,27 +29,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?