mongo_mapper 0.5.8 → 0.6.0

data/lib/mongo_mapper/associations/proxy.rb

@@ -6,7 +6,7 @@ module MongoMapper
       def initialize(owner, association)
         @owner = owner
         @association = association
-        @association.options[:extend].each { |ext| proxy_extend(ext) }
+        @association.options[:extend].each { |ext| class << self; self; end.instance_eval { include ext } }
         reset
       end
 
@@ -25,7 +25,12 @@ module MongoMapper
       end
 
       def send(method, *args)
-        return super if methods.include?(method.to_s)
+        metaclass_instance_methods = class << self; self; end.instance_methods
+        
+        if metaclass_instance_methods.any? { |m| m.to_s == method.to_s }
+          return __send__(method, *args)
+        end
+        
         load_target
         @target.send(method, *args)
       end
@@ -45,12 +50,12 @@ module MongoMapper
       end
       
       protected
-        def method_missing(method, *args)
+        def method_missing(method, *args, &block)
           if load_target
-            if block_given?
-              @target.send(method, *args)  { |*block_args| yield(*block_args) }
-            else
+            if block.nil?
               @target.send(method, *args)
+            else
+              @target.send(method, *args)  { |*block_args| block.call(*block_args) }
             end
           end
         end

data/lib/mongo_mapper/document.rb

@@ -55,7 +55,7 @@ module MongoMapper
       # @overload find(ids, options)
       #
       # @raise DocumentNotFound raised when no ID or arguments are provided
-      def find(*args)
+      def find!(*args)
         options = args.extract_options!
         case args.first
           when :first then first(options)
@@ -73,6 +73,12 @@ module MongoMapper
             end
         end
       end
+      
+      def find(*args)
+        find!(*args)
+      rescue DocumentNotFound
+        nil
+      end
 
       def paginate(options)
         per_page      = options.delete(:per_page) || self.per_page
@@ -247,26 +253,36 @@ module MongoMapper
         @connection
       end
 
-      # @overload database()
-      #   @return [Mongo] the database object used by your document class
+      # Changes the database name from the default to whatever you want
+      #
+      # @param [#to_s] name the new database name to use.
+      def set_database_name(name)
+        @database_name = name
+      end
+      
+      # Returns the database name
+      #
+      # @return [String] the database name
+      def database_name
+        @database_name
+      end
+
+      # Returns the database the document should use. Defaults to
+      #   MongoMapper.database if other database is not set.
       #
-      # @overload database(name)
-      #   @param [String] name the name of an existing, or new, Mongo database
-      #   @return [Mongo] a Mongo database object for the specified database
-      def database(name=nil)
-        if name.nil?
-          @database ||= MongoMapper.database
+      # @return [Mongo::DB] the mongo database instance
+      def database
+        if database_name.nil?
+          MongoMapper.database
         else
-          @database = connection.db(name)
+          connection.db(database_name)
         end
-        @database
       end
 
       # Changes the collection name from the default to whatever you want
       #
-      # @param [#to_s] name the new collection name to use. Defaults to +nil+
-      def set_collection_name(name=nil)
-        @collection = nil
+      # @param [#to_s] name the new collection name to use.
+      def set_collection_name(name)
         @collection_name = name
       end
 
@@ -280,7 +296,7 @@ module MongoMapper
 
       # @return the Mongo Ruby driver +collection+ object
       def collection
-        @collection ||= database.collection(collection_name)
+        database.collection(collection_name)
       end
       
       # Defines a +created_at+ and +updated_at+ attribute (with a +Time+ 
@@ -416,22 +432,22 @@ module MongoMapper
         read_attribute('_id').blank? || using_custom_id?
       end
 
-      def save
-        valid? ? create_or_update : false
+      def save(perform_validations=true)
+        !perform_validations || valid? ? create_or_update : false
       end
 
       def save!
-        valid? ? create_or_update : raise(DocumentNotValid.new(self))
+        save || raise(DocumentNotValid.new(self))
       end
 
       def destroy
         return false if frozen?
-        self.class.delete(id) unless new?
+        self.class.delete(_id) unless new?
         freeze
       end
 
       def reload
-        self.class.find(id)
+        self.class.find(_id)
       end
 
     private
@@ -447,7 +463,7 @@ module MongoMapper
 
       def assign_id
         if read_attribute(:_id).blank?
-          write_attribute(:_id, Mongo::ObjectID.new.to_s)
+          write_attribute :_id, Mongo::ObjectID.new
         end
       end
 

data/lib/mongo_mapper/embedded_document.rb

@@ -16,7 +16,7 @@ module MongoMapper
 
         extend Validations::Macros
 
-        key :_id, String
+        key :_id, ObjectId
         attr_accessor :_root_document
       end
     end
@@ -25,7 +25,7 @@ module MongoMapper
       def logger
         MongoMapper.logger
       end
-      
+
       def inherited(subclass)
         unless subclass.embeddable?
           subclass.set_collection_name(collection_name)
@@ -48,19 +48,23 @@ module MongoMapper
 
       def key(*args)
         key = Key.new(*args)
+        keys[key.name] = key
 
-        if keys[key.name].blank?
-          keys[key.name] = key
+        create_accessors_for(key)
+        create_key_in_subclasses(*args)
+        create_validations_for(key)
 
-          create_accessors_for(key)
-          create_key_in_subclasses(*args)
-          create_validations_for(key)
-          
-          key
-        end
-        
         key
       end
+      
+      def using_object_id?
+        object_id_key?(:_id)
+      end
+      
+      def object_id_key?(name)
+        key = keys[name.to_s]
+        key && key.type == ObjectId
+      end
 
       def embeddable?
         !self.ancestors.include?(Document)
@@ -89,7 +93,13 @@ module MongoMapper
       
     private
       def accessors_module
-        if const_defined?('MongoMapperKeys')
+        module_defined =  if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
+                            const_defined?('MongoMapperKeys')
+                          else
+                            const_defined?('MongoMapperKeys', false)
+                          end
+
+        if module_defined
           const_get 'MongoMapperKeys'
         else
           const_set 'MongoMapperKeys', Module.new
@@ -187,14 +197,14 @@ module MongoMapper
 
         if self.class.embeddable? 
           if read_attribute(:_id).blank?
-            write_attribute :_id, Mongo::ObjectID.new.to_s
+            write_attribute :_id, Mongo::ObjectID.new
             @new_document = true
           else
             @new_document = false
           end
         end
       end
-      
+
       def new?
         !!@new_document
       end
@@ -220,7 +230,6 @@ module MongoMapper
         attrs = HashWithIndifferentAccess.new
         
         embedded_keys.each do |key|
-          puts key.inspect
           attrs[key.name] = read_attribute(key.name).try(:attributes)
         end
         
@@ -270,15 +279,20 @@ module MongoMapper
       end
 
       def ==(other)
-        other.is_a?(self.class) && id == other.id
+        other.is_a?(self.class) && _id == other._id
       end
 
       def id
-        read_attribute(:_id)
+        read_attribute(:_id).to_s
       end
 
       def id=(value)
-        @using_custom_id = true
+        if self.class.using_object_id?
+          value = MongoMapper.normalize_object_id(value)
+        else
+          @using_custom_id = true
+        end
+        
         write_attribute :_id, value
       end
 

data/lib/mongo_mapper/finder_options.rb

@@ -8,24 +8,15 @@ module MongoMapper
   # useful for understanding how MongoMapper handles the parsing of finder 
   # conditions and options.
   #
-  # @private
-  class FinderOperator
-    def initialize(field, operator)
-      @field, @operator = field, operator
-    end
-    
-    def to_criteria(value)
-      {@field => {@operator => value}}
-    end
-  end
-  
+  # @private  
   class FinderOptions
     OptionKeys = [:fields, :select, :skip, :offset, :limit, :sort, :order]
 
     def initialize(model, options)
       raise ArgumentError, "Options must be a hash" unless options.is_a?(Hash)
+      options = options.clone
       options.symbolize_keys!
-      
+
       @model      = model
       @options    = {}
       @conditions = options.delete(:conditions) || {}
@@ -71,10 +62,16 @@ module MongoMapper
 
         conditions.each_pair do |field, value|
           field = normalized_field(field)
+          
+          if @model.object_id_key?(field) && value.is_a?(String)
+            value = Mongo::ObjectID.from_string(value)
+          end
+          
           if field.is_a?(FinderOperator)
             criteria.merge!(field.to_criteria(value))
             next
           end
+          
           case value
             when Array
               operator_present = field.to_s =~ /^\$/
@@ -127,4 +124,14 @@ module MongoMapper
         [field, direction]
       end
   end
+  
+  class FinderOperator
+    def initialize(field, operator)
+      @field, @operator = field, operator
+    end
+    
+    def to_criteria(value)
+      {@field => {@operator => value}}
+    end
+  end
 end

data/lib/mongo_mapper/rails_compatibility/document.rb

@@ -4,6 +4,10 @@ module MongoMapper
       def self.included(model)
         model.class_eval do
           alias_method :new_record?, :new?
+          
+          def human_name
+            self.name.demodulize.titleize
+          end
         end
       end
     end

data/lib/mongo_mapper/rails_compatibility/embedded_document.rb

@@ -17,6 +17,10 @@ module MongoMapper
         def column_names
           keys.keys
         end
+        
+        def human_name
+          self.name.demodulize.titleize
+        end
       end
     end
   end

data/lib/mongo_mapper/support.rb

@@ -1,10 +1,12 @@
+require 'set'
+
 class BasicObject #:nodoc:
-  alias_method :proxy_extend, :extend
-  instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|^methods$|instance_eval|proxy_|^object_id$)/ }
+  instance_methods.each { |m| undef_method m unless m =~ /(^__|instance_eval)/ }
 end unless defined?(BasicObject)
 
 class Array
   def self.to_mongo(value)
+    value = value.respond_to?(:lines) ? value.lines : value
     value.to_a
   end
   
@@ -13,34 +15,6 @@ class Array
   end
 end
 
-class Binary
-  def self.to_mongo(value)
-    if value.is_a?(ByteBuffer)
-      value
-    else
-      value.nil? ? nil : ByteBuffer.new(value)
-    end
-  end
-  
-  def self.from_mongo(value)
-    value
-  end
-end
-
-class Boolean
-  def self.to_mongo(value)
-    if value.is_a?(Boolean)
-      value
-    else
-      ['true', 't', '1'].include?(value.to_s.downcase)
-    end
-  end
-  
-  def self.from_mongo(value)
-    !!value
-  end
-end
-
 class Date
   def self.to_mongo(value)
     date = Date.parse(value.to_s)
@@ -120,6 +94,16 @@ class Object
   end
 end
 
+class Set
+  def self.to_mongo(value)
+    value.to_a
+  end
+  
+  def self.from_mongo(value)
+    Set.new(value || [])
+  end
+end
+
 class String
   def self.to_mongo(value)
     value.nil? ? nil : value.to_s
@@ -138,33 +122,21 @@ class Symbol
   end
 end
 
-class Time
+class Time  
   def self.to_mongo(value)
     if value.nil? || value == ''
       nil
     else
-      to_utc_time(value)
+      time = MongoMapper.time_class.parse(value.to_s)
+      time && time.utc
     end
   end
   
   def self.from_mongo(value)
-    if Time.respond_to?(:zone) && Time.zone && value.present?
+    if MongoMapper.use_time_zone? && value.present?
       value.in_time_zone(Time.zone)
     else
       value
     end
   end
-  
-  def self.to_utc_time(value)
-    to_local_time(value).try(:utc)
-  end
-  
-  # make sure we have a time and that it is local
-  def self.to_local_time(value)
-    if Time.respond_to?(:zone) && Time.zone
-      Time.zone.parse(value.to_s)
-    else
-      Time.parse(value.to_s)
-    end
-  end
 end