mongo_mapper 0.13.0.beta2 → 0.15.0

data/lib/mongo_mapper/plugins/accessible.rb

@@ -42,11 +42,21 @@ module MongoMapper
         self.class.accessible_attributes?
       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) }
+    protected
+
+      def filter_inaccessible_attrs(attrs)
+        return attrs if !accessible_attributes? || attrs.blank?
+        attrs.dup.delete_if { |key, val| attribute_inaccessible?(key.to_sym) }
+      end
+
+      def attribute_inaccessible?(attribute)
+        unless accessible_attributes.include?(attribute)
+          message = "Can't mass-assign protected attribute: #{attribute}"
+          MongoMapper.logger ? MongoMapper.logger.warn(message) : puts(message)
+
+          return true
         end
+      end
     end
   end
 end

data/lib/mongo_mapper/plugins/associations.rb

@@ -56,12 +56,13 @@ module MongoMapper
           end
         end
 
-        private
-          def create_association(association)
-            @embedded_associations = nil
-            associations[association.name] = association
-            association.setup(self)
-          end
+      private
+
+        def create_association(association)
+          @embedded_associations = nil
+          associations[association.name] = association
+          association.setup(self)
+        end
       end
 
       def associations

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

@@ -6,7 +6,7 @@ module MongoMapper
         attr_reader :name, :options, :query_options
 
         # Options that should not be considered MongoDB query options/criteria
-        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave, :touch]
+        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave, :touch, :counter_cache]
 
         def initialize(name, options={}, &extension)
           @name, @options, @query_options, @original_options = name.to_sym, {}, {}, options
@@ -43,6 +43,10 @@ module MongoMapper
           !!@options[:touch]
         end
 
+        def counter_cache?
+          !!@options[:counter_cache]
+        end
+
         def type_key_name
           "_type"
         end
@@ -72,22 +76,23 @@ module MongoMapper
         def setup(model)
         end
 
-        private
-          def separate_options_and_conditions
-            @original_options.each_pair do |key, value|
-              if AssociationOptions.include?(key)
-                @options[key] = value
-              else
-                @query_options[key] = value
-              end
+      private
+
+        def separate_options_and_conditions
+          @original_options.each_pair do |key, value|
+            if AssociationOptions.include?(key)
+              @options[key] = value
+            else
+              @query_options[key] = value
             end
           end
+        end
 
-          def modularized_extensions(*extensions)
-            extensions.flatten.compact.map do |extension|
-              Proc === extension ? Module.new(&extension) : extension
-            end
+        def modularized_extensions(*extensions)
+          extensions.flatten.compact.map do |extension|
+            Proc === extension ? Module.new(&extension) : extension
           end
+        end
       end
     end
   end

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

@@ -20,6 +20,7 @@ module MongoMapper
           model.key type_key_name, String unless model.key?(type_key_name) if polymorphic?
           super
           add_touch_callbacks if touch?
+          add_counter_cache if counter_cache?
         end
 
         def autosave?
@@ -28,7 +29,7 @@ module MongoMapper
 
         def add_touch_callbacks
           name        = self.name
-          method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
+          method_name = :"belongs_to_touch_after_save_or_destroy_for_#{name}"
           touch       = options.fetch(:touch)
 
           @model.send(:define_method, method_name) do
@@ -46,7 +47,15 @@ module MongoMapper
           @model.after_save(method_name)
           @model.after_touch(method_name)
           @model.after_destroy(method_name)
+        end
+
+        def add_counter_cache
+          options = {}
+          if @options[:counter_cache] && @options[:counter_cache] != true
+            options[:field] = @options[:counter_cache]
+          end
 
+          @model.counter_cache name, options
         end
       end
     end

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

@@ -19,15 +19,16 @@ module MongoMapper
           @target
         end
 
-        protected
-          def find_target
-            return nil if association_class.nil? || proxy_owner[association.foreign_key].nil?
-            association_class.find_by_id(proxy_owner[association.foreign_key])
-          end
+      protected
 
-          def association_class
-            proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
-          end
+        def find_target
+          return nil if association_class.nil? || proxy_owner[association.foreign_key].nil?
+          association_class.find_by_id(proxy_owner[association.foreign_key])
+        end
+
+        def association_class
+          proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
+        end
       end
     end
   end

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

@@ -34,18 +34,19 @@ module MongoMapper
           @target.save(options) if @target
         end
 
-        protected
-          def find_target
-            return nil if proxy_owner[association.foreign_key].nil?
-            klass.find_by_id(proxy_owner[association.foreign_key])
-          end
+      protected
 
-          def instantiate_target(instantiator, attrs={}, &block)
-            @target = klass.send(instantiator, attrs, &block)
-            proxy_owner[association.foreign_key] = @target.id
-            loaded
-            @target
-          end
+        def find_target
+          return nil if proxy_owner[association.foreign_key].nil?
+          klass.find_by_id(proxy_owner[association.foreign_key])
+        end
+
+        def instantiate_target(instantiator, attrs={}, &block)
+          @target = klass.send(instantiator, attrs, &block)
+          proxy_owner[association.foreign_key] = @target.id
+          loaded
+          @target
+        end
       end
     end
   end

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

@@ -34,10 +34,10 @@ module MongoMapper
           @target.each { |doc| doc.persist(options) } if @target
         end
 
-        private
-          def assign_references(*docs)
-            docs.each { |doc| doc._parent_document = proxy_owner }
-          end
+      private
+        def assign_references(*docs)
+          docs.each { |doc| doc._parent_document = proxy_owner }
+        end
       end
     end
   end

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

@@ -99,34 +99,35 @@ module MongoMapper
           reset
         end
 
-        private
-          def query(options={})
-            klass.
-              query(association.query_options).
-              amend(options).
-              amend(criteria)
-          end
+      private
 
-          def criteria
-            {:_id => ids}
-          end
+        def query(options={})
+          klass.
+            query(association.query_options).
+            amend(options).
+            amend(criteria)
+        end
 
-          def scoped_ids(args)
-            valid = args.flatten.select do |id|
-              id = ObjectId.to_mongo(id) if klass.using_object_id?
-              ids.include?(id)
-            end
-            valid.empty? ? nil : valid
-          end
+        def criteria
+          {:_id => ids}
+        end
 
-          def find_target
-            return [] if ids.blank?
-            all
+        def scoped_ids(args)
+          valid = args.flatten.select do |id|
+            id = ObjectId.to_mongo(id) if klass.using_object_id?
+            ids.include?(id)
           end
+          valid.empty? ? nil : valid
+        end
 
-          def ids
-            proxy_owner[options[:in]]
-          end
+        def find_target
+          return [] if ids.blank?
+          all
+        end
+
+        def ids
+          proxy_owner[options[:in]]
+        end
       end
     end
   end

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

@@ -3,25 +3,27 @@ module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsAsProxy < ManyDocumentsProxy
-        protected
-          def criteria
-            {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
-          end
+      protected
 
-          def apply_scope(doc)
-            ensure_owner_saved
-            criteria.each { |key, value| doc[key] = value }
-            doc
-          end
+        def criteria
+          {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
+        end
 
-        private
-          def type_key_name
-            "#{options[:as]}_type"
-          end
+        def apply_scope(doc)
+          ensure_owner_saved
+          criteria.each { |key, value| doc[key] = value }
+          doc
+        end
 
-          def id_key_name
-            "#{options[:as]}_id"
-          end
+      private
+
+        def type_key_name
+          "#{options[:as]}_type"
+        end
+
+        def id_key_name
+          "#{options[:as]}_id"
+        end
       end
     end
   end

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

@@ -80,63 +80,70 @@ module MongoMapper
           load_target.each(&block)
         end
 
-        protected
-          def query(options={})
-            klass.
-              query(association.query_options).
-              amend(options).amend(criteria)
-          end
+      protected
 
-          def method_missing(method, *args, &block)
-            if klass.respond_to?(method)
-              result = klass.send(method, *args, &block)
-              case result
-              when Plucky::Query
-                query.merge result
-
-              # If we got a single record of this classas a result, return it
-              when klass
-                result
-
-              # If we got an array of this class as a result, return it
-              when Array
-                if result[0].is_a? klass
-                  result
-                else
-                  super
-                end
-              else
-                super
-              end
-            else
-              super
-            end
-          end
+        def query(options={})
+          klass.
+            query(association.query_options).
+            amend(options).
+            amend(criteria)
+        end
 
-          def criteria
-            {self.foreign_key => proxy_owner.id}
-          end
+        def criteria
+          {self.foreign_key => proxy_owner.id}
+        end
 
-          def find_target
-            all
-          end
+        def find_target
+          all
+        end
 
-          def ensure_owner_saved
-            proxy_owner.save unless proxy_owner.persisted?
-          end
+        def ensure_owner_saved
+          proxy_owner.save unless proxy_owner.persisted?
+        end
 
-          def prepare(doc)
-            klass === doc ? apply_scope(doc) : build(doc)
-          end
+        def prepare(doc)
+          klass === doc ? apply_scope(doc) : build(doc)
+        end
 
-          def apply_scope(doc)
-            criteria.each { |key, value| doc[key] = value }
-            doc
+        def apply_scope(doc)
+          criteria.each { |key, value| doc[key] = value }
+          doc
+        end
+
+        def foreign_key
+          options[:foreign_key] || proxy_owner.class.name.foreign_key
+        end
+
+      private
+
+        def method_missing(method, *args, &block)
+          return super unless klass.respond_to?(method)
+
+          result = nil
+
+          query.with_scope(query.criteria_hash) do
+            result = klass.send(method, *args, &block)
           end
 
-          def foreign_key
-            options[:foreign_key] || proxy_owner.class.name.foreign_key
+          case result
+          when Plucky::Query
+            query.merge result
+
+          # If we got a single record of this class as a result, return it
+          when klass
+            result
+
+          # If we got an array of this class as a result, return it
+          when Array
+            if result[0].is_a? klass
+              result
+            else
+              super
+            end
+          else
+            super
           end
+        end
       end
     end
   end

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

@@ -10,22 +10,23 @@ module MongoMapper
           reset
         end
 
-        protected
-          def find_target
-            (@_values || []).map do |hash|
-              child = polymorphic_class(hash).load(hash, true)
-              assign_references(child)
-              child
-            end
+      protected
+
+        def find_target
+          (@_values || []).map do |hash|
+            child = polymorphic_class(hash).load(hash, true)
+            assign_references(child)
+            child
           end
+        end
 
-          def polymorphic_class(doc)
-            if class_name = doc[association.type_key_name]
-              class_name.constantize
-            else
-              klass
-            end
+        def polymorphic_class(doc)
+          if class_name = doc[association.type_key_name]
+            class_name.constantize
+          else
+            klass
           end
+        end
       end
     end
   end