mongoid 4.0.0.alpha2 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a19035d46ca8c08250b25f7351b5b74a1fffd1f
-  data.tar.gz: 5d21abf409d5f12902c313678f5ced482ef5bf9f
+  metadata.gz: 158b72d6477798214b724968813850224dc3657f
+  data.tar.gz: beff6994a7f9818cb6a956a1dbe682c66d1155f1
 SHA512:
-  metadata.gz: d9a2567b69ffd592e74a45b345a52e2c15f1e0a049360313c847dc1b08e6ac081973d1cfb88dbae44db72f3eb3c1e4a68855916c0b70f1cae99fcc6cf8a60490
-  data.tar.gz: 93da6b0c3d2539ea4fd3126ac238019e16d5b6060de1bf81309ecaa40ab8cb5a023f7f558f2c4fbe5db65bf7f3f98b9fdb5da541dd5502f73d4d462333c6af37
+  metadata.gz: d01a18d141f3883470322bf3e713bd141003d85df34b97cdc45437819ae6ded25291b6c0846fc1a59e0a9d2e88a51da50684ead9ddd4747d405157f9324c7de4
+  data.tar.gz: 872d41a758ecdf59a503bda991cb8677982e774e7cc2509020c2ffc0953bbac559636ed2cd0bd58a07e9099b78195f5688d91748d55025231ef78de210c36f66

data/CHANGELOG.md

@@ -7,6 +7,19 @@ For instructions on upgrading to newer versions, visit
 
 ### Major Changes (Backwards Incompatible)
 
+* \#3320 Remove Rails dependencies on database rake tasks. (Arthur Neves)
+
+    All db:* rake tasks should work as before when using Rails.
+    When not in a Rails, just load the database tasks using:
+
+        load 'mongoid/tasks/database.rake'
+
+* Mongoid 4 now only supports MongoDB 2.4.0 and higher.
+
+* `Document#metadata` has been renamed to `Document#relation_metadata` to
+  avoid common conflicts. Relation proxies also have this renamed to the
+  same as well.
+
 * Scopes and default scopes must now all be defined within lambdas or procs.
 
 * `skip_version_check` config option was removed.
@@ -214,6 +227,11 @@ For instructions on upgrading to newer versions, visit
 * `delete_all` and `destroy_all` no longer take a `:conditions` hash but
   just the raw attributes.
 
+* \#1908 Documents now loaded from criteria using `#only` or `#without` will now
+  raise an error when attempting to save, update, or delete these records.
+  Additionally fields excluded from the fields retrieved from the database will
+  also raise an exception when trying to access them.
+
 * \#1344 Atomic updates can now be executed in an `atomically` block, which will
   delay any atomic updates on the document the block was called on until the
   block is complete.
@@ -259,6 +277,16 @@ For instructions on upgrading to newer versions, visit
       ..
     end
 
+* Field types can now use symbols as well as class names. See:
+  https://github.com/mongoid/mongoid/blob/master/lib/mongoid/fields.rb#L16
+  for the available mappings.
+
+* \#3513 Documents now have a `#destroy!` method that will raise a
+  `Mongoid::Errors::DocumentNotDestroyed` error if a destroy callback returns
+  a false value.
+
+* \#3496 Added class level and criteria level `find_or_create_by!`.
+
 * \#3479 Map/reduce now respects criteria no timeout options if output is not
   inline.
 
@@ -268,10 +296,19 @@ For instructions on upgrading to newer versions, visit
     Band.none
     Band.none.where(name: "Tool") # Always has zero documents.
 
+* \#3410 Mongoid now has a query cache that can be used as a middleware in
+  Rack applications. (Arthur Neves)
+
+    For Rails:
+
+      config.middleware.use(Mongoid::QueryCache::Middleware)
+
 * \#3319 Counters can now be reset from a document instance:
 
     document.reset_counters(:relation)
 
+* \#3310 embedded_in relations now accept a `touch` option to update parents.
+
 * \#3302 Aliasing using `alias_attribute` now properly handles aliases in criteria.
 
 * \#3155 Range field will persist the exclude_end when provided.
@@ -304,8 +341,21 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#3514 Fixed query cache to work on first/last calls.
+
+* \#3383/\#3495 Fix has_and_belongs_to_many eager load. (Arthur Neves)
+
+* \#3492 $rename operations should not mongoize values. (Vladislav Melanitskiy)
+
+* \#3490 Allow localized fields to work with boolean `false` values.
+
+* \#3487 Map Boolean to Mongoid::Boolean in field definitions. (Arthur Neves)
+
 * \#3449 Touch needs to work for create and update. (Greggory Rothmeier)
 
+* \#3347 Creating documents off of scopes for embedded relations now properly
+  sets the parent document on the created children.
+
 * \#3432 Fixed mongoization of DateTime losing precision.
 
 * \#3397 Fixed $ne matcher for embedded documents to match server behaviour.
@@ -323,6 +373,9 @@ For instructions on upgrading to newer versions, visit
 
 * \#3242 Has_many relation must use the inverse foreign_key. (Arthur Neves)
 
+* \#3233 Don't double call validation callbacks when cascading children and
+  relation validation is turned on.
+
 * \#3197 Improvements in the calls to `aggregates` on root and embedded
   collections. (Wojciech Piekutowski)
 
@@ -351,6 +404,8 @@ For instructions on upgrading to newer versions, visit
 
 * \#3414 Backkport skip and limit options on aggregation. (Wojciech Piekutowski)
 
+* \#3469 Fix RegexpError: failed to allocate memory: /\./ on .hash_dot_syntax?  (Dmitry Krasnoukhov)
+
 ## 3.1.6
 
 ### Resolved Issues

data/README.md

@@ -1,4 +1,4 @@
-Mongoid [![Build Status](https://secure.travis-ci.org/mongoid/mongoid.png?branch=master)](http://travis-ci.org/mongoid/mongoid) [![Code Climate](https://codeclimate.com/github/mongoid/mongoid.png)](https://codeclimate.com/github/mongoid/mongoid) [![Coverage Status](https://coveralls.io/repos/mongoid/mongoid/badge.png?branch=master)](https://coveralls.io/r/mongoid/mongoid?branch=master) [![Gem Version](https://badge.fury.io/rb/mongoid.png)](http://badge.fury.io/rb/mongoid)
+Mongoid [![Build Status](https://secure.travis-ci.org/mongoid/mongoid.png?branch=master)](http://travis-ci.org/mongoid/mongoid) [![Code Climate](https://codeclimate.com/github/mongoid/mongoid.png)](https://codeclimate.com/github/mongoid/mongoid) [![Coverage Status](https://coveralls.io/repos/mongoid/mongoid/badge.png?branch=master)](https://coveralls.io/r/mongoid/mongoid?branch=master) [![Gem Version](https://badge.fury.io/rb/mongoid.png)](http://badge.fury.io/rb/mongoid) [![Dependency Status](https://www.versioneye.com/ruby/mongoid/3.1.6/badge.png)](https://www.versioneye.com/ruby/mongoid/3.1.6)
 ========
 
 Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
@@ -9,12 +9,12 @@ Project Tracking
 * [Mongoid Website and Documentation](http://mongoid.org)
 * [Mongoid Google Group](http://groups.google.com/group/mongoid)
 * [Stackoverflow](http://stackoverflow.com/questions/tagged/mongoid)
-* #mongoid on freenode IRC
+* [#mongoid](http://webchat.freenode.net/?channels=mongoid) on freenode IRC
 
 Compatibility
 -------------
 
-Mongoid is tested against MRI 1.9.3, 2.0.0, and JRuby (1.9).
+Mongoid is tested against MRI 1.9.3, 2.0.0, 2.1.0 and JRuby (1.9).
 
 Documentation
 -------------

data/lib/config/locales/en.yml

@@ -31,6 +31,13 @@ en:
           resolution: "Most likely this is caused by passing parameters directly
             through to the find, and the parameter either is not present or the
             key from which it is accessed is incorrect."
+        document_not_destroyed:
+          message: "%{klass} with id %{id} was not destroyed."
+          summary: "When calling %{klass}#destroy! and a callback halts the destroy
+            callback chain by returning a false value, the deletion will not
+            actually occur."
+          resolution: "Check the before/after destroy callbacks to ensure that the
+            return values are truthy for the chain to continue."
         document_not_found:
           message: "Document(s) not found for class %{klass} with id(s) %{missing}."
           summary: "When calling %{klass}.find with an id or array of ids, each
@@ -389,6 +396,12 @@ en:
             can only have values set when the document is a new record."
           resolution: "Don't define '%{name}' as readonly, or do not attempt
             to update its value after the document is persisted."
+        readonly_document:
+          message: "Attempted to persist the readonly document '%{klass}'."
+          summary: "Documents loaded from the database using #only
+            cannot be persisted."
+          resolution: "Don't attempt to persist documents that are flagged as
+            readonly."
         scope_overwrite:
           message: "Cannot create scope :%{scope_name}, because of existing
             method %{model_name}.%{scope_name}."

data/lib/mongoid.rb

@@ -20,6 +20,8 @@ require "mongoid/loggable"
 require "mongoid/sessions"
 require "mongoid/document"
 require "mongoid/log_subscriber"
+require "mongoid/tasks/database"
+require "mongoid/query_cache"
 
 # If we are using Rails then we will include the Mongoid railtie. This has all
 # the nifty initializers that Mongoid needs.
@@ -40,7 +42,7 @@ module Mongoid
   #
   # @example Set up configuration options.
   #   Mongoid.configure do |config|
-  #     config.use(name: "mongoid_test", host: "localhost", port: 27017)
+  #     config.connect_to("mongoid_test")
   #   end
   #
   # @return [ Config ] The configuration object.

data/lib/mongoid/atomic.rb

@@ -189,7 +189,7 @@ module Mongoid
     #
     # @since 2.1.0
     def atomic_paths
-      @atomic_paths ||= metadata ? metadata.path(self) : Atomic::Paths::Root.new(self)
+      @atomic_paths ||= __metadata ? __metadata.path(self) : Atomic::Paths::Root.new(self)
     end
 
     # Get all the attributes that need to be pulled.

data/lib/mongoid/atomic/paths/embedded/many.rb

@@ -35,7 +35,7 @@ module Mongoid
           def position
             pos = parent.atomic_position
             locator = document.new_record? ? "" : ".#{document._index}"
-            "#{pos}#{"." unless pos.blank?}#{document.metadata.store_as}#{locator}"
+            "#{pos}#{"." unless pos.blank?}#{document.__metadata.store_as}#{locator}"
           end
         end
       end

data/lib/mongoid/atomic/paths/embedded/one.rb

@@ -34,7 +34,7 @@ module Mongoid
           # @since 2.1.0
           def position
             pos = parent.atomic_position
-            "#{pos}#{"." unless pos.blank?}#{document.metadata.store_as}"
+            "#{pos}#{"." unless pos.blank?}#{document.__metadata.store_as}"
           end
         end
       end

data/lib/mongoid/attributes.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "active_model/attribute_methods"
 require "mongoid/attributes/dynamic"
 require "mongoid/attributes/nested"
 require "mongoid/attributes/processing"
@@ -90,6 +91,9 @@ module Mongoid
     # @since 1.0.0
     def read_attribute(name)
       normalized = database_field_name(name.to_s)
+      if attribute_missing?(name)
+        raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'."
+      end
       if hash_dot_syntax?(normalized)
         attributes.__nested__(normalized)
       else
@@ -219,6 +223,24 @@ module Mongoid
     end
     alias :attributes= :write_attributes
 
+    # Determine if the attribute is missing from the document, due to loading
+    # it from the database with missing fields.
+    #
+    # @example Is the attribute missing?
+    #   document.attribute_missing?("test")
+    #
+    # @param [ String ] name The name of the attribute.
+    #
+    # @return [ true, false ] If the attribute is missing.
+    #
+    # @since 4.0.0
+    def attribute_missing?(name)
+      selection = __selected_fields
+      return false unless selection
+      (selection.values.first == 0 && selection[name.to_s] == 0) ||
+        (selection.values.first == 1 && !selection.has_key?(name.to_s))
+    end
+
     private
 
     # Does the string contain dot syntax for accessing hashes?
@@ -232,7 +254,7 @@ module Mongoid
     #
     # @since 3.0.15
     def hash_dot_syntax?(string)
-      string =~ /\./
+      string.include?(".")
     end
 
     # Return the typecasted value for a field.

data/lib/mongoid/attributes/processing.rb

@@ -19,7 +19,7 @@ module Mongoid
       def process_attributes(attrs = nil)
         attrs ||= {}
         if !attrs.empty?
-          attrs = sanitize_for_mass_assignment(attrs.to_hash)
+          attrs = sanitize_for_mass_assignment(attrs)
           attrs.each_pair do |key, value|
             next if pending_attribute?(key, value)
             process_attribute(key, value)

data/lib/mongoid/composable.rb

@@ -11,6 +11,7 @@ require "mongoid/selectable"
 require "mongoid/scopable"
 require "mongoid/serializable"
 require "mongoid/shardable"
+require "mongoid/stateful"
 require "mongoid/traversable"
 require "mongoid/validatable"
 
@@ -50,7 +51,7 @@ module Mongoid
     include Serializable
     include Sessions
     include Shardable
-    include State
+    include Stateful
     include Threaded::Lifecycle
     include Traversable
     include Validatable
@@ -76,7 +77,7 @@ module Mongoid
       Serializable,
       Sessions,
       Shardable,
-      State,
+      Stateful,
       Threaded::Lifecycle,
       Traversable,
       Validatable,

data/lib/mongoid/contextual/command.rb

@@ -30,32 +30,6 @@ module Mongoid
       def session
         collection.database.session
       end
-
-      private
-
-      # Execute the block setting field limitations.
-      #
-      # @api private
-      #
-      # @example Execute with field limitations.
-      #   text_search.selecting do
-      #     #...
-      #   end
-      #
-      # @param [ Symbol ] param The name of the command parameter.
-      #
-      # @return [ Object ] The result of the yield.
-      #
-      # @since 4.0.0
-      def selecting(param)
-        begin
-          fields = command[param]
-          Threaded.set_selection(criteria.object_id, fields) unless fields.blank?
-          yield
-        ensure
-          Threaded.delete_selection(criteria.object_id)
-        end
-      end
     end
   end
 end

data/lib/mongoid/contextual/geo_near.rb

@@ -213,7 +213,7 @@ module Mongoid
       # @since 3.0.0
       def documents
         results["results"].map do |attributes|
-          doc = Factory.from_db(criteria.klass, attributes["obj"], criteria.object_id)
+          doc = Factory.from_db(criteria.klass, attributes["obj"], criteria.options[:fields])
           doc.attributes["geo_near_distance"] = attributes["dis"]
           doc
         end

data/lib/mongoid/contextual/mongo.rb

@@ -119,13 +119,11 @@ module Mongoid
       # @since 3.0.0
       def each(&block)
         if block_given?
-          selecting do
-            documents_for_iteration.each do |doc|
-              yield_document(doc, &block)
-            end
-            @cache_loaded = true
-            self
+          documents_for_iteration.each do |doc|
+            yield_document(doc, &block)
           end
+          @cache_loaded = true
+          self
         else
           to_enum
         end
@@ -624,7 +622,7 @@ module Mongoid
         if cached? && !documents.empty?
           documents
         elsif eager_loadable?
-          docs = query.map{ |doc| Factory.from_db(klass, doc) }
+          docs = query.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields]) }
           eager_load(docs)
           docs
         else
@@ -632,27 +630,6 @@ module Mongoid
         end
       end
 
-      # If we are limiting results, we need to set the field limitations on a
-      # thread local to avoid overriding the default values.
-      #
-      # @example Execute with selection.
-      #   context.selecting do
-      #     collection.find
-      #   end
-      #
-      # @return [ Object ] The yielded value.
-      #
-      # @since 2.4.4
-      def selecting
-        begin
-          fields = criteria.options[:fields]
-          Threaded.set_selection(criteria.object_id, fields) unless fields.blank?
-          yield
-        ensure
-          Threaded.delete_selection(criteria.object_id)
-        end
-      end
-
       # Yield to the document.
       #
       # @api private
@@ -667,7 +644,7 @@ module Mongoid
       # @since 3.0.0
       def yield_document(document, &block)
         doc = document.respond_to?(:_id) ?
-          document : Factory.from_db(klass, document, criteria.object_id)
+          document : Factory.from_db(klass, document, criteria.options[:fields])
         yield(doc)
         documents.push(doc) if cacheable?
       end

data/lib/mongoid/contextual/text_search.rb

@@ -24,10 +24,8 @@ module Mongoid
       # @since 4.0.0
       def each
         if block_given?
-          selecting(:project) do
-            documents.each do |doc|
-              yield doc
-            end
+          documents.each do |doc|
+            yield doc
           end
         else
           to_enum
@@ -158,7 +156,7 @@ module Mongoid
       # @since 4.0.0
       def documents
         results["results"].map do |attributes|
-          Factory.from_db(criteria.klass, attributes["obj"], criteria.object_id)
+          Factory.from_db(criteria.klass, attributes["obj"], command[:project])
         end
       end
 

data/lib/mongoid/criteria.rb

@@ -31,7 +31,7 @@ module Mongoid
     # @since 4.0.0
     CHECK = []
 
-    attr_accessor :embedded, :klass
+    attr_accessor :embedded, :klass, :parent_document, :metadata
 
     # Returns true if the supplied +Enumerable+ or +Criteria+ is equal to the results
     # of this +Criteria+ or the criteria itself.

data/lib/mongoid/criteria/modifiable.rb

@@ -68,6 +68,22 @@ module Mongoid
         find_or(:create, attrs, &block)
       end
 
+      # Find the first +Document+ given the conditions, or creates a new document
+      # with the conditions that were supplied. If validation fails an
+      # exception will be raised.
+      #
+      # @example Find or create the document.
+      #   Person.find_or_create_by!(:attribute => "value")
+      #
+      # @param [ Hash ] attrs The attributes to check.
+      #
+      # @raise [ Errors::Validations ] on validation error.
+      #
+      # @return [ Document ] A matching or newly created document.
+      def find_or_create_by!(attrs = {}, &block)
+        find_or(:create!, attrs, &block)
+      end
+
       # Find the first +Document+ given the conditions, or initializes a new document
       # with the conditions that were supplied.
       #
@@ -144,13 +160,17 @@ module Mongoid
       #
       # @since 3.0.0
       def create_document(method, attrs = nil, &block)
-        klass.__send__(method,
-          selector.reduce(attrs || {}) do |hash, (key, value)|
-            unless key.to_s =~ /\$/ || value.is_a?(Hash)
-              hash[key] = value
-            end
-            hash
-          end, &block)
+        attributes = selector.reduce(attrs || {}) do |hash, (key, value)|
+          unless key.to_s =~ /\$/ || value.is_a?(Hash)
+            hash[key] = value
+          end
+          hash
+        end
+        if embedded?
+          attributes[:_parent] = parent_document
+          attributes[:__metadata] = metadata
+        end
+        klass.__send__(method, attributes, &block)
       end
 
       # Find the first object or create/initialize it.