@@ -320,10 +320,8 @@ def generate_index
320
320
321
321
render_template template_file , out_file do |io |
322
322
here = binding
323
- # suppress 1.9.3 warning
324
323
here . local_variable_set ( :asset_rel_prefix , asset_rel_prefix )
325
- # some partials rely on the presence of current variable to render
326
- here . local_variable_set ( :current , @main_page )
324
+ here . local_variable_set ( :target , @main_page )
327
325
here
328
326
end
329
327
rescue => e
@@ -340,7 +338,7 @@ def generate_index
340
338
def generate_class klass , template_file = nil
341
339
setup
342
340
343
- current = klass
341
+ target = klass
344
342
345
343
template_file ||= @template_dir + 'class.rhtml'
346
344
@@ -351,18 +349,18 @@ def generate_class klass, template_file = nil
351
349
search_index_rel_prefix += @asset_rel_path if @file_output
352
350
353
351
asset_rel_prefix = rel_prefix + @asset_rel_path
354
- svninfo = get_svninfo ( current )
352
+ svninfo = get_svninfo ( target )
355
353
356
- breadcrumb = generate_nesting_namespaces_breadcrumb ( current , rel_prefix )
354
+ breadcrumb = generate_nesting_namespaces_breadcrumb ( target , rel_prefix )
357
355
358
356
@title = "#{ klass . type } #{ klass . full_name } - #{ @options . title } "
359
357
360
358
debug_msg " rendering #{ out_file } "
361
359
render_template template_file , out_file do |io |
362
360
here = binding
363
- # suppress 1.9.3 warning
364
361
here . local_variable_set ( :asset_rel_prefix , asset_rel_prefix )
365
362
here . local_variable_set ( :svninfo , svninfo )
363
+ here . local_variable_set ( :breadcrumb , breadcrumb )
366
364
here
367
365
end
368
366
end
@@ -379,16 +377,16 @@ def generate_class_files
379
377
return unless template_file . exist?
380
378
debug_msg "Generating class documentation in #{ @outputdir } "
381
379
382
- current = nil
380
+ target = nil
383
381
384
382
@classes . each do |klass |
385
- current = klass
383
+ target = klass
386
384
387
385
generate_class klass , template_file
388
386
end
389
387
rescue => e
390
388
error = RDoc ::Error . new \
391
- "error generating #{ current . path } : #{ e . message } (#{ e . class } )"
389
+ "error generating #{ target . path } : #{ e . message } (#{ e . class } )"
392
390
error . set_backtrace e . backtrace
393
391
394
392
raise error
@@ -413,10 +411,10 @@ def generate_file_files
413
411
debug_msg "Generating file documentation in #{ @outputdir } "
414
412
415
413
out_file = nil
416
- current = nil
414
+ target = nil
417
415
418
416
@files . each do |file |
419
- current = file
417
+ target = file
420
418
421
419
if file . text? and page_file . exist? then
422
420
generate_page file
@@ -449,9 +447,8 @@ def generate_file_files
449
447
450
448
render_template template_file , out_file do |io |
451
449
here = binding
452
- # suppress 1.9.3 warning
453
450
here . local_variable_set ( :asset_rel_prefix , asset_rel_prefix )
454
- here . local_variable_set ( :current , current )
451
+ here . local_variable_set ( :target , target )
455
452
here
456
453
end
457
454
end
@@ -477,16 +474,15 @@ def generate_page file
477
474
search_index_rel_prefix = rel_prefix
478
475
search_index_rel_prefix += @asset_rel_path if @file_output
479
476
480
- current = file
477
+ target = file
481
478
asset_rel_prefix = rel_prefix + @asset_rel_path
482
479
483
480
@title = "#{ file . page_name } - #{ @options . title } "
484
481
485
482
debug_msg " rendering #{ out_file } "
486
483
render_template template_file , out_file do |io |
487
484
here = binding
488
- # suppress 1.9.3 warning
489
- here . local_variable_set ( :current , current )
485
+ here . local_variable_set ( :target , target )
490
486
here . local_variable_set ( :asset_rel_prefix , asset_rel_prefix )
491
487
here
492
488
end
@@ -513,7 +509,6 @@ def generate_servlet_not_found message
513
509
514
510
render_template template_file do |io |
515
511
here = binding
516
- # suppress 1.9.3 warning
517
512
here . local_variable_set ( :asset_rel_prefix , asset_rel_prefix )
518
513
here
519
514
end
@@ -574,7 +569,6 @@ def generate_table_of_contents
574
569
575
570
render_template template_file , out_file do |io |
576
571
here = binding
577
- # suppress 1.9.3 warning
578
572
here . local_variable_set ( :asset_rel_prefix , asset_rel_prefix )
579
573
here
580
574
end
@@ -807,15 +801,15 @@ def excerpt(comment)
807
801
extracted_text [ 0 ...150 ] . gsub ( /\n / , " " ) . squeeze ( " " )
808
802
end
809
803
810
- def generate_table_from_the_current_object ( current )
811
- return '' if current . nil?
804
+ def generate_table_from_target ( target )
805
+ return '' if target . nil?
812
806
comment =
813
- if current . respond_to? :comment_location then
814
- current . comment_location
807
+ if target . respond_to? :comment_location then
808
+ target . comment_location
815
809
else
816
- current . comment
810
+ target . comment
817
811
end
818
- current . parse ( comment ) . table_of_contents . dup
812
+ target . parse ( comment ) . table_of_contents . dup
819
813
end
820
814
821
815
def generate_ancestor_list ( ancestors , klass )
@@ -882,10 +876,10 @@ def generate_sidebar_link(name, path, rel_prefix)
882
876
%(<a href="#{ rel_prefix } /#{ path } ">#{ name } </a>)
883
877
end
884
878
885
- def generate_pages_index_content ( page_files , rel_prefix , current )
879
+ def generate_pages_index_content ( page_files , rel_prefix , target )
886
880
return '' if page_files . empty?
887
881
888
- dir = current &.full_name &.[]( /\A [^\/ ]+(?=\/ )/ ) || current &.page_name
882
+ dir = target &.full_name &.[]( /\A [^\/ ]+(?=\/ )/ ) || target &.page_name
889
883
grouped_files = page_files . group_by { |f | f . full_name [ /\A [^\/ ]+(?=\/ )/ ] || f . page_name }
890
884
891
885
traverse_tree ( grouped_files ) do |name , files |
0 commit comments