mongo_mapper 0.7.6 → 0.8.0

data/lib/mongo_mapper/plugins/clone.rb

@@ -1,11 +1,17 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Clone
       module InstanceMethods
-        def clone
-          clone_attributes = self.attributes
-          clone_attributes.delete("_id")
-          self.class.new(clone_attributes)
+        def initialize_copy(other)
+          @_new       = true
+          @_destroyed = false
+          default_id_value({})
+          self.attributes = other.attributes.clone.except(:_id).inject({}) do |hash, entry|
+            key, value = entry
+            hash[key] = value.duplicable? ? value.clone : value
+            hash
+          end
         end
       end
     end

data/lib/mongo_mapper/plugins/descendants.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Descendants

data/lib/mongo_mapper/plugins/dirty.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Dirty

data/lib/mongo_mapper/plugins/document.rb

@@ -0,0 +1,41 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Document
+      module ClassMethods
+        def embeddable?
+          false
+        end
+      end
+
+      module InstanceMethods
+        def new?
+          @_new
+        end
+
+        def destroyed?
+          @_destroyed == true
+        end
+
+        def reload
+          if doc = self.class.query.find_one(:_id => id)
+            tap do |instance|
+              instance.class.associations.each_key do |association_name|
+                send(association_name).reset if respond_to?(association_name)
+              end
+              instance.attributes = doc
+            end
+          else
+            raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"
+          end
+        end
+
+        # Used by embedded docs to find root easily without if/respond_to? stuff.
+        # Documents are always root documents.
+        def _root_document
+          self
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/dynamic_querying.rb

@@ -0,0 +1,41 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module DynamicQuerying
+      module ClassMethods
+        def dynamic_find(finder, args)
+          attributes = {}
+
+          finder.attributes.each_with_index do |attr, index|
+            attributes[attr] = args[index]
+          end
+
+          options = args.extract_options!.merge(attributes)
+
+          if result = send(finder.finder, options)
+            result
+          else
+            if finder.raise?
+              raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
+            end
+
+            if finder.instantiator
+              self.send(finder.instantiator, attributes)
+            end
+          end
+        end
+
+        protected
+          def method_missing(method, *args, &block)
+            finder = DynamicFinder.new(method)
+
+            if finder.found?
+              dynamic_find(finder, args)
+            else
+              super
+            end
+          end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/{support/find.rb → plugins/dynamic_querying/dynamic_finder.rb}

@@ -1,29 +1,7 @@
+# encoding: UTF-8
 module MongoMapper
-  module Support
-    # @api private
-    module Find
-      def dynamic_find(finder, args)
-        attributes = {}
-
-        finder.attributes.each_with_index do |attr, index|
-          attributes[attr] = args[index]
-        end
-
-        options = args.extract_options!.merge(attributes)
-
-        if result = send(finder.finder, options)
-          result
-        else
-          if finder.raise?
-            raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
-          end
-
-          if finder.instantiator
-            self.send(finder.instantiator, attributes)
-          end
-        end
-      end
-
+  module Plugins
+    module DynamicQuerying
       class DynamicFinder
         attr_reader :method, :attributes, :finder, :bang, :instantiator
 
@@ -61,17 +39,6 @@ module MongoMapper
             @attributes = names && names.split('_and_')
           end
       end
-
-      protected
-        def method_missing(method, *args, &block)
-          finder = DynamicFinder.new(method)
-
-          if finder.found?
-            dynamic_find(finder, args)
-          else
-            super
-          end
-        end
     end
   end
 end

data/lib/mongo_mapper/plugins/embedded_document.rb

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module EmbeddedDocument
+      def self.configure(model)
+        model.class_eval do
+          attr_reader :_root_document, :_parent_document
+        end
+      end
+
+      module ClassMethods
+        def embeddable?
+          true
+        end
+
+        def embedded_in(owner_name)
+          define_method(owner_name) { _parent_document }
+        end
+      end
+
+      module InstanceMethods
+        def new?
+          _root_document.try(:new?) || @_new
+        end
+
+        def destroyed?
+          !!_root_document.try(:destroyed?)
+        end
+
+        def save(options={})
+          _root_document.try(:save, options).tap do |result|
+            @_new = false if result
+          end
+        end
+
+        def save!(options={})
+          _root_document.try(:save, options).tap do |result|
+            @_new = false if result
+          end
+        end
+
+        def _parent_document=(value)
+          @_root_document   = value._root_document
+          @_parent_document = value
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/equality.rb

@@ -1,18 +1,12 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Equality
       module InstanceMethods
-        def ==(other)
-          other.is_a?(self.class) && _id == other._id
-        end
-
         def eql?(other)
-          self == other
-        end
-
-        def equal?(other)
-          object_id === other.object_id
+          other.is_a?(self.class) && _id == other._id
         end
+        alias :== :eql?
 
         def hash
           _id.hash

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+require 'set'
+
 module MongoMapper
   module Plugins
     module IdentityMap
@@ -29,20 +32,19 @@ module MongoMapper
 
         def find_one(options={})
           query = query(options)
-          criteria = query.criteria.to_hash
-          
-          if simple_find?(criteria) && identity_map.key?(criteria[:_id])
-            identity_map[criteria[:_id]]
+
+          if query.simple? && identity_map.key?(query[:_id])
+            identity_map[query[:_id]]
           else
             super.tap do |document|
-              remove_documents_from_map(document) if selecting_fields?(query.options)
+              remove_documents_from_map(document) if query.fields?
             end
           end
         end
 
         def find_many(options)
           super.tap do |documents|
-            remove_documents_from_map(documents) if selecting_fields?(query(options).options)
+            remove_documents_from_map(documents) if query(options).fields?
           end
         end
 
@@ -92,10 +94,6 @@ module MongoMapper
             end
           end
 
-          def simple_find?(criteria)
-            criteria.keys == [:_id] || criteria.keys.to_set == [:_id, :_type].to_set
-          end
-
           def selecting_fields?(options)
             !options[:fields].nil?
           end

data/lib/mongo_mapper/plugins/indexes.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Indexes
+      module ClassMethods
+        def ensure_index(spec, options={})
+          collection.create_index(spec, options)
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/inspect.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Inspect

data/lib/mongo_mapper/plugins/keys.rb

@@ -1,15 +1,13 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Keys
-      autoload :Key, 'mongo_mapper/plugins/keys/key'
-
       def self.configure(model)
         model.key :_id, ObjectId
       end
 
       module ClassMethods
         def inherited(descendant)
-          key :_type, String unless keys.keys.include?(:_type)
           descendant.instance_variable_set(:@keys, keys.dup)
           super
         end
@@ -159,14 +157,12 @@ module MongoMapper
           default_id_value(attrs)
 
           if from_database
-            @new = false
+            @_new = false
             load_from_database(attrs)
           else
-            @new = true
+            @_new = true
             assign(attrs)
           end
-
-          assign_type
         end
 
         def persisted?
@@ -186,24 +182,22 @@ module MongoMapper
         end
 
         def attributes
-          attrs = HashWithIndifferentAccess.new
-
-          keys.each_pair do |name, key|
-            value = key.set(self[key.name])
-            attrs[name] = value
-          end
+          HashWithIndifferentAccess.new.tap do |attrs|
+            keys.each_pair do |name, key|
+              value = key.set(self[key.name])
+              attrs[name] = value
+            end
 
-          embedded_associations.each do |association|
-            if documents = instance_variable_get(association.ivar)
-              if association.one?
-                attrs[association.name] = documents.to_mongo
-              else
-                attrs[association.name] = documents.map { |document| document.to_mongo }
+            embedded_associations.each do |association|
+              if documents = instance_variable_get(association.ivar)
+                if association.one?
+                  attrs[association.name] = documents.to_mongo
+                else
+                  attrs[association.name] = documents.map { |document| document.to_mongo }
+                end
               end
             end
           end
-
-          attrs
         end
         alias :to_mongo :attributes
 
@@ -279,10 +273,6 @@ module MongoMapper
             end
           end
 
-          def assign_type
-            self._type = self.class.name if respond_to?(:_type=)
-          end
-
           def ensure_key_exists(name)
             self.class.key(name) unless respond_to?("#{name}=")
           end
@@ -314,8 +304,6 @@ module MongoMapper
             instance_variable_set :"@#{name}", key.set(value)
           end
       end
-
-
     end
   end
 end

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Keys
@@ -8,7 +9,7 @@ module MongoMapper
           options = args.extract_options!
           @name, @type = args.shift.to_s, args.shift
           self.options = (options || {}).symbolize_keys
-          self.default_value = self.options.delete(:default)
+          self.default_value = self.options[:default]
         end
 
         def ==(other)
@@ -16,7 +17,8 @@ module MongoMapper
         end
 
         def embeddable?
-          type.respond_to?(:embeddable?) && type.embeddable? ? true : false
+          return false unless type.respond_to?(:embeddable?)
+          type.embeddable?
         end
 
         def number?
@@ -36,8 +38,17 @@ module MongoMapper
         end
 
         def set(value)
-          type.to_mongo(value)
+          type.to_mongo(value).tap do |values|
+            if options[:typecast].present?
+              values.map! { |v| typecast_class.to_mongo(v) }
+            end
+          end
         end
+        
+        private
+          def typecast_class
+            @typecast_class ||= options[:typecast].constantize
+          end
       end
     end
   end

data/lib/mongo_mapper/plugins/logger.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Logger

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Modifiers
@@ -29,7 +30,7 @@ module MongoMapper
             criteria = {:id => ids}
           end
 
-          criteria  = query(criteria).criteria.to_hash
+          criteria  = criteria_hash(criteria).to_hash
           modifiers = keys.inject({}) { |hash, key| hash[key] = 1; hash }
           collection.update(criteria, {'$unset' => modifiers}, :multi => true)
         end
@@ -68,7 +69,7 @@ module MongoMapper
           def criteria_and_keys_from_args(args)
             keys     = args.pop
             criteria = args[0].is_a?(Hash) ? args[0] : {:id => args}
-            [query(criteria).criteria.to_hash, keys]
+            [criteria_hash(criteria).to_hash, keys]
           end
       end