@@ -3,7 +3,7 @@ Feature: Extract Method As a developer I want to extract methods - Scenario: Simple code, no variables + Scenario: Simple code, no variables, one method Given I have the following code: """ def the_method(firstArg, secondArg) @@ -28,5 +28,42 @@ Feature: Extract Method puts /to be/ puts 'refactored' end + + """ + + Scenario: Simple code, no variables, many methods + Given I have the following code: + """ + def the_method(firstArg, secondArg) + puts :code + puts /to be/ + puts 'refactored' + end + def more() + n = 3+2/7 + puts "other #{n}" + n + end + """ + And lines from 3 to 4 are selected + And I want them to be in the method called 'new_method' + When I call 'extract method' + Then the code should be: + """ + def the_method(firstArg, secondArg) + puts :code + new_method() + end + + def new_method() + puts /to be/ + puts 'refactored' + end + + def more() + n = 3+2/7 + puts "other #{n}" + n + end """ features/extract_method.feature @@ -5,7 +5,7 @@ module Rfactor def initialize(code) @code = code @ast = RubyParser.new.parse(code) - @line_finder = LineFinder.new(@ast, code.last_line) + @line_finder = LineFinder.new(@ast) end def extract_method(args) @@ -23,7 +23,7 @@ module Rfactor line_number = n + 1 # not 0-based if line_number == method_lines.first identation = extract_identation_level_from line - extracted_method << "\n\n#{identation}" + extracted_method << "\n#{identation}" extracted_method << "def #{args[:name]}()\n" end if selected_lines.include? line_number @@ -31,12 +31,13 @@ module Rfactor extracted_method << line elsif line_number > method_lines.last && !added added = true - new_code << extracted_method << "end\n" + new_code << extracted_method << "#{identation}end\n" + new_code << line else new_code << line end end - new_code << extracted_method << "#{identation}end\n" unless added + new_code << "\n#{extracted_method}#{identation}end\n" unless added new_code end lib/rfactor/code.rb @@ -2,15 +2,14 @@ module Rfactor class LineFinder - def initialize(ast, last_line) + def initialize(ast) @ast = ast - @last_line = last_line end def method_lines(line_in_code) processor = MethodLineFinderProcessor.new(line_in_code) processor.process(@ast) - Range.new(processor.method_line, processor.last_method_line || @last_line, true) + Range.new(processor.method_line, processor.last_method_line) end end @@ -27,18 +26,14 @@ module Rfactor @last_method_line = 0 end - def process_defn(exp, next_exp) + def process_defn(exp) current = exp.line if current > @method_line && current < @line @method_line = current - @last_method_line = next_exp.line if next_exp + @last_method_line = exp.endline end exp - end - - def last_method_line - @last_method_line if @last_method_line > @method_line - end + end end end lib/rfactor/line_finder.rb @@ -18,19 +18,19 @@ describe Rfactor::LineFinder do before(:each) do @ast = RubyParser.new.parse(CODE) - @finder = Rfactor::LineFinder.new(@ast, CODE.last_line) + @finder = Rfactor::LineFinder.new(@ast) end it "should find method start line" do @finder.method_lines(3).first.should == 2 end - it "should use next method line as last line" do - @finder.method_lines(3).last.should == 8 + it "should find method end line" do + @finder.method_lines(3).last.should == 6 end - it "should use file last line if position is last method method" do - @finder.method_lines(9).last.should == 11 + it "it should find method end line even if the method is the last" do + @finder.method_lines(9).last.should == 10 end end \ No newline at end of file spec/line_finder_spec.rb 940a7b92e2e49c0a1972448653019df625c16183 Fabio Kung fabio.kung@gmail.com http://github.com/fabiokung/rfactor/commit/f37189daf12f58fd86c9564df275edc9ed09d370 f37189daf12f58fd86c9564df275edc9ed09d370 2009-02-04T02:04:19-08:00 2009-02-04T02:04:19-08:00 getting method end lines from modified Ruby Parser AST 6fb3de52f7d132f0291da5387d1f997781ba17d7 Fabio Kung fabio.kung@gmail.com