Skip to content

A
annotate
Commit 289621b8 by Shu Fujita Committed by Andrew W. Lee
Options

Make methods private in AnnotateRoutes (#598)

In AnnotateRoutes, there were many public methods that is not used in other classes or modules. Before my extension, I made these methods private and sort them in order of appearance. All tests were passed. Please trace each commits carefully. I didn't nothing special. The commits consist of coordinating code.
parent 4e2946d1
Showing with 116 additions and 114 deletions
lib/annotate/annotate_routes.rb
...@@ -25,14 +25,53 @@ module AnnotateRoutes ...@@ -25,14 +25,53 @@ module AnnotateRoutes
HEADER_ROW = ['Prefix', 'Verb', 'URI Pattern', 'Controller#Action'] HEADER_ROW = ['Prefix', 'Verb', 'URI Pattern', 'Controller#Action']
class << self class << self
def content(line, maxs, options = {}) def do_annotations(options = {})
return line.rstrip unless options[:format_markdown] return unless routes_exists?
existing_text = File.read(routes_file)
line.each_with_index.map do |elem, index| if rewrite_contents_with_header(existing_text, header(options), options)
min_length = maxs.map { |arr| arr[index] }.max || 0 puts "#{routes_file} annotated."
end
end
sprintf("%-#{min_length}.#{min_length}s", elem.tr('|', '-')) def remove_annotations(_options={})
end.join(' | ') return unless routes_exists?
existing_text = File.read(routes_file)
content, where_header_found = strip_annotations(existing_text)
new_content = strip_on_removal(content, where_header_found)
if rewrite_contents(existing_text, new_content)
puts "Removed annotations from #{routes_file}."
end
end
private
def routes_exists?
routes_exists = File.exists?(routes_file)
puts "Can't find routes.rb" unless routes_exists
routes_exists
end
def routes_file
@routes_rb ||= File.join('config', 'routes.rb')
end
def rewrite_contents_with_header(existing_text, header, options = {})
content, where_header_found = strip_annotations(existing_text)
new_content = annotate_routes(header, content, where_header_found, options)
# Make sure we end on a trailing newline.
new_content << '' unless new_content.last == ''
new_text = new_content.join("\n")
if existing_text == new_text
puts "#{routes_file} unchanged."
false
else
File.open(routes_file, 'wb') { |f| f.puts(new_text) }
true
end
end end
def header(options = {}) def header(options = {})
...@@ -70,95 +109,49 @@ module AnnotateRoutes ...@@ -70,95 +109,49 @@ module AnnotateRoutes
out out
end end
def do_annotations(options = {}) # TODO: write the method doc using ruby rdoc formats
return unless routes_exists? # where_header_found => This will either be :before, :after, or
existing_text = File.read(routes_file) # a number. If the number is > 0, the
# annotation was found somewhere in the
if rewrite_contents_with_header(existing_text, header(options), options) # middle of the file. If the number is
puts "#{routes_file} annotated." # zero, no annotation was found.
end def strip_annotations(content)
end real_content = []
mode = :content
def remove_annotations(_options={}) header_found_at = 0
return unless routes_exists?
existing_text = File.read(routes_file)
content, where_header_found = strip_annotations(existing_text)
new_content = strip_on_removal(content, where_header_found)
if rewrite_contents(existing_text, new_content)
puts "Removed annotations from #{routes_file}."
end
end
end
def self.magic_comment_matcher
Regexp.new(/(^#\s*encoding:.*)|(^# coding:.*)|(^# -\*- coding:.*)|(^# -\*- encoding\s?:.*)|(^#\s*frozen_string_literal:.+)|(^# -\*- frozen_string_literal\s*:.+-\*-)/)
end
# @param [Array<String>] content
# @return [Array<String>] all found magic comments
# @return [Array<String>] content without magic comments
def self.extract_magic_comments_from_array(content_array)
magic_comments = []
new_content = []
content_array.map do |row| content.split(/\n/, -1).each_with_index do |line, line_number|
if row =~ magic_comment_matcher if mode == :header && line !~ /\s*#/
magic_comments << row.strip mode = :content
real_content << line unless line.blank?
elsif mode == :content
if line =~ /^\s*#\s*== Route.*$/
header_found_at = line_number + 1 # index start's at 0
mode = :header
else else
new_content << row real_content << line
end end
end end
[magic_comments, new_content]
end end
def self.app_routes_map(options) where_header_found(real_content, header_found_at)
routes_map = `rake routes`.chomp("\n").split(/\n/, -1)
# In old versions of Rake, the first line of output was the cwd. Not so
# much in newer ones. We ditch that line if it exists, and if not, we
# keep the line around.
routes_map.shift if routes_map.first =~ /^\(in \//
# Skip routes which match given regex
# Note: it matches the complete line (route_name, path, controller/action)
if options[:ignore_routes]
routes_map.reject! { |line| line =~ /#{options[:ignore_routes]}/ }
end
routes_map
end end
def self.routes_file def strip_on_removal(content, where_header_found)
@routes_rb ||= File.join('config', 'routes.rb') if where_header_found == :before
content.shift while content.first == ''
elsif where_header_found == :after
content.pop while content.last == ''
end end
def self.routes_exists? # TODO: If the user buried it in the middle, we should probably see about
routes_exists = File.exists?(routes_file) # TODO: preserving a single line of space between the content above and
puts "Can't find routes.rb" unless routes_exists # TODO: below...
content
routes_exists
end end
# @param [String, Array<String>] # @param [String, Array<String>]
def self.rewrite_contents(existing_text, new_content) def rewrite_contents(existing_text, new_content)
# Make sure we end on a trailing newline.
new_content << '' unless new_content.last == ''
new_text = new_content.join("\n")
if existing_text == new_text
puts "#{routes_file} unchanged."
false
else
File.open(routes_file, 'wb') { |f| f.puts(new_text) }
true
end
end
def self.rewrite_contents_with_header(existing_text, header, options = {})
content, where_header_found = strip_annotations(existing_text)
new_content = annotate_routes(header, content, where_header_found, options)
# Make sure we end on a trailing newline. # Make sure we end on a trailing newline.
new_content << '' unless new_content.last == '' new_content << '' unless new_content.last == ''
new_text = new_content.join("\n") new_text = new_content.join("\n")
...@@ -172,7 +165,7 @@ module AnnotateRoutes ...@@ -172,7 +165,7 @@ module AnnotateRoutes
end end
end end
def self.annotate_routes(header, content, where_header_found, options = {}) def annotate_routes(header, content, where_header_found, options = {})
magic_comments_map, content = extract_magic_comments_from_array(content) magic_comments_map, content = extract_magic_comments_from_array(content)
if %w(before top).include?(options[:position_in_routes]) if %w(before top).include?(options[:position_in_routes])
header = header << '' if content.first != '' header = header << '' if content.first != ''
...@@ -193,35 +186,52 @@ module AnnotateRoutes ...@@ -193,35 +186,52 @@ module AnnotateRoutes
new_content new_content
end end
# TODO: write the method doc using ruby rdoc formats def app_routes_map(options)
# where_header_found => This will either be :before, :after, or routes_map = `rake routes`.chomp("\n").split(/\n/, -1)
# a number. If the number is > 0, the
# annotation was found somewhere in the
# middle of the file. If the number is
# zero, no annotation was found.
def self.strip_annotations(content)
real_content = []
mode = :content
header_found_at = 0
content.split(/\n/, -1).each_with_index do |line, line_number| # In old versions of Rake, the first line of output was the cwd. Not so
if mode == :header && line !~ /\s*#/ # much in newer ones. We ditch that line if it exists, and if not, we
mode = :content # keep the line around.
real_content << line unless line.blank? routes_map.shift if routes_map.first =~ /^\(in \//
elsif mode == :content
if line =~ /^\s*#\s*== Route.*$/ # Skip routes which match given regex
header_found_at = line_number + 1 # index start's at 0 # Note: it matches the complete line (route_name, path, controller/action)
mode = :header if options[:ignore_routes]
routes_map.reject! { |line| line =~ /#{options[:ignore_routes]}/ }
end
routes_map
end
# @param [Array<String>] content
# @return [Array<String>] all found magic comments
# @return [Array<String>] content without magic comments
def extract_magic_comments_from_array(content_array)
magic_comments = []
new_content = []
content_array.map do |row|
if row =~ magic_comment_matcher
magic_comments << row.strip
else else
real_content << line new_content << row
end end
end end
[magic_comments, new_content]
end end
where_header_found(real_content, header_found_at) def content(line, maxs, options = {})
return line.rstrip unless options[:format_markdown]
line.each_with_index.map do |elem, index|
min_length = maxs.map { |arr| arr[index] }.max || 0
sprintf("%-#{min_length}.#{min_length}s", elem.tr('|', '-'))
end.join(' | ')
end end
def self.where_header_found(real_content, header_found_at) def where_header_found(real_content, header_found_at)
# By default assume the annotation was found in the middle of the file # By default assume the annotation was found in the middle of the file
# ... unless we have evidence it was at the beginning ... # ... unless we have evidence it was at the beginning ...
...@@ -234,16 +244,8 @@ module AnnotateRoutes ...@@ -234,16 +244,8 @@ module AnnotateRoutes
return real_content, header_found_at return real_content, header_found_at
end end
def self.strip_on_removal(content, where_header_found) def magic_comment_matcher
if where_header_found == :before Regexp.new(/(^#\s*encoding:.*)|(^# coding:.*)|(^# -\*- coding:.*)|(^# -\*- encoding\s?:.*)|(^#\s*frozen_string_literal:.+)|(^# -\*- frozen_string_literal\s*:.+-\*-)/)
content.shift while content.first == ''
elsif where_header_found == :after
content.pop while content.last == ''
end end
# TODO: If the user buried it in the middle, we should probably see about
# TODO: preserving a single line of space between the content above and
# TODO: below...
content
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment