mongo_mapper 0.14.0.rc1 → 0.15.3

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

@@ -0,0 +1,136 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class InForeignArrayProxy < Collection
+        include DynamicQuerying::ClassMethods
+
+        def find(*args)
+          query.find(*scoped_ids(args))
+        end
+
+        def find!(*args)
+          query.find!(*scoped_ids(args))
+        end
+
+        def paginate(options)
+          query.paginate(options)
+        end
+
+        def all(options={})
+          query(options).all
+        end
+
+        def first(options={})
+          query(options).first
+        end
+
+        def last(options={})
+          query(options).last
+        end
+
+        def count(options={})
+          query(options).count
+        end
+
+        def destroy_all(options={})
+          all(options).each do |doc|
+            doc.destroy
+          end
+          reset
+        end
+
+        def delete_all(options={})
+          docs = query(options).fields(:_id).all
+          klass.delete(docs.map { |d| d.id })
+          reset
+        end
+
+        def nullify
+          replace([])
+          reset
+        end
+
+        def create(attrs={})
+          doc = klass.create(attrs)
+          if doc.persisted?
+            inverse_association(doc) << proxy_owner
+            doc.save
+            reset
+          end
+          doc
+        end
+
+        def create!(attrs={})
+          doc = klass.create!(attrs)
+
+          if doc.persisted?
+            inverse_association(doc) << proxy_owner
+            doc.save
+            reset
+          end
+          doc
+        end
+
+        def <<(*docs)
+          flatten_deeper(docs).each do |doc|
+            inverse_association(doc) << proxy_owner
+            doc.save
+          end
+          reset
+        end
+        alias_method :push, :<<
+        alias_method :concat, :<<
+
+        def replace(docs)
+          doc_ids = docs.map do |doc|
+            doc.save unless doc.persisted?
+            inverse_association(doc) << proxy_owner
+            doc.save
+            doc.id
+          end
+
+          replace_selector =  { options[:from] => proxy_owner.id }
+          unless doc_ids.empty?
+            replace_selector[:_id] = {"$not" => {"$in" => doc_ids}}
+          end
+
+          klass.collection.update_many(replace_selector, {
+            "$pull" => { options[:from] => proxy_owner.id }
+          })
+
+          reset
+        end
+
+        private
+
+          def query(options={})
+            klass.query({}.
+              merge(association.query_options).
+              merge(options).
+              merge(criteria))
+          end
+
+          def criteria
+            {options[:from] => proxy_owner.id}
+          end
+
+          def scoped_ids(args)
+            valid = args.flatten.map do |id|
+              id = ObjectId.to_mongo(id) if klass.using_object_id?
+              id
+            end
+            valid.empty? ? nil : valid
+          end
+
+          def find_target
+            all
+          end
+
+          def inverse_association(doc)
+            doc.send(options[:as].to_s.pluralize)
+          end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,8 @@ module MongoMapper
               ManyPolymorphicProxy
             elsif as?
               ManyDocumentsAsProxy
+            elsif in_foreign_array?
+              InForeignArrayProxy
             elsif in_array?
               InArrayProxy
             else
@@ -26,7 +28,7 @@ module MongoMapper
         end
 
         def setup(model)
-          model.associations_module.module_eval <<-end_eval
+          model.associations_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
             def #{name}
               get_proxy(associations[#{name.inspect}])
             end
@@ -60,4 +62,4 @@ module MongoMapper
       end
     end
   end
-end
+end

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

@@ -11,7 +11,9 @@ module MongoMapper
         end
 
         def replace(doc)
-          if doc.respond_to?(:attributes)
+          if doc.instance_of?(klass)
+            @target = doc
+          elsif doc.respond_to?(:attributes)
             @target = klass.load(doc.attributes, true)
           else
             @target = klass.load(doc, true)

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

@@ -13,7 +13,6 @@ module MongoMapper
 
         attr_reader :proxy_owner, :association, :target
 
-        alias :proxy_target :target
         alias :proxy_association :association
 
         def_delegators :proxy_association, :klass, :options
@@ -100,10 +99,15 @@ module MongoMapper
           end
         end
 
+        def read
+          load_target
+          @target
+        end
+
       protected
 
         def load_target
-          unless loaded?
+          if !loaded? || stale_target?
             if @target.is_a?(Array) && @target.any?
               @target = find_target + @target.find_all { |record| !record.persisted? }
             else
@@ -130,9 +134,13 @@ module MongoMapper
 
       private
 
+        def stale_target?
+          false
+        end
+
         def method_missing(method, *args, &block)
           if load_target
-            target.send(method, *args, &block)
+            target.public_send(method, *args, &block)
           end
         end
       end

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

@@ -5,10 +5,11 @@ module MongoMapper
       class SingleAssociation < Base
         def setup(model)
           @model = model
-          model.associations_module.module_eval <<-end_eval
+
+          model.associations_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
             def #{name}
               proxy = get_proxy(associations[#{name.inspect}])
-              proxy.nil? ? nil : proxy
+              proxy.nil? ? nil : proxy.read
             end
 
             def #{name}=(value)
@@ -20,7 +21,7 @@ module MongoMapper
               end
 
               proxy.replace(value)
-              value
+              proxy.read
             end
 
             def #{name}?
@@ -43,4 +44,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -3,58 +3,50 @@ module MongoMapper
   module Plugins
     module Dirty
       extend ActiveSupport::Concern
-
       include ::ActiveModel::Dirty
 
-      def initialize(*)
-        # never register initial id assignment as a change
-        # Chaining super into tap breaks implicit block passing in Ruby 1.8
-        doc = super
-        doc.tap { changed_attributes.delete('_id') }
-      end
-
-      def save(*)
-        clear_changes { super }
-      end
-
-      def reload(*)
-        doc = super
-        doc.tap { clear_changes }
-      end
-
-      def clear_changes
-        previous = changes
-        (block_given? ? yield : true).tap do |result|
-          unless result == false #failed validation; nil is OK.
-            @previously_changed = previous
-            changed_attributes.clear
+      module ClassMethods
+        def create_accessors_for(key)
+          super.tap do
+            define_attribute_methods([key.name])
           end
         end
       end
 
-    protected
+      def save_to_collection(*)
+        super.tap do
+          changes_applied
+        end
+      end
 
-      # We don't call super here to avoid invoking #attributes, which builds a whole new hash per call.
-      def attribute_method?(attr_name)
-        keys.key?(attr_name) || !embedded_associations.detect {|a| a.name == attr_name }.nil?
+      def reload!
+        super.tap do
+          clear_changes_information
+        end
       end
 
     private
 
-      def write_key(key, value)
-        key = unalias_key(key)
-        if !keys.key?(key)
+      def write_key(key_name, value)
+        key_name = unalias_key(key_name)
+
+        if !keys.key?(key_name)
           super
         else
-          attribute_will_change!(key) unless attribute_changed?(key)
-          super.tap do
-            changed_attributes.delete(key) unless attribute_value_changed?(key)
+          # find the MongoMapper::Plugins::Keys::Key
+          _, key = keys.detect { |n, v| n == key_name }
+
+          # typecast to the new value
+          old_value = read_key(key_name)
+          new_value = key.get(key.set(value))
+
+          # only mark changed if really changed value (after typecasting)
+          unless old_value == new_value
+            attribute_will_change!(key_name)
           end
-        end
-      end
 
-      def attribute_value_changed?(key_name)
-        changed_attributes[key_name] != read_key(key_name)
+          super
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/document.rb

@@ -19,7 +19,7 @@ module MongoMapper
       end
 
       def reload
-        if doc = collection.find_one(:_id => id)
+        if doc = collection.find({:_id => id},{limit: -1}).first
           self.class.associations.each_value do |association|
             get_proxy(association).reset
           end

data/lib/mongo_mapper/plugins/dynamic_querying/dynamic_finder.rb

@@ -42,4 +42,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -44,6 +44,7 @@ module MongoMapper
           definition.each do |prefix, suffixes|
             suffixes.each do |suffix|
               callback = "%s_%s" % [prefix, suffix]
+
               class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
                 class << self
                   alias_method :__original_#{callback}, :#{callback}

data/lib/mongo_mapper/plugins/embedded_document.rb

@@ -41,12 +41,12 @@ module MongoMapper
 
       def persist(options={})
         @_new = false
-        clear_changes if respond_to?(:clear_changes)
+        changes_applied if respond_to?(:changes_applied)
         save_to_collection(options)
       end
 
       def _root_document
-        @_root_document ||= _parent_document.try(:_root_document)
+        _parent_document.try(:_root_document)
       end
     end
   end

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -133,10 +133,12 @@ module PluckyMethods
     end
 
     def find_each(opts={})
+      return super if !block_given?
+
       query = clone.amend(opts)
       super(opts) do |doc|
         doc.remove_from_identity_map if doc && query.fields?
-        yield doc if block_given?
+        yield doc
       end
     end
   end

data/lib/mongo_mapper/plugins/indexes.rb

@@ -6,19 +6,20 @@ module MongoMapper
 
       module ClassMethods
         def ensure_index(spec, options = {})
-          collection.ensure_index dealias_options(spec), options
+          #TODO: should we emulate the mongo 1.x behaviour of caching attempts to create indexes?
+          collection.indexes.create_one dealias_options(spec), options
         end
 
         def create_index(spec, options = {})
-          collection.create_index dealias_options(spec), options
+          collection.indexes.create_one dealias_options(spec), options
         end
 
         def drop_index(name)
-          collection.drop_index name
+          collection.indexes.drop_one name
         end
 
         def drop_indexes
-          collection.drop_indexes
+          collection.indexes.drop_all
         end
 
       private
@@ -26,11 +27,17 @@ module MongoMapper
         def dealias_options(options)
           case options
           when Symbol, String
-             abbr(options)
+            {abbr(options) => 1}
           when Hash
             dealias_keys(options)
           when Array
-            options.map {|o| dealias_options(o) }
+            if options.first.is_a?(Hash)
+              options.map {|o| dealias_options(o) }
+            elsif options.first.is_a?(Array) # [[:foo, 1], [:bar, 1]]
+              options.inject({}) {|acc, tuple| acc.merge(dealias_options(tuple))}
+            else
+              dealias_keys(Hash[*options])
+            end
           else
             options
           end

data/lib/mongo_mapper/plugins/keys.rb

@@ -144,9 +144,8 @@ module MongoMapper
         end
 
         def create_accessors_for(key)
-          accessors = ""
           if key.read_accessor?
-            accessors << <<-end_eval
+            accessors_module.module_eval(<<-end_eval, __FILE__, __LINE__+1)
               def #{key.name}
                 read_key(:#{key.name})
               end
@@ -158,7 +157,7 @@ module MongoMapper
           end
 
           if key.write_accessor?
-            accessors << <<-end_eval
+            accessors_module.module_eval(<<-end_eval, __FILE__, __LINE__+1)
               def #{key.name}=(value)
                 write_key(:#{key.name}, value)
               end
@@ -166,7 +165,7 @@ module MongoMapper
           end
 
           if key.predicate_accessor?
-            accessors << <<-end_eval
+            accessors_module.module_eval(<<-end_eval, __FILE__, __LINE__+1)
               def #{key.name}?
                 read_key(:#{key.name}).present?
               end
@@ -179,7 +178,6 @@ module MongoMapper
             end
           end
 
-          accessors_module.module_eval accessors
           include accessors_module
         end
 
@@ -295,8 +293,16 @@ module MongoMapper
         end
       end
 
+      # NOTE: We can't use alias_method here as we need the #attributes=
+      # superclass method to get called (for example:
+      # MongoMapper::Plugins::Accessible filters non-permitted parameters
+      # through `attributes=`
+      def assign_attributes(new_attributes)
+        self.attributes = new_attributes
+      end
+
       def to_mongo(include_abbreviatons = true)
-        BSON::OrderedHash.new.tap do |attrs|
+        Hash.new.tap do |attrs|
           self.class.unaliased_keys.each do |name, key|
             value = self.read_key(key.name)
             if key.type == ObjectId || !value.nil?
@@ -449,7 +455,6 @@ module MongoMapper
         else
           @_dynamic_attributes[key.name.to_sym] = as_typecast
         end
-        @attributes = nil
         value
       end