mongomodel 0.5.5 → 0.5.6

data/lib/mongomodel/concerns/associations/base/association.rb

@@ -6,26 +6,26 @@ module MongoModel
       class Association
         attr_reader :definition, :instance
         delegate :name, :klass, :polymorphic?, :to => :definition
-        
+
         def initialize(definition, instance)
           @definition, @instance = definition, instance
         end
-        
+
         def proxy
           @proxy ||= proxy_class.new(self)
         end
-        
+
         def replace(obj)
           proxy.target = obj
           proxy
         end
-        
+
         def ensure_class(value)
           unless value.is_a?(klass) || value.class.name.constantize <= klass.name.constantize
             raise AssociationTypeMismatch, "#{klass} expected, got #{value.class}"
           end
         end
-      
+
       protected
         def proxy_class
           self.class.parent::Proxy rescue Base::Proxy

data/lib/mongomodel/concerns/associations/base/definition.rb

@@ -29,7 +29,7 @@ module MongoModel
             name.to_s.classify.constantize
           end
         end
-        
+
         def singular_name
           name.to_s.singularize
         end
@@ -37,15 +37,15 @@ module MongoModel
         def polymorphic?
           options[:polymorphic]
         end
-        
+
         def collection?
           true
         end
-        
+
         def scope
           klass.scoped.apply_finder_options(scope_options)
         end
-        
+
         def scope_options
           options.slice(:conditions, :select, :offset, :limit, :order)
         end

data/lib/mongomodel/concerns/associations/base/proxy.rb

@@ -12,7 +12,7 @@ module MongoModel
         def initialize(association)
           @association = association
         end
-  
+
         def target=(new_target)
           @target = new_target
           loaded!

data/lib/mongomodel/concerns/associations/belongs_to.rb

@@ -2,52 +2,52 @@ module MongoModel
   module Associations
     class BelongsTo < Base::Definition
       def foreign_key
-        @foreign_key ||= :"#{name}_id"
+        @foreign_key ||= options[:foreign_key] || :"#{name}_id"
       end
-      
+
       def type_key
-        @type_key ||= :"#{name}_type"
+        @type_key ||= options[:type_key] || :"#{name}_type"
       end
-      
+
       def collection?
         false
       end
-      
+
       properties do |association|
         property association.foreign_key, MongoModel::Reference, :internal => true
         property association.type_key, String, :internal => true if association.polymorphic?
       end
-      
+
       methods do |association|
         define_method(association.name) do |*args|
           force_reload = args.first unless args.empty?
-          
+
           proxy = associations[association.name].proxy
-          
+
           proxy.reset if force_reload
           proxy.target.nil? ? nil : proxy
         end
-        
+
         define_method("#{association.name}=") { |obj| associations[association.name].replace(obj) }
-        
+
         unless association.polymorphic?
           define_method("build_#{association.name}") do |*args|
             associations[association.name].replace(association.klass.new(*args))
           end
-        
+
           define_method("create_#{association.name}") do |*args|
             associations[association.name].replace(association.klass.create(*args))
           end
         end
       end
-      
+
       class Association < Base::Association
         delegate :foreign_key, :type_key, :to => :definition
-        
+
         def target_id
           instance[foreign_key]
         end
-        
+
         def target_class
           if polymorphic?
             instance[type_key].constantize rescue nil
@@ -55,20 +55,20 @@ module MongoModel
             klass
           end
         end
-        
+
         def replace(obj)
           ensure_class(obj) if obj && !polymorphic?
-          
+
           instance[foreign_key] = obj ? obj.id : nil
           instance[type_key] = obj ? obj.class : nil if polymorphic?
-          
+
           super
         end
-        
+
         def find_target
           target_class.find(target_id) if target_id && target_class
         end
-      
+
       protected
         def proxy_class
           Base::Proxy

data/lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb

@@ -4,23 +4,23 @@ module MongoModel
       def foreign_key
         @foreign_key ||= options[:foreign_key] || :"#{inverse_of}_id"
       end
-      
+
       def inverse_of
         @inverse_of ||= options[:inverse_of] || owner.to_s.demodulize.underscore.singularize.to_sym
       end
-      
+
       def define!
         raise "has_many :by => :foreign_key is only valid on Document" unless owner.ancestors.include?(Document)
-        
+
         super
-        
+
         define_dependency_callbacks!
         self
       end
-      
+
       def define_dependency_callbacks!
         association = self
-        
+
         if options[:dependent] == :destroy
           owner.before_destroy do
             send(association.name).each { |child| child.destroy }
@@ -31,75 +31,75 @@ module MongoModel
           end
         end
       end
-      
+
       methods do |association|
         define_method(association.name) { associations[association.name].proxy }
         define_method("#{association.name}=") { |obj| associations[association.name].replace(obj) }
       end
-      
+
       class Association < Base::Association
         delegate :foreign_key, :inverse_of, :to => :definition
-        
+
         def find_target
           scoped.each { |doc|
             doc.send("#{inverse_of}=", instance) if doc.respond_to?("#{inverse_of}=")
           } + new_documents
         end
-        
+
         def build(*args, &block)
           doc = scoped.new(*args, &block)
           new_documents << doc
           doc
         end
-        
+
         def create(*args)
           scoped.create(*args) do |doc|
             set_inverse_association(doc)
             yield doc if block_given?
           end
         end
-        
+
         def create!(*args)
           scoped.create!(*args) do |doc|
             set_inverse_association(doc)
             yield doc if block_given?
           end
         end
-        
+
         def replace(array)
           ensure_class(array)
           array.each { |doc| assign(doc) }
           super
         end
-        
+
         def assign(doc)
           set_inverse_association(doc)
           doc.save(false) unless doc.new_record?
         end
-        
+
         def unset(doc)
           if doc.respond_to?("#{inverse_of}=")
             doc.send("#{inverse_of}=", nil) if doc.send(inverse_of) == instance
           else
             doc[foreign_key] = nil if doc[foreign_key] == instance.id
           end
-          
+
           doc.save(false) unless doc.new_record?
         end
-        
+
         def scoped
           definition.scope.where(foreign_key => instance.id).on_load { |doc| set_inverse_association(doc) }
         end
-        
+
         def ensure_class(array)
           array.is_a?(Array) ? array.each { |i| super(i) } : super
         end
-      
+
       protected
         def new_documents
           @new_documents ||= []
         end
-        
+
         def set_inverse_association(doc)
           if doc.respond_to?("#{inverse_of}=")
             doc.send("#{inverse_of}=", instance)
@@ -107,39 +107,39 @@ module MongoModel
             doc[foreign_key] = instance.id
           end
         end
-        
+
         def proxy_class
           Proxy
         end
       end
-      
+
       class Proxy < Base::Proxy
         # Pass these methods to the scope rather than the Array target
         OVERRIDE_METHODS = [ :find, :first, :last, :count, :paginate ]
-        
+
         delegate :ensure_class, :to => :association
-        
+
         def build(*args)
           association.build(*args) do |doc|
             self << doc
             yield doc if block_given?
           end
         end
-        
+
         def create(*args)
           association.create(*args) do |doc|
             self << doc
             yield doc if block_given?
           end
         end
-        
+
         def create!(*args)
           association.create!(*args) do |doc|
             self << doc
             yield doc if block_given?
           end
         end
-        
+
         def []=(index, doc)
           ensure_class(doc)
           association.unset(target[index]) if target[index]
@@ -147,7 +147,7 @@ module MongoModel
           super if loaded?
           self
         end
-        
+
         def <<(*documents)
           documents.flatten!
           ensure_class(documents)
@@ -155,40 +155,40 @@ module MongoModel
           super if loaded?
           self
         end
-        
+
         alias_method :push, :<<
         alias_method :concat, :<<
-        
+
         def insert(index, doc)
           ensure_class(doc)
           association.assign(doc)
           super if loaded?
           self
         end
-        
+
         def unshift(*documents)
           ensure_class(documents)
           documents.each { |doc| association.assign(doc) }
           super if loaded?
           self
         end
-        
+
         def delete(doc)
           association.unset(doc)
           super
           self
         end
-        
+
         def delete_at(index)
           association.unset(target[index])
           super
           self
         end
-        
+
         def ids
           target.map { |doc| doc.id }
         end
-        
+
         def select(*args, &block)
           if args.empty?
             target.select(&block)
@@ -196,7 +196,7 @@ module MongoModel
             association.scoped.send(:select, *args)
           end
         end
-      
+
       private
         def method_missing(method, *args, &block)
           if Array.method_defined?(method) && !OVERRIDE_METHODS.include?(method)

data/lib/mongomodel/concerns/associations/has_many_by_ids.rb

@@ -4,16 +4,16 @@ module MongoModel
       def property_name
         @property_name ||= :"#{singular_name}_ids"
       end
-      
+
       def define!
         super
         define_dependency_callbacks!
         self
       end
-      
+
       def define_dependency_callbacks!
         association = self
-        
+
         if options[:dependent] == :destroy
           owner.before_destroy do
             send(association.name).each { |child| child.destroy }
@@ -24,30 +24,30 @@ module MongoModel
           end
         end
       end
-      
+
       properties do |association|
         property association.property_name, Collection[MongoModel::Reference], :internal => true, :default => []
       end
-      
+
       methods do |association|
         define_method(association.name) { associations[association.name].proxy }
         define_method("#{association.name}=") { |obj| associations[association.name].replace(obj) }
       end
-      
+
       class Association < Base::Association
         delegate :property_name, :to => :definition
-        
+
         def ids
           instance[property_name]
         end
-        
+
         def replace(array)
           ensure_class(array)
-          
+
           instance[property_name] = array.map { |i| i.id }
           super
         end
-        
+
         def find_target
           if ids.any?
             docs = Array.wrap(definition.scope.where(:id.in => (ids - new_document_ids))) + new_documents
@@ -56,134 +56,134 @@ module MongoModel
             []
           end
         end
-        
+
         def build(*args, &block)
           doc = scoped.new(*args, &block)
           new_documents << doc
           doc
         end
-        
+
         def create(*args, &block)
           scoped.create(*args, &block)
         end
-        
+
         def scoped
           definition.scope.where(:id.in => ids)
         end
-        
+
         def ensure_class(array)
           array.is_a?(Array) ? array.each { |i| super(i) } : super
         end
-        
+
       protected
         def new_documents
           @new_documents ||= []
         end
-        
+
         def new_document_ids
           new_documents.map { |doc| doc.id }
         end
-        
+
         def proxy_class
           Proxy
         end
       end
-      
+
       class Proxy < Base::Proxy
         # Pass these methods to the association class rather than the Array target
         OVERRIDE_METHODS = [ :find ]
-        
+
         delegate :ensure_class, :to => :association
-        
+
         def build(*args, &block)
           doc = association.build(*args, &block)
           self << doc
           doc
         end
-        
+
         def create(*args, &block)
           doc = association.create(*args, &block)
           self << doc
           doc
         end
-        
+
         def []=(index, doc)
           ensure_class(doc)
           super if loaded?
           ids[index] = doc.id
           self
         end
-        
+
         def <<(doc)
           ensure_class(doc)
           super if loaded?
           ids << doc.id
           self
         end
-        
+
         def concat(documents)
           ensure_class(documents)
           super if loaded?
           ids.concat(documents.map { |doc| doc.id })
           self
         end
-        
+
         def insert(index, doc)
           ensure_class(doc)
           super if loaded?
           ids.insert(index, doc.id)
           self
         end
-        
+
         def replace(documents)
           ensure_class(documents)
           super if loaded?
           ids.replace(documents.map { |doc| doc.id })
           self
         end
-        
+
         def push(*documents)
           ensure_class(documents)
           super if loaded?
           ids.push(*documents.map { |doc| doc.id })
           self
         end
-        
+
         def unshift(*documents)
           ensure_class(documents)
           super if loaded?
           ids.unshift(*documents.map { |doc| doc.id })
           self
         end
-        
+
         def clear
           super if loaded?
           ids.clear
           self
         end
-        
+
         def delete(doc)
           super if loaded?
           ids.delete(doc.id)
           self
         end
-        
+
         def delete_at(index)
           super if loaded?
           ids.delete_at(index)
           self
         end
-        
+
         def delete_if(&block)
           super
           ids.replace(map { |doc| doc.id })
           self
         end
-        
+
         def ids
           association.ids
         end
-      
+
       private
         def method_missing(method_id, *args, &block)
           if target.respond_to?(method_id) && !OVERRIDE_METHODS.include?(method_id.to_sym)