mongo_mapper 0.12.0 → 0.13.0.beta1

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -71,64 +71,71 @@ module MongoMapper
               collection.update(criteria, {modifier => updates}, options.merge(:multi => true))
             else
               collection.update(criteria, {modifier => updates}, :multi => true)
-            end    
+            end
           end
 
           def criteria_and_keys_from_args(args)
             if args[0].is_a?(Hash)
               criteria = args[0]
-              updates = args[1]
-              options = args[2]
+              updates  = args[1]
+              options  = args[2]
             else
-              split_args = args.partition{|a| a.is_a?(BSON::ObjectId)}
-              criteria = {:id => split_args[0]}
-              updates = split_args[1].first
-              options = split_args[1].last
-            end    
+              criteria, (updates, options) = args.partition { |a| !a.is_a?(Hash) }
+              criteria = { :id => criteria }
+            end
+            upgrade_legacy_safe_usage!(options)
+
             [criteria_hash(criteria).to_hash, updates, options]
           end
+
+          def upgrade_legacy_safe_usage!(options)
+            if options and options.key?(:safe)
+              options.merge! Utils.get_safe_options(options)
+              options.delete :safe
+            end
+          end
       end
 
       def unset(*args)
-        self.class.unset(id, *args)
+        self.class.unset({:_id => id}, *args)
       end
 
       def increment(hash, options=nil)
-        self.class.increment(id, hash, options)
+        self.class.increment({:_id => id}, hash, options)
       end
 
       def decrement(hash, options=nil)
-        self.class.decrement(id, hash, options)
+        self.class.decrement({:_id => id}, hash, options)
       end
 
       def set(hash, options=nil)
-        self.class.set(id, hash, options)
+        self.class.set({:_id => id}, hash, options)
       end
 
       def push(hash, options=nil)
-        self.class.push(id, hash, options)
+        self.class.push({:_id => id}, hash, options)
       end
 
       def push_all(hash, options=nil)
-        self.class.push_all(id, hash, options)
+        self.class.push_all({:_id => id}, hash, options)
       end
 
       def pull(hash, options=nil)
-        self.class.pull(id, hash, options)
+        self.class.pull({:_id => id}, hash, options)
       end
 
       def pull_all(hash, options=nil)
-        self.class.pull_all(id, hash, options)
+        self.class.pull_all({:_id => id}, hash, options)
       end
 
       def add_to_set(hash, options=nil)
-        self.class.push_uniq(id, hash, options)
+        self.class.push_uniq({:_id => id}, hash, options)
       end
       alias push_uniq add_to_set
 
       def pop(hash, options=nil)
-        self.class.pop(id, hash, options)
+        self.class.pop({:_id => id}, hash, options)
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/persistence.rb

@@ -5,9 +5,18 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
+        def inherited(subclass)
+          unless subclass.embeddable?
+            subclass.connection(connection)
+            subclass.set_database_name(database_name)
+            subclass.set_collection_name(collection_name) unless subclass.explicit_collection_defined?
+          end
+          super
+        end
+
         def connection(mongo_connection=nil)
           assert_supported
-          if mongo_connection.nil?
+          if mongo_connection.nil? && MongoMapper.connection?
             @connection ||= MongoMapper.connection
           else
             @connection = mongo_connection
@@ -22,7 +31,7 @@ module MongoMapper
 
         def database_name
           assert_supported
-          @database_name
+          @database_name ||= nil   # ||= idiom prevents uninitialized ivar warnings.
         end
 
         def database
@@ -51,8 +60,9 @@ module MongoMapper
 
         private
           def assert_supported
-            if embeddable?
-              raise NotSupported.new('This is not supported for embeddable documents at this time.')
+            @embeddable ||= embeddable?
+            if @embeddable
+              raise MongoMapper::NotSupported.new('This is not supported for embeddable documents at this time.')
             end
           end
       end
@@ -66,4 +76,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/querying.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'mongo_mapper/plugins/querying/decorator'
+require 'mongo_mapper/plugins/querying/decorated_plucky_query'
 
 module MongoMapper
   module Plugins
@@ -24,11 +24,17 @@ module MongoMapper
         end
 
         def create(*docs)
-          initialize_each(*docs) { |doc| doc.save }
+          initialize_each(*docs) do |doc|
+            yield doc if block_given?
+            doc.save
+          end
         end
 
         def create!(*docs)
-          initialize_each(*docs) { |doc| doc.save! }
+          initialize_each(*docs) do |doc|
+            yield doc if block_given?
+            doc.save!
+          end
         end
 
         def update(*args)
@@ -40,31 +46,15 @@ module MongoMapper
           end
         end
 
-        def delete(*ids)
-          query(:_id => ids.flatten).remove
-        end
-
-        def delete_all(options={})
-          query(options).remove
-        end
-
-        def destroy(*ids)
-          find_some!(ids.flatten).each { |doc| doc.destroy }
-        end
-
-        def destroy_all(options={})
-          find_each(options) { |document| document.destroy }
-        end
-
         # @api private for now
         def query(options={})
-          query = Plucky::Query.new(collection, :transformer => transformer)
-          query.extend(Decorator)
+          query = MongoMapper::Plugins::Querying::DecoratedPluckyQuery.new(collection, :transformer => transformer)
           query.object_ids(object_id_keys)
           query.amend(options)
           query.model(self)
           query
         end
+        alias_method :scoped, :query
 
         # @api private for now
         def criteria_hash(criteria={})
@@ -76,22 +66,6 @@ module MongoMapper
             @transformer ||= lambda { |doc| load(doc) }
           end
 
-          def find_some(ids, options={})
-            query = query(options).amend(:_id => ids.flatten.compact.uniq)
-            query.all
-          end
-
-          def find_some!(ids, options={})
-            ids  = ids.flatten.compact.uniq
-            docs = find_some(ids, options)
-
-            if ids.size != docs.size
-              raise DocumentNotFound, "Couldn't find all of the ids (#{ids.to_sentence}). Found #{docs.size}, but was expecting #{ids.size}"
-            end
-
-            docs
-          end
-
           def initialize_each(*docs)
             instances = []
             docs = [{}] if docs.blank?
@@ -149,16 +123,17 @@ module MongoMapper
         end
 
         def create(options={})
-          save_to_collection(options)
+          save_to_collection(options.merge(:persistence_method => :insert))
         end
 
         def update(options={})
-          save_to_collection(options)
+          save_to_collection(options.merge(:persistence_method => :save))
         end
 
         def save_to_collection(options={})
           @_new = false
-          collection.save(to_mongo, :safe => options[:safe])
+          method = options.delete(:persistence_method) || :save
+          collection.send(method, to_mongo, Utils.get_safe_options(options))
         end
     end
   end

data/lib/mongo_mapper/plugins/querying/{decorator.rb → decorated_plucky_query.rb}

@@ -2,11 +2,27 @@
 module MongoMapper
   module Plugins
     module Querying
-      Methods = Plucky::Methods + [:find!]
+      Methods = Plucky::Methods + [:delete, :delete_all, :destroy, :destroy_all, :find!]
 
-      module Decorator
+      class DecoratedPluckyQuery < ::Plucky::Query
         include DynamicQuerying::ClassMethods
 
+        def delete(*ids)
+          where(:_id => ids.flatten).remove
+        end
+
+        def delete_all(options = {})
+          where(options).remove
+        end
+
+        def destroy(*ids)
+          [find!(*ids.flatten.compact.uniq)].flatten.each { |doc| doc.destroy }
+        end
+
+        def destroy_all(options={})
+          find_each(options) { |document| document.destroy }
+        end
+
         def model(model=nil)
           return @model if model.nil?
           @model = model
@@ -14,6 +30,7 @@ module MongoMapper
         end
 
         def find!(*ids)
+          ids = Array(ids).flatten.uniq
           raise DocumentNotFound, "Couldn't find without an ID" if ids.size == 0
 
           find(*ids).tap do |result|
@@ -27,8 +44,11 @@ module MongoMapper
           def method_missing(method, *args, &block)
             return super unless model.respond_to?(method)
             result = model.send(method, *args, &block)
-            return super unless result.is_a?(Plucky::Query)
-            merge(result)
+            if result.is_a?(Plucky::Query)
+              merge(result)
+            else
+              result
+            end
           end
       end
     end

data/lib/mongo_mapper/plugins/rails.rb

@@ -26,13 +26,25 @@ module MongoMapper
       end
 
       def read_attribute_before_type_cast(name)
-        read_key_before_type_cast(name)
+        @__mm_pre_cast ||= {}
+        name = unalias_key name
+        if !@__mm_pre_cast.key?(name)
+          @__mm_pre_cast[name] = read_attribute(name)
+        end
+        @__mm_pre_cast[name]
       end
 
       def write_attribute(name, value)
         self[name] = value
       end
 
+      def write_key(name, value)
+        name = unalias_key name
+        @__mm_pre_cast ||= {}
+        @__mm_pre_cast[name.to_s] = value
+        super
+      end
+
       module ClassMethods
         def has_one(*args)
           one(*args)
@@ -43,7 +55,7 @@ module MongoMapper
         end
 
         def column_names
-          keys.keys
+          unaliased_keys.keys
         end
 
         # Returns returns an ActiveRecordAssociationAdapter for an association. This adapter has an API that is a
@@ -52,6 +64,14 @@ module MongoMapper
         def reflect_on_association(name)
           ActiveRecordAssociationAdapter.for_association(associations[name]) if associations[name]
         end
+
+        def create_accessors_for(key)
+          super do
+            define_method "#{key.name}_before_type_cast" do
+              read_attribute_before_type_cast key.name
+            end
+          end
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/safe.rb

@@ -5,22 +5,25 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
+        attr_reader :safe_options
+
         def inherited(subclass)
           super
-          subclass.safe if safe?
+          subclass.safe(safe_options) if safe?
         end
 
-        def safe
-          @safe = true
+        def safe(options = true)
+          @safe_options = options
         end
 
         def safe?
-          @safe == true
+          @safe_options ||= nil
+          !!@safe_options
         end
       end
 
       def save_to_collection(options={})
-        options[:safe] = self.class.safe? unless options.key?(:safe)
+        options[:safe] = self.class.safe_options if !options.key?(:safe) && self.class.safe?
         super
       end
     end

data/lib/mongo_mapper/plugins/sci.rb

@@ -11,10 +11,11 @@ module MongoMapper
       module ClassMethods
         def inherited(subclass)
           key :_type, String unless key?(:_type)
-          subclass.instance_variable_set("@single_collection_inherited", true)
-          subclass.set_collection_name(collection_name) unless subclass.embeddable?
-          subclass.single_collection_parent = self
           super
+          if @collection_name == subclass.instance_variable_get("@collection_name")
+            subclass.single_collection_parent = self
+            subclass.instance_variable_set("@single_collection_inherited", true)
+          end
         end
 
         def single_collection_root
@@ -29,6 +30,27 @@ module MongoMapper
           root
         end
 
+        def criteria_hash(criteria={})
+          if single_collection_inherited?
+            super criteria.merge(:_type => name)
+          else
+            super
+          end
+        end
+
+        def set_collection_name(name)
+          if single_collection_inherited?
+            single_collection_parent = nil
+            @single_collection_inherited = false
+          end
+          @collection_defined = true
+          super
+        end
+
+        def explicit_collection_defined?
+          @collection_defined == true
+        end
+
         def single_collection_parent
           @single_collection_parent
         end
@@ -38,7 +60,7 @@ module MongoMapper
         end
 
         def single_collection_inherited?
-          @single_collection_inherited == true
+          !!(@single_collection_inherited ||= false)
         end
 
         def query(options={})

data/lib/mongo_mapper/plugins/scopes.rb

@@ -10,18 +10,19 @@ module MongoMapper
 
       module ClassMethods
         def scope(name, scope_options={})
-          scopes[name] = lambda do |*args|
+          # Assign to _scopes instead of using []= to avoid mixing subclass scopes
+          self._scopes = scopes.merge(name => lambda do |*args|
             result = scope_options.is_a?(Proc) ? scope_options.call(*args) : scope_options
             result = self.query(result) if result.is_a?(Hash)
             self.query.merge(result)
-          end
+          end)
           singleton_class.send :define_method, name, &scopes[name]
         end
 
         def scopes
-          self._scopes || self._scopes = {}
+          self._scopes ||= {}
         end
       end
     end
   end
-end
+end