mongoid 4.0.0.alpha1 → 4.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e868be748277deddf1b1ef5bc060551904de8ed
-  data.tar.gz: a285380f00b0d3f7dcb9d06f1d669e6b4262a980
+  metadata.gz: 4a19035d46ca8c08250b25f7351b5b74a1fffd1f
+  data.tar.gz: 5d21abf409d5f12902c313678f5ced482ef5bf9f
 SHA512:
-  metadata.gz: c7f1bc5844c340f5a8335e7c74d80a78082402de62e75d025cf510409f14842a785bb70644655f93ccf38e33e0859dfb1c4237ef961d377a3838586c92c15878
-  data.tar.gz: 52d507c0df35681fd4f7afb28f3d23ea5b6ff1c455e96bde67c44ef3ae4039a6c195aa957453ff95d437bb8de67f583d6422cf1fe84648a984e8787e95fcba60
+  metadata.gz: d9a2567b69ffd592e74a45b345a52e2c15f1e0a049360313c847dc1b08e6ac081973d1cfb88dbae44db72f3eb3c1e4a68855916c0b70f1cae99fcc6cf8a60490
+  data.tar.gz: 93da6b0c3d2539ea4fd3126ac238019e16d5b6060de1bf81309ecaa40ab8cb5a023f7f558f2c4fbe5db65bf7f3f98b9fdb5da541dd5502f73d4d462333c6af37

data/CHANGELOG.md

@@ -7,6 +7,10 @@ For instructions on upgrading to newer versions, visit
 
 ### Major Changes (Backwards Incompatible)
 
+* Scopes and default scopes must now all be defined within lambdas or procs.
+
+* `skip_version_check` config option was removed.
+
 * IdentityMap removed. (Arthur Neves)
 
 * Eager load rework. Eager load now doesnt need the identity map to load
@@ -255,6 +259,15 @@ For instructions on upgrading to newer versions, visit
       ..
     end
 
+* \#3479 Map/reduce now respects criteria no timeout options if output is not
+  inline.
+
+* \#3478 Criteria objects now have a #none method that will cause the criteria to
+  never hit the database and always have zero documents.
+
+    Band.none
+    Band.none.where(name: "Tool") # Always has zero documents.
+
 * \#3319 Counters can now be reset from a document instance:
 
     document.reset_counters(:relation)
@@ -291,8 +304,14 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#3449 Touch needs to work for create and update. (Greggory Rothmeier)
+
+* \#3432 Fixed mongoization of DateTime losing precision.
+
 * \#3397 Fixed $ne matcher for embedded documents to match server behaviour.
 
+* \#3352 Allow named scopes named "open" to work through 1-n relations.
+
 * \#3348 Fixing compounded indexes having the same keys with
   different directions. (Arthur Neves)
 
@@ -319,8 +338,19 @@ For instructions on upgrading to newer versions, visit
 * \#3063 `Document#becomes` now properly sets base object on errors.
   (Adam Ross Cohen)
 
+* \#3019 Atomic operations will no longer attempt to persist if the document
+  is not persisted.
+
 * \#2903 Removed unused string `to_a` extension.
 
+## 3.1.7
+
+### Resolved Issues
+
+* \#3465 Fixed ambigous relation errors where inverse_of is set to nil.
+
+* \#3414 Backkport skip and limit options on aggregation. (Wojciech Piekutowski)
+
 ## 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)
+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 is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.

data/lib/config/locales/en.yml

@@ -119,6 +119,7 @@ en:
             has the correct options.\n\n
             Valid options are:\n
             \_\_background: true|false\n
+            \_\_database: 'database_name'\n
             \_\_drop_dups: true|false\n
             \_\_name: 'index_name'\n
             \_\_sparse: true|false\n
@@ -128,6 +129,7 @@ en:
             \_\_bits: 26\n
             \_\_bucket_size : 1\n
             \_\_weights: { content: 1, title: 2 }\n
+            \_\_expire_after_seconds: number_of_seconds\n
             Valid types are: 1, -1, '2d', '2dsphere', 'geoHaystack', 'text', 'hashed'\n\n
             Example:\n
             \_\_class Band\n
@@ -156,15 +158,11 @@ en:
         invalid_scope:
           message: "Defining a scope of value %{value} on %{klass} is not
             allowed."
-          summary: "Scopes in Mongoid must be either criteria objects or procs
-            that wrap criteria objects."
-          resolution: "Change the scope to be a criteria or proc wrapped
-            critera.\n\n
+          summary: "Scopes in Mongoid must be procs that wrap criteria objects."
+          resolution: "Change the scope to be a proc wrapped critera.\n\n
             Example:\n
             \_\_class Band\n
             \_\_\_\_include Mongoid::Document\n
-            \_\_\_\_field :active, type: Boolean, default: true\n
-            \_\_\_\_scope :active, where(active: true)\n
             \_\_\_\_scope :inactive, ->{ where(active: false) }\n
             \_\_end\n\n"
         invalid_storage_options:

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)
+          attrs = sanitize_for_mass_assignment(attrs.to_hash)
           attrs.each_pair do |key, value|
             next if pending_attribute?(key, value)
             process_attribute(key, value)

data/lib/mongoid/contextual.rb

@@ -2,6 +2,7 @@
 require "mongoid/contextual/queryable"
 require "mongoid/contextual/mongo"
 require "mongoid/contextual/memory"
+require "mongoid/contextual/none"
 
 module Mongoid
   module Contextual
@@ -48,6 +49,7 @@ module Mongoid
     #
     # @since 3.0.0
     def create_context
+      return None.new(self) if empty_and_chainable?
       embedded ? Memory.new(self) : Mongo.new(self)
     end
   end

data/lib/mongoid/contextual/map_reduce.rb

@@ -268,7 +268,9 @@ module Mongoid
       # @since 3.0.0
       def documents
         return results["results"] if results.has_key?("results")
-        session[output_collection].find
+        query = session[output_collection].find
+        query.no_timeout if criteria.options[:timeout] == false
+        query
       end
 
       # Get the collection that the map/reduce results were stored in.

data/lib/mongoid/contextual/none.rb

@@ -0,0 +1,90 @@
+# encoding: utf-8
+module Mongoid
+  module Contextual
+    class None
+      include Enumerable
+      include Queryable
+
+      attr_reader :criteria, :klass
+
+      # Check if the context is equal to the other object.
+      #
+      # @example Check equality.
+      #   context == []
+      #
+      # @param [ Array ] other The other array.
+      #
+      # @return [ true, false ] If the objects are equal.
+      #
+      # @since 4.0.0
+      def ==(other)
+        other.is_a?(None)
+      end
+
+      # Iterate over the null context. There are no documents to iterate over
+      # in this case.
+      #
+      # @example Iterate over the context.
+      #   context.each do |doc|
+      #     puts doc.name
+      #   end
+      #
+      # @return [ Enumerator ] The enumerator.
+      #
+      # @since 4.0.0
+      def each
+        if block_given?
+          [].each { |doc| yield(doc) }
+          self
+        else
+          to_enum
+        end
+      end
+
+      # Do any documents exist for the context.
+      #
+      # @example Do any documents exist for the context.
+      #   context.exists?
+      #
+      # @return [ true, false ] If the count is more than zero.
+      #
+      # @since 4.0.0
+      def exists?; false; end
+
+      # Create the new null context.
+      #
+      # @example Create the new context.
+      #   Null.new(criteria)
+      #
+      # @param [ Criteria ] The criteria.
+      #
+      # @since 4.0.0
+      def initialize(criteria)
+        @criteria, @klass = criteria, criteria.klass
+      end
+
+      # Always returns nil.
+      #
+      # @example Get the last document.
+      #   context.last
+      #
+      # @return [ nil ] Always nil.
+      #
+      # @since 4.0.0
+      def last; nil; end
+
+      # Always returns zero.
+      #
+      # @example Get the length of matching documents.
+      #   context.length
+      #
+      # @return [ Integer ] Always zero.
+      #
+      # @since 4.0.0
+      def length
+        entries.length
+      end
+      alias :size :length
+    end
+  end
+end

data/lib/mongoid/criteria.rb

@@ -297,6 +297,31 @@ module Mongoid
       self
     end
 
+    # Returns a criteria that will always contain zero results and never hits
+    # the database.
+    #
+    # @example Return a none criteria.
+    #   criteria.none
+    #
+    # @return [ Criteria ] The none criteria.
+    #
+    # @since 4.0.0
+    def none
+      @none = true and self
+    end
+
+    # Is the criteria an empty but chainable criteria?
+    #
+    # @example Is the criteria a none criteria?
+    #   criteria.empty_and_chainable?
+    #
+    # @return [ true, false ] If the criteria is a none.
+    #
+    # @since 4.0.0
+    def empty_and_chainable?
+      !!@none
+    end
+
     # Overriden to include _type in the fields.
     #
     # @example Limit the fields returned from the database.

data/lib/mongoid/extensions/array.rb

@@ -177,4 +177,4 @@ module Mongoid
 end
 
 ::Array.__send__(:include, Mongoid::Extensions::Array)
-::Array.__send__(:extend, Mongoid::Extensions::Array::ClassMethods)
+::Array.extend(Mongoid::Extensions::Array::ClassMethods)

data/lib/mongoid/extensions/big_decimal.rb

@@ -66,4 +66,4 @@ module Mongoid
 end
 
 ::BigDecimal.__send__(:include, Mongoid::Extensions::BigDecimal)
-::BigDecimal.__send__(:extend, Mongoid::Extensions::BigDecimal::ClassMethods)
+::BigDecimal.extend(Mongoid::Extensions::BigDecimal::ClassMethods)

data/lib/mongoid/extensions/date.rb

@@ -74,4 +74,4 @@ module Mongoid
 end
 
 ::Date.__send__(:include, Mongoid::Extensions::Date)
-::Date.__send__(:extend, Mongoid::Extensions::Date::ClassMethods)
+::Date.extend(Mongoid::Extensions::Date::ClassMethods)

data/lib/mongoid/extensions/date_time.rb

@@ -12,9 +12,9 @@ module Mongoid
       #
       # @since 3.0.0
       def __mongoize_time__
-        return self if utc? && Mongoid.use_utc?
+        return to_time if utc? && Mongoid.use_utc?
         if Mongoid.use_activesupport_time_zone?
-          in_time_zone(::Time.zone)
+          in_time_zone(::Time.zone).to_time
         else
           time = to_time
           time.respond_to?(:getlocal) ? time.getlocal : time
@@ -70,4 +70,4 @@ module Mongoid
 end
 
 ::DateTime.__send__(:include, Mongoid::Extensions::DateTime)
-::DateTime.__send__(:extend, Mongoid::Extensions::DateTime::ClassMethods)
+::DateTime.extend(Mongoid::Extensions::DateTime::ClassMethods)

data/lib/mongoid/extensions/float.rb

@@ -54,4 +54,4 @@ module Mongoid
 end
 
 ::Float.__send__(:include, Mongoid::Extensions::Float)
-::Float.__send__(:extend, Mongoid::Extensions::Float::ClassMethods)
+::Float.extend(Mongoid::Extensions::Float::ClassMethods)

data/lib/mongoid/extensions/hash.rb

@@ -214,4 +214,4 @@ module Mongoid
 end
 
 ::Hash.__send__(:include, Mongoid::Extensions::Hash)
-::Hash.__send__(:extend, Mongoid::Extensions::Hash::ClassMethods)
+::Hash.extend(Mongoid::Extensions::Hash::ClassMethods)

data/lib/mongoid/extensions/integer.rb

@@ -64,4 +64,4 @@ module Mongoid
 end
 
 ::Integer.__send__(:include, Mongoid::Extensions::Integer)
-::Integer.__send__(:extend, Mongoid::Extensions::Integer::ClassMethods)
+::Integer.extend(Mongoid::Extensions::Integer::ClassMethods)

data/lib/mongoid/extensions/object.rb

@@ -104,14 +104,14 @@ module Mongoid
         send(name, *args) if name && respond_to?(name)
       end
 
-      # Get the value for an instance variable or nil if it doesn't exist.
+      # Get the value for an instance variable or false if it doesn't exist.
       #
       # @example Get the value for an instance var.
       #   document.ivar("person")
       #
       # @param [ String ] name The name of the variable.
       #
-      # @return [ Object, nil ] The value or nil.
+      # @return [ Object, false ] The value or false.
       #
       # @since 2.0.0.rc.1
       def ivar(name)
@@ -271,4 +271,4 @@ module Mongoid
 end
 
 ::Object.__send__(:include, Mongoid::Extensions::Object)
-::Object.__send__(:extend, Mongoid::Extensions::Object::ClassMethods)
+::Object.extend(Mongoid::Extensions::Object::ClassMethods)

data/lib/mongoid/extensions/object_id.rb

@@ -51,4 +51,4 @@ module Mongoid
 end
 
 BSON::ObjectId.__send__(:include, Mongoid::Extensions::ObjectId)
-BSON::ObjectId.__send__(:extend, Mongoid::Extensions::ObjectId::ClassMethods)
+BSON::ObjectId.extend(Mongoid::Extensions::ObjectId::ClassMethods)

data/lib/mongoid/extensions/range.rb

@@ -82,4 +82,4 @@ module Mongoid
 end
 
 ::Range.__send__(:include, Mongoid::Extensions::Range)
-::Range.__send__(:extend, Mongoid::Extensions::Range::ClassMethods)
+::Range.extend(Mongoid::Extensions::Range::ClassMethods)

data/lib/mongoid/extensions/regexp.rb

@@ -24,4 +24,4 @@ module Mongoid
   end
 end
 
-::Regexp.__send__(:extend, Mongoid::Extensions::Regexp::ClassMethods)
+::Regexp.extend(Mongoid::Extensions::Regexp::ClassMethods)

data/lib/mongoid/extensions/set.rb

@@ -52,4 +52,4 @@ module Mongoid
 end
 
 ::Set.__send__(:include, Mongoid::Extensions::Set)
-::Set.__send__(:extend, Mongoid::Extensions::Set::ClassMethods)
+::Set.extend(Mongoid::Extensions::Set::ClassMethods)

data/lib/mongoid/extensions/string.rb

@@ -196,4 +196,4 @@ module Mongoid
 end
 
 ::String.__send__(:include, Mongoid::Extensions::String)
-::String.__send__(:extend, Mongoid::Extensions::String::ClassMethods)
+::String.extend(Mongoid::Extensions::String::ClassMethods)

data/lib/mongoid/extensions/symbol.rb

@@ -51,4 +51,4 @@ module Mongoid
 end
 
 ::Symbol.__send__(:include, Mongoid::Extensions::Symbol)
-::Symbol.__send__(:extend, Mongoid::Extensions::Symbol::ClassMethods)
+::Symbol.extend(Mongoid::Extensions::Symbol::ClassMethods)

data/lib/mongoid/extensions/time.rb

@@ -85,4 +85,4 @@ module Mongoid
 end
 
 ::Time.__send__(:include, Mongoid::Extensions::Time)
-::Time.__send__(:extend, Mongoid::Extensions::Time::ClassMethods)
+::Time.extend(Mongoid::Extensions::Time::ClassMethods)

data/lib/mongoid/extensions/time_with_zone.rb

@@ -53,4 +53,4 @@ module Mongoid
 end
 
 ::ActiveSupport::TimeWithZone.__send__(:include, Mongoid::Extensions::TimeWithZone)
-::ActiveSupport::TimeWithZone.__send__(:extend, Mongoid::Extensions::TimeWithZone::ClassMethods)
+::ActiveSupport::TimeWithZone.extend(Mongoid::Extensions::TimeWithZone::ClassMethods)

data/lib/mongoid/findable.rb

@@ -31,6 +31,7 @@ module Mongoid
       :map_reduce,
       :max,
       :min,
+      :none,
       :pluck,
       :sum,
       :text_search,

data/lib/mongoid/interceptable.rb

@@ -252,10 +252,12 @@ module Mongoid
       unless respond_to?(name)
         chain = ActiveSupport::Callbacks::CallbackChain.new(name, {})
         send("_#{kind}_callbacks").each do |callback|
-          chain.push(callback) if callback.kind == place
+          chain.append(callback) if callback.kind == place
         end
         class_eval <<-EOM
-          def #{name}() #{chain.compile} end
+          def #{name}()
+            #{chain.compile}
+          end
           protected :#{name}
         EOM
       end

data/lib/mongoid/persistable.rb

@@ -142,7 +142,6 @@ module Mongoid
     #
     # @since 4.0.0
     def prepare_atomic_operation
-      # @todo: Check if the document is persisted here.
       operations = yield({})
       persist_or_delay_atomic_operation(operations)
       self
@@ -205,8 +204,10 @@ module Mongoid
     #
     # @since 4.0.0
     def persist_atomic_operations(operations)
-      selector = atomic_selector
-      _root.collection.find(selector).update(positionally(selector, operations))
+      if persisted?
+        selector = atomic_selector
+        _root.collection.find(selector).update(positionally(selector, operations))
+      end
     end
   end
 end