pwnash-mongo_mapper 0.7.5 → 0.7.6

data/lib/mongo_mapper/plugins.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     def plugins
@@ -11,24 +12,32 @@ module MongoMapper
       plugins << mod
     end
 
-    autoload :Callbacks,      'mongo_mapper/plugins/callbacks'
-    autoload :Clone,          'mongo_mapper/plugins/clone'
-    autoload :Descendants,    'mongo_mapper/plugins/descendants'
-    autoload :Dirty,          'mongo_mapper/plugins/dirty'
-    autoload :Equality,       'mongo_mapper/plugins/equality'
-    autoload :IdentityMap,    'mongo_mapper/plugins/identity_map'
-    autoload :Inspect,        'mongo_mapper/plugins/inspect'
-    autoload :Keys,           'mongo_mapper/plugins/keys'
-    autoload :Logger,         'mongo_mapper/plugins/logger'
-    autoload :Modifiers,      'mongo_mapper/plugins/modifiers'
-    autoload :Persistence,    'mongo_mapper/plugins/persistence'
-    autoload :Protected,      'mongo_mapper/plugins/protected'
-    autoload :Rails,          'mongo_mapper/plugins/rails'
-    autoload :Serialization,  'mongo_mapper/plugins/serialization'
-    autoload :Timestamps,     'mongo_mapper/plugins/timestamps'
-    autoload :Userstamps,     'mongo_mapper/plugins/userstamps'
-    autoload :Validations,    'mongo_mapper/plugins/validations'
-    autoload :QueryLogger,    'mongo_mapper/plugins/query_logger'
+    autoload :Document,         'mongo_mapper/plugins/document'
+    autoload :EmbeddedDocument, 'mongo_mapper/plugins/embedded_document'
+
+    autoload :Callbacks,        'mongo_mapper/plugins/callbacks'
+    autoload :Clone,            'mongo_mapper/plugins/clone'
+    autoload :Descendants,      'mongo_mapper/plugins/descendants'
+    autoload :Dirty,            'mongo_mapper/plugins/dirty'
+    autoload :DynamicQuerying,  'mongo_mapper/plugins/dynamic_querying'
+    autoload :Equality,         'mongo_mapper/plugins/equality'
+    autoload :IdentityMap,      'mongo_mapper/plugins/identity_map'
+    autoload :Inspect,          'mongo_mapper/plugins/inspect'
+    autoload :Indexes,          'mongo_mapper/plugins/indexes'
+    autoload :Keys,             'mongo_mapper/plugins/keys'
+    autoload :Logger,           'mongo_mapper/plugins/logger'
+    autoload :Modifiers,        'mongo_mapper/plugins/modifiers'
+    autoload :Persistence,      'mongo_mapper/plugins/persistence'
+    autoload :Protected,        'mongo_mapper/plugins/protected'
+    autoload :Querying,         'mongo_mapper/plugins/querying'
+    autoload :Rails,            'mongo_mapper/plugins/rails'
+    autoload :Sci,              'mongo_mapper/plugins/sci'
+    autoload :Serialization,    'mongo_mapper/plugins/serialization'
+    autoload :Timestamps,       'mongo_mapper/plugins/timestamps'
+    autoload :Userstamps,       'mongo_mapper/plugins/userstamps'
+    autoload :Validations,      'mongo_mapper/plugins/validations'
+    autoload :QueryLogger,      'mongo_mapper/plugins/query_logger'
+
   end
 end
 

data/lib/mongo_mapper/plugins/associations.rb

@@ -1,7 +1,13 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       module ClassMethods
+        def inherited(subclass)
+          subclass.associations = associations.dup
+          super
+        end
+
         def belongs_to(association_id, options={}, &extension)
           create_association(:belongs_to, association_id, options, &extension)
         end
@@ -22,11 +28,6 @@ module MongoMapper
           @associations = hash
         end
 
-        def inherited(subclass)
-          subclass.associations = associations.dup
-          super
-        end
-
         private
           def create_association(type, name, options, &extension)
             association = Associations::Base.new(type, name, options, &extension)
@@ -85,7 +86,7 @@ module MongoMapper
           proxy
         end
 
-        def save_to_collection(options = {})
+        def save_to_collection(options={})
           super
           associations.each do |association_name, association|
             proxy = get_proxy(association)

data/lib/mongo_mapper/plugins/associations/base.rb

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

data/lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/collection.rb

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

data/lib/mongo_mapper/plugins/associations/embedded_collection.rb

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

data/lib/mongo_mapper/plugins/associations/in_array_proxy.rb

@@ -1,8 +1,9 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class InArrayProxy < Collection
-        include Support::Find
+        include MongoMapper::Plugins::DynamicQuerying::ClassMethods
 
         def find(*args)
           options = args.extract_options!

data/lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -1,8 +1,9 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsProxy < Collection
-        include Support::Find
+        include MongoMapper::Plugins::DynamicQuerying::ClassMethods
 
         def find(*args)
           options = args.extract_options!
@@ -82,14 +83,13 @@ module MongoMapper
         end
 
         def nullify
-          criteria = Query.new(klass, scoped_conditions).criteria
-          all(criteria).each do |doc|
+          all.each do |doc|
             doc.update_attributes(self.foreign_key => nil)
           end
           reset
         end
 
-        def save_to_collection(options = {})
+        def save_to_collection(options={})
           @target.each { |doc| doc.save(options) } if @target
         end
 

data/lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/one_proxy.rb

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

data/lib/mongo_mapper/plugins/associations/proxy.rb

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

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Almost all of this callback stuff is pulled directly from ActiveSupport
 # in the interest of support rails 2 and 3 at the same time and is the
 # same copyright as rails.
@@ -76,7 +77,7 @@ module MongoMapper
           result
         end
 
-        def run_callbacks(kind, options = {}, &block)
+        def run_callbacks(kind, options={}, &block)
           callback_chain_method = "#{kind}_callback_chain"
           return unless self.class.respond_to?(callback_chain_method)
           self.class.send(callback_chain_method).run(self, options, &block)
@@ -122,7 +123,7 @@ module MongoMapper
           new(methods)
         end
 
-        def run(object, options = {}, &terminator)
+        def run(object, options={}, &terminator)
           enumerator = options[:enumerator] || :each
 
           unless block_given?
@@ -169,7 +170,7 @@ module MongoMapper
       class Callback
         attr_reader :kind, :method, :identifier, :options
 
-        def initialize(kind, method, options = {})
+        def initialize(kind, method, options={})
           @kind       = kind
           @method     = method
           @identifier = options[:identifier]

data/lib/mongo_mapper/plugins/clone.rb

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

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,40 @@
+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(:_id => id).query.first
+            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,42 @@
+module MongoMapper
+  module Plugins
+    module DynamicQuerying
+      autoload :DynamicFinder, 'mongo_mapper/plugins/dynamic_querying/dynamic_finder'
+
+      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,6 @@
 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 +38,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,48 @@
+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,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Equality

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module IdentityMap
@@ -28,25 +29,25 @@ module MongoMapper
         end
 
         def find_one(options={})
-          criteria, query_options = to_query(options)
-
-          if simple_find?(criteria) && identity_map.key?(criteria[:_id])
-            identity_map[criteria[:_id]]
+          query = query(options)
+          
+          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)
-          criteria, query_options = to_query(options)
           super.tap do |documents|
-            remove_documents_from_map(documents) if selecting_fields?(query_options)
+            remove_documents_from_map(documents) if query(options).fields?
           end
         end
 
         def load(attrs)
+          return nil if attrs.nil?
           document = identity_map[attrs['_id']]
 
           if document.nil? || identity_map_off?
@@ -91,10 +92,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