mongoid 2.0.0.beta.13 → 2.0.0.beta.14

data/lib/mongoid.rb

@@ -33,6 +33,7 @@ require "active_model/callbacks"
 require "active_model/conversion"
 require "active_model/deprecated_error_methods"
 require "active_model/errors"
+require "active_model/mass_assignment_security"
 require "active_model/naming"
 require "active_model/serialization"
 require "active_model/translation"

data/lib/mongoid/associations/references_many.rb

@@ -10,7 +10,7 @@ module Mongoid #:nodoc:
       def <<(*objects)
         load_target
         objects.flatten.each do |object|
-          object.send("#{@foreign_key}=", @parent.id)
+          object.write_attribute(@foreign_key, @parent.id)
           @target << object
           object.save unless @parent.new_record?
         end
@@ -27,7 +27,8 @@ module Mongoid #:nodoc:
       def build(attributes = nil)
         load_target
         name = determine_name
-        object = @klass.instantiate((attributes || {}).merge(name => @parent))
+        object = @klass.instantiate(attributes || {})
+        object.send("#{name}=", @parent)
         @target << object
         object
       end
@@ -125,15 +126,16 @@ module Mongoid #:nodoc:
       def nested_build(attributes, options = {})
         attributes.each do |index, attrs|
           begin
-            document = find(index.to_i)
-            if options && options[:allow_destroy] && attrs['_destroy']
+            _destroy = Boolean.set(attrs.delete('_destroy'))
+            document = find(attrs.delete("id"))
+            if options && options[:allow_destroy] && _destroy
               @target.delete(document)
               document.destroy
             else
-              document.write_attributes(attrs)
+              document.update_attributes(attrs)
             end
           rescue Errors::DocumentNotFound
-            build(attrs)
+            create(attrs)
           end
         end
       end

data/lib/mongoid/attributes.rb

@@ -2,10 +2,6 @@
 module Mongoid #:nodoc:
   module Attributes
     extend ActiveSupport::Concern
-    included do
-      class_inheritable_accessor :_protected_fields
-      self._protected_fields = []
-    end
 
     # Get the id associated with this object. This will pull the _id value out
     # of the attributes +Hash+.
@@ -38,10 +34,10 @@ module Mongoid #:nodoc:
     # attributes provided in the suppied +Hash+ so that no extra nil values get
     # put into the document's attributes.
     def process(attrs = nil)
-      (attrs || {}).each_pair do |key, value|
+      sanitize_for_mass_assignment(attrs || {}).each_pair do |key, value|
         if set_allowed?(key)
           write_attribute(key, value)
-        elsif write_allowed?(key)
+        else
           if associations.include?(key.to_s) and associations[key.to_s].embedded? and value.is_a?(Hash)
             if association = send(key)
               association.nested_build(value)
@@ -188,12 +184,6 @@ module Mongoid #:nodoc:
       end
     end
 
-    # Return true if writing to the given field is allowed
-    def write_allowed?(key)
-      name = key.to_s
-      !self._protected_fields.include?(name)
-    end
-
     module ClassMethods
       # Defines attribute setters for the associations specified by the names.
       # This will work for a has one or has many association.
@@ -224,19 +214,6 @@ module Mongoid #:nodoc:
           end
         end
       end
-
-      # Defines fields that cannot be set via mass assignment.
-      #
-      # Example:
-      #
-      #   class Person
-      #     include Mongoid::Document
-      #     field :security_code
-      #     attr_protected :security_code
-      #   end
-      def attr_protected(*names)
-        _protected_fields.concat(names.flatten.map(&:to_s))
-      end
     end
   end
 end

data/lib/mongoid/components.rb

@@ -8,6 +8,7 @@ module Mongoid #:nodoc
       include ActiveModel::Conversion
       include ActiveModel::Naming
       include ActiveModel::Serialization
+      include ActiveModel::MassAssignmentSecurity
       include ActiveModel::Serializers::JSON
       include ActiveModel::Serializers::Xml
       include Mongoid::Associations

data/lib/mongoid/criterion/optional.rb

@@ -63,10 +63,12 @@ module Mongoid #:nodoc:
         return args if !using_object_ids? || args.is_a?(BSON::ObjectID) || !cast
         if args.is_a?(String)
           BSON::ObjectID(args)
-        else
+        elsif args.is_a?(Array)
           args.map{ |a|
             a.is_a?(BSON::ObjectID) ? a : BSON::ObjectID(a)
           }
+        else
+          args
         end
       end
 

data/lib/mongoid/field.rb

@@ -3,15 +3,6 @@ module Mongoid #:nodoc:
   class Field
     attr_reader :name, :type
 
-    # Determine if the field is able to be accessible via a mass update.
-    #
-    # Returns:
-    #
-    # true if accessible, false if not.
-    def accessible?
-      !!@accessible
-    end
-
     # Get the declared options for this field
     #
     # Returns:
@@ -46,7 +37,6 @@ module Mongoid #:nodoc:
       @type = options[:type] || String
       @name, @default = name, options[:default]
       @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
-      @accessible = options.has_key?(:accessible) ? options[:accessible] : true
       @options = options
       check_default!
     end

data/lib/mongoid/persistence/insert_embedded.rb

@@ -26,16 +26,12 @@ module Mongoid #:nodoc:
       def persist
         return @document if @validate && @document.invalid?(:create)
         parent = @document._parent
-        @document.run_callbacks(:create) do
-          @document.run_callbacks(:save) do
-            if parent.new_record?
-              parent.insert
-            else
-              update = { @document._inserter => { @document._position => @document.raw_attributes } }
-              @collection.update(parent._selector, update, @options.merge(:multi => false))
-              @document.new_record = false
-            end
-          end
+        if parent.new_record?
+          parent.insert
+        else
+          update = { @document._inserter => { @document._position => @document.raw_attributes } }
+          @collection.update(parent._selector, update, @options.merge(:multi => false))
+          @document.new_record = false
         end
         @document
       end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.beta.13"
+  VERSION = "2.0.0.beta.14"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196473
+  hash: 62196479
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 13
-  version: 2.0.0.beta.13
+  - 14
+  version: 2.0.0.beta.14
 platform: ruby
 authors: 
 - Durran Jordan