sourcify 0.3.0 → 0.4.0

data/lib/sourcify/proc/scanner.rl

@@ -132,7 +132,8 @@ module Sourcify
       sqm . sqs20 | sqm . sqs21 | sqm . sqs22 | sqm . sqs23 | sqm . sqs24 |
       sqm . sqs25 | sqm . sqs26 | sqm . sqs27 | sqm . sqs28
     ) => {
-      push(:sstring, ts, te)
+      push(:sstring, ts, te);
+      fgoto main;
     };
 
     ## == Double quote strings
@@ -441,16 +442,26 @@ module Sourcify
       fgoto heredoc;
     };
 
-    ('"' | "'" | '`' | '/' | '%') => {
+    ('"' | "'" | '`' | '%') => {
       fhold; fgoto string;
     };
 
+    '/' => {
+      if preceded_with?(:char, :digit, :var, :const, :symbol, :dstring, :sstring, ')', ']', '}')
+        push(:op, ts, te)
+      else
+        fhold; fgoto string;
+      end
+    };
+
     ## == Misc
 
     var         => { push(:var, ts, te) };
     const       => { push(:const, ts, te) };
     symbol      => { push(:symbol, ts, te) };
     mspaces     => { push(:space, ts, te) };
+    [0-9]       => { push(:digit, ts, te) };
+    lower       => { push(:char, ts, te) };
     any         => { push(:any, ts, te) };
 
   *|;

data/lib/sourcify/proc/scanner/extensions.rb

@@ -9,9 +9,11 @@ module Sourcify
 
         class Escape < Exception; end
 
-        def process(data, stop_on_newline = false)
+        def process(data, opts={})
           begin
-            @stop_on_newline = stop_on_newline
+            @start_pattern = opts[:start_pattern] || /.*/
+            @body_matcher = opts[:body_matcher] || lambda{|_| true }
+            @stop_on_newline = opts[:stop_on_newline]
             @results, @data = [], data.unpack("c*")
             reset_attributes
             execute!
@@ -69,15 +71,28 @@ module Sourcify
           @tokens << [:assoc, '=>']
         end
 
+        def preceded_with?(*args)
+          begin
+            prev_token = @tokens[-1][0] == :space ? @tokens[-2] : @tokens[-1]
+            !([args].flatten & prev_token).empty?
+          rescue
+          end
+        end
+
         def increment_lineno
           @lineno += 1
-          raise Escape if @stop_on_newline || !@results.empty?
+          if @stop_on_newline || !@results.empty? || (@results.empty? && @rejecting_block)
+            raise Escape
+          end
         end
 
         def increment_counter(key, count = 1)
           return if other_counter(key).started?
-          counter = this_counter(key)
-          offset_attributes unless counter.started?
+          unless (counter = this_counter(key)).started?
+            return if (@rejecting_block = codified_tokens !~ @start_pattern)
+            @false_start_backup = @tokens.dup if key == :brace
+            offset_attributes
+          end
           counter.increment(count)
         end
 
@@ -88,7 +103,9 @@ module Sourcify
         end
 
         def fix_counter_false_start(key)
-          reset_attributes if this_counter(key).just_started?
+          return unless this_counter(key).just_started?
+          reset_attributes
+          @tokens, @false_start_backup = @false_start_backup.dup, nil if @false_start_backup
         end
 
         def other_counter(type)
@@ -101,22 +118,29 @@ module Sourcify
 
         def construct_result_code
           begin
-            code = 'proc ' + @tokens.map(&:last).join
+            code = 'proc ' + codified_tokens
             eval(code) # TODO: any better way to check for completeness of proc code ??
-            @results << code
-            raise Escape if @stop_on_newline or @lineno != 1
-            reset_attributes
+            if @body_matcher.call(code)
+              @results << code
+              raise Escape if @stop_on_newline or @lineno != 1
+              reset_attributes
+            end
           rescue Exception
             raise if $!.is_a?(Escape)
           end
         end
 
+        def codified_tokens
+          @tokens.map(&:last).join
+        end
+
         def reset_attributes
           @tokens = []
           @lineno = 1
           @heredoc, @dstring, @comment = nil
           @do_end_counter = DoEndBlockCounter.new
           @brace_counter = BraceBlockCounter.new
+          @rejecting_block = false
         end
 
         def offset_attributes

data/sourcify.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sourcify}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NgTzeYang"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2010-10-15}
   s.description = %q{}
   s.email = %q{ngty77@gmail.com}
-  s.extensions = ["ext/sourcify/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -20,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".infinity_test",
      "HISTORY.txt",
      "LICENSE",
      "README.rdoc",
@@ -27,6 +27,10 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/sourcify.rb",
      "lib/sourcify/proc.rb",
+     "lib/sourcify/proc/methods.rb",
+     "lib/sourcify/proc/methods/source_location.rb",
+     "lib/sourcify/proc/methods/to_sexp.rb",
+     "lib/sourcify/proc/methods/to_source.rb",
      "lib/sourcify/proc/parser.rb",
      "lib/sourcify/proc/scanner.rb",
      "lib/sourcify/proc/scanner.rl",
@@ -41,7 +45,10 @@ Gem::Specification.new do |s|
      "spec/proc/created_on_the_fly_proc_spec.rb",
      "spec/proc/others_spec.rb",
      "spec/proc/readme",
+     "spec/proc/spec_helper.rb",
+     "spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb",
      "spec/proc/to_sexp_variables_spec.rb",
+     "spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb",
      "spec/proc/to_sexp_within_irb_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb",
@@ -61,10 +68,19 @@ Gem::Specification.new do |s|
      "spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb",
      "spec/proc/to_source_from_multi_blocks_w_many_matches_spec.rb",
      "spec/proc/to_source_from_multi_blocks_w_single_match_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_single_match_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_many_matches_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_no_match_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_single_match_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_ignore_nested_spec.rb",
      "spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb",
      "spec/proc/to_source_magic_file_var_spec.rb",
      "spec/proc/to_source_magic_line_var_spec.rb",
      "spec/proc/to_source_variables_spec.rb",
+     "spec/proc/to_source_w_specified_strip_enclosure_spec.rb",
      "spec/proc/to_source_within_irb_spec.rb",
      "spec/proc_scanner/block_comment_spec.rb",
      "spec/proc_scanner/double_colons_spec.rb",
@@ -75,6 +91,7 @@ Gem::Specification.new do |s|
      "spec/proc_scanner/kw_do_alias2_spec.rb",
      "spec/proc_scanner/per_line_comment_spec.rb",
      "spec/proc_scanner/single_quote_str_spec.rb",
+     "spec/proc_scanner/slash_operator_spec.rb",
      "spec/proc_scanner/spec_helper.rb",
      "spec/spec_helper.rb"
   ]
@@ -87,6 +104,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/proc_scanner/kw_do_alias1_spec.rb",
      "spec/proc_scanner/single_quote_str_spec.rb",
+     "spec/proc_scanner/slash_operator_spec.rb",
      "spec/proc_scanner/kw_do_alias2_spec.rb",
      "spec/proc_scanner/double_colons_spec.rb",
      "spec/proc_scanner/block_comment_spec.rb",
@@ -96,6 +114,8 @@ Gem::Specification.new do |s|
      "spec/proc_scanner/spec_helper.rb",
      "spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_single_match_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_begin_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb",
      "spec/proc/created_on_the_fly_proc_spec.rb",
@@ -107,18 +127,28 @@ Gem::Specification.new do |s|
      "spec/proc/to_sexp_within_irb_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_module_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_do_end_block_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_method_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_class_spec.rb",
      "spec/proc/to_source_within_irb_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_case_spec.rb",
      "spec/proc/to_source_magic_line_var_spec.rb",
+     "spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_many_matches_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_unless_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_no_match_spec.rb",
      "spec/proc/others_spec.rb",
      "spec/proc/19x_extras.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb",
      "spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb",
      "spec/proc/to_source_variables_spec.rb",
+     "spec/proc/to_source_w_specified_strip_enclosure_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_single_match_spec.rb",
+     "spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb",
+     "spec/proc/to_source_from_multi_blocks_w_specified_ignore_nested_spec.rb",
+     "spec/proc/spec_helper.rb",
      "spec/proc/to_sexp_variables_spec.rb",
      "spec/proc/to_source_magic_file_var_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb",
@@ -133,17 +163,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby2ruby>, [">= 1.2.5"])
+      s.add_runtime_dependency(%q<sexp_processor>, [">= 3.0.5"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
-      s.add_development_dependency(%q<otaku>, [">= 0.4.0"])
     else
       s.add_dependency(%q<ruby2ruby>, [">= 1.2.5"])
+      s.add_dependency(%q<sexp_processor>, [">= 3.0.5"])
       s.add_dependency(%q<bacon>, [">= 0"])
-      s.add_dependency(%q<otaku>, [">= 0.4.0"])
     end
   else
     s.add_dependency(%q<ruby2ruby>, [">= 1.2.5"])
+    s.add_dependency(%q<sexp_processor>, [">= 3.0.5"])
     s.add_dependency(%q<bacon>, [">= 0"])
-    s.add_dependency(%q<otaku>, [">= 0.4.0"])
   end
 end
 

data/spec/proc/created_on_the_fly_proc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Created on the fly proc" do
   unless has_parsetree?

data/spec/proc/others_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Misc" do
 
@@ -12,6 +12,10 @@ describe "Misc" do
     s_proc.should.be having_source('proc { :test }')
   end
 
+  should "handle proc with '/' char" do
+    (lambda { @x1/2 }).should.be having_source('proc { @x1/2 }')
+  end
+
   should "handle lexer bug in missing trailing chars after '=>' operator" do
     # This example addresses bug @ http://redmine.ruby-lang.org/issues/show/3765
     {
@@ -26,7 +30,7 @@ describe "Misc" do
     }.values.last.should.be having_source('proc { :test }')
   end
 
-  unless Object.const_defined?(:ParseTree)
+  unless has_parsetree?
     should "raise Sourcify::CannotParseEvalCodeError when proc is created from eval" do
       lambda { eval("proc {:test }").to_source }.should.
         raise(Sourcify::CannotParseEvalCodeError)

data/spec/proc/spec_helper.rb

@@ -0,0 +1 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'spec_helper')

data/spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb

@@ -0,0 +1,46 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Proc#to_sexp w specified {:attached_to => ...}' do
+
+  # NOTE: We just want enough specs to show that handling of :attached_to
+  # works for Proc#to_sexp as well.
+
+  options = {:attached_to => /^.*?(\W|)watever(\W)/}
+
+  should 'handle no nesting on same line' do
+    b1 = lambda {|a| @x1+1 }; b2 = watever { @x1+2 }; b3 = lambda { @x1+3 }
+    b2.should.be having_sexp(
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:call, s(:ivar, :@x1), :+, s(:arglist, s(:lit, 2)))),
+      options
+    )
+  end
+
+  should 'handle single level nesting on same line' do
+    b1 = lambda {|a| @x2+1 }; b2 = watever { lambda { @x2+2 } }
+    b2.should.be having_sexp(
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call, nil, :lambda, s(:arglist)),
+          nil,
+          s(:call, s(:ivar, :@x2), :+, s(:arglist, s(:lit, 2))))),
+      options
+    )
+  end
+
+  should 'handle multi level nesting on same line' do
+    b2 = (lambda {|a| watever { lambda { @x3 } } }).call(1)
+    b2.should.be having_sexp(
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, s(:ivar, :@x3))),
+      options
+    )
+  end
+
+end

data/spec/proc/to_sexp_variables_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_sexp (variables)" do
 

data/spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb

@@ -0,0 +1,60 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Proc#to_sexp w specified {:strip_enclosure => ...}' do
+
+  describe '>> w true' do
+
+    options = {:strip_enclosure => true}
+
+    should 'strip enclosing proc wo arg' do
+      lambda { a+b }.should.be having_sexp(
+        s(:call,
+          s(:call, nil, :a, s(:arglist)),
+          :+,
+          s(:arglist, s(:call, nil, :b, s(:arglist)))),
+        options
+      )
+    end
+
+    should 'strip enclosing proc w arg' do
+      lambda {|a| a+b }.should.be having_sexp(
+        s(:call,
+          s(:lvar, :a),
+          :+,
+          s(:arglist, s(:call, nil, :b, s(:arglist)))),
+        options
+      )
+    end
+
+  end
+
+  describe '>> w false' do
+
+    options = {:strip_enclosure => false}
+
+    should 'not strip enclosing proc wo arg' do
+      lambda { a+b }.should.be having_sexp(
+        s(:iter,
+          s(:call, nil, :proc, s(:arglist)),
+          nil,
+          s(:call,
+            s(:call, nil, :a, s(:arglist)),
+            :+,
+            s(:arglist, s(:call, nil, :b, s(:arglist))))),
+        options
+      )
+    end
+
+    should 'not strip enclosing proc w arg' do
+      lambda {|a| a+b }.should.be having_sexp(
+        s(:iter,
+          s(:call, nil, :proc, s(:arglist)),
+          s(:lasgn, :a),
+          s(:call, s(:lvar, :a), :+, s(:arglist, s(:call, nil, :b, s(:arglist))))),
+        options
+      )
+    end
+
+  end
+
+end

data/spec/proc/to_sexp_within_irb_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_sexp within IRB" do
 

data/spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from { ... } block (w nested { ... } block)" do
 

data/spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from { ... } block (w nested hash)" do
 
@@ -27,7 +27,7 @@ describe "Proc#to_source from { ... } block (w nested hash)" do
   end
 
   if RUBY_VERSION.include?('1.9.')
-    require File.join(File.dirname(__FILE__), '19x_extras')
+    require File.join(File.expand_path(File.dirname(__FILE__)), '19x_extras')
     behaves_like 'Proc#to_source from { ... } block (1.9.*)'
   end
 

data/spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from { ... } block (wo nesting complication)" do