lib/rom/repository/relation_proxy/combine.rb in rom-repository-1.0.0.beta3 vs lib/rom/repository/relation_proxy/combine.rb in rom-repository-1.0.0.rc1
- old
+ new
@@ -46,12 +46,10 @@
#
# @param options [Hash] Options for combine
# @option :many [Hash] Sets options for "has-many" type of association
# @option :one [Hash] Sets options for "has-one/belongs-to" type of association
#
- # @param [Hash] options
- #
# @return [RelationProxy]
#
# @api public
def combine(*args)
options = args[0].is_a?(Hash) ? args[0] : args
@@ -188,11 +186,12 @@
#
# When source has association corresponding to target's name, it'll be
# used to get the keys. Otherwise we fall back to using default keys based
# on naming conventions.
#
- # @param [RelationProxy] relation
- # @param [Symbol] type The type can be either :parent or :children
+ # @param [Relation::Name] source The source relation name
+ # @param [Relation::Name] target The target relation name
+ # @param [Symbol] type The association type, can be either :parent or :children
#
# @return [Hash<Symbol=>Symbol>]
#
# @api private
def combine_keys(source, target, type)