wolverine 0.2.1 → 0.2.2

data/lib/wolverine.rb

@@ -5,6 +5,7 @@ require 'wolverine/version'
 require 'wolverine/configuration'
 require 'wolverine/script'
 require 'wolverine/path_component'
+require 'wolverine/lua_error'
 
 module Wolverine
   def self.config

data/lib/wolverine/lua_error.rb

@@ -0,0 +1,41 @@
+module Wolverine
+  class LuaError < StandardError
+    PATTERN = /ERR Error (compiling|running) script \(.*?\): \[.*?\]:(\d+): (.*)/
+    WOLVERINE_LIB_PATH = File.expand_path('../../', __FILE__)
+
+    def self.intercepts?(e)
+      e.message =~ PATTERN
+    end
+
+    attr_reader :error, :file
+    def initialize(error, file)
+      @error = error
+      @file = file
+
+      error.message =~ PATTERN
+      stage, line_number, message = $1, $2, $3
+
+
+      super(message)
+      set_backtrace generate_backtrace(file, line_number)
+    end
+
+    def generate_backtrace(file, line_number)
+      pre_wolverine = backtrace_before_entering_wolverine(error.backtrace)
+      index_of_first_wolverine_line = (error.backtrace.size - pre_wolverine.size - 1)
+      pre_wolverine.unshift(error.backtrace[index_of_first_wolverine_line])
+      pre_wolverine.unshift("#{file}:#{line_number}")
+      pre_wolverine
+    end
+
+    def backtrace_before_entering_wolverine(backtrace)
+      backtrace.reverse.take_while { |line| ! line_from_wolverine(line) }.reverse
+    end
+
+    def line_from_wolverine(line)
+      line.split(':').first.include?(WOLVERINE_LIB_PATH)
+    end
+
+  end
+
+end

data/lib/wolverine/script.rb

@@ -1,9 +1,6 @@
 require 'digest/sha1'
 
 module Wolverine
-  class LuaError < StandardError ; end
-  class LuaCompilationError < LuaError ; end
-  class LuaRuntimeError < LuaError ; end
 
   class Script
     attr_reader :content, :digest, :file
@@ -20,14 +17,8 @@ module Wolverine
         e.message =~ /NOSCRIPT/ ? run_eval(redis, *args) : raise
       end
     rescue => e
-      if e.message =~ /ERR Error (compiling|running) script \(.*?\): \[.*?\]:(\d+): (.*)/
-        stage, line_number, message = $1, $2, $3
-        klass = (stage == "compiling") ? LuaCompilationError : LuaRuntimeError
-        begin
-          raise klass.new(message)
-        rescue => e
-          raise correct_lua_backtrace(e, file, line_number)
-        end
+      if LuaError.intercepts?(e) 
+        raise LuaError.new(e, file)
       else
         raise
       end
@@ -35,12 +26,6 @@ module Wolverine
 
     private
 
-    def correct_lua_backtrace(error, file, line_number)
-      4.times { error.backtrace.shift }
-      error.backtrace.unshift("#{file}:#{line_number}")
-      error
-    end
-
     def run_evalsha redis, *args
       redis.evalsha digest, args.size, *args
     end

data/lib/wolverine/version.rb

@@ -1,3 +1,3 @@
 module Wolverine
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/wolverine/script_test.rb

@@ -23,9 +23,10 @@ module Wolverine
         script.instance_variable_set("@content", "asdfasdfasdf+31f")
         script.instance_variable_set("@digest", "79437f5edda13f9c1669b978dd7a9066dd2059f1")
         script.call(Redis.new)
-      rescue Wolverine::LuaCompilationError => e
+      rescue Wolverine::LuaError => e
         assert_equal "'=' expected near '+'", e.message
-        assert_equal "e/file1.lua:1", e.backtrace.first
+        assert_equal "/a/b/c/d/e/file1.lua:1", e.backtrace.first
+        assert_match /script.rb/, e.backtrace[1]
       end
     end
 
@@ -38,9 +39,10 @@ module Wolverine
         script.instance_variable_set("@content", "return nil > 3")
         script.instance_variable_set("@digest", "39437f5edda13f9c1669b978dd7a9066dd2059f1")
         script.call(Redis.new)
-      rescue Wolverine::LuaRuntimeError => e
+      rescue Wolverine::LuaError => e
         assert_equal "attempt to compare number with nil", e.message
-        assert_equal "e/file1.lua:1", e.backtrace.first
+        assert_equal "/a/b/c/d/e/file1.lua:1", e.backtrace.first
+        assert_match /script.rb/, e.backtrace[1]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolverine
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70117913236100 !ruby/object:Gem::Requirement
+  requirement: &70197029666560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117913236100
+  version_requirements: *70197029666560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70117913249000 !ruby/object:Gem::Requirement
+  requirement: &70197029690560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117913249000
+  version_requirements: *70197029690560
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70117913244780 !ruby/object:Gem::Requirement
+  requirement: &70197029689640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117913244780
+  version_requirements: *70197029689640
 description: Wolverine provides a simple way to run server-side redis scripts from
   a rails app
 email:
@@ -64,6 +64,7 @@ files:
 - examples/mhmsetnx.lua
 - lib/wolverine.rb
 - lib/wolverine/configuration.rb
+- lib/wolverine/lua_error.rb
 - lib/wolverine/path_component.rb
 - lib/wolverine/script.rb
 - lib/wolverine/version.rb