sourcify 0.1.2 → 0.2.0

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

@@ -0,0 +1,24 @@
+module Sourcify
+  module Proc
+    module Scanner #:nodoc:all
+      class Heredoc < Struct.new(:tag, :indented)
+
+        def <<(content)
+          (@contents ||= []) << content
+        end
+
+        def to_s
+          @contents.join
+        end
+
+        def closed?(sealer)
+          return false unless sealer == "\n"
+          parts = @contents[-1].split("\n")
+          return true if parts[-1] == tag
+          indented && parts[-1].sub(/^\s*(.*)$/,'\1') == tag
+        end
+
+      end
+    end
+  end
+end

data/sourcify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sourcify}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NgTzeYang"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-09-11}
   s.description = %q{}
   s.email = %q{ngty77@gmail.com}
   s.extra_rdoc_files = [
@@ -26,14 +26,19 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/sourcify.rb",
      "lib/sourcify/proc.rb",
-     "lib/sourcify/proc/counter.rb",
-     "lib/sourcify/proc/lexer.rb",
-     "lib/sourcify/proc/lexer18.rb",
-     "lib/sourcify/proc/lexer19.rb",
      "lib/sourcify/proc/parser.rb",
+     "lib/sourcify/proc/scanner.rb",
+     "lib/sourcify/proc/scanner.rl",
+     "lib/sourcify/proc/scanner/comment.rb",
+     "lib/sourcify/proc/scanner/counter.rb",
+     "lib/sourcify/proc/scanner/dstring.rb",
+     "lib/sourcify/proc/scanner/extensions.rb",
+     "lib/sourcify/proc/scanner/heredoc.rb",
      "sourcify.gemspec",
+     "spec/dump_object_space_procs.rb",
      "spec/proc/19x_extras.rb",
-     "spec/proc/misc_spec.rb",
+     "spec/proc/created_on_the_fly_proc_spec.rb",
+     "spec/proc/others_spec.rb",
      "spec/proc/readme",
      "spec/proc/to_sexp_variables_spec.rb",
      "spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb",
@@ -58,6 +63,17 @@ Gem::Specification.new do |s|
      "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_scanner/block_comment_spec.rb",
+     "spec/proc_scanner/double_colons_spec.rb",
+     "spec/proc_scanner/double_quote_str_w_interpolation_spec.rb",
+     "spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb",
+     "spec/proc_scanner/heredoc_spec.rb",
+     "spec/proc_scanner/kw_do_alias1_spec.rb",
+     "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/spec_helper.rb",
+     "spec/proc_scanner/to_proc_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/ngty/sourcify}
@@ -66,9 +82,21 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Workarounds before ruby-core officially supports Proc#to_source (& friends)}
   s.test_files = [
-    "spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb",
+    "spec/proc_scanner/kw_do_alias1_spec.rb",
+     "spec/proc_scanner/single_quote_str_spec.rb",
+     "spec/proc_scanner/to_proc_spec.rb",
+     "spec/proc_scanner/kw_do_alias2_spec.rb",
+     "spec/proc_scanner/double_colons_spec.rb",
+     "spec/proc_scanner/block_comment_spec.rb",
+     "spec/proc_scanner/per_line_comment_spec.rb",
+     "spec/proc_scanner/heredoc_spec.rb",
+     "spec/proc_scanner/double_quote_str_w_interpolation_spec.rb",
+     "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_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",
      "spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_while_spec.rb",
      "spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb",
@@ -82,15 +110,16 @@ Gem::Specification.new do |s|
      "spec/proc/to_source_magic_line_var_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/others_spec.rb",
      "spec/proc/19x_extras.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_sexp_variables_spec.rb",
      "spec/proc/to_source_magic_file_var_spec.rb",
-     "spec/proc/misc_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb",
      "spec/proc/to_source_from_do_end_block_w_nested_for_spec.rb",
+     "spec/dump_object_space_procs.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/dump_object_space_procs.rb

@@ -0,0 +1,84 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'lib', 'sourcify')
+require 'benchmark'
+require 'pp'
+
+if RUBY_PLATFORM =~ /java/i
+  require 'jruby'
+  JRuby.objectspace = true
+  reload! rescue nil
+end
+
+DUMPED_OBJECT_SPACE_PROCS = {:max => nil, :done => 0}
+DUMP_OBJECT_SPACE_PROCS_ERRORS = []
+class STOP_DUMPING_OBJECT_SPACE_PROCS < Exception; end
+
+def dump_object_space_procs(debug = false)
+  # Determine working dir
+  name = [
+    RUBY_DESCRIPTION =~ /enterprise/i ? 'ree' : (RUBY_PLATFORM =~ /java/i ? 'jruby' : 'mri'),
+    RUBY_VERSION,
+    Object.const_defined?(:ParseTree) ? 'parsetree' : nil
+  ].compact.join('~')
+  dump_dir = File.join(File.dirname(File.expand_path(__FILE__)), '..', 'tmp', name)
+  Dir.mkdir(dump_dir) unless File.exists?(dump_dir)
+
+  puts '',
+    '== NOTE: dump files can be found at %s' % dump_dir
+
+  # Core processing
+  ObjectSpace.each_object(Proc).to_a.
+    group_by{|o| o.source_location[0] }.each do |ofile, objs|
+      nfile = File.join(dump_dir, ofile.gsub('/','~'))
+      File.open(nfile,'w') do |f|
+        objs.sort_by{|o| o.source_location[1] }.map do |o|
+          DUMPED_OBJECT_SPACE_PROCS[:done] += 1
+          begin
+            data = {
+              :location => o.source_location,
+              :sexp => o.to_sexp,
+              :source => o.to_source
+            }
+            f.puts(data.pretty_inspect)
+            print '.'
+          rescue Exception
+            data = {
+              :location => o.source_location,
+              :error => $!.inspect
+            }
+            DUMP_OBJECT_SPACE_PROCS_ERRORS << data
+            f.puts(data.pretty_inspect)
+            pp(data) if debug
+            print 'x'
+          ensure
+            raise STOP_DUMPING_OBJECT_SPACE_PROCS \
+              if DUMPED_OBJECT_SPACE_PROCS.values.uniq.size == 1
+          end
+        end
+      end
+    end
+end
+
+# Dumping in action
+figures = Benchmark.measure do
+  begin
+    dump_object_space_procs
+  rescue STOP_DUMPING_OBJECT_SPACE_PROCS
+  end
+end
+
+# Printout the failures/passes
+unless DUMP_OBJECT_SPACE_PROCS_ERRORS.empty?
+  puts '', '== OOPS, we have some erorrs :('
+  DUMP_OBJECT_SPACE_PROCS_ERRORS.each_with_index do |e, i|
+    print "#{i}). %s" % e.pretty_inspect
+  end
+else
+  puts '', '== YEAH, no errors :)'
+end
+
+# Printout the benchmark results
+puts '',
+  '== Benchmark results for processing %s procs:' % DUMPED_OBJECT_SPACE_PROCS[:done],
+  figures.to_s, ''
+
+# __END__

data/spec/proc/created_on_the_fly_proc_spec.rb

@@ -0,0 +1,172 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe "Created on the fly proc" do
+  unless Object.const_defined?(:ParseTree)
+
+    klass = Class.new do
+      def test(&block); block ; end
+      def blah; 1+2; end
+    end
+
+    describe 'Blah#to_proc raising Sourcify::CannotHandleCreatedOnTheFlyProcError' do
+
+      should "raise when created by :to_proc" do
+        lambda {
+          x, y = klass.new.method(:test).to_proc, lambda { 1+2 }
+          x.to_source
+        }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
+      end
+
+      should "not raise even with prepending :to_proc on the same line" do
+        x, y = klass.new.method(:test).to_proc, lambda { 1+2 }
+        y.to_source.should.not.be.nil
+      end
+
+      should "not raise even with appending :to_proc on the same line" do
+        x, y = lambda { 1+2 }, klass.new.method(:test).to_proc
+        x.to_source.should.not.be.nil
+      end
+
+      should "not raise even with nested :to_proc on the same line" do
+        x = lambda { klass.new.method(:test).to_proc }
+        x.to_source.should.not.be.nil
+      end
+
+    end
+
+    if RUBY_VERSION.include?('1.9.') or RUBY_PLATFORM =~ /java/i
+
+      describe '&:blah raising Sourcify::CannotHandleCreatedOnTheFlyProcError' do
+
+        should "raise when created by &:blah" do
+          lambda {
+            x, y = klass.new.test(&:blah), lambda { 1+2 }
+            x.to_source
+          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
+        end
+
+        should "not raise even with prepending &:blah on the same line" do
+          x, y = klass.new.test(&:blah), lambda { 1+2 }
+          y.to_source.should.not.be.nil
+        end
+
+        should "not raise even with appending &:blah on the same line" do
+          x, y = lambda { 1+2 }, klass.new.test(&:blah)
+          x.to_source.should.not.be.nil
+        end
+
+        should "not raise even with nested &:blah on the same line" do
+          x = lambda { klass.new.test(&:blah) }
+          x.to_source.should.not.be.nil
+        end
+
+        should "not raise with nested &:blah on diff line" do
+          (
+            lambda do
+              klass.new.test(&:blah)
+            end
+          ).to_source.should.not.be.nil
+        end
+
+      end
+
+    else
+
+      describe '&:blah raising Sourcify::CannotHandleCreatedOnTheFlyProcError' do
+
+        should "raise w no other proc on the same line" do
+          lambda {
+            x = klass.new.test(&:blah)
+            x.to_source
+          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
+        end
+
+        should "raise w prepending proc of different arity on the same line" do
+          lambda {
+            y, x = lambda {|a| 1+2 }, klass.new.test(&:blah)
+            x.to_source
+          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
+        end
+
+        should "raise w appending proc of different arity on the same line" do
+          lambda {
+            x, y = klass.new.test(&:blah), lambda {|a| 1+2 }
+            x.to_source
+          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
+        end
+
+        should "raise w nested proc of different arity on the same line" do
+          lambda {
+            y = lambda {|a| klass.new.test(&:blah) }
+            x = y.call(1).to_source
+          }.should.raise(Sourcify::CannotHandleCreatedOnTheFlyProcError)
+        end
+
+        should "not raise with nested &:blah on diff line" do
+          (
+            lambda do
+              klass.new.test(&:blah)
+            end
+          ).to_source.should.not.be.nil
+        end
+
+      end
+
+      describe '&:blah raising Sourcify::MultipleMatchingProcsPerLineError' do
+
+        should 'raise w prepending proc w zero arg (arity -1) on the same line' do
+          lambda {
+            y, x = lambda { 1+2 }, klass.new.test(&:blah)
+            x.to_source
+          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
+        end
+
+        should 'raise w appending proc w zero arg (arity -1) on the same line' do
+          lambda {
+            x, y = klass.new.test(&:blah), lambda { 1+2 }
+            x.to_source
+          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
+        end
+
+        should 'raise w nested proc w zero arg (arity -1) on the same line' do
+          lambda {
+            x = lambda { klass.new.test(&:blah) }
+            x.call.to_source
+          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
+        end
+
+        should 'raise w prepending proc w single optional arg (arity -1) on the same line' do
+          lambda {
+            y, x = lambda {|*a| 1+2 }, klass.new.test(&:blah)
+            x.to_source
+          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
+        end
+
+        should 'raise w appending proc w single optional arg (arity -1) on the same line' do
+          lambda {
+            x, y = klass.new.test(&:blah), lambda {|*a| 1+2 }
+            x.to_source
+          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
+        end
+
+        should 'raise w nested proc w single optional arg (arity -1) on the same line' do
+          lambda {
+            x = lambda {|*a| klass.new.test(&:blah) }
+            x.call.to_source
+          }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
+        end
+
+        should "not raise with nested &:blah on diff line" do
+          (
+            lambda do
+              x = klass.new.test(&:blah)
+            end
+          ).to_source.should.not.be.nil
+        end
+
+      end
+
+    end
+
+  end
+end

data/spec/proc/others_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe "Misc" do
+
+  should 'handle accessing #to_sexp after #to_source' do
+    (s_proc = lambda { :test }).to_source
+    s_proc.should.be having_sexp(s(:iter, s(:call, nil, :proc, s(:arglist)), nil, s(:lit, :test)))
+  end
+
+  should 'handle accessing #to_source after #to_sexp' do
+    (s_proc = lambda { :test }).to_sexp
+    s_proc.should.be having_source('proc { :test }')
+  end
+
+  should "handle lexer bug in missing trailing chars after '=>' operator" do
+    # This example addresses bug @ http://redmine.ruby-lang.org/issues/show/3765
+    {
+      __LINE__ => lambda { :test }
+    }.values.last.should.be having_source('proc { :test }')
+  end
+
+  should "handle lexer bug in missing trailing chars after '=>' operator" do
+    # This example addresses bug @ http://redmine.ruby-lang.org/issues/show/3765
+    {
+      __LINE__ => lambda do :test end
+    }.values.last.should.be having_source('proc { :test }')
+  end
+
+  unless Object.const_defined?(:ParseTree)
+    should "raise Sourcify::CannotParseEvalCodeError when proc is created from eval" do
+      lambda { eval("proc {:test }").to_source }.should.
+        raise(Sourcify::CannotParseEvalCodeError)
+    end
+  end
+
+end

data/spec/proc/to_sexp_variables_spec.rb

@@ -30,14 +30,14 @@ describe "Proc#to_sexp (variables)" do
   should 'handle class_eval scoped local var' do
     (
       x = 1
-      lambda { Object.class_eval { y = x } }
+      lambda { Object.class_eval {|x| y = x } }
     ).should.be having_sexp(
       s(:iter,
         s(:call, nil, :proc, s(:arglist)),
         nil,
         s(:iter,
           s(:call, s(:const, :Object), :class_eval, s(:arglist)),
-          nil,
+          s(:lasgn, :x),
           s(:lasgn, :y, s(:lvar, :x))))
     )
   end
@@ -45,14 +45,14 @@ describe "Proc#to_sexp (variables)" do
   should 'handle instance_eval scoped local var' do
     (
       x = 1
-      lambda { 'aa'.instance_eval { y = x } }
+      lambda { 'aa'.instance_eval {|x| y = x } }
     ).should.be having_sexp(
       s(:iter,
         s(:call, nil, :proc, s(:arglist)),
         nil,
         s(:iter,
           s(:call, s(:str, "aa"), :instance_eval, s(:arglist)),
-          nil,
+          s(:lasgn, :x),
           s(:lasgn, :y, s(:lvar, :x))))
     )
   end
@@ -60,7 +60,7 @@ describe "Proc#to_sexp (variables)" do
   should 'handle define_method scoped local var' do
     (
       x = 1
-      lambda { Object.send(:define_method, :aa) { y = x } }
+      lambda { Object.send(:define_method, :aa) {|x| y = x } }
     ).should.be having_sexp(
       s(:iter,
         s(:call, nil, :proc, s(:arglist)),
@@ -70,7 +70,7 @@ describe "Proc#to_sexp (variables)" do
             s(:const, :Object),
             :send,
             s(:arglist, s(:lit, :define_method), s(:lit, :aa))),
-            nil,
+            s(:lasgn, :x),
             s(:lasgn, :y, s(:lvar, :x))))
     )
   end