Ticket #7651: fix_rhtml_references.diff

File fix_rhtml_references.diff, 1.2 kB (added by jeremymcanally, 3 years ago)
Fixes last documentation reference and a small bug.

railties/lib/rails_generator/base.rb

old	new
32	32	# controller.rb
33	33	# functional_test.rb
34	34	# helper.rb
35		# view.~~rhtml~~
	35	# view.erb
36	36	#
37	37	# The directory name (+controller+) matches the name of the generator file
38	38	# (controller_generator.rb) and class (+ControllerGenerator+). The files

old	new
30	30
31	31	if File.directory?(item)
32	32	results.update(find_in(item))
33		elsif item =~ /\.r(?:b\|xml\|js)$/
	33	elsif item =~ /\.r(?:b\|xml\|js)$/ \|\| item =~ /\.builder$/
34	34	results.update(extract_annotations_from(item, /#\s(#{tag}):?\s(.*)$/))
35		elsif item =~ /\.rhtml$/
	35	elsif item =~ /\.rhtml$/ \|\| item =~ /\.erb$/
36	36	results.update(extract_annotations_from(item, /<%\s#\s(#{tag}):?\s(.?)\s*%>/))
37	37	end
38	38	end