mongoid 2.0.0.beta.19 → 2.0.0.beta.20

data/lib/mongoid/associations.rb

@@ -193,12 +193,16 @@ module Mongoid # :nodoc:
       # Options:
       #
       # name: A +Symbol+ that is the related class name pluralized.
+      # default_order: A +Criteria+ that specifies the default sort order for
+      # this association. (e.g. :position.asc). If an explicit ordering is
+      # specified on a +Criteria+ object, the default order will NOT be used.
       #
       # Example:
       #
       #   class Person
       #     include Mongoid::Document
       #     references_many :posts
+      #     references_many :board_games, :default_order => :title.asc
       #   end
       #
       def references_many(name, options = {}, &block)

data/lib/mongoid/associations/options.rb

@@ -68,6 +68,11 @@ module Mongoid #:nodoc:
       def stored_as
         self[:stored_as]
       end
+
+      # Used with references_many to define a default sorting order
+      def default_order
+        self[:default_order]
+      end
     end
   end
 end

data/lib/mongoid/associations/references_many.rb

@@ -24,10 +24,10 @@ module Mongoid #:nodoc:
       # association, and the attributes will be passed into the constructor.
       #
       # Returns the newly created object.
-      def build(attributes = nil)
+      def build(attributes = {},type = nil)
         load_target
         name = determine_name
-        object = @klass.instantiate(attributes || {})
+        object = (type || @klass).instantiate(attributes)
         object.send("#{name}=", @parent)
         @target << object
         object
@@ -39,16 +39,16 @@ module Mongoid #:nodoc:
       # the new object will then be saved.
       #
       # Returns the newly created object.
-      def create(attributes = nil)
-        build(attributes).tap(&:save)
+      def create(attributes = nil,type = nil)
+        build(attributes,type).tap(&:save)
       end
 
       # Creates a new Document and adds it to the association collection. If
       # validation fails an error is raised.
       #
       # Returns the newly created object.
-      def create!(attributes = nil)
-        build(attributes).tap(&:save!)
+      def create!(attributes = nil,type = nil)
+        build(attributes,type).tap(&:save!)
       end
 
       # Delete all the associated objects.
@@ -166,7 +166,11 @@ module Mongoid #:nodoc:
       #   An +Array+ of objects if an ActiveRecord association
       #   A +Collection+ if a DataMapper association.
       def query
-        @query ||= lambda { @klass.all(:conditions => { @foreign_key => @parent.id }) }
+        @query ||= lambda {
+          @klass.all(:conditions => { @foreign_key => @parent.id }).tap do |crit|
+            crit.set_order_by(@options.default_order) if @options.default_order
+          end
+        }
       end
 
       # Remove the objects based on conditions.

data/lib/mongoid/associations/references_many_as_array.rb

@@ -45,9 +45,9 @@ module Mongoid #:nodoc:
       # association, and the attributes will be passed into the constructor.
       #
       # Returns the newly created object.
-      def build(attributes = nil)
+      def build(attributes = {},type=nil)
         load_target
-        document = @klass.instantiate(attributes || {})
+        document = (type || @klass).instantiate(attributes)
         push(document); document
       end
 

data/lib/mongoid/collection.rb

@@ -83,7 +83,7 @@ module Mongoid #:nodoc
     #
     # Options:
     #
-    # map: The map javascript funcdtion.
+    # map: The map javascript function.
     # reduce: The reduce javascript function.
     def map_reduce(map, reduce, options = {})
       directed(options).map_reduce(map, reduce, options)

data/lib/mongoid/config.rb

@@ -103,7 +103,10 @@ module Mongoid #:nodoc
     #
     # The master +Mongo::DB+
     def master
-      raise Errors::InvalidDatabase.new(nil) unless @master
+      unless @master
+        _master(@settings)  if @settings
+        raise Errors::InvalidDatabase.new(nil) unless @master
+      end
       if @reconnect
         @reconnect = false
         reconnect!
@@ -142,6 +145,7 @@ module Mongoid #:nodoc
     #
     # The slave +Mongo::DBs+
     def slaves
+      _slaves(@settings)  unless @slaves || !@settings
       @slaves
     end
 
@@ -194,8 +198,7 @@ module Mongoid #:nodoc
       settings.except("database", "slaves").each_pair do |name, value|
         send("#{name}=", value) if respond_to?("#{name}=")
       end
-      _master(settings)
-      _slaves(settings)
+      @settings = settings.dup
     end
 
     # Adds a new I18n locale file to the load path

data/lib/mongoid/criterion/complex.rb

@@ -16,6 +16,19 @@ module Mongoid #:nodoc:
       def initialize(opts = {})
         @key, @operator = opts[:key], opts[:operator]
       end
+
+      def hash
+        [@key, @operator].hash
+      end
+
+      def eql?(other)
+        self == (other)
+      end
+
+      def ==(other)
+        return false unless other.is_a?(self.class)
+        self.key == other.key && self.operator == other.operator
+      end
     end
   end
 end

data/lib/mongoid/criterion/optional.rb

@@ -3,6 +3,16 @@ module Mongoid #:nodoc:
   module Criterion #:nodoc:
     module Optional
 
+      def using_default_sort?
+        @use_default_sort = true if @use_default_sort.nil? # TODO: move initialization elsewhere
+        return @use_default_sort
+      end
+
+      def remove_default_sort
+        @options[:sort] = nil if using_default_sort?
+        @use_default_sort = false
+      end
+
       # Adds fields to be sorted in ascending order. Will add them in the order
       # they were passed into the method.
       #
@@ -10,6 +20,8 @@ module Mongoid #:nodoc:
       #
       # <tt>criteria.ascending(:title, :dob)</tt>
       def ascending(*fields)
+        remove_default_sort
+
         @options[:sort] = [] unless @options[:sort] || fields.first.nil?
         fields.flatten.each { |field| @options[:sort] << [ field, :asc ] }
         self
@@ -45,6 +57,8 @@ module Mongoid #:nodoc:
       #
       # <tt>criteria.descending(:title, :dob)</tt>
       def descending(*fields)
+        remove_default_sort
+
         @options[:sort] = [] unless @options[:sort] || fields.first.nil?
         fields.flatten.each { |field| @options[:sort] << [ field, :desc ] }
         self
@@ -149,6 +163,11 @@ module Mongoid #:nodoc:
       #
       # Returns: <tt>self</tt>
       def order_by(*args)
+        remove_default_sort
+        set_order_by(*args)
+      end
+
+      def set_order_by(*args)
         @options[:sort] = [] unless @options[:sort] || args.first.nil?
         arguments = args.first
         case arguments
@@ -200,6 +219,7 @@ module Mongoid #:nodoc:
         types = [types] unless types.is_a?(Array)
         self.in(:_type => types)
       end
+
     end
   end
 end

data/lib/mongoid/document.rb

@@ -94,7 +94,7 @@ module Mongoid #:nodoc:
     # an empty +Hash+.
     #
     # If a primary key is defined, the document's id will be set to that key,
-    # otherwise it will be set to a fresh +BSON::ObjectID+ string.
+    # otherwise it will be set to a fresh +BSON::ObjectId+ string.
     #
     # Options:
     #

data/lib/mongoid/extensions.rb

@@ -114,7 +114,6 @@ end
 
 class BSON::ObjectId #:nodoc
   extend Mongoid::Extensions::ObjectId::Conversions
-
   def as_json(options = nil)
     to_s
   end

data/lib/mongoid/matchers/default.rb

@@ -8,7 +8,8 @@ module Mongoid #:nodoc:
       end
       # Return true if the attribute and value are equal.
       def matches?(value)
-        value === @attribute
+        @attribute.is_a?(Array) && value.is_a?(String) ?
+          @attribute.include?(value) : value === @attribute
       end
 
       protected

data/lib/mongoid/validations/uniqueness.rb

@@ -54,7 +54,7 @@ module Mongoid #:nodoc:
       # ensure :case_sensitive is true by default
       def unique_search_value(value)
         if options[:case_sensitive] == false
-          value ? /^#{value}$/i : nil
+          value ? Regexp.new("^#{Regexp.escape(value.to_s)}$", Regexp::IGNORECASE) : nil
         else
           value
         end

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -14,6 +14,8 @@ module Mongoid #:nodoc:
 
     module ClassMethods #:nodoc:
       attr_accessor :version_max
+      
+      # the number of max_version should >= 0
       def max_versions(number)
         self.version_max = number.to_i
       end
@@ -26,10 +28,14 @@ module Mongoid #:nodoc:
     def revise
       last_version = self.class.first(:conditions => { :_id => id, :version => version })
       if last_version
+        old_versions = ( @attributes['versions'].duplicable? ? @attributes['versions'].dup : nil )
         self.versions << last_version.clone
-        self.versions.shift if self.class.version_max.present? && self.versions.length > self.class.version_max
+        if self.class.version_max.present? && ( self.class.version_max >= 0 ) && ( self.versions.length > self.class.version_max )
+          self.versions.shift
+          @attributes['versions'].shift
+        end
         self.version = (version || 1 ) + 1
-        @modifications["versions"] = [ nil, @attributes["versions"] ] if @modifications
+        @modifications["versions"] = [ old_versions, @attributes['versions'] ] if @modifications
       end
     end
   end

data/lib/rails/mongoid.rb

@@ -7,7 +7,7 @@ module Rails #:nodoc:
       # that indexing and inheritance work in both development and production
       # with the same results.
       def load_models(app)
-        app.config.paths.app.models.each do |path|
+        app.config.paths['app/models'].each do |path|
           Dir.glob("#{path}/**/*.rb").sort.each do |file|
             require_dependency(file)
           end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196421
+  hash: 62196427
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 19
-  version: 2.0.0.beta.19
+  - 20
+  version: 2.0.0.beta.20
 platform: ruby
 authors: 
 - Durran Jordan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -07:00
+date: 2010-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,14 +71,13 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 13
         segments: 
         - 1
-        - 0
-        - 9
-        version: 1.0.9
+        - 1
+        version: "1.1"
   requirement: *id004
   type: :runtime
   name: mongo
@@ -87,14 +86,13 @@ dependencies:
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 13
         segments: 
         - 1
-        - 0
-        - 9
-        version: 1.0.9
+        - 1
+        version: "1.1"
   requirement: *id005
   type: :development
   name: bson_ext
@@ -121,14 +119,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 13
         segments: 
         - 2
         - 0
-        - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - 1
+        version: 2.0.1
   requirement: *id007
   type: :development
   name: rspec