mongo_mapper 0.8.6 → 0.9.0

data/lib/mongo_mapper/plugins/document.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Document
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def embeddable?
           false
@@ -20,8 +22,8 @@ module MongoMapper
         def reload
           if doc = collection.find_one(:_id => id)
             tap do |instance|
-              instance.class.associations.each_key do |association_name|
-                send(association_name).reset if respond_to?(association_name)
+              instance.class.associations.each_value do |association|
+                get_proxy(association).reset
               end
               instance.attributes = doc
             end

data/lib/mongo_mapper/plugins/dynamic_querying.rb

@@ -4,6 +4,8 @@ require 'mongo_mapper/plugins/dynamic_querying/dynamic_finder'
 module MongoMapper
   module Plugins
     module DynamicQuerying
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def dynamic_find(finder, args)
           attributes = {}

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module EmbeddedCallbacks
+      extend ActiveSupport::Concern
+
+      included do
+        extend  ::ActiveModel::Callbacks
+        include ::ActiveModel::Validations::Callbacks
+
+        define_model_callbacks :validation, :save, :create, :update, :destroy, :only => [:before, :after]
+      end
+
+      module InstanceMethods
+        def run_callbacks(callback, &block)
+          embedded_docs = []
+
+          embedded_associations.each do |association|
+            embedded_docs += Array(get_proxy(association).send(:load_target))
+          end
+
+          block = embedded_docs.inject(block) do |chain, doc|
+            if doc.class.respond_to?("_#{callback}_callbacks")
+              lambda { doc.run_callbacks(callback, &chain) }
+            else
+              chain
+            end
+          end
+          super callback, &block
+        end
+      end
+    end
+  end
+end
+
+# Need to monkey patch ActiveModel for now since it uses the internal
+# _run_validation_callbacks, which is impossible to override due to the
+# way ActiveSupport::Callbacks is implemented.
+ActiveModel::Validations::Callbacks.class_eval do
+  def run_validations!
+    run_callbacks(:validation) { super }
+  end
+end

data/lib/mongo_mapper/plugins/embedded_document.rb

@@ -2,10 +2,10 @@
 module MongoMapper
   module Plugins
     module EmbeddedDocument
-      def self.configure(model)
-        model.class_eval do
-          attr_accessor :_parent_document
-        end
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :_parent_document
       end
 
       module ClassMethods
@@ -14,7 +14,7 @@ module MongoMapper
         end
 
         def embedded_in(owner_name)
-          define_method(owner_name) { _parent_document }
+          alias_method owner_name, :_parent_document
         end
       end
 
@@ -29,20 +29,27 @@ module MongoMapper
 
         def save(options={})
           _root_document.try(:save, options).tap do |result|
-            @_new = false if result
+            persist(options) if result
           end
         end
 
         def save!(options={})
-          _root_document.try(:save, options).tap do |result|
-            @_new = false if result
+          valid? || raise(DocumentNotValid.new(self))
+          _root_document.try(:save!, options).tap do |result|
+            persist(options) if result
           end
         end
 
+        def persist(options={})
+          @_new = false
+          clear_changes if respond_to?(:clear_changes)
+          save_to_collection(options)
+        end
+
         def _root_document
           @_root_document ||= _parent_document.try(:_root_document)
         end
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/equality.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Equality
+      extend ActiveSupport::Concern
+
       module InstanceMethods
         def eql?(other)
           other.is_a?(self.class) && _id == other._id

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -4,6 +4,8 @@ require 'set'
 module MongoMapper
   module Plugins
     module IdentityMap
+      extend ActiveSupport::Concern
+
       def self.models
         @models ||= Set.new
       end
@@ -12,8 +14,8 @@ module MongoMapper
         models.each { |m| m.identity_map.clear }
       end
 
-      def self.configure(model)
-        IdentityMap.models << model
+      included do
+        IdentityMap.models << self
       end
 
       module ClassMethods

data/lib/mongo_mapper/plugins/indexes.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Indexes
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def ensure_index(spec, options={})
           collection.create_index(spec, options)

data/lib/mongo_mapper/plugins/inspect.rb

@@ -2,9 +2,11 @@
 module MongoMapper
   module Plugins
     module Inspect
+      extend ActiveSupport::Concern
+
       module InstanceMethods
         def inspect
-          attributes_as_nice_string = key_names.collect do |name|
+          attributes_as_nice_string = key_names.sort.collect do |name|
             "#{name}: #{self[name].inspect}"
           end.join(", ")
           "#<#{self.class} #{attributes_as_nice_string}>"

data/lib/mongo_mapper/plugins/keys.rb

@@ -4,8 +4,11 @@ require 'mongo_mapper/plugins/keys/key'
 module MongoMapper
   module Plugins
     module Keys
-      def self.configure(model)
-        model.key :_id, ObjectId
+      extend ActiveSupport::Concern
+
+      included do
+        extend ActiveSupport::DescendantsTracker
+        key :_id, ObjectId
       end
 
       module ClassMethods
@@ -15,7 +18,7 @@ module MongoMapper
         end
 
         def keys
-          @keys ||= HashWithIndifferentAccess.new
+          @keys ||= {}
         end
 
         def key(*args)
@@ -37,7 +40,7 @@ module MongoMapper
         end
 
         def object_id_keys
-          keys.keys.select { |key| keys[key].type == ObjectId }.map(&:to_sym)
+          keys.keys.select { |key| keys[key].type == ObjectId }.map { |k| k.to_sym }
         end
 
         def object_id_key?(name)
@@ -92,8 +95,8 @@ module MongoMapper
                 read_key(:#{key.name})
               end
 
-              def #{key.name}_before_typecast
-                read_key_before_typecast(:#{key.name})
+              def #{key.name}_before_type_cast
+                read_key_before_type_cast(:#{key.name})
               end
 
               def #{key.name}=(value)
@@ -137,11 +140,11 @@ module MongoMapper
             end
 
             if key.options[:in]
-              validates_inclusion_of(attribute, :within => key.options[:in])
+              validates_inclusion_of(attribute, :in => key.options[:in])
             end
 
             if key.options[:not_in]
-              validates_exclusion_of(attribute, :within => key.options[:not_in])
+              validates_exclusion_of(attribute, :in => key.options[:not_in])
             end
 
             if key.options[:length]
@@ -168,6 +171,7 @@ module MongoMapper
         def initialize_from_database(attrs={})
           @_new = false
           load_from_database(attrs)
+          default_id_value(attrs)
           self
         end
 
@@ -196,7 +200,7 @@ module MongoMapper
 
             embedded_associations.each do |association|
               if documents = instance_variable_get(association.ivar)
-                if association.one?
+                if association.is_a?(Associations::OneAssociation)
                   attrs[association.name] = documents.to_mongo
                 else
                   attrs[association.name] = documents.map { |document| document.to_mongo }
@@ -221,6 +225,10 @@ module MongoMapper
           save!
         end
 
+        def update_attribute(name, value)
+          update_attributes(name.to_sym => value)
+        end
+
         def id
           _id
         end
@@ -258,6 +266,13 @@ module MongoMapper
           keys.values.select { |key| key.embeddable? }
         end
 
+        def default_id_value(attrs={})
+          id_provided = !attrs.nil? && attrs.keys.map { |k| k.to_s }.detect { |k| k == 'id' || k == '_id' }
+          if !id_provided && self.class.can_default_id?
+            write_key :_id, BSON::ObjectId.new
+          end
+        end
+
         private
           def load_from_database(attrs)
             return if attrs.blank?
@@ -270,15 +285,6 @@ module MongoMapper
             end
           end
 
-          def default_id_value(attrs)
-            unless attrs.nil?
-              id_provided = attrs.keys.map { |k| k.to_s }.detect { |k| k == 'id' || k == '_id' }
-              if !id_provided && self.class.can_default_id?
-                write_key :_id, BSON::ObjectId.new
-              end
-            end
-          end
-
           def ensure_key_exists(name)
             self.class.key(name) unless respond_to?("#{name}=")
           end
@@ -290,21 +296,21 @@ module MongoMapper
           end
 
           def read_key(key_name)
-            if key = keys[key_name]
+            if key = keys[key_name.to_s]
               value = key.get(instance_variable_get(:"@#{key_name}"))
               set_parent_document(key, value)
               instance_variable_set(:"@#{key_name}", value)
             end
           end
 
-          def read_key_before_typecast(name)
-            instance_variable_get(:"@#{name}_before_typecast")
+          def read_key_before_type_cast(name)
+            instance_variable_get(:"@#{name}_before_type_cast")
           end
 
           def write_key(name, value)
             key = keys[name.to_s]
             set_parent_document(key, value)
-            instance_variable_set :"@#{name}_before_typecast", value
+            instance_variable_set :"@#{name}_before_type_cast", value
             instance_variable_set :"@#{name}", key.set(value)
           end
       end

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -22,11 +22,11 @@ module MongoMapper
         end
 
         def can_default_id?
-          type && [ObjectId, BSON::ObjectId, String].include?(type)
+          type && (type == ObjectId || type == BSON::ObjectId || type == String)
         end
 
         def number?
-          [Integer, Float].include?(type)
+          type == Integer || type == Float
         end
 
         def get(value)
@@ -34,11 +34,17 @@ module MongoMapper
             if default_value.respond_to?(:call)
               return default_value.call
             else
-              return default_value
+              # Using Marshal is easiest way to get a copy of mutable objects
+              # without getting an error on immutable objects
+              return Marshal.load(Marshal.dump(default_value))
             end
           end
 
-          type.from_mongo(value)
+          if options[:typecast].present?
+            type.from_mongo(value).map! { |v| typecast_class.from_mongo(v) }
+          else
+            type.from_mongo(value)
+          end
         end
 
         def set(value)
@@ -48,7 +54,7 @@ module MongoMapper
             end
           end
         end
-        
+
         private
           def typecast_class
             @typecast_class ||= options[:typecast].constantize
@@ -56,4 +62,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/logger.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Logger
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def logger
           MongoMapper.logger

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Modifiers
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def increment(*args)
           modifier_update('$inc', args)
@@ -17,7 +19,7 @@ module MongoMapper
         def set(*args)
           criteria, updates = criteria_and_keys_from_args(args)
           updates.each do |key, value|
-            updates[key] = keys[key].set(value) if key?(key)
+            updates[key] = keys[key.to_s].set(value) if key?(key)
           end
           collection.update(criteria, {'$set' => updates}, :multi => true)
         end

data/lib/mongo_mapper/plugins/pagination.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Pagination
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def per_page; 25 end
 

data/lib/mongo_mapper/plugins/persistence.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Persistence
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def connection(mongo_connection=nil)
           assert_supported

data/lib/mongo_mapper/plugins/protected.rb

@@ -4,6 +4,8 @@ require 'set'
 module MongoMapper
   module Plugins
     module Protected
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def attr_protected(*attrs)
           raise AccessibleOrProtected.new(name) if try(:accessible_attributes?)

data/lib/mongo_mapper/plugins/querying.rb

@@ -5,6 +5,8 @@ require 'mongo_mapper/plugins/querying/plucky_methods'
 module MongoMapper
   module Plugins
     module Querying
+      extend ActiveSupport::Concern
+
       module ClassMethods
         include PluckyMethods
 
@@ -50,7 +52,7 @@ module MongoMapper
         end
 
         def destroy(*ids)
-          find_some!(ids.flatten).each(&:destroy)
+          find_some!(ids.flatten).each { |doc| doc.destroy }
         end
 
         def destroy_all(options={})
@@ -148,13 +150,12 @@ module MongoMapper
         end
 
         def delete
-          @_destroyed = true
-          self.class.delete(id) unless new?
+          self.class.delete(id).tap { @_destroyed = true } if persisted?
         end
 
         private
           def create_or_update(options={})
-            result = new? ? create(options) : update(options)
+            result = persisted? ? update(options) : create(options)
             result != false
           end