@@ -996,65 +996,65 @@ def defaults(defaults = {})
996996 end
997997
998998 private
999- def merge_path_scope ( parent , child ) #:nodoc:
999+ def merge_path_scope ( parent , child )
10001000 Mapper . normalize_path ( "#{ parent } /#{ child } " )
10011001 end
10021002
1003- def merge_shallow_path_scope ( parent , child ) #:nodoc:
1003+ def merge_shallow_path_scope ( parent , child )
10041004 Mapper . normalize_path ( "#{ parent } /#{ child } " )
10051005 end
10061006
1007- def merge_as_scope ( parent , child ) #:nodoc:
1007+ def merge_as_scope ( parent , child )
10081008 parent ? "#{ parent } _#{ child } " : child
10091009 end
10101010
1011- def merge_shallow_prefix_scope ( parent , child ) #:nodoc:
1011+ def merge_shallow_prefix_scope ( parent , child )
10121012 parent ? "#{ parent } _#{ child } " : child
10131013 end
10141014
1015- def merge_module_scope ( parent , child ) #:nodoc:
1015+ def merge_module_scope ( parent , child )
10161016 parent ? "#{ parent } /#{ child } " : child
10171017 end
10181018
1019- def merge_controller_scope ( parent , child ) #:nodoc:
1019+ def merge_controller_scope ( parent , child )
10201020 child
10211021 end
10221022
1023- def merge_action_scope ( parent , child ) #:nodoc:
1023+ def merge_action_scope ( parent , child )
10241024 child
10251025 end
10261026
1027- def merge_via_scope ( parent , child ) #:nodoc:
1027+ def merge_via_scope ( parent , child )
10281028 child
10291029 end
10301030
1031- def merge_format_scope ( parent , child ) #:nodoc:
1031+ def merge_format_scope ( parent , child )
10321032 child
10331033 end
10341034
1035- def merge_path_names_scope ( parent , child ) #:nodoc:
1035+ def merge_path_names_scope ( parent , child )
10361036 merge_options_scope ( parent , child )
10371037 end
10381038
1039- def merge_constraints_scope ( parent , child ) #:nodoc:
1039+ def merge_constraints_scope ( parent , child )
10401040 merge_options_scope ( parent , child )
10411041 end
10421042
1043- def merge_defaults_scope ( parent , child ) #:nodoc:
1043+ def merge_defaults_scope ( parent , child )
10441044 merge_options_scope ( parent , child )
10451045 end
10461046
1047- def merge_blocks_scope ( parent , child ) #:nodoc:
1047+ def merge_blocks_scope ( parent , child )
10481048 merged = parent ? parent . dup : [ ]
10491049 merged << child if child
10501050 merged
10511051 end
10521052
1053- def merge_options_scope ( parent , child ) #:nodoc:
1053+ def merge_options_scope ( parent , child )
10541054 ( parent || { } ) . merge ( child )
10551055 end
10561056
1057- def merge_shallow_scope ( parent , child ) #:nodoc:
1057+ def merge_shallow_scope ( parent , child )
10581058 child ? true : false
10591059 end
10601060
@@ -1868,7 +1868,7 @@ def using_match_shorthand?(path)
18681868 path =~ %r{^/?[-\w ]+/[-\w /]+$}
18691869 end
18701870
1871- def decomposed_match ( path , controller , options , _path , to , via , formatted , anchor , options_constraints ) # :nodoc:
1871+ def decomposed_match ( path , controller , options , _path , to , via , formatted , anchor , options_constraints )
18721872 if on = options . delete ( :on )
18731873 send ( on ) { decomposed_match ( path , controller , options , _path , to , via , formatted , anchor , options_constraints ) }
18741874 else
@@ -1883,7 +1883,7 @@ def decomposed_match(path, controller, options, _path, to, via, formatted, ancho
18831883 end
18841884 end
18851885
1886- def add_route ( action , controller , options , _path , to , via , formatted , anchor , options_constraints ) # :nodoc:
1886+ def add_route ( action , controller , options , _path , to , via , formatted , anchor , options_constraints )
18871887 path = path_for_action ( action , _path )
18881888 raise ArgumentError , "path is required" if path . blank?
18891889
0 commit comments