mongoid 1.9.5 → 2.0.0.alpha

data/lib/mongoid/extensions/hash/conversions.rb

@@ -3,41 +3,11 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:
       module Conversions #:nodoc:
-        extend ActiveSupport::Concern
-
-        module InstanceMethods #:nodoc:
-
-          # Get the difference between 2 hashes. This will give back a new hash
-          # with the keys and pairs of [ old, new ] values.
-          #
-          # Example:
-          #
-          #   first = { :field => "value" }
-          #   second = { :field => "new" }
-          #   first.difference(second) # => { :field => [ "value", "new" ] }
-          #
-          # Returns:
-          #
-          # A +Hash+ of modifications.
-          def difference(other)
-            changes = {}
-            each_pair do |key, value|
-              if other.has_key?(key)
-                new_value = other[key]
-                changes[key] = [ value, new_value ] if new_value != value
-              end
-            end
-            changes
-          end
+        def get(value)
+          value
         end
-
-        module ClassMethods #:nodoc:
-          def get(value)
-            value
-          end
-          def set(value)
-            value
-          end
+        def set(value)
+          value
         end
       end
     end

data/lib/mongoid/extensions/integer/conversions.rb

@@ -5,11 +5,7 @@ module Mongoid #:nodoc:
       module Conversions #:nodoc:
         def set(value)
           return nil if value.blank?
-          begin
-            Integer(value)
-          rescue ArgumentError => e
-            puts(e.message); value
-          end
+          value =~ /\d/ ? value.to_i : value
         end
         def get(value)
           value

data/lib/mongoid/extensions/nil/assimilation.rb

@@ -7,10 +7,6 @@ module Mongoid #:nodoc:
         def assimilate(parent, options, type = nil)
           parent.remove_attribute(options.name); self
         end
-
-        def collectionize
-          to_s.collectionize
-        end
       end
     end
   end

data/lib/mongoid/extensions/object/conversions.rb

@@ -4,13 +4,7 @@ module Mongoid #:nodoc:
     module Object #:nodoc:
       # This module converts objects into mongoid related objects.
       module Conversions #:nodoc:
-        def self.included(base)
-          base.class_eval do
-            include InstanceMethods
-            extend ClassMethods
-          end
-        end
-
+        extend ActiveSupport::Concern
         module InstanceMethods
           # Converts this object to a hash of attributes
           def mongoidize
@@ -24,7 +18,7 @@ module Mongoid #:nodoc:
           end
 
           def get(value)
-            value ? self.new(value) : value
+            self.new(value)
           end
         end
       end

data/lib/mongoid/extensions/objectid/conversions.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
-    module ObjectId #:nodoc:
+    module ObjectID #:nodoc:
       module Conversions #:nodoc:
         def set(value)
           value

data/lib/mongoid/extensions/string/conversions.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     module String #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value.to_s unless value.nil?
+          value.to_s
         end
         def get(value)
           value

data/lib/mongoid/extensions/symbol/inflections.rb

@@ -23,7 +23,7 @@ module Mongoid #:nodoc:
           to_s.plural?
         end
 
-        ["gt", "lt", "gte", "lte", "ne", "near", "in", "nin", "mod", "all", "size", "exists", "within"].each do |oper|
+        ["gt", "lt", "gte", "lte", "ne", "in", "nin", "mod", "all", "size", "exists"].each do |oper|
           class_eval <<-OPERATORS
             def #{oper}
               Criterion::Complex.new(:key => self, :operator => "#{oper}")

data/lib/mongoid/extensions/time/conversions.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Time #:nodoc:
+      module Conversions #:nodoc:
+        def set(value)
+          return nil if value.blank?
+          time = ::Time.parse(value.is_a?(::Time) ? value.strftime("%Y-%m-%d %H:%M:%S %Z") : value.to_s)
+          time.utc? ? time : time.utc
+        end
+        def get(value)
+          return nil if value.blank?
+          ::Time.zone ? value.getlocal : value
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/factory.rb

@@ -11,8 +11,7 @@ module Mongoid #:nodoc:
     #
     # klass: The class to instantiate from if _type is not present.
     # attributes: The +Document+ attributes.
-    def self.build(klass, attributes)
-      attrs = {}.merge(attributes)
+    def self.build(klass, attrs)
       type = attrs["_type"]
       type ? type.constantize.instantiate(attrs) : klass.instantiate(attrs)
     end

data/lib/mongoid/field.rb

@@ -18,7 +18,7 @@ module Mongoid #:nodoc:
     #
     # The primitive value or a copy of the default.
     def default
-      copy
+      (@default.is_a?(Array) || @default.is_a?(Hash)) ? @default.dup : @default
     end
 
     # Create the new field with a name and optional additional options. Valid
@@ -34,7 +34,6 @@ module Mongoid #:nodoc:
     # <tt>Field.new(:score, :default => 0)</tt>
     def initialize(name, options = {})
       @name, @default = name, options[:default]
-      @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
       @type = options[:type] || String
       @accessible = options.has_key?(:accessible) ? options[:accessible] : true
     end
@@ -42,18 +41,12 @@ module Mongoid #:nodoc:
     # Used for setting an object in the attributes hash. If nil is provided the
     # default will get returned if it exists.
     def set(object)
-      type.set(object)
+      object.nil? ? default : type.set(object)
     end
 
     # Used for retrieving the object out of the attributes hash.
     def get(object)
       type.get(object)
     end
-
-    protected
-    # Slightly faster default check.
-    def copy
-      @copyable ? @default.dup : @default
-    end
   end
 end

data/lib/mongoid/fields.rb

@@ -1,17 +1,14 @@
 # encoding: utf-8
 module Mongoid #:nodoc
   module Fields #:nodoc
-    def self.included(base)
-      base.class_eval do
-        extend ClassMethods
-        # Set up the class attributes that must be available to all subclasses.
-        # These include defaults, fields
-        class_inheritable_accessor :fields
+    extend ActiveSupport::Concern
+    included do
+      # Set up the class attributes that must be available to all subclasses.
+      # These include defaults, fields
+      class_inheritable_accessor :fields
 
-        self.fields = {}
-
-        delegate :defaults, :fields, :to => "self.class"
-      end
+      self.fields = {}
+      delegate :defaults, :fields, :to => "self.class"
     end
 
     module ClassMethods #:nodoc
@@ -47,7 +44,6 @@ module Mongoid #:nodoc
         meth = options.delete(:as) || name
         fields[name] = Field.new(name, options)
         create_accessors(name, meth, options)
-        add_dirty_methods(name)
       end
 
       # Create the field accessors.

data/lib/mongoid/finders.rb

@@ -42,7 +42,7 @@ module Mongoid #:nodoc:
     # Find a +Document+ in several different ways.
     #
     # If a +String+ is provided, it will be assumed that it is a
-    # representation of a Mongo::ObjectId and will attempt to find a single
+    # representation of a Mongo::ObjectID and will attempt to find a single
     # +Document+ based on that id. If a +Symbol+ and +Hash+ is provided then
     # it will attempt to find either a single +Document+ or multiples based
     # on the conditions provided and the first parameter.
@@ -51,7 +51,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.find(:all, :conditions => { :attribute => "value" })</tt>
     #
-    # <tt>Person.find(Mongo::ObjectId.new.to_s)</tt>
+    # <tt>Person.find(Mongo::ObjectID.new.to_s)</tt>
     def find(*args)
       raise Errors::InvalidOptions.new("Calling Document#find with nil is invalid") if args[0].nil?
       type = args.delete_at(0) if args[0].is_a?(Symbol)

data/lib/mongoid/identity.rb

@@ -5,7 +5,7 @@ module Mongoid #:nodoc:
       # Create the identity for the +Document+.
       #
       # The id will be set in either in the form of a Mongo
-      # +ObjectId+ or a composite key set up by defining a key on the document.
+      # +ObjectID+ or a composite key set up by defining a key on the document.
       #
       # The _type will be set to the document's class name.
       def create(doc)
@@ -15,19 +15,19 @@ module Mongoid #:nodoc:
       protected
       # Return the proper id for the document.
       def generate_id
-        id = BSON::ObjectId.new
+        id = Mongo::ObjectID.new
         Mongoid.use_object_ids ? id : id.to_s
       end
 
       # Set the id for the document.
       def identify(doc)
         doc.id = compose(doc).join(" ").identify if doc.primary_key
-        doc.id = generate_id if doc.id.blank?
+        doc.id = generate_id unless doc.id
       end
 
       # Set the _type field on the document.
       def type(doc)
-        doc._type = doc.class.name if doc.hereditary?
+        doc._type = doc.class.name if Mongoid.persist_types
       end
 
       # Generates the composite key for a document.

data/lib/mongoid/indexes.rb

@@ -1,21 +1,18 @@
 # encoding: utf-8
 module Mongoid #:nodoc
   module Indexes #:nodoc
-    def self.included(base)
-      base.class_eval do
-        extend ClassMethods
-
-        cattr_accessor :indexed
-        self.indexed = false
-      end
+    extend ActiveSupport::Concern
+    included do
+      cattr_accessor :indexed
+      self.indexed = false
     end
 
     module ClassMethods #:nodoc
       # Add the default indexes to the root document if they do not already
       # exist. Currently this is only _type.
       def add_indexes
-        if hereditary && !indexed
-          self._collection.create_index(:_type, :unique => false, :background => true)
+        unless indexed
+          self._collection.create_index(:_type, false)
           self.indexed = true
         end
       end
@@ -23,7 +20,7 @@ module Mongoid #:nodoc
       # Adds an index on the field specified. Options can be :unique => true or
       # :unique => false. It will default to the latter.
       def index(name, options = { :unique => false })
-        collection.create_index(name, options)
+        collection.create_index(name, options[:unique])
       end
     end
   end

data/lib/mongoid/memoization.rb

@@ -2,20 +2,14 @@ module Mongoid #:nodoc
   module Memoization
 
     # Handles cases when accessing an association that should be memoized in
-    # the Mongoid specific manner. Does not memoize nil values though
+    # the Mongoid specific manner.
     def memoized(name, &block)
       var = "@#{name}"
       if instance_variable_defined?(var)
         return instance_variable_get(var)
       end
       value = yield
-      instance_variable_set(var, value) if value
-    end
-
-    # Removes an memozied association if it exists
-    def unmemoize(name)
-      var = "@#{name}"
-      remove_instance_variable(var) if instance_variable_defined?(var)
+      instance_variable_set(var, value)
     end
 
     # Mongoid specific behavior is to remove the memoized object when setting

data/lib/mongoid/named_scope.rb

@@ -27,11 +27,16 @@ module Mongoid #:nodoc:
         end
       EOT
     end
+    
+    alias :scope :named_scope 
+
     alias :scope :named_scope
 
     # Return the scopes or default to an empty +Hash+.
     def scopes
       read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
     end
+
   end
 end
+

data/lib/mongoid/observable.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
     #
     # <tt>document.notify_observers(self)</tt>
     def notify_observers(*args)
-      @observers.dup.each { |observer| observer.observe(*args) } if @observers
+      @observers.dup.each { |observer| observer.update(*args) } if @observers
     end
   end
 end

data/lib/mongoid/paths.rb

@@ -3,49 +3,29 @@ module Mongoid #:nodoc:
   module Paths #:nodoc:
     extend ActiveSupport::Concern
     included do
-      attr_accessor :__path
-      attr_accessor :_index
+      cattr_accessor :_path, :_position
+      delegate :_path, :_position, :to => "self.class"
     end
     module InstanceMethods
-      # Get the insertion modifier for the document. Will be nil on root
-      # documents, $set on embeds_one, $push on embeds_many.
-      #
-      # Example:
-      #
-      # <tt>name.inserter</tt>
-      def _inserter
-        embedded? ? (embedded_many? ? "$push" : "$set") : nil
-      end
-
       # Return the path to this +Document+ in JSON notation, used for atomic
       # updates via $set in MongoDB.
       #
       # Example:
       #
       # <tt>address.path # returns "addresses"</tt>
-      def _path
-        _position.sub!(/\.\d+$/, '') || _position
+      def path
+        self._path ||= climb("") do |document, value|
+          value = "#{document.association_name}#{"." + value unless value.blank?}"
+        end
       end
-      alias :_pull :_path
 
       # Returns the positional operator of this document for modification.
       #
       # Example:
       #
       # <tt>address.position</tt>
-      def _position
-        locator = _index ? (new_record? ? "" : ".#{_index}") : ""
-        embedded? ? "#{_parent._position}#{"." unless _parent._position.blank?}#{@association_name}#{locator}" : ""
-      end
-
-      # Get the removal modifier for the document. Will be nil on root
-      # documents, $unset on embeds_one, $set on embeds_many.
-      #
-      # Example:
-      #
-      # <tt>name.remover</tt>
-      def _remover
-        embedded? ? (_index ? "$pull" : "$unset") : nil
+      def position
+        self._position ||= (path.blank? ? "" : "#{path}.$")
       end
 
       # Return the selector for this document to be matched exactly for use
@@ -54,8 +34,20 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>address.selector</tt>
-      def _selector
-        embedded? ? _parent._selector.merge("#{_path}._id" => id) : { "_id" => id }
+      def selector
+        @selector ||= climb({ "_id" => _root.id }) do |document, value|
+          value["#{document.path}._id"] = document.id; value
+        end
+      end
+
+      protected
+      def climb(value, &block)
+        document = self;
+        while (document._parent) do
+          value = yield document, value
+          document = document._parent
+        end
+        value
       end
     end
   end

data/lib/mongoid/state.rb

@@ -1,39 +1,32 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module State #:nodoc:
-    extend ActiveSupport::Concern
-    included do
-      attr_reader :new_record
+    # Returns true if the +Document+ has not been persisted to the database,
+    # false if it has. This is determined by the variable @new_record
+    # and NOT if the object has an id.
+    def new_record?
+      @new_record == true
     end
 
-    module InstanceMethods
-      # Returns true if the +Document+ has not been persisted to the database,
-      # false if it has. This is determined by the variable @new_record
-      # and NOT if the object has an id.
-      def new_record?
-        !!@new_record
-      end
-
-      # Sets the new_record boolean - used after document is saved.
-      def new_record=(saved)
-        @new_record = saved
-      end
+    # Sets the new_record boolean - used after document is saved.
+    def new_record=(saved)
+      @new_record = saved
+    end
 
-      # Checks if the document has been saved to the database.
-      def persisted?
-        !new_record?
-      end
+    # Checks if the document has been saved to the database.
+    def persisted?
+      !new_record?
+    end
 
-      # Returns true if the +Document+ has been succesfully destroyed, and false if it hasn't.
-      # This is determined by the variable @destroyed and NOT by checking the database.
-      def destroyed?
-        @destroyed == true
-      end
+    # Returns true if the +Document+ has been succesfully destroyed, and false if it hasn't.
+    # This is determined by the variable @destroyed and NOT by checking the database.
+    def destroyed?
+      @destroyed == true
+    end
 
-      # Sets the destroyed boolean - used after document is destroyed.
-      def destroyed=(destroyed)
-        @destroyed = destroyed && true
-      end
+    # Sets the destroyed boolean - used after document is destroyed.
+    def destroyed=(destroyed)
+      @destroyed = destroyed && true
     end
   end
 end