na 1.2.92 → 1.2.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34119e46896bef108bcd426961bff8809cd81ef75054984d4735a84fbe8cdc58
-  data.tar.gz: 6d9d1c2faffce4ba6d4cab6f75ccb2c3364c9ced1b9a0552097189431a5faff9
+  metadata.gz: d71185523bd5dc5bd29bca30dda53bedc598c7cd3df911aff0e6cfd6a1adb8cd
+  data.tar.gz: 388f8288110e0510397d9a7aa8fc75fc13305725c6dfdac10363274a4b2b6aef
 SHA512:
-  metadata.gz: e87485d65980548a49de41456198dceef2497c3b907285da0a98def36a6836ccc5ba65c1d7457d65ff0be51157e0ba3ca06593fff0d4c57afe89db5d5f9fe2aa
-  data.tar.gz: d8b96dad65a1119ae604c2e27f876bdd7b3db7b5d0a0f4945e5cad429764823e635c2687510f3dc09cd8a7e92c55b4945666a12f597e60b2c28aee27c1e9db7a
+  metadata.gz: 2b045eef10b1132aa64324d3e62f1910ac1e0754f60ee4b368ed85d841f594c5c2a960c908bd04966cdfc223752b54e2ee67a9f60b9960d684868daefcdbef0a
+  data.tar.gz: 8289a691269c86e829ae8e2abc48a97a0cf680240837f0fbdd48dbfe0f83feb65fb9fb729811253f22ab93215556b46321cfc3914b7dfb0fc8fbec1adf1b3cc7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.2.93
+
+2025-11-29 21:51
+
+#### FIXED
+
+- Search strings containing special regex characters no longer cause RegexpError when regex option is false.
+
 ### 1.2.92
 
 2025-11-16 10:32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.92)
+    na (1.2.93)
       chronic (~> 0.10, >= 0.10.2)
       csv (>= 3.2)
       git (~> 3.0.0)

data/README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is 1.2.92.
+The current version of `na` is 1.2.93.
 
 
 ### Table of contents
@@ -116,7 +116,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.92
+    1.2.93
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)

data/lib/na/todo.rb

@@ -94,8 +94,11 @@ module NA
             optional_tag.push({ tag: t })
           end
         end
+        # Track whether strings came from direct path (need escaping) or parse_search (already processed)
+        strings_from_direct_path = false
         unless settings[:search].nil? || (settings[:search].respond_to?(:empty?) && settings[:search].empty?)
           if settings[:regex] || settings[:search].is_a?(String)
+            strings_from_direct_path = true
             if settings[:negate]
               negated.push(settings[:search])
             else
@@ -113,9 +116,31 @@ module NA
         end
 
         # Pre-compile regexes for better performance
-        optional = optional.map { |rx| rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE) }
-        required = required.map { |rx| rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE) }
-        negated = negated.map { |rx| rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE) }
+        # When regex is false and string came from direct path, escape special characters
+        # When regex is true, use as-is (it's already a regex pattern)
+        # Strings from parse_search are already processed by wildcard_to_rx, so use as-is
+        compile_regex = lambda do |rx|
+          if rx.is_a?(Regexp)
+            rx
+          elsif settings[:regex]
+            Regexp.new(rx, Regexp::IGNORECASE)
+          elsif strings_from_direct_path
+            Regexp.new(Regexp.escape(rx.to_s), Regexp::IGNORECASE)
+          else
+            # From parse_search, already processed by wildcard_to_rx
+            # Try to compile as-is, but if it fails, escape it (handles edge cases with special chars)
+            begin
+              Regexp.new(rx, Regexp::IGNORECASE)
+            rescue RegexpError
+              # If compilation fails, escape the string (fallback for edge cases)
+              Regexp.new(Regexp.escape(rx.to_s), Regexp::IGNORECASE)
+            end
+          end
+        end
+
+        optional = optional.map(&compile_regex)
+        required = required.map(&compile_regex)
+        negated = negated.map(&compile_regex)
 
         files = if !settings[:file_path].nil?
                   [settings[:file_path]]

data/lib/na/version.rb

@@ -5,5 +5,5 @@
 module Na
   ##
   # Current version of the na gem.
-  VERSION = '1.2.92'
+  VERSION = '1.2.93'
 end

data/src/_README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is <!--VER-->1.2.91<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.92<!--END VER-->.
 
 <!--GITHUB-->
 ### Table of contents

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.92
+  version: 1.2.93
 platform: ruby
 authors:
 - Brett Terpstra