wolverine 0.1.1 → 0.1.2

data/examples/mexists.lua

@@ -1,6 +1,6 @@
 local exists = {}
 local existence
 for _, key in ipairs(KEYS) do
-  table.insert(exists, redis.call('exists', key))
+	table.insert(exists, redis.call('exists', key))
 end
-return exists
+return exists

data/examples/mhincrby.lua

@@ -0,0 +1,8 @@
+local hash, key, increment
+for i = 1, #KEYS, 3 do
+	hash      = KEYS[i]
+	key       = KEYS[i + 1]
+	increment = KEYS[i + 2]
+	redis.call('hincrby', hash, key, increment)
+end
+return "OK"

data/examples/mhmset.lua

@@ -0,0 +1,8 @@
+local hash, key, value
+for i = 1, #KEYS, 3 do
+	hash  = KEYS[i]
+	key   = KEYS[i + 1]
+	value = KEYS[i + 2]
+	redis.call('hset', hash, key, value)
+end
+return "OK"

data/examples/mhmsetnx.lua

@@ -0,0 +1,8 @@
+local hash, key, value
+for i = 1, #KEYS, 3 do
+	hash  = KEYS[i]
+	key   = KEYS[i + 1]
+	value = KEYS[i + 2]
+	redis.call('hsetnx', hash, key, value)
+end
+return "OK"

data/lib/wolverine/script.rb

@@ -1,17 +1,27 @@
 require 'digest/sha1'
 
 module Wolverine
+  class InvalidScriptError < StandardError ; end
   class Script
     attr_reader :content, :digest
     def initialize file
+      @file = file
       @content = load_lua file
       @digest = Digest::SHA1.hexdigest @content
     end
 
     def call redis, *args
-      run_evalsha redis, *args
+      begin
+        run_evalsha redis, *args
+      rescue => e
+        e.message =~ /NOSCRIPT/ ? run_eval(redis, *args) : raise
+      end
     rescue => e
-      e.message =~ /NOSCRIPT/ ? run_eval(redis, *args) : raise
+      if e.message =~ /ERR Error (compiling|running) script/
+        raise InvalidScriptError, "#{e.message} (in #{@file.inspect})"
+      else
+        raise
+      end
     end
 
     private

data/lib/wolverine/version.rb

@@ -1,3 +1,3 @@
 module Wolverine
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/wolverine/script_test.rb

@@ -14,6 +14,15 @@ module Wolverine
       @script ||= Wolverine::Script.new('file1')
     end
 
+    def test_errors_are_better
+      assert_raises Wolverine::InvalidScriptError do
+        script = Wolverine::Script.new('file1')
+        script.instance_variable_set("@content", "asdfasdfasdf+31f")
+        script.instance_variable_set("@digest", "79437f5edda13f9c1669b978dd7a9066dd2059f1")
+        script.call(Redis.new)
+      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.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70168248879520 !ruby/object:Gem::Requirement
+  requirement: &70212795870940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168248879520
+  version_requirements: *70212795870940
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70168248877840 !ruby/object:Gem::Requirement
+  requirement: &70212795869140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168248877840
+  version_requirements: *70212795869140
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70168248876300 !ruby/object:Gem::Requirement
+  requirement: &70212795890120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168248876300
+  version_requirements: *70212795890120
 description: Wolverine provides a simple way to run server-side redis scripts from
   a rails app
 email:
@@ -59,6 +59,9 @@ files:
 - Rakefile
 - TODO
 - examples/mexists.lua
+- examples/mhincrby.lua
+- examples/mhmset.lua
+- examples/mhmsetnx.lua
 - lib/wolverine.rb
 - lib/wolverine/configuration.rb
 - lib/wolverine/path_component.rb