ruby-next-core 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d760d668ee7358474931d4a69ebff41ff99aa2d7e300fdbe58aa023e38644422
-  data.tar.gz: f7a982bae326176fb4ac5b991f8b61be10648efe5cfc501a4d81f14b974bc55b
+  metadata.gz: b8ba05cac5681186f90c6a46731a78532ec69707c9b01bc1df15702ebae13e4d
+  data.tar.gz: cb58fc9d453a7be076a594902701b2011ea79496cab642437620519ccf3a0682
 SHA512:
-  metadata.gz: 5093c8523a20d95a073254f09e2226e766df69e9ba48692686f34693ba132fe2d5f6d5b08a558d9ef7f7be2842784aded96a181903577d9fbcef060dc8f8c108
-  data.tar.gz: 17df494938c41ce179f64776cb6ce13a966c97ac3ba3f6ac32e0d1d6da7fc38ee7689dc65ef4f6480208ba5190d288f292b03830bcec43756911c0e2092b6669
+  metadata.gz: 1a75869db2f6fffade1e12d60aca0e1592cc669a0572cd114edae2c24e0d5bed22337063246a7edee5c2ce27a89c3aece048837aed463ff6781e5ea5e7052008
+  data.tar.gz: a28a71c3ad5e3a0e0bb08679dad23fe69a6a3ebdd14c66f4b800269c29eb97a74a837ab2c8479b824d9a47c81c1dd3916d1e9cefa76c3c88dd7a29170adc1b80

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.1.0 (2025-01-15)
+
+- Prepare for Ruby 3.5.
+
 ## 1.0.3 (2024-04-18)
 
 - Fix RuboCop compatibility.

data/README.md

@@ -364,6 +364,20 @@ If the command fails we warn the end user.
 
 This feature, _auto-transpiling_, is **disabled** by default (will likely be enabled in future versions). You can enable it by calling `RubyNext::Language.setup_gem_load_path(transpile: true)`.
 
+### Dependency-less setup
+
+If you want to avoid adding `ruby-next-core` to your gem's dependencies, you can tweak the `$LOAD_PATH` yourself. It's much easier to do if you go with a single transpiled version per source file (i.e., use `--single-version` or specify particular rewriters using the `--rewrite` option of the `ruby-next nextify` command). If so, you can drop the following snippet to your gem's entrypoint:
+
+```ruby
+# lib/my_gem.rb
+$LOAD_PATH.unshift "#{__dir__}/.rbnext"
+
+# Then go `require` statements
+# ...
+```
+
+That's it! Keep in mind that in this cases there is no auto-transpiling support (so, you may want to keep the transpiled files in the repository to allow installing the gem from source).
+
 ## Runtime usage
 
 It is also possible to transpile Ruby source code in run-time via Ruby Next.
@@ -552,7 +566,7 @@ require "ruby-next/language/runtime"
 
 ### Supported edge features
 
-- Implicit `it` block parameter ([#19890](https://bugs.ruby-lang.org/issues/18980)).
+None yet.
 
 ### Supported proposed features
 

data/bin/parse

@@ -15,6 +15,17 @@ contents =
     ARGV[0]
   end
 
+require "optparse"
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: parse filepath_or_code [options]"
+
+  opts.on("--next", "Use Ruby Next parser") do
+    require "parser/rubynext"
+    RubyNext::Language.parser_class = ::Parser::RubyNext
+  end
+end.parse!
+
 ast = RubyNext::Language.parse(contents)
 puts ast
 puts "\n // Parsed with #{RubyNext::Language.parser_class}"

data/lib/.rbnext/2.1/ruby-next/language.rb

@@ -285,6 +285,17 @@ module RubyNext
     require "ruby-next/language/rewriters/2.6/endless_range"
     rewriters << Rewriters::EndlessRange
 
+    require "ruby-next/language/rewriters/3.4/it_param"
+
+    # We must add `it` rewriter before nubmered params rewriter to allow it to transform the source code further
+    number_params = rewriters.index(Rewriters::NumberedParams)
+
+    if number_params
+      rewriters.insert(number_params, Rewriters::ItParam)
+    else
+      rewriters << Rewriters::ItParam
+    end
+
     if RubyNext.edge_syntax?
       require "ruby-next/language/rewriters/edge"
     end

data/lib/.rbnext/2.3/ruby-next/config.rb

@@ -10,10 +10,10 @@ module RubyNext
   # Defines last minor version for every major version
   LAST_MINOR_VERSIONS = {
     2 => 8, # 2.8 is required for backward compatibility: some gems already uses it
-    3 => 4
+    3 => 5
   }.freeze
 
-  LATEST_VERSION = [3, 4].freeze
+  LATEST_VERSION = [3, 5].freeze
 
   # A virtual version number used for proposed features
   NEXT_VERSION = "1995.next.0"

data/lib/.rbnext/2.3/ruby-next/language/eval.rb

@@ -20,7 +20,7 @@ module RubyNext
     module InstanceEval # :nodoc:
       refine Object do
         def instance_eval(*args, &block)
-          return super(*args, &block) if block
+          return super if block
 
           source = args.shift
           new_source = ::RubyNext::Language::Runtime.transform(source, using: false)
@@ -33,7 +33,7 @@ module RubyNext
     module ClassEval
       refine Module do
         def module_eval(*args, &block)
-          return super(*args, &block) if block
+          return super if block
 
           source = args.shift
           new_source = ::RubyNext::Language::Runtime.transform(source, using: false)
@@ -43,7 +43,7 @@ module RubyNext
         end
 
         def class_eval(*args, &block)
-          return super(*args, &block) if block
+          return super if block
 
           source = args.shift
           new_source = ::RubyNext::Language::Runtime.transform(source, using: false)

data/lib/.rbnext/2.3/ruby-next/language/rewriters/2.7/args_forward.rb

@@ -5,7 +5,7 @@ module RubyNext
     module Rewriters
       class ArgsForward < Base
         NAME = "args-forward"
-        SYNTAX_PROBE = "obj = Object.new; def obj.foo(...) super(...); end"
+        SYNTAX_PROBE = "Module.new { def foo(...) super(...); end }"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
 
         REST = :__rest__
@@ -17,7 +17,7 @@ module RubyNext
 
           context.track! self
 
-          node = super(node)
+          node = super
 
           replace(farg.loc.expression, "*#{REST}, &#{BLOCK}")
 
@@ -33,14 +33,14 @@ module RubyNext
 
         def on_send(node)
           fargs = extract_fargs(node)
-          return super(node) unless fargs
+          return super unless fargs
 
           process_fargs(node, fargs)
         end
 
         def on_super(node)
           fargs = extract_fargs(node)
-          return super(node) unless fargs
+          return super unless fargs
 
           process_fargs(node, fargs)
         end

data/lib/.rbnext/2.3/ruby-next/utils.rb

@@ -26,11 +26,19 @@ module RubyNext
            end
            using(Module.new do
              refine RubyNext::Utils::A do
-               include(Module.new do
-                 def i_am_refinement
-                   "yes, you are!"
-                 end
-               end)
+               if RUBY_VERSION >= "3.3.0"
+                 import_methods(Module.new do
+                   def i_am_refinement
+                     "yes, you are!"
+                   end
+                 end)
+               else
+                 include(Module.new do
+                   def i_am_refinement
+                     "yes, you are!"
+                   end
+                 end)
+               end
              end
            end)
            RubyNext::Utils::B.new.i_am_refinement

data/lib/.rbnext/3.2/ruby-next/rubocop.rb

@@ -36,6 +36,15 @@ end
 module RuboCop
   class ProcessedSource
     module ParserClassExt
+      require "ruby-next/language"
+      TEXT_REWRITERS = RubyNext::Language.rewriters.select(&:text?)
+
+      def parse(src, *args)
+        # We must apply text rewriters before parsing
+        src = RubyNext::Language.send(:text_rewrite, src, rewriters: TEXT_REWRITERS, using: false, context: RubyNext::Language::TransformContext.new(path: path))
+        super
+      end
+
       def parser_class(version, *__rest__)
         return super unless version == RUBY_NEXT_VERSION
 
@@ -166,7 +175,7 @@ module RuboCop
         def on_pair(node)
           return if node.children[0].loc.last_column == node.children[1].loc.last_column
 
-          super(node)
+          super
         end
       end)
     end

data/lib/ruby-next/config.rb

@@ -10,10 +10,10 @@ module RubyNext
   # Defines last minor version for every major version
   LAST_MINOR_VERSIONS = {
     2 => 8, # 2.8 is required for backward compatibility: some gems already uses it
-    3 => 4
+    3 => 5
   }.freeze
 
-  LATEST_VERSION = [3, 4].freeze
+  LATEST_VERSION = [3, 5].freeze
 
   # A virtual version number used for proposed features
   NEXT_VERSION = "1995.next.0"

data/lib/ruby-next/language/eval.rb

@@ -20,7 +20,7 @@ module RubyNext
     module InstanceEval # :nodoc:
       refine Object do
         def instance_eval(*args, &block)
-          return super(*args, &block) if block
+          return super if block
 
           source = args.shift
           new_source = ::RubyNext::Language::Runtime.transform(source, using: false)
@@ -33,7 +33,7 @@ module RubyNext
     module ClassEval
       refine Module do
         def module_eval(*args, &block)
-          return super(*args, &block) if block
+          return super if block
 
           source = args.shift
           new_source = ::RubyNext::Language::Runtime.transform(source, using: false)
@@ -43,7 +43,7 @@ module RubyNext
         end
 
         def class_eval(*args, &block)
-          return super(*args, &block) if block
+          return super if block
 
           source = args.shift
           new_source = ::RubyNext::Language::Runtime.transform(source, using: false)

data/lib/ruby-next/language/parser.rb

@@ -4,7 +4,7 @@ begin
   require "prism"
   require "prism/translation/parser"
 rescue LoadError
-  require "parser/ruby33"
+  require "parser/ruby34"
 end
 
 module RubyNext
@@ -83,7 +83,7 @@ module RubyNext
           Language.const_set(:PrismParser, clazz)
         end
       else
-        ::Parser::Ruby33
+        ::Parser::Ruby34
       end
     end
   end

data/lib/ruby-next/language/rewriters/2.3/safe_navigation.rb

@@ -11,7 +11,7 @@ module RubyNext
         SAFE_LVAR = :__safe_lvar__
 
         def on_csend(node)
-          node = super(node)
+          node = super # rubocop:disable Lint/ShadowedArgument
 
           context.track! self
 
@@ -32,7 +32,7 @@ module RubyNext
         end
 
         def on_block(node)
-          return super(node) unless node.children[0].type == :csend
+          return super unless node.children[0].type == :csend
 
           context.track!(self)
 
@@ -40,7 +40,7 @@ module RubyNext
         end
 
         def on_numblock(node)
-          return super(node) unless node.children[0].type == :csend
+          return super unless node.children[0].type == :csend
 
           context.track!(self)
 
@@ -48,7 +48,7 @@ module RubyNext
         end
 
         def on_op_asgn(node)
-          return super(node) unless node.children[0].type == :csend
+          return super unless node.children[0].type == :csend
 
           context.track!(self)
 

data/lib/ruby-next/language/rewriters/2.3/squiggly_heredoc.rb

@@ -9,7 +9,7 @@ module RubyNext
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.3.0")
 
         def on_str(node)
-          node = super(node) if defined?(super_method)
+          node = super if defined?(super_method)
           return node unless node.loc.respond_to?(:heredoc_body) && node.loc.expression.source.include?("<<~")
 
           context.track! self

data/lib/ruby-next/language/rewriters/2.4/dir.rb

@@ -9,7 +9,7 @@ module RubyNext
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.4.0")
 
         def on_send(node)
-          return super(node) unless node.children[1] == :__dir__
+          return super unless node.children[1] == :__dir__
 
           context.track! self
 

data/lib/ruby-next/language/rewriters/2.5/rescue_within_block.rb

@@ -18,7 +18,7 @@ module RubyNext
             node && (node.type == :rescue || node.type == :ensure)
           end
 
-          return super(block_node) unless exception_node
+          return super unless exception_node
 
           context.track! self
 

data/lib/ruby-next/language/rewriters/2.7/args_forward.rb

@@ -5,7 +5,7 @@ module RubyNext
     module Rewriters
       class ArgsForward < Base
         NAME = "args-forward"
-        SYNTAX_PROBE = "obj = Object.new; def obj.foo(...) super(...); end"
+        SYNTAX_PROBE = "Module.new { def foo(...) super(...); end }"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
 
         REST = :__rest__
@@ -17,7 +17,7 @@ module RubyNext
 
           context.track! self
 
-          node = super(node)
+          node = super
 
           replace(farg.loc.expression, "*#{REST}, &#{BLOCK}")
 
@@ -33,14 +33,14 @@ module RubyNext
 
         def on_send(node)
           fargs = extract_fargs(node)
-          return super(node) unless fargs
+          return super unless fargs
 
           process_fargs(node, fargs)
         end
 
         def on_super(node)
           fargs = extract_fargs(node)
-          return super(node) unless fargs
+          return super unless fargs
 
           process_fargs(node, fargs)
         end

data/lib/ruby-next/language/rewriters/3.0/args_forward_leading.rb

@@ -5,7 +5,7 @@ module RubyNext
     module Rewriters
       class ArgsForwardLeading < ArgsForward
         NAME = "args-forward-leading"
-        SYNTAX_PROBE = "obj = Object.new; def obj.foo(...) super(1, ...); end"
+        SYNTAX_PROBE = "Module.new { def foo(...) super(1, ...); end }"
         MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
 
         attr_reader :leading_farg

data/lib/ruby-next/language/rewriters/3.0/endless_method.rb

@@ -11,7 +11,7 @@ module RubyNext
         def on_def(node)
           return process_def(node) if endless?(node)
 
-          super(node)
+          super
         end
 
         def process_def(node)
@@ -34,7 +34,7 @@ module RubyNext
 
         def on_defs(node)
           return process_defs(node) if endless?(node)
-          super(node)
+          super
         end
 
         def process_defs(node)

data/lib/ruby-next/language/rewriters/3.0/find_pattern.rb

@@ -30,7 +30,7 @@ module RubyNext
 
         def on_find_pattern(node)
           @has_find_pattern = true
-          super(node)
+          super
         end
 
         private

data/lib/ruby-next/language/rewriters/3.1/endless_method_command.rb

@@ -11,13 +11,13 @@ module RubyNext
         def process_def(node)
           return node unless command?(node)
 
-          super(node)
+          super
         end
 
         def process_defs(node)
           return node unless command?(node)
 
-          super(node)
+          super
         end
 
         private

data/lib/ruby-next/language/rewriters/3.1/oneline_pattern_parensless.rb

@@ -30,7 +30,7 @@ module RubyNext
             insert_before(pattern.loc.expression, left_p)
             insert_after(pattern.loc.expression, right_p)
           else
-            super(node)
+            super
           end
         end
 

data/lib/ruby-next/language/rewriters/3.1/pin_vars_pattern.rb

@@ -38,7 +38,7 @@ module RubyNext
 
         def on_pin(node)
           @has_pin_vars = node.children.first.type != :lvar
-          super(node)
+          super
         end
 
         private

data/lib/ruby-next/language/rewriters/3.1/shorthand_hash.rb

@@ -9,7 +9,7 @@ module RubyNext
         MIN_SUPPORTED_VERSION = Gem::Version.new("3.1.0")
 
         def on_pair(node)
-          return super(node) unless (node.children[0].loc.last_column == node.children[1].loc.last_column) &&
+          return super unless (node.children[0].loc.last_column == node.children[1].loc.last_column) &&
             (node.children[1].loc.first_line == node.children[1].loc.last_line)
 
           context.track! self

data/lib/ruby-next/language/rewriters/{edge → 3.4}/it_param.rb

@@ -53,7 +53,7 @@ module RubyNext
           node.is_a?(Parser::AST::Node) && (
             node.type == :send && node.children[0].nil? && node.children[1] == :it && node.children[2].nil?
           ) || ( # Prism version
-            node.type == :lvar && node.children[0] == :"0it"
+            node.type == :lvar && node.children[0] == :it
           )
         end
       end

data/lib/ruby-next/language/rewriters/edge.rb

@@ -1,15 +1,3 @@
 # frozen_string_literal: true
 
 # Load edge Ruby features
-
-require "ruby-next/language/rewriters/edge/it_param"
-
-# We must add this rewriter before nubmered params rewriter to allow it to transform the source code further
-
-number_params = RubyNext::Language.rewriters.index(RubyNext::Language::Rewriters::NumberedParams)
-
-if number_params
-  RubyNext::Language.rewriters.insert(number_params, RubyNext::Language::Rewriters::ItParam)
-else
-  RubyNext::Language.rewriters << RubyNext::Language::Rewriters::ItParam
-end

data/lib/ruby-next/language/rewriters/proposed/bind_vars_pattern.rb

@@ -41,7 +41,7 @@ module RubyNext
 
         def on_match_var(node)
           @has_vars_pattern = true if node.children[0].is_a?(::Parser::AST::Node)
-          super(node)
+          super
         end
 
         private

data/lib/ruby-next/language.rb

@@ -285,6 +285,17 @@ module RubyNext
     require "ruby-next/language/rewriters/2.6/endless_range"
     rewriters << Rewriters::EndlessRange
 
+    require "ruby-next/language/rewriters/3.4/it_param"
+
+    # We must add `it` rewriter before nubmered params rewriter to allow it to transform the source code further
+    number_params = rewriters.index(Rewriters::NumberedParams)
+
+    if number_params
+      rewriters.insert(number_params, Rewriters::ItParam)
+    else
+      rewriters << Rewriters::ItParam
+    end
+
     if RubyNext.edge_syntax?
       require "ruby-next/language/rewriters/edge"
     end

data/lib/ruby-next/pry.rb

@@ -49,7 +49,6 @@ Pry.prepend(Module.new do
       obj.instance_eval do
         def eval(code, *args)
           new_code = ::RubyNext::Language::Runtime.transform(code, using: false)
-
           super(new_code, *args)
         end
 
@@ -70,7 +69,7 @@ Pry::Code.singleton_class.prepend(Module.new do
     true
   rescue Parser::SyntaxError => ex
     case ex.message
-    when /unexpected token \$end/
+    when /(unexpected token \$end|unexpected end-of-input)/
       false
     else
       true

data/lib/ruby-next/rubocop.rb

@@ -36,6 +36,15 @@ end
 module RuboCop
   class ProcessedSource
     module ParserClassExt
+      require "ruby-next/language"
+      TEXT_REWRITERS = RubyNext::Language.rewriters.select(&:text?)
+
+      def parse(src, *args)
+        # We must apply text rewriters before parsing
+        src = RubyNext::Language.send(:text_rewrite, src, rewriters: TEXT_REWRITERS, using: false, context: RubyNext::Language::TransformContext.new(path: path))
+        super
+      end
+
       def parser_class(version, *)
         return super unless version == RUBY_NEXT_VERSION
 
@@ -166,7 +175,7 @@ module RuboCop
         def on_pair(node)
           return if node.children[0].loc.last_column == node.children[1].loc.last_column
 
-          super(node)
+          super
         end
       end)
     end

data/lib/ruby-next/utils.rb

@@ -27,11 +27,19 @@ module RubyNext
 
             using(Module.new do
               refine RubyNext::Utils::A do
-                include(Module.new do
-                  def i_am_refinement
-                    "yes, you are!"
-                  end
-                end)
+                if RUBY_VERSION >= "3.3.0"
+                  import_methods(Module.new do
+                    def i_am_refinement
+                      "yes, you are!"
+                    end
+                  end)
+                else
+                  include(Module.new do
+                    def i_am_refinement
+                      "yes, you are!"
+                    end
+                  end)
+                end
               end
             end)
 

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require-hooks
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2.0
+        version: 3.4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2.0
+        version: 3.4.0.2
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -178,10 +178,10 @@ files:
 - lib/ruby-next/language/rewriters/3.1/refinement_import_methods.rb
 - lib/ruby-next/language/rewriters/3.1/shorthand_hash.rb
 - lib/ruby-next/language/rewriters/3.2/anonymous_restargs.rb
+- lib/ruby-next/language/rewriters/3.4/it_param.rb
 - lib/ruby-next/language/rewriters/abstract.rb
 - lib/ruby-next/language/rewriters/base.rb
 - lib/ruby-next/language/rewriters/edge.rb
-- lib/ruby-next/language/rewriters/edge/it_param.rb
 - lib/ruby-next/language/rewriters/proposed.rb
 - lib/ruby-next/language/rewriters/proposed/bind_vars_pattern.rb
 - lib/ruby-next/language/rewriters/proposed/method_reference.rb