mongoid 2.8.1 → 3.0.0.rc

data/lib/mongoid/indexes/validators/options.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+module Mongoid
+  module Indexes
+    module Validators
+
+      # Validates the options passed to the index macro.
+      module Options
+        extend self
+
+        VALID_OPTIONS = [ :background, :drop_dups, :name, :sparse, :unique ]
+        VALID_TYPES = [ 1, -1, "2d" ]
+
+        # Validate the index specification.
+        #
+        # @example Validate the index spec.
+        #   Options.validate(Band, name: 1)
+        #
+        # @param [ Class ] klass The model class.
+        # @param [ Hash ] spec The index specification.
+        # @param [ Hash ] options The index options.
+        #
+        # @raise [ Errors::InvalidIndex ] If validation failed.
+        #
+        # @since 3.0.0
+        def validate(klass, spec, options)
+          validate_spec(klass, spec, options)
+          validate_options(klass, spec, options)
+        end
+
+        private
+
+        # Validates the options of the index spec.
+        #
+        # @api private
+        #
+        # @example Validate the options.
+        #   Options.validate_options(Band, name: 1)
+        #
+        # @param [ Class ] klass The model class.
+        # @param [ Hash ] spec The index specification.
+        # @param [ Hash ] options The index options.
+        #
+        # @raise [ Errors::InvalidIndex ] If validation failed.
+        #
+        # @since 3.0.0
+        def validate_options(klass, spec, options)
+          options.each_pair do |name, value|
+            unless VALID_OPTIONS.include?(name)
+              raise Errors::InvalidIndex.new(klass, spec, options)
+            end
+          end
+        end
+
+        # Validates the index spec.
+        #
+        # @api private
+        #
+        # @example Validate the spec.
+        #   Options.validate_spec(Band, name: 1)
+        #
+        # @param [ Class ] klass The model class.
+        # @param [ Hash ] spec The index specification.
+        # @param [ Hash ] options The index options.
+        #
+        # @raise [ Errors::InvalidIndex ] If validation failed.
+        #
+        # @since 3.0.0
+        def validate_spec(klass, spec, options)
+          raise Errors::InvalidIndex.new(klass, spec, options) if !spec.is_a?(::Hash)
+          spec.each_pair do |name, value|
+            next if name == :options
+            unless VALID_TYPES.include?(value)
+              raise Errors::InvalidIndex.new(klass, spec, options)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/inspection.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc
+module Mongoid
 
   # Contains the bahviour around inspecting documents via
   # <tt>Object#inspect</tt>.

data/lib/mongoid/javascript.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
   class Javascript
     # Constant for the file that defines all the js functions.
     FUNCTIONS = File.join(File.dirname(__FILE__), "javascript", "functions.yml")

data/lib/mongoid/json.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
   # This module is for hooking in to +ActiveModel+s serialization to let
   # configuring the ability to include the root in JSON happen from the Mongoid
   # config.
@@ -10,7 +10,7 @@ module Mongoid #:nodoc:
     # similar to +ActiveRecord+.
     included do
       undef_method :include_root_in_json
-      delegate :include_root_in_json, :to => ::Mongoid
+      delegate :include_root_in_json, to: ::Mongoid
     end
   end
 end

data/lib/mongoid/loggable.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+module Mongoid
+
+  # Contains logging behaviour.
+  module Loggable
+
+    # Get the logger.
+    #
+    # @note Will try to grab Rails' logger first before creating a new logger
+    #   with stdout.
+    #
+    # @example Get the logger.
+    #   Loggable.logger
+    #
+    # @return [ Logger ] The logger.
+    #
+    # @since 3.0.0
+    def logger
+      return @logger if defined?(@logger)
+      @logger = rails_logger || default_logger
+    end
+
+    # Set the logger.
+    #
+    # @example Set the logger.
+    #   Loggable.logger = Logger.new($stdout)
+    #
+    # @param [ Logger ] The logger to set.
+    #
+    # @return [ Logger ] The new logger.
+    #
+    # @since 3.0.0
+    def logger=(logger)
+      @logger = logger
+    end
+
+    private
+
+    # Gets the default Mongoid logger - stdout.
+    #
+    # @api private
+    #
+    # @example Get the default logger.
+    #   Loggable.default_logger
+    #
+    # @return [ Logger ] The default logger.
+    #
+    # @since 3.0.0
+    def default_logger
+      logger = Logger.new($stdout)
+      logger.level = Logger::INFO
+      logger
+    end
+
+    # Get the Rails logger if it's defined.
+    #
+    # @api private
+    #
+    # @example Get Rails' logger.
+    #   Loggable.rails_logger
+    #
+    # @return [ Logger ] The Rails logger.
+    #
+    # @since 3.0.0
+    def rails_logger
+      defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
+    end
+  end
+end

data/lib/mongoid/matchers.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "mongoid/matchers/strategies"
 
-module Mongoid #:nodoc:
+module Mongoid
 
   # This module contains all the behavior for ruby implementations of MongoDB
   # selectors.

data/lib/mongoid/matchers/all.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Checks that all values match.
     class All < Default
@@ -14,13 +14,12 @@ module Mongoid #:nodoc:
       #
       # @return [ true, false ] If the values match.
       def matches?(value)
+        first = first(value)
+        return false if first.is_a?(Array) && first.empty?
+
         attribute_array = Array.wrap(@attribute)
-        value.values.first.all? do |e|
-          if e.is_a?(Regexp)
-            attribute_array.any? { |_attribute| _attribute =~ e }
-          else
-            attribute_array.include?(e)
-          end
+        first.all? do |e|
+          attribute_array.any? { |_attribute| e === _attribute }
         end
       end
     end

data/lib/mongoid/matchers/and.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Defines behavior for handling $or expressions in embedded documents.
     class And < Default
@@ -8,7 +8,7 @@ module Mongoid #:nodoc:
       # Does the supplied query match the attribute?
       #
       # @example Does this match?
-      #   matcher.matches?("$and" => [ { field => value } ])
+      #   matcher.matches?([ { field => value } ])
       #
       # @param [ Array ] conditions The or expression.
       #

data/lib/mongoid/matchers/default.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Contains all the default behavior for checking for matching documents
     # given MongoDB expressions.
@@ -32,7 +32,7 @@ module Mongoid #:nodoc:
       #
       # @since 1.0.0
       def matches?(value)
-        attribute.is_a?(Array) && !value.is_a?(Array) ? attribute.include?(value) : value === attribute
+        attribute.is_a?(Array) && !value.is_a?(Array) ? attribute.any? { |_attribute| value === _attribute } : value === attribute
       end
 
       protected
@@ -63,7 +63,9 @@ module Mongoid #:nodoc:
       #
       # @since 1.0.0
       def determine(value, operator)
-        attribute ? attribute.send(operator, first(value)) : false
+        attribute.__array__.any? {|attr|
+          attr ? attr.send(operator, first(value)) : false
+        }
       end
     end
   end

data/lib/mongoid/matchers/exists.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Checks for existance.
     class Exists < Default

data/lib/mongoid/matchers/gt.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs Greater Than matching.
     class Gt < Default

data/lib/mongoid/matchers/gte.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs Greater than or equal to matching.
     class Gte < Default

data/lib/mongoid/matchers/in.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs matching for any value in an array.
     class In < Default
@@ -16,11 +16,7 @@ module Mongoid #:nodoc:
       def matches?(value)
         attribute_array = Array.wrap(@attribute)
         value.values.first.any? do |e|
-          if e.is_a?(Regexp)
-            attribute_array.any? { |_attribute| _attribute =~ e }
-          else
-            attribute_array.include?(e)
-          end
+          attribute_array.any? { |_attribute| e === _attribute }
         end
       end
     end

data/lib/mongoid/matchers/lt.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs less than matching.
     class Lt < Default

data/lib/mongoid/matchers/lte.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs less than or equal to matching.
     class Lte < Default

data/lib/mongoid/matchers/ne.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs non-equivalency checks.
     class Ne < Default

data/lib/mongoid/matchers/nin.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs not in checking.
     class Nin < Default

data/lib/mongoid/matchers/or.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Defines behavior for handling $or expressions in embedded documents.
     class Or < Default

data/lib/mongoid/matchers/size.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # Performs size checking.
     class Size < Default

data/lib/mongoid/matchers/strategies.rb

@@ -13,8 +13,8 @@ require "mongoid/matchers/nin"
 require "mongoid/matchers/or"
 require "mongoid/matchers/size"
 
-module Mongoid #:nodoc:
-  module Matchers #:nodoc:
+module Mongoid
+  module Matchers
 
     # This module is responsible for returning the correct matcher given a
     # MongoDB query expression.
@@ -81,7 +81,7 @@ module Mongoid #:nodoc:
       # @since 2.2.1
       def extract_attribute(document, key)
         if (key_string = key.to_s) =~ /.+\..+/
-          key_string.split('.').inject(document.attributes) do |_attribs, _key|
+          key_string.split('.').inject(document.as_document) do |_attribs, _key|
             if _attribs.is_a?(::Array)
               _attribs.map { |doc| doc.try(:[], _key) }
             else

data/lib/mongoid/multi_parameter_attributes.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
 
   # Adds Rails' multi-parameter attribute support to Mongoid.
   #
   # @todo: Durran: This module needs an overhaul.
   module MultiParameterAttributes
 
-    module Errors #:nodoc:
+    module Errors
 
       # Raised when an error occurred while doing a mass assignment to an
       # attribute through the <tt>attributes=</tt> method. The exception
@@ -41,14 +41,14 @@ module Mongoid #:nodoc:
     # put into the document's attributes.
     #
     # @example Process the attributes.
-    #   person.process(:title => "sir", :age => 40)
+    #   person.process_attributes(:title => "sir", :age => 40)
     #
     # @param [ Hash ] attrs The attributes to set.
     # @param [ Symbol ] role A role for scoped mass assignment.
     # @param [ Boolean ] guard_protected_attributes False to skip mass assignment protection.
     #
     # @since 2.0.0.rc.7
-    def process(attrs = nil, role = :default, guard_protected_attributes = true)
+    def process_attributes(attrs = nil, role = :default, guard_protected_attributes = true)
       if attrs
         errors = []
         attributes = {}
@@ -66,7 +66,7 @@ module Mongoid #:nodoc:
         multi_parameter_attributes.each_pair do |key, values|
           begin
             values = (values.keys.min..values.keys.max).map { |i| values[i] }
-            field = self.class.fields[key]
+            field = self.class.fields[aliased_fields[key] || key]
             attributes[key] = instantiate_object(field, values)
           rescue => e
             errors << Errors::AttributeAssignmentError.new(
@@ -76,10 +76,8 @@ module Mongoid #:nodoc:
         end
 
         unless errors.empty?
-          raise(
-            Errors::MultiparameterAssignmentErrors.new(errors),
+          raise Errors::MultiparameterAssignmentErrors.new(errors),
             "#{errors.size} error(s) on assignment of multiparameter attributes"
-          )
         end
 
         super attributes, role, guard_protected_attributes
@@ -95,9 +93,9 @@ module Mongoid #:nodoc:
       values = values_with_empty_parameters.collect { |v| v.nil? ? 1 : v }
       klass = field.type
       if klass == DateTime || klass == Date || klass == Time
-        field.serialize(values)
+        field.mongoize(values)
       elsif klass
-        klass.new *values
+        klass.new(*values)
       else
         values
       end