brakeman 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51f9be0abe3095685d6aa282d7aef3286701cb7410693a611211c55c65490a9
-  data.tar.gz: 35e9864b9bb02ee1c546ca0492d64a907d8fc407a78380494c9c7fa106b8ed2f
+  metadata.gz: 388dbae9faa71cc1f26c5e63f748019d7b1570f24a9faa83ce90deabb2298675
+  data.tar.gz: b210a9e0c13a75ccce1c7897f39906331cfeda3ad46e14c682e299d0e35ac2bf
 SHA512:
-  metadata.gz: d0bdf041b55f8183bb5eb332a42b8a843930ba0b80070fcd77769bba44e1243d8341694158a2b445748b7363cece61d2489eb1f3db2cd9eb0aeeb703109c67d8
-  data.tar.gz: ff2f4631ffb5c5429f66a3945583c5d0e9fbb520d4f4d06a7a6c242e8ead51801e19bc1d7ecb339d52a7586228510e9268f952bdb729ea99dff147064140328d
+  metadata.gz: 4f9f5579aa7005921ca0da113900acd19a2506cdd5e774fb91bb5f89ab7f4bc51d666b246460ef51c68e0e0810e686453e492fc37dd4b0fceedb5eb3ba845327
+  data.tar.gz: 4d31c48d9cfd10a80ea070297baf4bfc37d4b807931e54d7fa80769d7bd8ce263a211bd27d1d2c35d492efaadad4aeec5a7bc8f17f2c34589e9699450075bd53

data/CHANGES.md

@@ -1,3 +1,16 @@
+# 7.1.1 - 2025-11-03
+
+* Fix false positive when calling `with_content` on ViewComponents (Peer Allan)
+* Word wrap text output in pager
+* Consider Tempfile.create.path as safe input (Ali Ismayilov)
+* Exclude directories before searching for files
+* Check each side of `or` SQL arguments
+* Ignore attribute builder in Haml 6
+* Add `FilePath#to_path` for Ruby 3.5 compatibility (S-H-GAMELINKS)
+* Fix SQL injection check for calculate method (Rohan Sharma)
+* Fix missing `td` in HTML report (John Hawthorn)
+* Check for unsafe SQL when two arguments are passed to AR methods (Patrick Brinich-Langlois)
+
 # 7.1.0 - 2025-07-18
 
 * Add EOL dates for Rails 8.0 and Ruby 3.4
@@ -7,7 +20,7 @@
 * Improve ignored warnings layout in HTML report (Sebastien Savater)
 * Update JUnit report for CircleCI (Philippe Bernery)
 * Only load escape functionality from cgi library (Earlopain)
-* Add `--ensure-no-obsolete-config-entries` option (viralpraxis)
+* Add `--ensure-no-obsolete-ignore-entries` option (viralpraxis)
 
 # 7.0.2 - 2025-04-04
 

data/README.md

@@ -1,7 +1,7 @@
 [![Brakeman Logo](http://brakemanscanner.org/images/logo_medium.png)](http://brakemanscanner.org/)
 
 [![Build Status](https://circleci.com/gh/presidentbeef/brakeman.svg?style=svg)](https://circleci.com/gh/presidentbeef/brakeman)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/1b08a5c74695cb0d11ec/test_coverage)](https://codeclimate.com/github/presidentbeef/brakeman/test_coverage)
+[![Code Coverage](https://qlty.sh/gh/presidentbeef/projects/brakeman/coverage.svg)](https://qlty.sh/gh/presidentbeef/projects/brakeman)
 
 # Brakeman
 

data/bundle/load.rb

@@ -1,17 +1,17 @@
 path = File.expand_path('../..', __FILE__)
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/csv-3.3.5/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/erubis-2.7.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/haml-6.3.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/highline-3.1.2/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/parallel-1.27.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/reline-0.6.1/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/rexml-3.4.1/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/ruby2ruby-2.5.2/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/ruby_parser-3.20.3/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/sexp_processor-4.17.3/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/slim-5.2.1/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/temple-0.10.3/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/terminal-table-4.0.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/tilt-2.6.1/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/unicode-display_width-3.1.4/lib"
-$:.unshift "#{path}/bundle/ruby/3.2.0/gems/unicode-emoji-4.0.4/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/csv-3.3.5/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/erubis-2.7.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/haml-6.4.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/highline-3.1.2/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/parallel-1.27.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/reline-0.6.2/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/rexml-3.4.4/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/ruby2ruby-2.5.2/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/ruby_parser-3.20.3/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/sexp_processor-4.17.4/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/slim-5.2.1/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/temple-0.10.4/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/terminal-table-4.0.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/tilt-2.6.1/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/unicode-display_width-3.2.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.1.0/gems/unicode-emoji-4.1.0/lib"

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Haml Changelog
 
+## 6.4.0
+
+* Authorize characters in attribute name for vuejs https://github.com/haml/haml/pull/1172
+* Compile new-style attributes statically https://github.com/haml/haml/pull/1165
+* Remove newlines from template annotation comments https://github.com/haml/haml/pull/1186
+* Fix line numbers within a :ruby filter https://github.com/haml/haml/pull/1166
+* Fix .class + nested class array bug https://github.com/haml/haml/pull/1191
+
+## 6.3.1
+
+* Optimize string transformation using `String#tr` https://github.com/haml/haml/pull/1168
+* Provide a Changelog link on rubygems.org https://github.com/haml/haml/pull/1157
+
 ## 6.3.0
 
 * Remove `Haml::RailsTemplate#default_format` that was added in v6.1.3 for Turbo [#1152](https://github.com/haml/haml/issues/1152), [#1154](https://github.com/haml/haml/issues/1154) ([discussion](https://github.com/haml/haml/pull/1144#issuecomment-1755088572))
@@ -8,7 +21,6 @@
 ## 6.2.5
 
 * Deprecate `Haml::RailsTemplate#default_format` that was added in v6.1.3 for Turbo ([discussion](https://github.com/haml/haml/pull/1144#issuecomment-1755088572))
-  * See [the reference](https://github.com/haml/haml/blob/v6.2.5/REFERENCE.md#turbo) for suggested alternatives.
 
 ## 6.2.4
 

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/Gemfile

@@ -25,3 +25,10 @@ end
 if RUBY_VERSION < '2.6'
   gem 'rake-compiler', '< 1.2.4'
 end
+
+# Temporary workaround to ensure Ruby 2.5 and 2.6 can pass tests with Rails 6.1
+# Reference: https://github.com/rails/rails/issues/54260
+# TODO: Remove this workaround when dropping support for Rails versions below 7.1
+if RUBY_VERSION < '2.7'
+  gem 'concurrent-ruby', '< 1.3.5'
+end

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/README.md

@@ -4,6 +4,7 @@
 [![test](https://github.com/haml/haml/actions/workflows/test.yml/badge.svg)](https://github.com/haml/haml/actions/workflows/test.yml)
 [![Code Climate](https://codeclimate.com/github/haml/haml/badges/gpa.svg)](https://codeclimate.com/github/haml/haml)
 [![Inline docs](https://inch-ci.org/github/haml/haml.svg)](https://inch-ci.org/github/haml/haml)
+[![Discord Server](https://dcbadge.limes.pink/api/server/https://discord.gg/G8dEAwvV2Y)](https://discord.gg/G8dEAwvV2Y)
 
 Haml is a templating engine for HTML. It's designed to make it both easier and
 more pleasant to write HTML documents, by eliminating redundancy, reflecting the

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/REFERENCE.md

@@ -105,7 +105,7 @@ set :haml, { escape_html: false }
 ```
 
 Finally, you can also set them by passing an options hash to `Haml::Engine.new` or `Haml::Template.new`.
-For the complete list of available options, please see `Haml::Engine`.
+For the complete list of available options, please see [`Haml::Engine`](https://github.com/haml/haml/blob/main/lib/haml/engine.rb).
 
 ## Plain Text
 
@@ -320,7 +320,7 @@ or using `true` and `false`:
     %input(selected=true)
 
 This feature works only for attributes that are included in
-[`Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES`](https://github.com/haml/haml/blob/main/lib/haml/attribute_builder.rb#L5),
+[`Haml::BOOLEAN_ATTRIBUTES`](https://github.com/haml/haml/blob/main/lib/haml/attribute_compiler.rb#L8),
 as well as `data-` and `aria-` attributes.
 
     %input{'data-hidden' => false}
@@ -360,13 +360,6 @@ will render as:
 
     <a data-author-id='123' data-category='7' href='/posts'>Posts By Author</a>
 
-Notice that the underscore in `author_id` was replaced with a hyphen. If you wish
-to suppress this behavior, you can set Haml's
-{Haml::Options#hyphenate_data_attrs `:hyphenate_data_attrs` option} to `false`,
-and the output will be rendered as:
-
-    <a data-author_id='123' data-category='7' href='/posts'>Posts By Author</a>
-
 This expansion of hashes is recursive – any value of the child hash that is
 itself a hash will create an attribute for each entry, with the attribute name
 prefixed with all ancestor keys. For example:
@@ -568,7 +561,7 @@ prefix for both the id and class attributes. For example:
     # file: app/controllers/users_controller.rb
 
     def show
-      @user = CrazyUser.find(15)
+      @user = FriendlyUser.find(15)
     end
 
     -# file: app/views/users/show.haml
@@ -579,7 +572,7 @@ prefix for both the id and class attributes. For example:
 
 is compiled to:
 
-    <div class='greeting_crazy_user' id='greeting_crazy_user_15'>
+    <div class='greeting_friendly_user' id='greeting_friendly_user_15'>
       <bar class='fixnum' id='fixnum_581' />
       Hello!
     </div>
@@ -587,11 +580,11 @@ is compiled to:
 If you require that the class be something other than the underscored object's
 class, you can implement the `haml_object_ref` method on the object.
 
-    # file: app/models/crazy_user.rb
+    # file: app/models/friendly_user.rb
 
-    class CrazyUser < ActiveRecord::Base
+    class FriendlyUser < ActiveRecord::Base
       def haml_object_ref
-        "a_crazy_user"
+        "a_friendly_user"
       end
     end
 
@@ -602,7 +595,7 @@ class, you can implement the `haml_object_ref` method on the object.
 
 is compiled to:
 
-    <div class='a_crazy_user' id='a_crazy_user_15'>
+    <div class='a_friendly_user' id='a_friendly_user_15'>
       Hello!
     </div>
 
@@ -1298,7 +1291,7 @@ Blocks of literal text can be preserved using the [`:preserve` filter](#preserve
 
 ## Turbo
 
-For people using Turbo-rails and Haml 6+ need to either:
+For people using Turbo-rails need to either:
 *  follow the naming convention with the html format (ie. ensure any `.haml` files end `.html.haml`), or
 *  add a monkey patch as follows:
 

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/haml.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
+
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency 'temple', '>= 0.8.2'

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/attribute_builder.rb

@@ -54,7 +54,7 @@ module Haml::AttributeBuilder
         when value.is_a?(String)
           classes += value.split(' ')
         when value.is_a?(Array)
-          classes += value.select { |v| v }
+          classes += value.flatten.select { |v| v }
         when value
           classes << value.to_s
         end
@@ -105,7 +105,7 @@ module Haml::AttributeBuilder
             if k.nil?
               flattened[key] = v
             else
-              flattened["#{key}-#{k.to_s.gsub(/_/, '-')}"] = v
+              flattened["#{key}-#{k.to_s.tr('_', '-')}"] = v
             end
           end
         else

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/attribute_compiler.rb

@@ -98,7 +98,7 @@ module Haml
     def compile_boolean!(temple, key, values)
       exp = literal_for(values.last)
 
-      if Temple::StaticAnalyzer.static?(exp)
+      if values.last.first == :static || Temple::StaticAnalyzer.static?(exp)
         value = eval(exp)
         case value
         when true then temple << [:html, :attr, key, @format == :xhtml ? [:static, key] : [:multi]]

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/filters/plain.rb

@@ -7,7 +7,7 @@ module Haml
       def compile(node)
         text = node.value[:text]
         text = text.rstrip unless ::Haml::Util.contains_interpolation?(text) # for compatibility
-        [:multi, *compile_plain(text)]
+        [:multi, [:newline], *compile_plain(text)]
       end
 
       private

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/filters/ruby.rb

@@ -3,7 +3,7 @@ module Haml
   class Filters
     class Ruby < Base
       def compile(node)
-        [:code, node.value[:text]]
+        [:multi, [:newline], [:code, node.value[:text]]]
       end
     end
   end

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/parser.rb

@@ -749,7 +749,7 @@ module Haml
     end
 
     def parse_new_attribute(scanner)
-      unless (name = scanner.scan(/[-:\w]+/))
+      unless (name = scanner.scan(/[-:@#\w\.]+/))
         return if scanner.scan(/\)/)
         return false
       end

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/rails_template.rb

@@ -40,8 +40,8 @@ module Haml
 
       if ActionView::Base.try(:annotate_rendered_view_with_filenames) && template.format == :html
         options = options.merge(
-          preamble: "<!-- BEGIN #{template.short_identifier} -->\n",
-          postamble: "<!-- END #{template.short_identifier} -->\n",
+          preamble: "<!-- BEGIN #{template.short_identifier} -->",
+          postamble: "<!-- END #{template.short_identifier} -->",
         )
       end
 

data/bundle/ruby/{3.2.0/gems/haml-6.3.0 → 3.1.0/gems/haml-6.4.0}/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = '6.3.0'
+  VERSION = '6.4.0'
 end

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/config.rb

@@ -177,6 +177,11 @@ class Reline::Config
     if_stack = []
 
     lines.each_with_index do |line, no|
+      # Even after encoding conversion, we need to verify the encoding is valid
+      # as some invalid byte sequences might pass through the conversion.
+      unless line.valid_encoding?
+        raise InvalidInputrc, "#{file}:#{no + 1}: can't be converted to the locale #{Reline.encoding_system_needs.name}"
+      end
       next if line.match(/\A\s*#/)
 
       no += 1

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/io/ansi.rb

@@ -124,6 +124,10 @@ class Reline::ANSI < Reline::IO
       Reline.core.line_editor.handle_signal
     end
     c = @input.getbyte
+
+    # When "Escape non-ASCII Input with Control-V" is enabled in macOS Terminal.app,
+    # all non-ascii bytes are automatically escaped with `C-v`.
+    # "\xE3\x81\x82" (U+3042) becomes "\x16\xE3\x16\x81\x16\x82".
     (c == 0x16 && @input.tty? && @input.raw(min: 0, time: 0, &:getbyte)) || c
   rescue Errno::EIO
     # Maybe the I/O has been closed.
@@ -180,14 +184,14 @@ class Reline::ANSI < Reline::IO
     s = [ENV["LINES"].to_i, ENV["COLUMNS"].to_i]
     return s if s[0] > 0 && s[1] > 0
     [24, 80]
-  rescue Errno::ENOTTY, Errno::ENODEV
+  rescue SystemCallError
     [24, 80]
   end
 
   def set_screen_size(rows, columns)
     @input.winsize = [rows, columns]
     self
-  rescue Errno::ENOTTY, Errno::ENODEV
+  rescue SystemCallError
     self
   end
 
@@ -295,7 +299,7 @@ class Reline::ANSI < Reline::IO
     # Signal.trap may raise an ArgumentError if the platform doesn't support the signal.
   end
 
-  def read_single_char(keyseq_timeout)
+  def read_single_char(timeout_second)
     # Disable intr to read `C-c` `C-z` `C-\` for quoted insert
     @input.raw(intr: false) do
       super

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/io.rb

@@ -37,10 +37,10 @@ module Reline
     end
 
     # Read a single encoding valid character from the input.
-    def read_single_char(keyseq_timeout)
+    def read_single_char(timeout_second)
       buffer = String.new(encoding: Encoding::ASCII_8BIT)
       loop do
-        timeout = buffer.empty? ? Float::INFINITY : keyseq_timeout
+        timeout = buffer.empty? ? Float::INFINITY : timeout_second
         c = getc(timeout)
         return unless c
 

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/key_actor/emacs.rb

@@ -377,11 +377,11 @@ module Reline::KeyActor
     # 187 M-;
     nil,
     # 188 M-<
-    nil,
+    :beginning_of_history,
     # 189 M-=
     nil,
     # 190 M->
-    nil,
+    :end_of_history,
     # 191 M-?
     nil,
     # 192 M-@

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/line_editor.rb

@@ -470,14 +470,6 @@ class Reline::LineEditor
     end
   end
 
-  def print_nomultiline_prompt
-    Reline::IOGate.disable_auto_linewrap(true) if Reline::IOGate.win?
-    # Readline's test `TestRelineAsReadline#test_readline` requires first output to be prompt, not cursor reset escape sequence.
-    Reline::IOGate.write Reline::Unicode.strip_non_printing_start_end(@prompt) if @prompt && !@is_multiline
-  ensure
-    Reline::IOGate.disable_auto_linewrap(false) if Reline::IOGate.win?
-  end
-
   def render
     wrapped_cursor_x, wrapped_cursor_y = wrapped_cursor_position
     new_lines = wrapped_prompt_and_input_lines.flatten(1)[screen_scroll_top, screen_height].map do |prompt, line|
@@ -1654,6 +1646,16 @@ class Reline::LineEditor
   end
   alias_method :next_history, :ed_next_history
 
+  private def ed_beginning_of_history(key)
+    move_history(0, line: :end, cursor: :end)
+  end
+  alias_method :beginning_of_history, :ed_beginning_of_history
+
+  private def ed_end_of_history(key)
+    move_history(Reline::HISTORY.size, line: :end, cursor: :end)
+  end
+  alias_method :end_of_history, :ed_end_of_history
+
   private def ed_newline(key)
     process_insert(force: true)
     if @is_multiline

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/unicode/east_asian_width.rb

@@ -129,7 +129,7 @@ class Reline::Unicode::EastAsianWidth
     [0x450, 1],
     [0x451, -1],
     [0x482, 1],
-    [0x487, 0],
+    [0x489, 0],
     [0x590, 1],
     [0x5bd, 0],
     [0x5be, 1],
@@ -356,6 +356,7 @@ class Reline::Unicode::EastAsianWidth
     [0x109d, 0],
     [0x10ff, 1],
     [0x115f, 2],
+    [0x11ff, 0],
     [0x135c, 1],
     [0x135f, 0],
     [0x1711, 1],
@@ -411,8 +412,6 @@ class Reline::Unicode::EastAsianWidth
     [0x1a7e, 1],
     [0x1a7f, 0],
     [0x1aaf, 1],
-    [0x1abd, 0],
-    [0x1abe, 1],
     [0x1ace, 0],
     [0x1aff, 1],
     [0x1b03, 0],
@@ -491,10 +490,6 @@ class Reline::Unicode::EastAsianWidth
     [0x20ab, 1],
     [0x20ac, -1],
     [0x20cf, 1],
-    [0x20dc, 0],
-    [0x20e0, 1],
-    [0x20e1, 0],
-    [0x20e4, 1],
     [0x20f0, 0],
     [0x2102, 1],
     [0x2103, -1],
@@ -767,7 +762,7 @@ class Reline::Unicode::EastAsianWidth
     [0xa48f, 1],
     [0xa4c6, 2],
     [0xa66e, 1],
-    [0xa66f, 0],
+    [0xa672, 0],
     [0xa673, 1],
     [0xa67d, 0],
     [0xa69d, 1],
@@ -840,6 +835,10 @@ class Reline::Unicode::EastAsianWidth
     [0xabed, 0],
     [0xabff, 1],
     [0xd7a3, 2],
+    [0xd7af, 1],
+    [0xd7c6, 0],
+    [0xd7ca, 1],
+    [0xd7fb, 0],
     [0xdfff, 1],
     [0xf8ff, -1],
     [0xfaff, 2],

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline/unicode.rb

@@ -72,26 +72,32 @@ class Reline::Unicode
 
   require 'reline/unicode/east_asian_width'
 
+  def self.east_asian_width(ord)
+    chunk_index = EastAsianWidth::CHUNK_LAST.bsearch_index { |o| ord <= o }
+    size = EastAsianWidth::CHUNK_WIDTH[chunk_index]
+    size == -1 ? Reline.ambiguous_width : size
+  end
+
   def self.get_mbchar_width(mbchar)
     ord = mbchar.ord
     if ord <= 0x1F # in EscapedPairs
       return 2
-    elsif ord <= 0x7E # printable ASCII chars
+    elsif mbchar.length == 1 && ord <= 0x7E # printable ASCII chars
       return 1
     end
+
     utf8_mbchar = mbchar.encode(Encoding::UTF_8)
-    ord = utf8_mbchar.ord
-    chunk_index = EastAsianWidth::CHUNK_LAST.bsearch_index { |o| ord <= o }
-    size = EastAsianWidth::CHUNK_WIDTH[chunk_index]
-    if size == -1
-      Reline.ambiguous_width
-    elsif size == 1 && utf8_mbchar.size >= 2
-      second_char_ord = utf8_mbchar[1].ord
-      # Halfwidth Dakuten Handakuten
-      # Only these two character has Letter Modifier category and can be combined in a single grapheme cluster
-      (second_char_ord == 0xFF9E || second_char_ord == 0xFF9F) ? 2 : 1
-    else
-      size
+    zwj = false
+    utf8_mbchar.chars.sum do |c|
+      if zwj
+        zwj = false
+        0
+      elsif c.ord == 0x200D # Zero Width Joiner
+        zwj = true
+        0
+      else
+        east_asian_width(c.ord)
+      end
     end
   end
 
@@ -214,7 +220,7 @@ class Reline::Unicode
           next
         elsif padding && !cover_begin && prev_width < start_col && start_col < total_width
           # Add preceding padding. This padding might have background color.
-          chunk << ' '
+          chunk << ' ' * (total_width - start_col)
           chunk_start_col ||= start_col
           chunk_end_col = total_width
           next
@@ -228,7 +234,7 @@ class Reline::Unicode
           # Current character exceeds end_col
           if padding && end_col < total_width
             # Add succeeding padding. This padding might have background color.
-            chunk << ' '
+            chunk << ' ' * (end_col - prev_width)
             chunk_start_col ||= prev_width
             chunk_end_col = end_col
           end

data/bundle/ruby/3.1.0/gems/reline-0.6.2/lib/reline/version.rb

@@ -0,0 +1,3 @@
+module Reline
+  VERSION = '0.6.2'
+end

data/bundle/ruby/{3.2.0/gems/reline-0.6.1 → 3.1.0/gems/reline-0.6.2}/lib/reline.rb

@@ -324,8 +324,6 @@ module Reline
       line_editor.auto_indent_proc = auto_indent_proc
       line_editor.dig_perfect_match_proc = dig_perfect_match_proc
 
-      # Readline calls pre_input_hook just after printing the first prompt.
-      line_editor.print_nomultiline_prompt
       pre_input_hook&.call
 
       unless Reline::IOGate.dumb?
@@ -347,7 +345,8 @@ module Reline
                 # io_gate is Reline::ANSI because the key :bracketed_paste_start is only assigned in Reline::ANSI
                 key = Reline::Key.new(io_gate.read_bracketed_paste, :insert_multiline_text)
               when :quoted_insert, :ed_quoted_insert
-                key = Reline::Key.new(io_gate.read_single_char(config.keyseq_timeout), :insert_raw_char)
+                char = io_gate.read_single_char(config.keyseq_timeout.fdiv(1000))
+                key = Reline::Key.new(char || '', :insert_raw_char)
               end
               line_editor.set_pasting_state(io_gate.in_pasting?)
               line_editor.update(key)