redis-prescription 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e78c33e47df77d8456a6207e85758665624c1513637d4cd67a88fc10430045a
-  data.tar.gz: 9729555b027ec9d4d7acc41a2c6bd6b43e36f3d2d21a6721d503020c799ae41e
+  metadata.gz: 617a2c55e0d763f97983c56f3e7c7fbea30b4c999736a0eb8eaa4f38dab3a684
+  data.tar.gz: 16ab341290e6ee88abe15d0c0ee5523b1aaa1ab7b0228e05c9650ff4b861cf52
 SHA512:
-  metadata.gz: 263da116f96133dedd46869901cb455bb8dde63c8278fcef253aa9b62e64c524b28caba8ccb496662e16ea6ce4b710c54cce044b6fdd14974ddc38969a393536
-  data.tar.gz: ab11c229344bb840896bb87ead1192d3fbc9d8db97de94806699ced01dd20f0a3f0449594a485590becb0cc95d02aeafd2ec427b6e3e38858b818f42f352fe23
+  metadata.gz: 654c70a9fda3e076291c0c5339cde768c430c4d960d434fedf9e3bf7e8aaab5d4ea280a1be3a8d554015b09fd8adec26a4f2349ee169cd43e3139ce2b9b6badd
+  data.tar.gz: ce8112a9aa153b41e05e4e327dbcb6b6bf62abd120a96dad1eacbf818e747899abd7615bf975484850cad540cd4669764e320ce7a07e07d447a371397fe33c55

data/lib/redis_prescription/errors.rb

@@ -10,17 +10,82 @@ class RedisPrescription
 
   # Lua script eval/evalsha failure
   class ScriptError < Error
-    # Lua script source.
+    # rubocop:disable Layout/LineLength
+    LUA_ERROR_MESSAGE = %r{
+      # * Error compiling script:
+      # ** Redis 6.0, 6.2, 7.0
+      # *** ERR Error compiling script (new function): user_script:7: unexpected symbol near '!'
+      # * Error running script:
+      # ** Redis 6.0, 6.2
+      # *** ERR Error running script (call to f_64203334c42d5690c2d008a78aa7789f5b83e5bb): @user_script:4: user_script:4: attempt to perform arithmetic on a string value
+      # ** Redis 7.0
+      # *** ERR user_script:4: attempt to perform arithmetic on a string value script: 64203334c42d5690c2d008a78aa7789f5b83e5bb, on @user_script:4.
+      \A
+      ERR\s
+      (?:
+        Error\scompiling\sscript\s\([^)]+\):\s          # Redis 6.0, 6.2, 7.0
+        .+:(?<loc>\d+):\s                               # Redis 6.0, 6.2, 7.0
+        (?<message>.+)                                  # Redis 6.0, 6.2, 7.0
+      |
+        (?:Error\srunning\sscript\s\([^)]+\):\s@\S+\s)? # Redis 6.0, 6.2
+        .+:(?<loc>\d+):\s                               # Redis 6.0, 6.2, 7.0
+        (?<message>.+?)                                 # Redis 6.0, 6.2, 7.0
+        (?::\s\h+,\son\s@[^:]+:\d+\.)?                  # Redis 7.0
+      )
+      \z
+    }x
+    private_constant :LUA_ERROR_MESSAGE
+    # rubocop:enable Layout/LineLength
+
+    # Lua script source
     #
     # @return [String]
     attr_reader :source
 
+    # Line of code where error was encountered
+    #
+    # @return [Integer?]
+    attr_reader :loc
+
     # @param message [String]
-    # @param source [String]
+    # @param source [#to_s]
     def initialize(message, source)
-      @source = source
+      @source = -source.to_s
+
+      if (parsed = LUA_ERROR_MESSAGE.match(message))
+        @loc    = parsed[:loc].to_i
+        message = [parsed[:message], excerpt(@source, @loc)].compact.join("\n\n")
+      end
 
       super(message)
     end
+
+    private
+
+    def excerpt(source, loc)
+      lines  = excerpt_lines(source, loc)
+      gutter = lines.map(&:first).max.to_s.length
+
+      lines.map! do |(pos, line)|
+        format(pos == loc ? "\t%#{gutter}d > %s" : "\t%#{gutter}d | %s", pos, line).rstrip
+      end
+
+      lines.join("\n")
+    rescue => e
+      warn "Failed extracting source excerpt: #{e.message}"
+      nil
+    end
+
+    def excerpt_lines(source, loc)
+      lines  = source.lines
+      pos    = loc - 1 # reported line of code is 1-offset
+      min    = pos - 2 # 2 lines of head context
+      max    = pos + 2 # 2 lines of tail context
+
+      min = 0              if min.negative?
+      max = lines.size - 1 if lines.size <= max
+
+      (min..max).map { |i| [i.succ, lines[i]] }
+    end
   end
 end

data/lib/redis_prescription/version.rb

@@ -2,5 +2,5 @@
 
 class RedisPrescription
   # Gem version.
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/redis_prescription.rb

@@ -30,7 +30,7 @@ class RedisPrescription
   # @return [String]
   attr_reader :digest
 
-  # @param source [#to_s] Lua script.
+  # @param source [#to_s] Lua script
   def initialize(source)
     @source = -source.to_s
     @digest = Digest::SHA1.hexdigest(@source).freeze
@@ -46,7 +46,7 @@ class RedisPrescription
   def call(redis, keys: EMPTY_LIST, argv: EMPTY_LIST)
     unpool(redis) { |r| evalsha_with_fallback(r, keys, argv) }
   rescue CommandError => e
-    raise ScriptError.new(e.message, @script)
+    raise ScriptError.new(e.message, @source)
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-prescription
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexey Zapparov
@@ -35,7 +35,7 @@ metadata:
   homepage_uri: https://gitlab.com/ixti/redis-prescription
   source_code_uri: https://gitlab.com/ixti/redis-prescription
   bug_tracker_uri: https://gitlab.com/ixti/redis-prescription/issues
-  changelog_uri: https://gitlab.com/ixti/redis-prescription/blob/v2.0.0/CHANGES.md
+  changelog_uri: https://gitlab.com/ixti/redis-prescription/blob/v2.1.0/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []