mvz-live_ast 1.3.2 → 2.0.0

data/lib/live_ast/to_ruby.rb

@@ -1,26 +1,16 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
+require "live_ast/base"
 
-[Method, UnboundMethod, Proc].each do |klass|
-  klass.class_eval do
-    def to_ruby #:nodoc:
+module LiveAST
+  module CallableToRuby
+    # Generate ruby code which reflects the AST of this object.
+    def to_ruby
       LiveAST.parser::Unparser.unparse(LiveAST.ast(self))
     end
   end
 end
 
-class Method
-  # :method: to_ruby
-  # Generate ruby code which reflects the AST of this object.
-end
-
-class UnboundMethod
-  # :method: to_ruby
-  # Generate ruby code which reflects the AST of this object.
-end
-
-class Proc
-  # :method: to_ruby
-  # Generate ruby code which reflects the AST of this object.
-end
+Method.include LiveAST::CallableToRuby
+UnboundMethod.include LiveAST::CallableToRuby
+Proc.include LiveAST::CallableToRuby

data/lib/live_ast/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LiveAST
-  VERSION = "1.3.2"
+  VERSION = "2.0.0"
 end

data/test/alias_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class AliasTest < RegularTest
   class A

data/test/ast_eval/ast_eval_test.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'main'
+require "main"
 
-require 'live_ast/ast_eval'
+require "live_ast/ast_eval"
 
 class ASTEvalTest < BaseTest
   def test_defines_ast_eval

data/test/ast_load/ast_load_test.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'main'
+require "main"
 
-require 'live_ast/ast_load'
+require "live_ast/ast_load"
 
 class AstLoadTest < BaseTest
   include FileUtils

data/test/attr_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class AttrTest < RegularTest
   class A

data/test/backtrace_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 # test for raise redefinition side-effects: unsort this TestCase from
 # other TestCases.
@@ -113,7 +113,7 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
     raise_after_eval("raise", false)
     raise_after_eval("1/0", false)
 
-    require 'live_ast/replace_raise'
+    require "live_ast/replace_raise"
 
     raise_after_eval("raise", true)
     raise_after_eval("1/0", false)
@@ -123,14 +123,14 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
     3.times do
       orig = eval %{
 
-        lambda { #{code} }
+        lambda { #{code} } # lambda { foo }
 
 
       }, binding, "somewhere", 1000
 
       live = ast_eval %{
 
-          lambda { #{code} }
+          lambda { #{code} } # lambda { foo }
 
 
       }, binding, "somewhere", 1000

data/test/base/noninvasive_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'main'
+require "main"
 
 class NoninvasiveTest < BaseTest
   def test_no_clutter

data/test/base/reload_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'main'
+require "main"
 
 class ReloadTest < BaseTest
   include FileUtils

data/test/covert_define_method_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class CovertDefineMethodTest < RegularTest
   DEFINE = lambda do

data/test/def_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class DefTest < RegularTest
   class A

data/test/define_method_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class DefineMethodTest < RegularTest
   WITH_BLOCKS = lambda do
@@ -8,7 +8,7 @@ class DefineMethodTest < RegularTest
       {
         f: :+,
         g: :*,
-        h: :-,
+        h: :-
       }.each_pair do |name, op|
         case op
         when :+

data/test/define_singleton_method_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class DefineSingletonMethodTest < RegularTest
   def test_define_singleton_method

data/test/encoding_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class AllEncodingTest < RegularTest
   ENC_TESTS = {

data/test/error_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class ErrorTest < RegularTest
   def test_multiple_lambda_same_line
@@ -70,12 +70,12 @@ class ErrorTest < RegularTest
     end
   end
 
-  def test_reload_with_raw_eval_1
+  def test_reload_with_raw_eval_one
     ast_eval("lambda { }", binding)
     eval("lambda { }")
   end
 
-  def test_reload_with_raw_eval_2
+  def test_reload_with_raw_eval_two
     c = ast_eval %{
       Class.new do
         def f

data/test/eval_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class EvalTest < RegularTest
   DEFINE_A = lambda do

data/test/flush_cache_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 # test for flushing side-effects: unsort this TestCase from other
 # TestCases.
@@ -18,6 +18,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
   def uncached_method_from_require
     klass = Class.new do
       def f; end
+
       def g; end
     end
 
@@ -69,6 +70,7 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
   def lost_method_from_require
     klass = Class.new do
       def f; end
+
       def g; end
     end
 

data/test/full/ast_reload_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'main'
+require "main"
 
 class ASTReloadTest < ReplaceEvalTest
   include FileUtils

data/test/full/replace_eval_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'main'
+require "main"
 
 class FullReplaceEvalTest < ReplaceEvalTest
   RESULT = {}
@@ -71,7 +71,7 @@ class FullReplaceEvalTest < ReplaceEvalTest
     assert_equal 33, RESULT[:new]
   end
 
-  def test_const_lookup_2
+  def test_const_lookup_two
     Class.new do
       eval %{
         def f
@@ -108,7 +108,7 @@ class FullReplaceEvalTest < ReplaceEvalTest
     end
   end
 
-  def test_const_lookup_3
+  def test_const_lookup_three
     DEFINE_QS.call
     Q::R.new.f
     S::T.new.f
@@ -141,7 +141,7 @@ class FullReplaceEvalTest < ReplaceEvalTest
   end
 
   def test_instance_eval_arg_error_no_block
-    [[], ('a'..'z').to_a].each do |args|
+    [[], ("a".."z").to_a].each do |args|
       orig = assert_raises ArgumentError do
         Object.new.live_ast_original_instance_eval(*args)
       end
@@ -173,7 +173,7 @@ class FullReplaceEvalTest < ReplaceEvalTest
 
   describe "instance_eval argument errors" do
     before do
-      require 'live_ast/full'
+      require "live_ast/full"
     end
 
     let(:orig) {
@@ -188,7 +188,7 @@ class FullReplaceEvalTest < ReplaceEvalTest
     }
 
     describe "when the second argument is nil" do
-      let(:args) { ['1', nil] }
+      let(:args) { ["1", nil] }
       it "raises the same error as the original" do
         assert_equal orig.message, live.message
         assert_equal orig.class, live.class
@@ -198,10 +198,10 @@ class FullReplaceEvalTest < ReplaceEvalTest
 
   def test_instance_eval_arg_error_with_block
     orig = assert_raises ArgumentError do
-      Object.new.live_ast_original_instance_eval(3, 4, 5) {}
+      Object.new.live_ast_original_instance_eval(3, 4, 5) { nil }
     end
     live = assert_raises ArgumentError do
-      Object.new.instance_eval(3, 4, 5) {}
+      Object.new.instance_eval(3, 4, 5) { nil }
     end
     assert_equal orig.message, live.message
   end

data/test/irb_test.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'main'
-require 'live_ast/irb_spy'
+require_relative "main"
+require "live_ast/irb_spy"
 
 class IRBTest < RegularTest
   def with_module(parent, child)

data/test/lambda_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class LambdaTest < RegularTest
   def test_block_braces_multiline
@@ -31,7 +31,7 @@ class LambdaTest < RegularTest
   def test_stabby_lambda
     a = ->(x, y) { x - y }
 
-    expected = binop_block(:lambda, :-)
+    expected = binop_lambda(:-)
     assert_equal expected, a.to_ast
   end
 

data/test/load_path_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'main'
+require_relative "main"
 
 class LoadPathTest < BaseTest
   include FileUtils
@@ -68,7 +68,7 @@ class LoadPathTest < BaseTest
         "",
         "/usr",
         ".",
-        "..",
+        ".."
       ].each do |file|
         compare_load_errors(file)
       end

data/test/load_test.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'main'
-require_relative '../devel/levitate'
+require_relative "main"
+require_relative "../devel/levitate"
 
 class LoadFileTest < BaseTest
   class << self
@@ -80,7 +80,7 @@ class LoadFileTest < BaseTest
   end
 
   def test_verbose_respected
-    lib = File.expand_path(File.dirname(__FILE__) + "/../lib")
+    lib = File.expand_path("../lib", File.dirname(__FILE__))
 
     [
       # respects a loaded file setting $VERBOSE = true

data/test/main.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 
 # require first for stdlib_test
-require 'pp'
-require 'find'
-require 'fileutils'
+require "pp"
+require "find"
+require "fileutils"
 
-require 'minitest/mock'
-require 'minitest/autorun'
+require "minitest/mock"
+require "minitest/autorun"
 
 $VERBOSE = true
 
-require 'live_ast/base'
+require "live_ast/base"
 
 def define_unsorted_test_case(name, superclass, &block)
   klass = Class.new superclass, &block
-  letter = ('A'..'Z').to_a[rand(26)]
+  letter = ("A".."Z").to_a[rand(26)]
   Object.const_set "#{letter}#{name}", klass
 end
 
@@ -37,7 +37,7 @@ class JLMiniTest < MiniTest::Test
   end
 
   def mu_pp(obj)
-    +'' <<
+    +"" <<
       delim("_") <<
       obj.pretty_inspect.chomp <<
       delim("=")
@@ -52,9 +52,9 @@ class JLMiniTest < MiniTest::Test
   def assert_nothing_raised
     yield
     assert_nil nil
-  rescue StandardError => ex
+  rescue StandardError => e
     raise MiniTest::Assertion,
-      exception_details(ex, "Expected nothing raised, but got:")
+          exception_details(e, "Expected nothing raised, but got:")
   end
 
   %w(
@@ -68,15 +68,15 @@ end
 class BaseTest < JLMiniTest
   include LiveAST.parser::Test
 
-  DATA_DIR = File.expand_path(File.dirname(__FILE__) + "/data")
+  DATA_DIR = File.expand_path("data", File.dirname(__FILE__))
 
   def self.stdlib_has_source?
     RUBY_ENGINE != "jruby"
   end
 
   def temp_file(code, basename = nil)
-    basename ||= ('a'..'z').to_a.shuffle.join + ".rb"
-    path = DATA_DIR + "/" + basename
+    basename ||= ("a".."z").to_a.shuffle.join + ".rb"
+    path = File.join(DATA_DIR, basename)
 
     write_file path, code if code
     begin
@@ -106,7 +106,7 @@ end
 class RegularTest < BaseTest
   def setup
     super
-    require 'live_ast'
+    require "live_ast"
   end
 end
 
@@ -114,10 +114,10 @@ class ReplaceEvalTest < BaseTest
   def initialize(*args)
     super
     ok = begin
-           require 'live_ast/full'
+           require "live_ast/full"
            true
          rescue LoadError
-           raise "need: gem install binding_of_caller" if RUBY_ENGINE == "ruby"
+           raise "need: gem install bindings" if RUBY_ENGINE == "ruby"
 
            false
          end
@@ -127,7 +127,7 @@ class ReplaceEvalTest < BaseTest
     self.class.class_eval do
       instance_methods(false).each do |m|
         remove_method(m)
-        define_method(m) {}
+        define_method(m) { nil }
       end
     end
   end