method_source 0.8.pre.3 → 0.8.pre.4

data/Rakefile

@@ -29,7 +29,7 @@ def apply_spec_defaults(s)
 end
 
 task :test do
-  sh "bacon -q #{direc}/test/test.rb"
+  sh "bacon -q #{direc}/test/test.rb #{direc}/test/test_code_helpers.rb"
 end
 
 desc "reinstall gem"

data/lib/method_source/code_helpers.rb

@@ -7,10 +7,14 @@ module MethodSource
     #
     # @param [Array<String>, File, String] file  The file to parse, either as a File or as
     # @param [Fixnum]  line_number  The line number at which to look.
-    #                             NOTE: The first line in a file is line 1!
-    # @param [Boolean]  strict  If set to true, then only completely valid expressions are
-    #                         returned. Otherwise heuristics are used to extract
-    #                         expressions that may have been valid inside an eval.
+    #                             NOTE: The first line in a file is
+    #                           line 1!
+    # @param [Hash] options The optional configuration parameters.
+    # @option options [Boolean] :strict  If set to true, then only completely
+    #   valid expressions are returned. Otherwise heuristics are used to extract
+    #   expressions that may have been valid inside an eval.
+    # @option options [Fixnum] :consume  A number of lines to automatically
+    #   consume (add to the expression buffer) without checking for validity.
     # @return [String]  The first complete expression
     # @raise [SyntaxError]  If the first complete expression can't be identified
     def expression_at(file, line_number, options={})
@@ -80,7 +84,9 @@ module MethodSource
     # Get the first expression from the input.
     #
     # @param [Array<String>]  lines
-    # @param [&Block]  a clean-up function to run before checking for complete_expression
+    # @param [Fixnum] consume A number of lines to automatically
+    #   consume (add to the expression buffer) without checking for validity.
+    # @yield a clean-up function to run before checking for complete_expression
     # @return [String]  a valid ruby expression
     # @raise [SyntaxError]
     def extract_first_expression(lines, consume=0, &block)
@@ -117,8 +123,10 @@ module MethodSource
     # fixed by adding more input to the buffer.
     module IncompleteExpression
       def self.===(ex)
+        return false unless SyntaxError === ex
         case ex.message
         when /unexpected (\$end|end-of-file|END_OF_FILE)/, # mri, jruby, ironruby
+          /embedded document meets end of file/, # =begin
           /unterminated (quoted string|string|regexp) meets end of file/, # "quoted string" is ironruby
           /missing 'end' for/, /: expecting '[})\]]'$/, /can't find string ".*" anywhere before EOF/, /: expecting keyword_end/, /expecting kWHEN/ # rbx
           true

data/lib/method_source/version.rb

@@ -1,3 +1,3 @@
 module MethodSource
-  VERSION = "0.8.pre.3"
+  VERSION = "0.8.pre.4"
 end

data/test/test_code_helpers.rb

@@ -0,0 +1,41 @@
+describe MethodSource::CodeHelpers do
+  before do
+    @tester = Object.new.extend(MethodSource::CodeHelpers)
+  end
+
+  [
+    ["p = '", "'"],
+    ["def", "a", "(); end"],
+    ["p = <<FOO", "lots", "and", "lots of", "foo", "FOO"],
+    ["[", ":lets,", "'list',", "[/nested/", "], things ]"],
+    ["abc =~ /hello", "/"],
+    ["issue = %W/", "343/"],
+    ["pouts(<<HI, 'foo", "bar", "HI", "baz')"],
+    ["=begin", "no-one uses this syntax anymore...", "=end"],
+    ["puts 1, 2,", "3"],
+    ["puts 'hello'\\", "'world'"]
+  ].each do |lines|
+    it "should not raise an error on broken lines: #{lines.join("\\n")}" do
+      1.upto(lines.size - 1) do |i|
+        @tester.complete_expression?(lines[0...i].join("\n") + "\n").should == false
+      end
+      @tester.complete_expression?(lines.join("\n")).should == true
+    end
+  end
+
+  [
+    ["end"],
+    ["puts )("],
+    ["1 1"],
+    ["puts :"]
+  ] + (RbConfig::CONFIG['ruby_install_name'] == 'rbx' ? [] : [
+    ["def", "method(1"], # in this case the syntax error is "expecting ')'".
+    ["o = Object.new.tap{ def o.render;","'MEH'", "}"] # in this case the syntax error is "expecting keyword_end".
+  ]).compact.each do |foo|
+    it "should raise an error on invalid syntax like #{foo.inspect}" do
+      lambda{
+        @tester.complete_expression?(foo.join("\n"))
+      }.should.raise(SyntaxError)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: method_source
 version: !ruby/object:Gem::Version
-  version: 0.8.pre.3
+  version: 0.8.pre.4
   prerelease: 4
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -62,6 +62,7 @@ files:
 - lib/method_source/version.rb
 - method_source.gemspec
 - test/test.rb
+- test/test_code_helpers.rb
 - test/test_helper.rb
 homepage: http://banisterfiend.wordpress.com
 licenses: []
@@ -89,4 +90,5 @@ specification_version: 3
 summary: retrieve the sourcecode for a method
 test_files:
 - test/test.rb
+- test/test_code_helpers.rb
 - test/test_helper.rb