mongo_mapper 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 143438e47efd4cc910b443067a35aff261a7c32baa12bbe8836b0505edb6c8ad
-  data.tar.gz: 0d8d33172da4805fa47544585d2ea5369a82e9154be19dcd9be2789b5c2747cb
+  metadata.gz: 77d669d6c4286995fb2afbed7cf23475c6dc496cb3faf97a57f3b8f115e263b3
+  data.tar.gz: d11040bb05eeb6cb57465c4585c0667b16d750b16d7fd5fedca5e03734b769ac
 SHA512:
-  metadata.gz: 50b970107ed41cc982e24fe9d171fed471847c593db3c5239b7e60fa88fb67ef799473eb1a088d2eb92d6d2cda49d8ec391b61a24e92bb5b9a9e7eea399ed61b
-  data.tar.gz: 1674cc8cdc27d2f3bc7460a8f32017903bde7263feeae62bf3074386d5fa0b080b3fc52c4407c200a7b4df8fb083fd917e6b5611b19f8538ec10033c789667ab
+  metadata.gz: 56a665e63c65da52238cc18348333a2a9c6b6d1c5acf564308f60f8fcec8a1be759c5b7546a0259092a7f6acc9170659d55c462ac59fffe6520f3339a650df15
+  data.tar.gz: 8dceac60d1ef1159585453450d2960e4d9d50e472ec7728f3b703da8e40e80af625b01bb6c4022327e16631960faa698da93c7d37c563cd1c839eb3ebfc28ddb

data/README.md

@@ -2,11 +2,11 @@
 
 A Ruby Object Mapper for Mongo.
 
-[<img src="https://badge.fury.io/rb/mongo_mapper.png" alt="RubyGems">](https://rubygems.org/gems/mongo_mapper)
+[<img src="https://badge.fury.io/rb/mongo_mapper.svg" alt="RubyGems">](https://rubygems.org/gems/mongo_mapper)
 
-[<img src="https://travis-ci.org/mongomapper/mongomapper.png?branch=master" alt="Build Status" />](https://travis-ci.org/mongomapper/mongomapper)
+[<img src="https://travis-ci.org/mongomapper/mongomapper.svg?branch=master" alt="Build Status" />](https://travis-ci.org/mongomapper/mongomapper)
 
-[<img src="https://coveralls.io/repos/mongomapper/mongomapper/badge.png" alt="Coverage Status" />](https://coveralls.io/r/mongomapper/mongomapper)
+[<img src="https://coveralls.io/repos/mongomapper/mongomapper/badge.svg" alt="Coverage Status" />](https://coveralls.io/r/mongomapper/mongomapper)
 
 ## Install
 
@@ -45,8 +45,6 @@ Additionally, MongoMapper is tested against:
 
 Hit up the Google group: http://groups.google.com/group/mongomapper
 
-Hop on IRC: irc://chat.freenode.net/#mongomapper
-
 ## Copyright
 
 Copyright (c) 2009-2020 MongoMapper. See LICENSE for details.
@@ -59,6 +57,5 @@ MongoMapper/Plucky is:
 * Chris Heald
 * Scott Taylor
 
-With contributions from:
-
-* Frederick Cheung
+But all open source projects are a team effort and could not happen without
+everyone who has contributed.  See `CONTRIBUTORS` for the full list.  Thank you!

data/lib/mongo_mapper.rb

@@ -62,6 +62,7 @@ module MongoMapper
     autoload :Scopes,             'mongo_mapper/plugins/scopes'
     autoload :Serialization,      'mongo_mapper/plugins/serialization'
     autoload :Stats,              'mongo_mapper/plugins/stats'
+    autoload :StrongParameters,   'mongo_mapper/plugins/strong_parameters'
     autoload :Timestamps,         'mongo_mapper/plugins/timestamps'
     autoload :Userstamps,         'mongo_mapper/plugins/userstamps'
     autoload :Validations,        'mongo_mapper/plugins/validations'
@@ -87,6 +88,7 @@ module MongoMapper
       autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
       autoload :OneEmbeddedPolymorphicProxy,  'mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy'
       autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
+      autoload :InForeignArrayProxy,          'mongo_mapper/plugins/associations/in_foreign_array_proxy'
     end
   end
 

data/lib/mongo_mapper/plugins/accessible.rb

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

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

@@ -6,7 +6,7 @@ module MongoMapper
         attr_reader :name, :options, :query_options
 
         # Options that should not be considered MongoDB query options/criteria
-        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave, :touch, :counter_cache]
+        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :from, :polymorphic, :autosave, :touch, :counter_cache, :ordered]
 
         def initialize(name, options={}, &extension)
           @name, @options, @query_options, @original_options = name.to_sym, {}, {}, options
@@ -28,13 +28,17 @@ module MongoMapper
         end
 
         def as?
-          !!@options[:as]
+          !in_foreign_array? && !!@options[:as]
         end
 
         def in_array?
           !!@options[:in]
         end
 
+        def in_foreign_array?
+          !!@options[:from]
+        end
+
         def embeddable?
           klass.embeddable?
         end
@@ -47,6 +51,10 @@ module MongoMapper
           !!@options[:counter_cache]
         end
 
+        def ordered?
+          !!@options[:ordered]
+        end
+
         def type_key_name
           "_type"
         end

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

@@ -6,11 +6,11 @@ module MongoMapper
         include DynamicQuerying::ClassMethods
 
         def find(*args)
-          query.find(*scoped_ids(args))
+          order_results(query.find(*scoped_ids(args)))
         end
 
         def find!(*args)
-          query.find!(*scoped_ids(args))
+          order_results(query.find!(*scoped_ids(args)))
         end
 
         def paginate(options)
@@ -20,17 +20,29 @@ module MongoMapper
 
         def all(options={})
           return [] if ids.blank?
-          query(options).all
+          order_results(query(options).all)
         end
 
         def first(options={})
           return nil if ids.blank?
-          query(options).first
+
+          if ordered?
+            ids = find_ordered_ids(options)
+            find!(ids.first) if ids.any?
+          else
+            query(options).first
+          end
         end
 
         def last(options={})
           return nil if ids.blank?
-          query(options).last
+
+          if ordered?
+            ids = find_ordered_ids(options)
+            find!(ids.last) if ids.any?
+          else
+            query(options).last
+          end
         end
 
         def count(options={})
@@ -120,6 +132,13 @@ module MongoMapper
           valid.empty? ? nil : valid
         end
 
+        def find_ordered_ids(options={})
+          return ids if options.empty?
+
+          matched_ids = klass.collection.distinct(:_id, query(options).criteria.to_hash)
+          matched_ids.sort_by! { |matched_id| ids.index(matched_id) }
+        end
+
         def find_target
           return [] if ids.blank?
           all
@@ -128,7 +147,18 @@ module MongoMapper
         def ids
           proxy_owner[options[:in]]
         end
+
+        def order_results(objects)
+          return objects if !ordered?
+          return objects unless objects.respond_to?(:to_a) && objects.respond_to?(:sort_by)
+          objects.sort_by { |obj| ids.index(obj.id) }
+        end
+
+        def ordered?
+          association.ordered?
+        end
+
       end
     end
   end
-end
+end

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/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,6 +99,11 @@ module MongoMapper
           end
         end
 
+        def read
+          load_target
+          @target
+        end
+
       protected
 
         def load_target

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/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/keys.rb

@@ -295,6 +295,14 @@ 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)
         Hash.new.tap do |attrs|
           self.class.unaliased_keys.each do |name, key|

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

@@ -3,10 +3,11 @@ module MongoMapper
   module Plugins
     module Keys
       class Key
-        attr_accessor :name, :type, :options, :default, :ivar, :abbr, :accessors
-
+        RESERVED_KEYS = %w( id class object_id attributes )
         ID_STR = '_id'
 
+        attr_accessor :name, :type, :options, :default, :ivar, :abbr, :accessors
+
         def initialize(*args)
           options_from_args = args.extract_options!
           @name, @type = args.shift.to_s, args.shift
@@ -60,12 +61,17 @@ module MongoMapper
           # Special Case: Generate default _id on access
           value = default_value if @is_id and !value
 
+          value = type.from_mongo(value)
+
           if @typecast
-            klass = typecast_class  # Don't make this lookup on every call
-            type.from_mongo(value).map { |v| klass.from_mongo(v) }
-          else
-            type.from_mongo(value)
+            klass = typecast_class # Don't make this lookup on every call
+            # typecast assumes array-ish object.
+            value = value.map { |v| klass.from_mongo(v) }
+            # recast it in the original type
+            value = type.from_mongo(value)
           end
+
+          value
         end
 
         def set(value)
@@ -93,7 +99,6 @@ module MongoMapper
           !!@name.match(/\A[a-z_][a-z0-9_]*\z/i)
         end
 
-        RESERVED_KEYS = %w( id class object_id )
         def reserved_name?
           RESERVED_KEYS.include?(@name)
         end
@@ -124,7 +129,7 @@ module MongoMapper
 
         def validate_key_name!
           if reserved_name?
-            raise MongoMapper::InvalidKey.new("`#{@name}` is a reserved key name (did you mean to use _id?)")
+            raise MongoMapper::InvalidKey.new("`#{@name}` is a reserved key name")
           elsif !valid_ruby_name?
             raise MongoMapper::InvalidKey.new("`#{@name}` is not a valid key name. Keys must match [a-z][a-z0-9_]*")
           end