mvz-live_ast 1.1.1 → 1.1.2

data/lib/live_ast/ruby_parser/unparser.rb

@@ -3,11 +3,15 @@ require 'ruby2ruby'
 #
 # Used by +to_ruby+ in LiveAST.
 #
-module LiveAST::RubyParser::Unparser
-  #
-  # Return a ruby source string which reflects the given AST.
-  #
-  def self.unparse(sexp)
-    Ruby2Ruby.new.process(sexp)
+module LiveAST
+  class RubyParser
+    module Unparser
+      #
+      # Return a ruby source string which reflects the given AST.
+      #
+      def self.unparse(sexp)
+        ::Ruby2Ruby.new.process(sexp)
+      end
+    end
   end
 end

data/lib/live_ast/to_ast.rb

@@ -7,7 +7,7 @@ require 'live_ast/base'
     end
   end
 end
-    
+
 class Proc
   # Extract the AST of this object.
   def to_ast

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/ast_eval/ast_eval_test.rb

@@ -0,0 +1,11 @@
+require 'main'
+
+require 'live_ast/ast_eval'
+
+class ASTEvalTest < BaseTest
+  def test_defines_ast_eval
+    assert respond_to?(:ast_eval)
+
+    assert private_methods.include?(:ast_eval)
+  end
+end

data/test/ast_load/ast_load_test.rb

@@ -0,0 +1,45 @@
+require 'main'
+
+require 'live_ast/ast_load'
+
+class AstLoadTest < BaseTest
+  include FileUtils
+
+  def test_defines_ast_load
+    assert private_methods.include?(:ast_load)
+  end
+
+  def test_reloading
+    noninvasive_ast_reload
+  end
+
+  def noninvasive_ast_reload
+    code_1 = %{
+      class AstLoadTest::B
+        def f
+          "first B#f"
+        end
+      end
+    }
+
+    code_2 = %{
+      class AstLoadTest::B
+        def f
+          "second B#f"
+        end
+      end
+    }
+
+    temp_file code_1 do |file|
+      load file
+
+      LiveAST.ast(B.instance_method(:f))
+
+      write_file file, code_2
+      ast_load file
+
+      assert_equal no_arg_def(:f, "second B#f"),
+                   LiveAST.ast(B.instance_method(:f))
+    end
+  end
+end

data/test/backtrace_test.rb

@@ -8,22 +8,22 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
     3.times do
       orig = exception_backtrace do
         eval %{
-  
+
           raise
-  
-  
+
+
         }, binding, "somewhere", 1000
       end
-  
+
       live = exception_backtrace do
         ast_eval %{
-  
+
           raise
-  
-  
+
+
         }, binding, "somewhere", 1000
       end
-      
+
       assert_equal orig.first, live.first
       assert_match(/somewhere:1002/, live.first)
     end
@@ -33,19 +33,19 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
     3.times do
       orig = exception_backtrace do
         eval %{
-  
+
 
           raise
-  
+
         }, binding, __FILE__, (__LINE__ + 9)
       end
-  
+
       live = exception_backtrace do
         ast_eval %{
-  
+
 
           raise
-  
+
         }, binding
       end
 
@@ -59,19 +59,19 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
     3.times do
       orig = exception_backtrace do
         eval %{
-  
+
 
           raise
-  
+
         }, binding, __FILE__, (__LINE__ + 9)
       end
-  
+
       live = exception_backtrace do
         ast_eval %{
-  
+
 
           raise
-  
+
         }, binding, __FILE__, __LINE__
       end
 
@@ -85,19 +85,19 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
     3.times do
       orig = exception_backtrace do
         eval %{
-  
+
 
           raise
-  
+
         }, binding, __FILE__
       end
-  
+
       live = exception_backtrace do
         ast_eval %{
-  
+
 
           raise
-  
+
         }, binding, __FILE__
       end
 
@@ -106,7 +106,7 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
       assert_match(/#{here}/, live.first)
     end
   end
-  
+
   def test_raise_after_eval
     raise_after_eval("raise", false)
     raise_after_eval("1/0", false)
@@ -125,7 +125,7 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
 
 
       }, binding, "somewhere", 1000
-  
+
       live = ast_eval %{
 
           lambda { #{code} }
@@ -147,11 +147,12 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
       end
     end
   end
-  
+
   def test_tokens_stripped
-    exception_backtrace do
+    lines = exception_backtrace do
       ast_eval %{ ast_eval %{ ast_eval %{raise}, binding }, binding }, binding
-    end.each do |line|
+    end
+    lines.each do |line|
       assert_nil line.index(LiveAST::Linker::REVISION_TOKEN)
     end
   end

data/test/{noninvasive_test.rb → base/noninvasive_test.rb}

@@ -1,15 +1,17 @@
-require_relative 'main'
+require 'main'
 
-class AAA_NoninvasiveTest < BaseTest
+class NoninvasiveTest < BaseTest
   def test_no_clutter
     [Method, UnboundMethod, Proc].each do |klass|
       assert !klass.instance_methods.include?(:to_ast)
       assert !klass.instance_methods.include?(:to_ruby)
     end
-    
+
     assert !respond_to?(:ast_eval)
+    assert !private_methods.include?(:ast_eval)
     assert !Kernel.respond_to?(:ast_eval)
     assert !respond_to?(:ast_load)
+    assert !private_methods.include?(:ast_load)
     assert !Kernel.respond_to?(:ast_load)
   end
 
@@ -30,14 +32,14 @@ class AAA_NoninvasiveTest < BaseTest
   end
 
   def test_lambda
-    a = lambda { |x, y| x ** y }
+    a = lambda { |x, y| x**y }
 
     assert_equal binop_block(:lambda, :**), LiveAST.ast(a)
   end
 
   def test_ast_eval
     code = %{ lambda { |x, y| x / y } }
-    
+
     expected = binop_block(:lambda, :/)
     result = LiveAST.ast(LiveAST.eval(code, binding))
     assert_equal expected, result

data/test/base/reload_test.rb

@@ -0,0 +1,41 @@
+require 'main'
+
+class ReloadTest < BaseTest
+  include FileUtils
+
+  def test_reloading
+    raw_reload
+  end
+
+  def raw_reload
+    code_1 = %{
+      class ReloadTest::A
+        def f
+          "first A#f"
+        end
+      end
+    }
+
+    code_2 = %{
+      class ReloadTest::A
+        def f
+          "second A#f"
+        end
+      end
+    }
+
+    temp_file code_1 do |file|
+      load file
+
+      LiveAST.ast(A.instance_method(:f))
+
+      write_file file, code_2
+      load file
+
+      # forced a raw-reload inconsistency -- verify bogus
+
+      assert_equal no_arg_def(:f, "first A#f"),
+                   LiveAST.ast(A.instance_method(:f))
+    end
+  end
+end

data/test/covert_define_method_test.rb

@@ -6,7 +6,7 @@ class CovertDefineMethodTest < RegularTest
       def A.my_def(*args, &block)
         define_method(*args, &block)
       end
-      
+
       my_def :h do |x, y|
         x + y
       end

data/test/define_method_test.rb

@@ -4,9 +4,9 @@ class DefineMethodTest < RegularTest
   WITH_BLOCKS = lambda do
     class A
       {
-        :f => :+,
-        :g => :*,
-        :h => :-,
+        f: :+,
+        g: :*,
+        h: :-,
       }.each_pair do |name, op|
         case op
         when :+
@@ -42,10 +42,10 @@ class DefineMethodTest < RegularTest
   WITH_PROCS = lambda do
     class B
       op = lambda { |x, y| x / y }
-      
+
       no_arg = proc { "B#f" }
 
-      define_method :g, &no_arg ; define_method :f, &op
+      define_method :g, &no_arg; define_method :f, &op
     end
   end
 

data/test/encoding_test.rb

@@ -1,7 +1,7 @@
 require_relative 'main'
 
 class AllEncodingTest < RegularTest
-  ENC_TESTS = Hash[*%w[
+  ENC_TESTS = Hash[*%w(
     default US-ASCII
     usascii US-ASCII
     utf8 UTF-8
@@ -17,7 +17,7 @@ class AllEncodingTest < RegularTest
     eucjp EUC-JP
     koi8 KOI8-R
     koi8_shebang KOI8-R
-  ]]
+  )]
 
   if RUBY_VERSION < '2.0.0'
     ENC_TESTS['default'] = 'US-ASCII'
@@ -35,9 +35,9 @@ class AllEncodingTest < RegularTest
 
       ast = EncodingTest.instance_method("#{abbr}_string").to_ast
       assert_equal "UTF-8", no_arg_def_return(ast).encoding.to_s
-      
+
       LiveAST.load "./test/encoding_test/#{abbr}.rb"
-      
+
       ast = EncodingTest.instance_method("#{abbr}_string").to_ast
       assert_equal "UTF-8", no_arg_def_return(ast).encoding.to_s
     end
@@ -51,7 +51,7 @@ class AllEncodingTest < RegularTest
       LiveAST.load "./test/encoding_test/bad.rb"
     end
     # inconsistent punctuation from Ruby
-    re = %r!\Aunknown encoding name\s*[-:]\s*feynman-diagram\Z!
+    re = /\Aunknown encoding name\s*[-:]\s*feynman-diagram\Z/
     assert_match re, orig.message
     assert_match re, live.message
   end

data/test/error_test.rb

@@ -2,9 +2,9 @@ require_relative 'main'
 
 class ErrorTest < RegularTest
   def test_multiple_lambda_same_line
-    a = lambda { } ; b = lambda { }
+    a = lambda {}; b = lambda {}
     ignore(b)
-    
+
     assert_raises LiveAST::MultipleDefinitionsOnSameLineError do
       a.to_ast
     end
@@ -12,7 +12,7 @@ class ErrorTest < RegularTest
 
   DEFINE_A = lambda do
     class A
-      def f ; end ; def g ; end
+      def f; end; def g; end
     end
   end
 
@@ -72,7 +72,7 @@ class ErrorTest < RegularTest
     ast_eval("lambda { }", binding)
     eval("lambda { }")
   end
-  
+
   def test_reload_with_raw_eval_2
     c = ast_eval %{
       Class.new do
@@ -89,12 +89,12 @@ class ErrorTest < RegularTest
       }
       nil
     end
-    
+
     assert_raises LiveAST::RawEvalError do
       c.instance_method(:f).to_ast
     end
   end
-  
+
   def test_bad_binding
     orig = assert_raises TypeError do
       eval("", "bogus")

data/test/eval_test.rb

@@ -98,10 +98,10 @@ class EvalTest < RegularTest
     assert_equal "#{self.class}::C", C.name
     assert_equal C, C.instance_method(:g).owner
 
-    assert_equal binop_define_method(:g, :+), 
+    assert_equal binop_define_method(:g, :+),
                  C.instance_method(:g).to_ast
 
-    assert_equal binop_define_method(:g, :+), 
+    assert_equal binop_define_method(:g, :+),
                  C.new.method(:g).to_ast
   end
 
@@ -164,7 +164,7 @@ class EvalTest < RegularTest
     assert_equal binop_define_method(:g, :/),
                  klass.new.method(:g).to_ast
   end
-  
+
   DEFINE_GH = lambda do
     ast_eval %{
       class G
@@ -172,7 +172,7 @@ class EvalTest < RegularTest
           "G#f"
         end
       end
-  
+
       class H
         def g
           "H#g"
@@ -180,7 +180,7 @@ class EvalTest < RegularTest
       end
     }, binding
   end
-  
+
   def test_reuse_string
     DEFINE_GH.call
     assert_equal "#{self.class}::G", G.name
@@ -191,7 +191,7 @@ class EvalTest < RegularTest
 
     assert_equal no_arg_def(:f, "G#f"),
                  G.new.method(:f).to_ast
-    
+
     assert_equal no_arg_def(:g, "H#g"),
                  H.instance_method(:g).to_ast
 
@@ -258,7 +258,7 @@ class EvalTest < RegularTest
     # sanity check
     assert_not_equal binop_block(:lambda, :+), a.to_ast
   end
-  
+
   # from rubyspec
   def test_to_str_on_file
     file = MiniTest::Mock.new