wolverine 0.2.0 → 0.2.1

data/TODO

@@ -1,3 +1,5 @@
+- be smarter about trimming and rearranging the backtrace
+- cache methods on Wolverine, rather than using mm all the time
 - clean up error handling method
 - Re-evaluate what actually needs to be exposed as public
 - Think of more TODO items

data/lib/wolverine/script.rb

@@ -13,7 +13,6 @@ module Wolverine
       @digest = Digest::SHA1.hexdigest @content
     end
 
-    # Wolverine::InvalidScriptError: ERR Error running script (call to f_f5fbb1da9ad036109842747becb4e2abb5e95966): [string "func definition"]:27: attempt to compare nil with number  (in #<Pathname:/Users/burke/src/s/shopify/app/wolverine/reservations/reserve.lua>)
     def call redis, *args
       begin
         run_evalsha redis, *args
@@ -27,8 +26,7 @@ module Wolverine
         begin
           raise klass.new(message)
         rescue => e
-          e.backtrace.unshift("\tfrom #{relative_path}:#{line_number}")
-          raise e
+          raise correct_lua_backtrace(e, file, line_number)
         end
       else
         raise
@@ -37,11 +35,10 @@ module Wolverine
 
     private
 
-    def relative_path
-      file.relative_path_from(Wolverine.config.script_path)
-    end
-
-    def format_error_message(error)
+    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

data/lib/wolverine/version.rb

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

data/test/wolverine/script_test.rb

@@ -25,7 +25,7 @@ module Wolverine
         script.call(Redis.new)
       rescue Wolverine::LuaCompilationError => e
         assert_equal "'=' expected near '+'", e.message
-        assert_equal "\tfrom e/file1.lua:1", e.backtrace.first
+        assert_equal "e/file1.lua:1", e.backtrace.first
       end
     end
 
@@ -40,11 +40,10 @@ module Wolverine
         script.call(Redis.new)
       rescue Wolverine::LuaRuntimeError => e
         assert_equal "attempt to compare number with nil", e.message
-        assert_equal "\tfrom e/file1.lua:1", e.backtrace.first
+        assert_equal "e/file1.lua:1", e.backtrace.first
       end
     end
 
-
     def test_digest_and_content
       content = "return 1" 
       assert_equal CONTENT, script.content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolverine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   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: &70232015308460 !ruby/object:Gem::Requirement
+  requirement: &70117913236100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232015308460
+  version_requirements: *70117913236100
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70232015306420 !ruby/object:Gem::Requirement
+  requirement: &70117913249000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232015306420
+  version_requirements: *70117913249000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70232015303920 !ruby/object:Gem::Requirement
+  requirement: &70117913244780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232015303920
+  version_requirements: *70117913244780
 description: Wolverine provides a simple way to run server-side redis scripts from
   a rails app
 email: