mongo_mapper-unstable 2009.11.8 → 2009.11.18

data/Rakefile

@@ -12,7 +12,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors     = ["John Nunemaker"]
   
   gem.add_dependency('activesupport', '>= 2.3')
-  gem.add_dependency('mongo', '0.16')
+  gem.add_dependency('mongo', '0.17.1')
   gem.add_dependency('jnunemaker-validatable', '1.8.1')
   
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
@@ -51,5 +51,5 @@ task :default  => :test
 task :test     => :check_dependencies
 
 YARD::Rake::YardocTask.new(:doc) do |t|
-  t.options = ["--legacy"]
-end
+  t.options = ["--legacy"] if RUBY_VERSION < "1.9.0"
+end

data/VERSION

@@ -1 +1 @@
-2009.11.08
+2009.11.18

data/bin/mmconsole

@@ -1,8 +1,13 @@
 #!/usr/bin/env ruby
-$:.unshift File.dirname(__FILE__)+"/../lib"
-
-require 'mongo_mapper'
-require 'irb'
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+begin
+  require 'mongo_mapper'
+  require 'irb'
+rescue LoadError
+  require 'rubygems'
+  retry
+end
 
 IRB.setup(nil)
 irb = IRB::Irb.new
@@ -43,12 +48,12 @@ Example 2:
 
   all_things = Thing.all
   puts all_things.map { |object| object.name }.inspect
-
 @
 
 trap("SIGINT") do
   irb.signal_handle
 end
+
 catch(:IRB_EXIT) do
   irb.eval_input
 end

data/lib/mongo_mapper.rb

@@ -15,28 +15,32 @@ module MongoMapper
   # raised when document not valid and using !
   class DocumentNotValid < MongoMapperError
     def initialize(document)
-      @document = document
-      super("Validation failed: #{@document.errors.full_messages.join(", ")}")
+      super("Validation failed: #{document.errors.full_messages.join(", ")}")
     end
   end
   
+  # @api public
   def self.connection
     @@connection ||= Mongo::Connection.new
   end
-
+  
+  # @api public
   def self.connection=(new_connection)
     @@connection = new_connection
   end
   
+  # @api public
   def self.logger
     connection.logger
   end
-
+  
+  # @api public
   def self.database=(name)
     @@database = nil
     @@database_name = name
   end
-
+  
+  # @api public
   def self.database
     if @@database_name.blank?
       raise 'You forgot to set the default database name: MongoMapper.database = "foobar"'
@@ -45,14 +49,17 @@ module MongoMapper
     @@database ||= MongoMapper.connection.db(@@database_name)
   end
   
+  # @api private
   def self.ensured_indexes
     @@ensured_indexes ||= []
   end
   
+  # @api private
   def self.ensure_index(klass, keys, options={})
     ensured_indexes << {:klass => klass, :keys => keys, :options => options}
   end
   
+  # @api public
   def self.ensure_indexes!
     ensured_indexes.each do |index|
       unique = index[:options].delete(:unique)
@@ -60,6 +67,7 @@ module MongoMapper
     end
   end
   
+  # @api private
   module Finders
     def dynamic_find(finder, args)
       attributes = {}
@@ -83,9 +91,24 @@ module MongoMapper
       end
     end
   end
+  
+  # @api private
+  def self.use_time_zone?
+    Time.respond_to?(:zone) && Time.zone ? true : false
+  end
+  
+  # @api private
+  def self.time_class
+    use_time_zone? ? Time.zone : Time
+  end
+  
+  def self.normalize_object_id(value)
+    value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
+  end
 end
 
 require 'mongo_mapper/support'
+require 'mongo_mapper/types'
 require 'mongo_mapper/associations'
 require 'mongo_mapper/associations/base'
 require 'mongo_mapper/associations/proxy'

data/lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb

@@ -4,7 +4,7 @@ module MongoMapper
       def replace(doc)
         if doc
           doc.save if doc.new?
-          id, type = doc.id, doc.class.name
+          id, type = doc._id, doc.class.name
         end
         
         @owner.send("#{@association.foreign_key}=", id)

data/lib/mongo_mapper/associations/belongs_to_proxy.rb

@@ -4,7 +4,7 @@ module MongoMapper
       def replace(doc)
         if doc
           doc.save if doc.new?
-          id = doc.id
+          id = doc._id
         end
 
         @owner.send("#{@association.foreign_key}=", id)

data/lib/mongo_mapper/associations/many_documents_as_proxy.rb

@@ -3,13 +3,13 @@ module MongoMapper
     class ManyDocumentsAsProxy < ManyDocumentsProxy
       protected
         def scoped_conditions
-          {as_type_name => @owner.class.name, as_id_name => @owner.id}
+          {as_type_name => @owner.class.name, as_id_name => @owner._id}
         end
 
         def apply_scope(doc)
           ensure_owner_saved
           doc.send("#{as_type_name}=", @owner.class.name)
-          doc.send("#{as_id_name}=", @owner.id)
+          doc.send("#{as_id_name}=", @owner._id)
           doc
         end
 

data/lib/mongo_mapper/associations/many_documents_proxy.rb

@@ -98,7 +98,7 @@ module MongoMapper
       
       protected
         def scoped_conditions
-          {self.foreign_key => @owner.id}
+          {self.foreign_key => @owner._id}
         end
         
         def scoped_options(options)
@@ -115,7 +115,7 @@ module MongoMapper
 
         def apply_scope(doc)
           ensure_owner_saved
-          doc.send("#{self.foreign_key}=", @owner.id)
+          doc.send("#{self.foreign_key}=", @owner._id)
           doc
         end
 

data/lib/mongo_mapper/associations/many_embedded_proxy.rb

@@ -13,9 +13,10 @@ module MongoMapper
         doc
       end
 
+      # TODO: test that both string and oid version work
       def find(id)
         load_target
-        @target.detect { |item| item.id == id }
+        @target.detect { |item| item.id == id || item._id == id }
       end
 
       def <<(*docs)

data/lib/mongo_mapper/document.rb

@@ -344,15 +344,6 @@ module MongoMapper
           instances.size == 1 ? instances[0] : instances
         end
 
-        def initialize_doc(doc)
-          begin
-            klass = doc['_type'].present? ? doc['_type'].constantize : self
-            klass.new(doc)
-          rescue NameError
-            new(doc)
-          end
-        end
-
         def find_every(options)
           criteria, options = to_finder_options(options)
           collection.find(criteria, options).to_a.map do |doc|
@@ -442,12 +433,12 @@ module MongoMapper
 
       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
@@ -463,7 +454,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)
@@ -83,11 +87,20 @@ module MongoMapper
         if instance_or_hash.is_a?(self)
           instance_or_hash
         else
-          new(instance_or_hash)
+          initialize_doc(instance_or_hash)
         end
       end
       
     private
+      def initialize_doc(doc)
+        begin
+          klass = doc['_type'].present? ? doc['_type'].constantize : self
+          klass.new(doc)
+        rescue NameError
+          new(doc)
+        end
+      end
+      
       def accessors_module
         module_defined =  if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
                             const_defined?('MongoMapperKeys')
@@ -191,16 +204,16 @@ module MongoMapper
           end
         end
 
-        if self.class.embeddable? 
+        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
@@ -275,15 +288,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
 
@@ -353,7 +371,7 @@ module MongoMapper
         def write_attribute(name, value)
           key = _keys[name]
           instance_variable_set "@#{name}_before_typecast", value
-          instance_variable_set "@#{name}", key.set(value)          
+          instance_variable_set "@#{name}", key.set(value)
         end
         
         def embedded_associations

data/lib/mongo_mapper/finder_options.rb

@@ -8,17 +8,7 @@ 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]
 
@@ -72,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 =~ /^\$/
@@ -128,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