mvz-live_ast 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33748a6b01c44b3b88da1cc0aad7270f7e1fb7670c7f73999dc84f4d97b967df
-  data.tar.gz: b1754e7fb57d4b55cc02f286865dad014f672d7a62fd022c04a26024b122ecd5
+  metadata.gz: 55a4905b0508e1fb40901c7459dba58c4955dd176c37c3d420e105754588707e
+  data.tar.gz: 8d1e9426cbb0eb669047fe8e73717012f4c5493b63a8971152c5dfb261bc5959
 SHA512:
-  metadata.gz: 8a100e55251ed50bd535e2055d8c363d07127a065ad4b993ef00e79229b63f3a8bfce4c616550274381487963280b04f4058f3fa42740767c99de8ce14622a4c
-  data.tar.gz: 53d0943b4aa6f226ad12ba95973ae2b070d356de7fd7a17fba495886a792368286483e58ec5391f84651534c7e81b14e8bd7a31963dbc4310fc579ff024b0791
+  metadata.gz: 4465fa6540167ff69f472dcba3a881e4ef039795eaaeb2d79e7cb95142de456047fd9b42589779889875bb2ed30508160361a89dc43d91a81c470a76b288345b
+  data.tar.gz: 1cc74db8fed7f2a011a142fa44ce86e1e56a082a571b7a66104a5ed2b63f340f3f7ea2a7fe7b8d944a55b92f151818a558d688b497737aa7858cb9076daeb27d

data/CHANGES.rdoc

@@ -1,5 +1,12 @@
 = live_ast Changes
 
+== Version 2.2.0
+
+* Improve error message compatibility for instance_eval filename argument
+* Drop support for Ruby 2.7
+* Fix source location for eval with binding and no location
+* Add support for Ruby 3.2 and 3.3
+
 == Version 2.1.2
 
 * Raise informative acception for methods defined in the prelude

data/README.rdoc

@@ -80,7 +80,7 @@ sexps used by tools such as <code>ruby2ruby</code>.
 
 LiveAST is thread-safe.
 
-Ruby 2.6.0 or higher is required.
+Ruby 2.7.0 or higher is required.
 
 == Links
 

data/lib/live_ast/ast_eval.rb

@@ -7,7 +7,7 @@ module Kernel
 
   # The same as +eval+ except that the binding argument is required
   # and AST-accessible objects are created.
-  def ast_eval(*args)
-    LiveAST::Evaler.eval(args[0], *args)
+  def ast_eval(string, bind, filename = nil, lineno = nil)
+    LiveAST::Evaler.eval(string, string, bind, filename, lineno)
   end
 end

data/lib/live_ast/base.rb

@@ -51,8 +51,8 @@ module LiveAST
     #
     # Equivalent to <code>Kernel#ast_eval</code>.
     #
-    def eval(*args) # :nodoc:
-      Evaler.eval(args[0], *args)
+    def eval(string, bind, filename = nil, lineno = nil) # :nodoc:
+      Evaler.eval(string, string, bind, filename, lineno)
     end
 
     #

data/lib/live_ast/common.rb

@@ -7,18 +7,25 @@ module LiveAST
     def arg_to_str(arg)
       arg.to_str
     rescue NameError
-      thing = arg.nil? ? nil : arg.class
+      thing = arg&.class
 
       message = "no implicit conversion of #{thing.inspect} into String"
       raise TypeError, message
     end
 
     def arg_to_str2(arg)
+      return "" if arg.nil? && RUBY_VERSION >= "3.3.0"
+
       arg.to_str
     rescue NameError
-      thing = arg.nil? ? nil : arg.class
+      thing = arg&.class
+
+      message = if arg.nil?
+                  "wrong argument type #{thing.inspect} (expected String)"
+                else
+                  "no implicit conversion of #{thing.inspect} into String"
+                end
 
-      message = "wrong argument type #{thing.inspect} (expected String)"
       raise TypeError, message
     end
 
@@ -38,18 +45,13 @@ module LiveAST
       raise TypeError, message
     end
 
-    def location_for_eval(*args)
-      bind, *location = args
-
-      if bind
-        case location.size
-        when 0
-          bind.source_location
-        when 1
-          [location.first, 1]
-        else
-          location
-        end
+    def location_for_eval(bind, filename = nil, lineno = nil)
+      if filename
+        lineno ||= 1
+        [filename, lineno]
+      elsif RUBY_VERSION >= "3.3.0"
+        file, line = bind.source_location
+        ["(eval at #{file}:#{line})", 1]
       else
         ["(eval)", 1]
       end

data/lib/live_ast/evaler.rb

@@ -5,10 +5,12 @@ module LiveAST
     class << self
       include Common
 
-      def eval(parser_source, *args)
-        evaler_source, bind, *rest = handle_args(*args)
+      def eval(parser_source, evaler_source, bind, filename = nil, lineno = nil)
+        evaler_source = arg_to_str evaler_source
+        check_is_binding bind
+        filename = arg_to_str filename if filename
 
-        file, line = location_for_eval(bind, *rest)
+        file, line = location_for_eval(bind, filename, lineno)
         file = LiveAST.strip_token(file)
 
         key, = Linker.new_cache_synced(parser_source, file, line, false)
@@ -20,15 +22,6 @@ module LiveAST
           raise e
         end
       end
-
-      def handle_args(*args)
-        args.tap do
-          check_arity(args, 2..4)
-          args[0] = arg_to_str(args[0])
-          check_is_binding(args[1])
-          args[2] = arg_to_str(args[2]) if args[2]
-        end
-      end
     end
   end
 end

data/lib/live_ast/linker.rb

@@ -2,8 +2,9 @@
 
 module LiveAST
   class Cache
-    def initialize(*args)
-      @source, @user_line = args
+    def initialize(file, lineno)
+      @source = file
+      @user_line = lineno
       @asts = nil
     end
 
@@ -73,6 +74,7 @@ module LiveAST
       def find_ast(*location)
         raise ASTNotFoundError unless location.size == 2
         raise RawEvalError if location.first == "(eval)"
+        raise RawEvalError if location.first.match?(/^\(eval at .*\)$/) # Ruby 3.3
         raise ASTNotFoundError if location.first == "<internal:prelude>"
 
         ast = fetch_from_cache(*location)
@@ -109,10 +111,8 @@ module LiveAST
         return key, cache
       end
 
-      def new_cache_synced(*args)
-        @mutex.synchronize do
-          new_cache(*args)
-        end
+      def new_cache_synced(...)
+        @mutex.synchronize { new_cache(...) }
       end
 
       def flush_cache

data/lib/live_ast/reader.rb

@@ -3,8 +3,8 @@
 
 module LiveAST
   module Reader
-    UTF8_BOM = /\A\xef\xbb\xbf/.freeze
-    MAGIC_COMMENT = /\A(?:#!.*?\n)?\s*\#.*(?:en)?coding\s*[:=]\s*([^\s;]+)/.freeze
+    UTF8_BOM = /\A\xef\xbb\xbf/
+    MAGIC_COMMENT = /\A(?:#!.*?\n)?\s*\#.*(?:en)?coding\s*[:=]\s*([^\s;]+)/
 
     def self.read(file)
       contents = File.read(file, encoding: "BINARY")

data/lib/live_ast/replace_caller.rb

@@ -6,8 +6,9 @@ module Kernel
   private
 
   alias live_ast_original_caller caller
-  def caller(*args)
-    c = live_ast_original_caller(*args)
+
+  def caller(...)
+    c = live_ast_original_caller(...)
     c.shift
     c.map { |line| LiveAST.strip_token line }
   end

data/lib/live_ast/replace_eval.rb

@@ -53,12 +53,11 @@ module Kernel
 
   alias live_ast_original_eval eval
 
-  def eval(*args)
-    LiveAST::Common.check_arity(args, 1..4)
+  def eval(string, binding = nil, filename = nil, lineno = nil)
     LiveAST.eval(
-      args[0],
-      args[1] || Binding.of_caller(1),
-      *LiveAST::Common.location_for_eval(*args[1..3]))
+      string,
+      binding || Binding.of_caller(1),
+      filename, lineno)
   end
 end
 
@@ -66,8 +65,8 @@ end
 class Binding
   alias live_ast_original_binding_eval eval
 
-  def eval(*args)
-    LiveAST.eval(args[0], self, *args[1..])
+  def eval(string, filename = nil, lineno = nil)
+    LiveAST.eval(string, self, filename, lineno)
   end
 end
 
@@ -75,6 +74,8 @@ end
 class BasicObject
   alias live_ast_original_instance_eval instance_eval
 
+  # Arity must be handled in code because the first argument is only required
+  # if no block is passed.
   def instance_eval(*args, &block)
     if block
       live_ast_original_instance_eval(*args, &block)
@@ -92,6 +93,8 @@ end
 class Module
   alias live_ast_original_module_eval module_eval
 
+  # Arity must be handled in code because the first argument is only required
+  # if no block is passed.
   def module_eval(*args, &block)
     if block
       live_ast_original_module_eval(*args, &block)

data/lib/live_ast/replace_raise.rb

@@ -7,9 +7,9 @@ module Kernel
 
   alias live_ast_original_raise raise
 
-  def raise(*args)
+  def raise(...)
     ex = begin
-           live_ast_original_raise(*args)
+           live_ast_original_raise(...)
          rescue Exception => e
            e
          end

data/lib/live_ast/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvz-live_ast
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - James M. Lawrence
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-23 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
@@ -74,103 +74,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rake-manifest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-manifest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.51'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.34.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.34.2
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -242,14 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Live abstract syntax trees of methods and procs.