brakeman 7.1.0 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51f9be0abe3095685d6aa282d7aef3286701cb7410693a611211c55c65490a9
-  data.tar.gz: 35e9864b9bb02ee1c546ca0492d64a907d8fc407a78380494c9c7fa106b8ed2f
+  metadata.gz: 49ebce7c5b36fd14e30b08390083b297cafca5d188f7b57a50b872c466958479
+  data.tar.gz: 6c71f882538ebef7c9802018793032fe10213be7537b9f88465e1390babc12bb
 SHA512:
-  metadata.gz: d0bdf041b55f8183bb5eb332a42b8a843930ba0b80070fcd77769bba44e1243d8341694158a2b445748b7363cece61d2489eb1f3db2cd9eb0aeeb703109c67d8
-  data.tar.gz: ff2f4631ffb5c5429f66a3945583c5d0e9fbb520d4f4d06a7a6c242e8ead51801e19bc1d7ecb339d52a7586228510e9268f952bdb729ea99dff147064140328d
+  metadata.gz: c24948824de7bbbb8242acf97bf21c12306e25540cde8510cb292a041573b05309b7db5973caa78e0acda30868d82361e75f6bf1f0c4d8129065b773d4a98917
+  data.tar.gz: e312665bc3680ce63f8b9c416bbf77966b8aba5d9666533252e9b4e8540353a01b49261d21281455a601e7becd3f5bbf068cf8b81edad862d910d7479a6f24c6

data/CHANGES.md

@@ -1,3 +1,24 @@
+# 7.1.2 - 2025-12-25
+
+* Update `ruby_parser` to remove version restriction (Chedli Bourguiba)
+* Raise minimum required Ruby to 3.2.0
+* Use Minitest 6.0
+* Reduce SQL injection false positives from `count` calls
+* Ignore more Haml attribute builder methods
+
+# 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 +28,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
 
@@ -65,7 +65,7 @@ Outside of Rails root (note that the output file is relative to path/to/rails/ap
 
 Brakeman should work with any version of Rails from 2.3.x to 8.x.
 
-Brakeman can analyze code written with Ruby 2.0 syntax and newer, but requires at least Ruby 3.0.0 to run.
+Brakeman can analyze code written with Ruby 2.0 syntax and newer, but requires at least Ruby 3.2.0 to run.
 
 # Basic Options
 
@@ -75,7 +75,7 @@ To specify an output file for the results:
 
     brakeman -o output_file
 
-The output format is determined by the file extension or by using the `-f` option. Current options are: `text`, `html`, `tabs`, `json`, `junit`, `markdown`, `csv`, `codeclimate`, and `sonar`.
+The output format is determined by the file extension or by using the `-f` option. Current options are: `text`, `html`, `tabs`, `json`, `junit`, `markdown`, `csv`, `codeclimate`, `github` and `sonar`.
 
 Multiple output files can be specified:
 

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/haml-6.4.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/reline-0.6.3/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/rexml-3.4.4/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/ruby_parser-3.22.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/sexp_processor-4.17.5/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/temple-0.10.4/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.2.0/gems/unicode-display_width-3.2.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/unicode-emoji-4.2.0/lib"

data/bundle/ruby/3.2.0/gems/{haml-6.3.0 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → reline-0.6.3}/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 → reline-0.6.3}/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.
@@ -163,31 +167,20 @@ class Reline::ANSI < Reline::IO
     @buf.unshift(c)
   end
 
-  def retrieve_keybuffer
-    begin
-      return unless @input.wait_readable(0.001)
-      str = @input.read_nonblock(1024)
-      str.bytes.each do |c|
-        @buf.push(c)
-      end
-    rescue EOFError
-    end
-  end
-
   def get_screen_size
     s = @input.winsize
     return s if s[0] > 0 && s[1] > 0
     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 +288,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
@@ -305,7 +298,6 @@ class Reline::ANSI < Reline::IO
   def prep
     # Enable bracketed paste
     write "\e[?2004h" if Reline.core.config.enable_bracketed_paste && both_tty?
-    retrieve_keybuffer
     nil
   end
 

data/bundle/ruby/3.2.0/gems/{reline-0.6.1 → reline-0.6.3}/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 → reline-0.6.3}/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 → reline-0.6.3}/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|
@@ -956,7 +948,7 @@ class Reline::LineEditor
 
   def wrap_method_call(method_symbol, key, with_operator)
     if @waiting_proc
-      @waiting_proc.call(key)
+      @waiting_proc.call(key, method_symbol)
       return
     end
 
@@ -1442,21 +1434,24 @@ class Reline::LineEditor
   end
   alias_method :end_of_line, :ed_move_to_end
 
-  private def generate_searcher(search_key)
+  private def generate_searcher(direction)
     search_word = String.new(encoding: encoding)
     hit_pointer = nil
-    lambda do |key|
+    lambda do |key, key_symbol|
       search_again = false
-      case key
-      when "\C-h", "\C-?"
+      case key_symbol
+      when :em_delete_prev_char, :backward_delete_char
         grapheme_clusters = search_word.grapheme_clusters
         if grapheme_clusters.size > 0
           grapheme_clusters.pop
           search_word = grapheme_clusters.join
         end
-      when "\C-r", "\C-s"
-        search_again = true if search_key == key
-        search_key = key
+      when :reverse_search_history, :vi_search_prev
+        search_again = direction == :reverse
+        direction = :reverse
+      when :forward_search_history, :vi_search_next
+        search_again = direction == :forward
+        direction = :forward
       else
         search_word << key
       end
@@ -1470,11 +1465,11 @@ class Reline::LineEditor
             search_word = Reline.last_incremental_search
           end
           if @history_pointer
-            case search_key
-            when "\C-r"
+            case direction
+            when :reverse
               history_pointer_base = 0
               history = Reline::HISTORY[0..(@history_pointer - 1)]
-            when "\C-s"
+            when :forward
               history_pointer_base = @history_pointer + 1
               history = Reline::HISTORY[(@history_pointer + 1)..-1]
             end
@@ -1483,11 +1478,11 @@ class Reline::LineEditor
             history = Reline::HISTORY
           end
         elsif @history_pointer
-          case search_key
-          when "\C-r"
+          case direction
+          when :reverse
             history_pointer_base = 0
             history = Reline::HISTORY[0..@history_pointer]
-          when "\C-s"
+          when :forward
             history_pointer_base = @history_pointer
             history = Reline::HISTORY[@history_pointer..-1]
           end
@@ -1495,12 +1490,12 @@ class Reline::LineEditor
           history_pointer_base = 0
           history = Reline::HISTORY
         end
-        case search_key
-        when "\C-r"
+        case direction
+        when :reverse
           hit_index = history.rindex { |item|
             item.include?(search_word)
           }
-        when "\C-s"
+        when :forward
           hit_index = history.index { |item|
             item.include?(search_word)
           }
@@ -1510,31 +1505,28 @@ class Reline::LineEditor
           hit = Reline::HISTORY[hit_pointer]
         end
       end
-      case search_key
-      when "\C-r"
-        prompt_name = 'reverse-i-search'
-      when "\C-s"
-        prompt_name = 'i-search'
-      end
+      prompt_name = direction == :forward ? 'i-search' : 'reverse-i-search'
       prompt_name = "failed #{prompt_name}" unless hit
       [search_word, prompt_name, hit_pointer]
     end
   end
 
-  private def incremental_search_history(key)
+  private def incremental_search_history(direction)
     backup = @buffer_of_lines.dup, @line_index, @byte_pointer, @history_pointer, @line_backup_in_history
-    searcher = generate_searcher(key)
-    @searching_prompt = "(reverse-i-search)`': "
+    searcher = generate_searcher(direction)
+    prompt_name = direction == :forward ? 'i-search' : 'reverse-i-search'
+    @searching_prompt = "(#{prompt_name})`': "
     termination_keys = ["\C-j"]
     termination_keys.concat(@config.isearch_terminators.chars) if @config.isearch_terminators
-    @waiting_proc = ->(k) {
+    accept_key_syms = [:em_delete_prev_char, :backward_delete_char, :vi_search_prev, :vi_search_next, :reverse_search_history, :forward_search_history]
+    @waiting_proc = ->(k, key_symbol) {
       if k == "\C-g"
         # cancel search and restore buffer
         @buffer_of_lines, @line_index, @byte_pointer, @history_pointer, @line_backup_in_history = backup
         @searching_prompt = nil
         @waiting_proc = nil
-      elsif !termination_keys.include?(k) && (k.match?(/[[:print:]]/) || k == "\C-h" || k == "\C-?" || k == "\C-r" || k == "\C-s")
-        search_word, prompt_name, hit_pointer = searcher.call(k)
+      elsif !termination_keys.include?(k) && (k.match?(/[[:print:]]/) || accept_key_syms.include?(key_symbol))
+        search_word, prompt_name, hit_pointer = searcher.call(k, key_symbol)
         Reline.last_incremental_search = search_word
         @searching_prompt = "(%s)`%s'" % [prompt_name, search_word]
         @searching_prompt += ': ' unless @is_multiline
@@ -1549,12 +1541,12 @@ class Reline::LineEditor
   end
 
   private def vi_search_prev(key)
-    incremental_search_history(key)
+    incremental_search_history(:reverse)
   end
   alias_method :reverse_search_history, :vi_search_prev
 
   private def vi_search_next(key)
-    incremental_search_history(key)
+    incremental_search_history(:forward)
   end
   alias_method :forward_search_history, :vi_search_next
 
@@ -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
@@ -2180,7 +2182,7 @@ class Reline::LineEditor
   end
 
   private def vi_replace_char(key, arg: 1)
-    @waiting_proc = ->(k) {
+    @waiting_proc = ->(k, _sym) {
       if arg == 1
         byte_size = Reline::Unicode.get_next_mbchar_size(current_line, @byte_pointer)
         before = current_line.byteslice(0, @byte_pointer)
@@ -2204,11 +2206,11 @@ class Reline::LineEditor
   end
 
   private def vi_next_char(key, arg: 1, inclusive: false)
-    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, inclusive: inclusive) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_next_char(key_for_proc, arg, inclusive: inclusive) }
   end
 
   private def vi_to_next_char(key, arg: 1, inclusive: false)
-    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, need_prev_char: true, inclusive: inclusive) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_next_char(key_for_proc, arg, need_prev_char: true, inclusive: inclusive) }
   end
 
   private def search_next_char(key, arg, need_prev_char: false, inclusive: false)
@@ -2251,11 +2253,11 @@ class Reline::LineEditor
   end
 
   private def vi_prev_char(key, arg: 1)
-    @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_prev_char(key_for_proc, arg) }
   end
 
   private def vi_to_prev_char(key, arg: 1)
-    @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg, true) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_prev_char(key_for_proc, arg, true) }
   end
 
   private def search_prev_char(key, arg, need_next_char = false)