unparser 0.6.5 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd425c8abea3ba512e8652c7f913b5ed09b5254fa868358f000f3af1fcd3ed82
-  data.tar.gz: caf2e58c2f862bd94f63d3290876b61620cf100a22c88a07d3916d87f253c0c0
+  metadata.gz: 9d1d0033d21b1c64de6affcc9c555797edf5206dc2947484ff8391e3c8e739ce
+  data.tar.gz: 60732ffbcc8a43cd2f04a6cba76e955b7e764ada9d201cd51a0a624d093b3659
 SHA512:
-  metadata.gz: f45782eed90b778fbde30cdbd90f388a4b9f649e0080c26618e9243014618774d3afd9eb2076c7a47d0a0d43e137d1940382c85d0dea0915afa232f87d9e950d
-  data.tar.gz: 2fda013558e05453f9ea1540b64bb51a9bd9269f6166395bd92f775aed3523abc5878b1c92c5ba4f0352842b6b4fb532f317f8a5d54aa108822f94dfcb7d9e9a
+  metadata.gz: 77db441f3e4da2b584065c597796d4adbb08b07e481b43ee85c80218375cbf8932bae847727afa9abee0be02ee5dea1c2effd5caa70216a5bafa34007d0c3820
+  data.tar.gz: c180d28c4ac14fe5d6b5756350592b472cd084ce932309fd6cc87f042dffb1f1870dd194260e71b53dbac71fa648bd359c7b4d3c8860c7508f7cc854c9d2ef25

data/README.md

@@ -10,13 +10,13 @@ The following constraints apply:
 
 * No support for macruby extensions
 * Only support for the [modern AST](https://github.com/whitequark/parser/#usage) format
-* Only support for Ruby >= 2.7
+* Only support for Ruby >= 3.1
 
 Notable Users:
 
 * [mutant](https://github.com/mbj/mutant) - Code review engine via mutation testing.
 * [ruby-next](https://github.com/ruby-next/ruby-next) - Ruby Syntax Backports.
-* May other [reverse-dependencies](https://rubygems.org/gems/unparser/reverse_dependencies).
+* Many other [reverse-dependencies](https://rubygems.org/gems/unparser/reverse_dependencies).
 
 (if you want your tool to be mentioned here please PR the addition with a TLDR of your use case).
 
@@ -187,10 +187,15 @@ Contributing
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with Rakefile or version
+* Commit, do not mess with version
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+Known Users
+-------------
+
+* [RailsRocket](https://www.railsrocket.app) - A no-code app builder that creates Rails apps
+
 License
 -------
 

data/bin/unparser

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 trap('INT') do |status|
-  exit! 128 + status
+  exit! status + 128
 end
 
 require 'unparser'

data/lib/unparser/adamantium.rb

@@ -20,9 +20,11 @@ module Unparser
       # @return [Object]
       #
       # @api public
+      #
+      # mutant:disable
       def freeze
         memoized_method_cache
-        super()
+        super
       end
 
     private

data/lib/unparser/ast/local_variable_scope.rb

@@ -5,7 +5,7 @@ module Unparser
 
     # Calculated local variable scope for a given node
     class LocalVariableScope
-      include Enumerable, Adamantium, Concord.new(:node)
+      include Enumerable, Adamantium
 
       # Initialize object
       #
@@ -21,7 +21,6 @@ module Unparser
           items << scope
         end
         @items = items
-        super(node)
       end
 
       # Test if local variable was first at given assignment

data/lib/unparser/buffer.rb

@@ -44,7 +44,6 @@ module Unparser
     #
     def append_without_prefix(string)
       write(string)
-      self
     end
 
     # Increase indent
@@ -77,7 +76,6 @@ module Unparser
     #
     def nl
       write(NL)
-      self
     end
 
     def root_indent
@@ -107,18 +105,6 @@ module Unparser
       @content.dup.freeze
     end
 
-    # Capture the content written to the buffer within the block
-    #
-    # @return [String]
-    #
-    # @api private
-    #
-    def capture_content
-      size_before = content.size
-      yield
-      content[size_before..]
-    end
-
     # Write raw fragment to buffer
     #
     # Does not do indentation logic.

data/lib/unparser/cli.rb

@@ -169,11 +169,11 @@ module Unparser
 
     def targets(file_name)
       if File.directory?(file_name)
-        Dir.glob(File.join(file_name, '**/*.rb')).sort
+        Dir.glob(File.join(file_name, '**/*.rb'))
       elsif File.file?(file_name)
         [file_name]
       else
-        Dir.glob(file_name).sort
+        Dir.glob(file_name)
       end.map { |file| Target::Path.new(Pathname.new(file)) }
     end
   end # CLI

data/lib/unparser/color.rb

@@ -28,7 +28,12 @@ module Unparser
 
     private
 
+      # Well rubocop you are static so you do not have a clue here ;)
+      # rubocop:disable Style/RedundantInitialize
+      # rubocop:disable Style/MissingSuper
       def initialize; end
+      # rubocop:enable Style/RedundantInitialize
+      # rubocop:enable Style/MissingSuper
 
     end.new
 

data/lib/unparser/emitter/argument.rb

@@ -2,11 +2,13 @@
 
 module Unparser
   class Emitter
-    # Emitter for block and kwrestarg arguments
-    class Morearg < self
+    # Emitter for forwarding arguments
+    class ForwardArg < self
       MAP = {
-        blockarg:  '&',
-        kwrestarg: '**'
+        blockarg:            '&',
+        forwarded_kwrestarg: '**',
+        forwarded_restarg:   '*',
+        kwrestarg:           '**'
       }.freeze
 
       handle(*MAP.keys)

data/lib/unparser/emitter/flipflop.rb

@@ -25,9 +25,14 @@ module Unparser
     private
 
       def dispatch
-        visit(left)
+        visit(left) if left
         write(MAP.fetch(node.type))
-        visit(right)
+
+        if right
+          visit(right)
+        else
+          write(';')
+        end
       end
     end # FlipFLop
   end # Emitter

data/lib/unparser/emitter/hash.rb

@@ -6,14 +6,6 @@ module Unparser
     class Hash < self
       handle :hash
 
-      def emit_last_argument_hash
-        if children.empty?
-          write('{}')
-        else
-          emit_hash_body
-        end
-      end
-
       def emit_heredoc_reminders
         children.each(&method(:emit_heredoc_reminder_member))
       end
@@ -33,7 +25,7 @@ module Unparser
       end
 
       def emit_heredoc_reminder_member(node)
-        emitter(node.children.last).emit_heredoc_reminders
+        emitter(node.children.last).emit_heredoc_reminders if n_pair?(node)
       end
 
       def emit_hash_body

data/lib/unparser/emitter/match_pattern.rb

@@ -9,20 +9,11 @@ module Unparser
 
       children :target, :pattern
 
-      # Modern ast format emits `match_pattern`
-      # node on single line pre 3.0, but 3.0+ uses `match_pattern_p`
-      SYMBOL =
-        if RUBY_VERSION < '3.0'
-          ' in '
-        else
-          ' => '
-        end
-
     private
 
       def dispatch
         visit(target)
-        write(SYMBOL)
+        write(' => ')
         visit(pattern)
       end
     end # MatchPattern

data/lib/unparser/emitter/op_assign.rb

@@ -35,6 +35,11 @@ module Unparser
 
       children :target, :operator, :value
 
+      def emit_heredoc_reminders
+        emitter(target).emit_heredoc_reminders
+        emitter(value).emit_heredoc_reminders
+      end
+
     private
 
       def dispatch

data/lib/unparser/emitter/pair.rb

@@ -15,19 +15,45 @@ module Unparser
     private
 
       def dispatch
-        if colon?(key)
-          write(key.children.first.to_s, ': ')
+        if colon?
+          emit_colon
+          unless implicit_value_lvar? || implicit_value_send?
+            write(' ')
+            visit(value)
+          end
         else
           visit(key)
           write(' => ')
+          visit(value)
         end
-
-        visit(value)
       end
 
-      def colon?(key)
+      def colon?
         n_sym?(key) && BAREWORD.match?(key.children.first)
       end
+
+      def emit_colon
+        write(key.children.first.to_s, ':')
+      end
+
+      def key_value
+        key.children.first
+      end
+
+      def implicit_value_lvar?
+        n_lvar?(value) && value.children.first.equal?(key_value)
+      end
+
+      def implicit_value_send?
+        children = value.children
+
+        n_send?(value) \
+          && !key_value.end_with?('?') \
+          && !key_value.end_with?('!') \
+          && children.fetch(0).nil? \
+          && children.fetch(1).equal?(key_value) \
+          && children.at(2).nil?
+      end
     end
   end
 end

data/lib/unparser/emitter/primitive.rb

@@ -10,7 +10,7 @@ module Unparser
       # Emitter for primitives based on Object#inspect
       class Inspect < self
 
-        handle :sym, :str
+        handle :str
 
       private
 
@@ -20,6 +20,32 @@ module Unparser
 
       end # Inspect
 
+      class Symbol < self
+
+        handle :sym
+
+        private
+
+        # mutant:disable
+        def dispatch
+          if inspect_breaks_parsing?
+            write(":#{value.name.inspect}")
+          else
+            write(value.inspect)
+          end
+        end
+
+        # mutant:disable
+        def inspect_breaks_parsing?
+          return false unless RUBY_VERSION < '3.2.'
+
+          Unparser.parse(value.inspect)
+          false
+        rescue Parser::SyntaxError
+          true
+        end
+      end # Symbol
+
       # Emitter for complex literals
       class Complex < self
 

data/lib/unparser/generation.rb

@@ -121,25 +121,29 @@ module Unparser
     end
 
     def emit_body(node, indent: true)
-      if indent
-        buffer.indent
-        nl
-      end
-
-      if n_begin?(node)
-        if node.children.one?
-          visit_deep(node)
+      with_indent(indent: indent) do
+        if n_begin?(node)
+          if node.children.empty?
+            write('()')
+          elsif node.children.one?
+            visit_deep(node)
+          else
+            emit_body_inner(node)
+          end
         else
-          emit_body_inner(node)
+          visit_deep(node)
         end
-      else
-        visit_deep(node)
       end
+    end
 
-      if indent
-        buffer.unindent
-        nl
-      end
+    def with_indent(indent:)
+      return yield unless indent
+
+      buffer.indent
+      nl
+      yield
+      buffer.unindent
+      nl
     end
 
     def emit_body_inner(node)

data/lib/unparser/node_details/send.rb

@@ -19,9 +19,10 @@ module Unparser
       end
 
       def binary_syntax_allowed?
-        selector_binary_operator?        \
-          && arguments.one?              \
-          && !n_splat?(arguments.first)  \
+        selector_binary_operator? \
+          && n_send?(node) \
+          && arguments.one? \
+          && !n_splat?(arguments.first) \
           && !n_kwargs?(arguments.first)
       end
 

data/lib/unparser/node_helpers.rb

@@ -52,6 +52,7 @@ module Unparser
       kwargs
       kwsplat
       lambda
+      lvar
       match_rest
       pair
       rescue

data/lib/unparser/validation.rb

@@ -17,6 +17,7 @@ module Unparser
     #
     # @api private
     #
+    # rubocop:disable Style/OperatorMethodCall
     def success?
       [
         original_source,
@@ -25,6 +26,7 @@ module Unparser
         generated_node
       ].all?(&:right?) && generated_node.from_right.==(original_node.from_right)
     end
+    # rubocop:enable Style/OperatorMethodCall
 
     # Return error report
     #

data/lib/unparser/writer/dynamic_string.rb

@@ -113,18 +113,6 @@ module Unparser
         n_str?(last) && last.children.first[-1].eql?("\n")
       end
 
-      def emit_squiggly_heredoc_body
-        buffer.indent
-        children.each do |child|
-          if n_str?(child)
-            write(escape_dynamic(child.children.first))
-          else
-            emit_dynamic(child)
-          end
-        end
-        buffer.unindent
-      end
-
       def emit_normal_heredoc_body
         buffer.root_indent do
           children.each do |child|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.15
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,8 @@ metadata:
   bug_tracker_uri: https://github.com/mbj/unparser/issues
   changelog_uri: https://github.com/mbj/unparser/blob/master/Changelog.md
   funding_uri: https://github.com/sponsors/mbj
+  source_code_uri: https://github.com/mbj/unparser
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -259,14 +261,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes