mongo_mapper 0.10.1 → 0.11.0

data/UPGRADES

@@ -1,3 +1,6 @@
+0.10 => 0.11
+  * #update_attribute now ignores attr_accessible and attr_protected
+
 0.9 => 0.10
   * Using String IDs are no longer supported. If you are declaring your own ID, ensure it is an ObjectId, and set the default
       key :_id, ObjectId, :default => lambda { BSON::ObjectId.new }

data/examples/plugins.rb

@@ -16,11 +16,8 @@ module FooPlugin
     end
   end
 
-  # InstanceMethods module will automatically get included
-  module InstanceMethods
-    def foo
-      'Foo instance method!'
-    end
+  def foo
+    'Foo instance method!'
   end
 
   # Any configuration can be done in the #included block, which gets

data/lib/mongo_mapper.rb

@@ -75,6 +75,7 @@ module MongoMapper
       autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
       autoload :OneAsProxy,                   'mongo_mapper/plugins/associations/one_as_proxy'
       autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
+      autoload :OneEmbeddedPolymorphicProxy,  'mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy'
       autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
   end

data/lib/mongo_mapper/connection.rb

@@ -62,6 +62,10 @@ module MongoMapper
       raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
       env = config_for_environment(environment)
 
+      if env['options'].is_a? Hash
+        options = env['options'].symbolize_keys.merge(options)
+      end
+
       MongoMapper.connection = if env['hosts']
         Mongo::ReplSetConnection.new( *env['hosts'].push(options) )
       else

data/lib/mongo_mapper/embedded_document.rb

@@ -19,6 +19,7 @@ module MongoMapper
     include Plugins::Rails
     include Plugins::Sci
     include Plugins::Serialization
+    include Plugins::Timestamps
     include Plugins::Validations
     include Plugins::EmbeddedCallbacks
 

data/lib/mongo_mapper/extensions/object.rb

@@ -2,6 +2,8 @@
 module MongoMapper
   module Extensions
     module Object
+      extend ActiveSupport::Concern
+
       module ClassMethods
         def to_mongo(value)
           value
@@ -12,16 +14,13 @@ module MongoMapper
         end
       end
 
-      module InstanceMethods
-        def to_mongo
-          self.class.to_mongo(self)
-        end
+      def to_mongo
+        self.class.to_mongo(self)
       end
     end
   end
 end
 
 class Object
-  extend MongoMapper::Extensions::Object::ClassMethods
-  include MongoMapper::Extensions::Object::InstanceMethods
+  include MongoMapper::Extensions::Object
 end

data/lib/mongo_mapper/plugins/accessible.rb

@@ -14,25 +14,23 @@ module MongoMapper
         end
       end
 
-      module InstanceMethods
-        def attributes=(attrs={})
-          super(filter_inaccessible_attrs(attrs))
-        end
-
-        def update_attributes(attrs={})
-          super(filter_inaccessible_attrs(attrs))
-        end
+      def attributes=(attrs={})
+        super(filter_inaccessible_attrs(attrs))
+      end
 
-        def update_attributes!(attrs={})
-          super(filter_inaccessible_attrs(attrs))
-        end
+      def update_attributes(attrs={})
+        super(filter_inaccessible_attrs(attrs))
+      end
 
-        protected
-          def filter_inaccessible_attrs(attrs)
-            return attrs if !accessible_attributes? || attrs.blank?
-            attrs.dup.delete_if { |key, val| !accessible_attributes.include?(key.to_sym) }
-          end
+      def update_attributes!(attrs={})
+        super(filter_inaccessible_attrs(attrs))
       end
+
+      protected
+        def filter_inaccessible_attrs(attrs)
+          return attrs if !accessible_attributes? || attrs.blank?
+          attrs.dup.delete_if { |key, val| !accessible_attributes.include?(key.to_sym) }
+        end
     end
   end
 end

data/lib/mongo_mapper/plugins/associations.rb

@@ -56,35 +56,33 @@ module MongoMapper
           end
       end
 
-      module InstanceMethods
-        def associations
-          self.class.associations
-        end
+      def associations
+        self.class.associations
+      end
 
-        def embedded_associations
-          associations.values.select { |assoc| assoc.embeddable? }
-        end
+      def embedded_associations
+        associations.values.select { |assoc| assoc.embeddable? }
+      end
 
-        def build_proxy(association)
-          proxy = association.proxy_class.new(self, association)
-          self.instance_variable_set(association.ivar, proxy)
+      def build_proxy(association)
+        proxy = association.proxy_class.new(self, association)
+        self.instance_variable_set(association.ivar, proxy)
 
-          proxy
-        end
+        proxy
+      end
 
-        def get_proxy(association)
-          unless proxy = self.instance_variable_get(association.ivar)
-            proxy = build_proxy(association)
-          end
-          proxy
+      def get_proxy(association)
+        unless proxy = self.instance_variable_get(association.ivar)
+          proxy = build_proxy(association)
         end
+        proxy
+      end
 
-        def save_to_collection(options={})
-          super if defined?(super)
-          associations.each do |association_name, association|
-            proxy = get_proxy(association)
-            proxy.save_to_collection(options) if proxy.proxy_respond_to?(:save_to_collection) && association.autosave?
-          end
+      def save_to_collection(options={})
+        super if defined?(super)
+        associations.each do |association_name, association|
+          proxy = get_proxy(association)
+          proxy.save_to_collection(options) if proxy.proxy_respond_to?(:save_to_collection) && association.autosave?
         end
       end
     end

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

@@ -40,7 +40,7 @@ module MongoMapper
         end
 
         def type_key_name
-          "#{as}_type"
+          "_type"
         end
 
         def as

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

@@ -3,6 +3,10 @@ module MongoMapper
   module Plugins
     module Associations
       class BelongsToAssociation < SingleAssociation
+        def type_key_name
+          "#{as}_type"
+        end
+
         def embeddable?
           false
         end

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

@@ -8,10 +8,6 @@ module MongoMapper
           @class_name ||= options[:class_name] || name.to_s.singularize.camelize
         end
 
-        def type_key_name
-          "_type"
-        end
-
         # hate this, need to revisit
         def proxy_class
           @proxy_class ||= if klass.embeddable?

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

@@ -10,7 +10,7 @@ module MongoMapper
         def proxy_class
           @proxy_class ||=
             if klass.embeddable?
-              OneEmbeddedProxy
+              polymorphic? ? OneEmbeddedPolymorphicProxy : OneEmbeddedProxy
             elsif as?
               OneAsProxy
             else

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

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class OneEmbeddedPolymorphicProxy < OneEmbeddedProxy
+        def replace(value)
+          @value = value.respond_to?(:attributes) ? value.attributes.merge(association.type_key_name => value.class.name) : value
+          reset
+        end
+        
+        protected
+          def find_target
+            if @value
+              child = polymorphic_class(@value).load(@value)
+              assign_references(child)
+              child
+            end
+          end
+
+          def polymorphic_class(doc)
+            if class_name = doc[association.type_key_name]
+              class_name.constantize
+            else
+              klass
+            end
+          end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/caching.rb

@@ -4,19 +4,17 @@ module MongoMapper
     module Caching
       extend ActiveSupport::Concern
 
-      module InstanceMethods
-        def cache_key(*suffixes)
-          cache_key = case
-                        when !persisted?
-                          "#{self.class.name}/new"
-                        when timestamp = self[:updated_at]
-                          "#{self.class.name}/#{id}-#{timestamp.to_s(:number)}"
-                        else
-                          "#{self.class.name}/#{id}"
-                      end
-          cache_key += "/#{suffixes.join('/')}" unless suffixes.empty?
-          cache_key
-        end
+      def cache_key(*suffixes)
+        cache_key = case
+                      when !persisted?
+                        "#{self.class.name}/new"
+                      when timestamp = self[:updated_at]
+                        "#{self.class.name}/#{id}-#{timestamp.to_s(:number)}"
+                      else
+                        "#{self.class.name}/#{id}"
+                    end
+        cache_key += "/#{suffixes.join('/')}" unless suffixes.empty?
+        cache_key
       end
     end
   end

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -4,23 +4,21 @@ module MongoMapper
     module Callbacks
       extend ActiveSupport::Concern
 
-      module InstanceMethods
-        def destroy
-          run_callbacks(:destroy) { super }
-        end
+      def destroy
+        run_callbacks(:destroy) { super }
+      end
 
-      private
-        def create_or_update(*)
-          run_callbacks(:save) { super }
-        end
+    private
+      def create_or_update(*)
+        run_callbacks(:save) { super }
+      end
 
-        def create(*)
-          run_callbacks(:create) { super }
-        end
+      def create(*)
+        run_callbacks(:create) { super }
+      end
 
-        def update(*)
-          run_callbacks(:update) { super }
-        end
+      def update(*)
+        run_callbacks(:update) { super }
       end
     end
   end

data/lib/mongo_mapper/plugins/clone.rb

@@ -4,19 +4,17 @@ module MongoMapper
     module Clone
       extend ActiveSupport::Concern
 
-      module InstanceMethods
-        def initialize_copy(other)
-          @_new       = true
-          @_destroyed = false
-          @_id        = nil
-          associations.each do |name, association|
-            instance_variable_set(association.ivar, nil)
-          end
-          self.attributes = other.attributes.clone.except(:_id).inject({}) do |hash, entry|
-            key, value = entry
-            hash[key] = value.duplicable? ? value.clone : value
-            hash
-          end
+      def initialize_copy(other)
+        @_new       = true
+        @_destroyed = false
+        @_id        = nil
+        associations.each do |name, association|
+          instance_variable_set(association.ivar, nil)
+        end
+        self.attributes = other.attributes.clone.except(:_id).inject({}) do |hash, entry|
+          key, value = entry
+          hash[key] = value.duplicable? ? value.clone : value
+          hash
         end
       end
     end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -6,56 +6,54 @@ module MongoMapper
 
       include ::ActiveModel::Dirty
 
-      module InstanceMethods
-        def initialize(*)
-          # never register initial id assignment as a change
-          super.tap { changed_attributes.delete('_id') }
-        end
+      def initialize(*)
+        # never register initial id assignment as a change
+        super.tap { changed_attributes.delete('_id') }
+      end
 
-        def initialize_from_database(*)
-          super.tap { changed_attributes.clear }
-        end
+      def initialize_from_database(*)
+        super.tap { changed_attributes.clear }
+      end
 
-        def save(*)
-          clear_changes { super }
-        end
+      def save(*)
+        clear_changes { super }
+      end
 
-        def reload(*)
-          super.tap { clear_changes }
-        end
+      def reload(*)
+        super.tap { clear_changes }
+      end
 
-        protected
+      protected
 
-        def attribute_method?(attr)
-          # This overrides ::ActiveSupport::Dirty#attribute_method? to allow attributes to be any key
-          # in the attributes hash ( default ) or any key defined on the model that may not yet have
-          # had a value stored in the attributes collection.
-          super || key_names.include?(attr)
-        end
+      def attribute_method?(attr)
+        # This overrides ::ActiveSupport::Dirty#attribute_method? to allow attributes to be any key
+        # in the attributes hash ( default ) or any key defined on the model that may not yet have
+        # had a value stored in the attributes collection.
+        super || key_names.include?(attr)
+      end
 
-        def clear_changes
-          previous = changes
-          (block_given? ? yield : true).tap do |result|
-            unless result == false #failed validation; nil is OK.
-              @previously_changed = previous
-              changed_attributes.clear
-            end
+      def clear_changes
+        previous = changes
+        (block_given? ? yield : true).tap do |result|
+          unless result == false #failed validation; nil is OK.
+            @previously_changed = previous
+            changed_attributes.clear
           end
         end
+      end
 
-        private
+      private
 
-        def write_key(key, value)
-          key = key.to_s
-          attribute_will_change!(key) unless attribute_changed?(key)
-          super(key, value).tap do
-            changed_attributes.delete(key) unless attribute_value_changed?(key)
-          end
+      def write_key(key, value)
+        key = key.to_s
+        attribute_will_change!(key) unless attribute_changed?(key)
+        super(key, value).tap do
+          changed_attributes.delete(key) unless attribute_value_changed?(key)
         end
+      end
 
-        def attribute_value_changed?(key_name)
-          attribute_was(key_name) != read_key(key_name)
-        end
+      def attribute_value_changed?(key_name)
+        attribute_was(key_name) != read_key(key_name)
       end
     end
   end

data/lib/mongo_mapper/plugins/document.rb

@@ -10,34 +10,32 @@ module MongoMapper
         end
       end
 
-      module InstanceMethods
-        def new?
-          @_new
-        end
+      def new?
+        @_new
+      end
 
-        def destroyed?
-          @_destroyed == true
-        end
+      def destroyed?
+        @_destroyed == true
+      end
 
-        def reload
-          if doc = collection.find_one(:_id => id)
-            self.class.associations.each_value do |association|
-              get_proxy(association).reset
-            end
-            instance_variables.each { |ivar| instance_variable_set(ivar, nil) }
-            load_from_database(doc)
-            self
-          else
-            raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"
+      def reload
+        if doc = collection.find_one(:_id => id)
+          self.class.associations.each_value do |association|
+            get_proxy(association).reset
           end
-        end
-
-        # Used by embedded docs to find root easily without if/respond_to? stuff.
-        # Documents are always root documents.
-        def _root_document
+          instance_variables.each { |ivar| instance_variable_set(ivar, nil) }
+          load_from_database(doc)
           self
+        else
+          raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"
         end
       end
+
+      # Used by embedded docs to find root easily without if/respond_to? stuff.
+      # Documents are always root documents.
+      def _root_document
+        self
+      end
     end
   end
 end