wolverine 0.2.3 → 0.2.5

data/lib/wolverine.rb

@@ -7,7 +7,7 @@ require 'wolverine/script'
 require 'wolverine/path_component'
 require 'wolverine/lua_error'
 
-module Wolverine
+class Wolverine
   # Returns the configuration object for reading and writing
   # configuration values.
   #
@@ -44,10 +44,36 @@ module Wolverine
     super
   end
 
+  def initialize(config = nil)
+    @config = config
+  end
+
+  def config
+    @config || self.class.config
+  end
+
+  def redis
+    config.redis
+  end
+
+  def reset!
+    @root_directory = nil
+  end
+
+  def method_missing sym, *args
+    root_directory.send(sym, *args)
+  rescue PathComponent::MissingTemplate
+    super
+  end
+
   private
 
   def self.root_directory
     @root_directory ||= PathComponent.new(config.script_path)
   end
 
+  def root_directory
+    @root_directory ||= PathComponent.new(config.script_path, {:config => config, :redis => redis})
+  end
+
 end

data/lib/wolverine/configuration.rb

@@ -1,4 +1,4 @@
-module Wolverine
+class Wolverine
   class Configuration < Struct.new(:redis, :script_path, :instrumentation)
 
     # @return [Redis] the redis connection actively in use by Wolverine

data/lib/wolverine/lua_error.rb

@@ -1,11 +1,11 @@
-module Wolverine
+class Wolverine
   # Reformats errors raised by redis representing failures while executing
   # a lua script. The default errors have confusing messages and backtraces,
   # and a type of +RuntimeError+. This class improves the message and
   # modifies the backtrace to include the lua script itself in a reasonable
   # way.
   class LuaError < StandardError
-    PATTERN = /ERR Error (compiling|running) script \(.*?\): \[.*?\]:(\d+): (.*)/
+    PATTERN = /ERR Error (compiling|running) script \(.*?\): .*?:(\d+): (.*)/
     WOLVERINE_LIB_PATH = File.expand_path('../../', __FILE__)
 
     # Is this error one that should be reformatted?

data/lib/wolverine/path_component.rb

@@ -1,4 +1,4 @@
-module Wolverine
+class Wolverine
   # A {PathComponent} represents either the +Wolverine.config.script_path+
   # directory, or a subdirectory of it. Calling (nearly) any method on it will
   # cause it to look in the filesystem at the location it refers to for a file
@@ -14,8 +14,12 @@ module Wolverine
     class MissingTemplate < StandardError ; end
 
     # @param path [Pathname] full path to the current file or directory
-    def initialize path
+    # @param redis [Redis]
+    def initialize path, options = {}
       @path = path
+      @options = options
+      @redis = options[:redis] || Wolverine.redis
+      @config = options[:config] || Wolverine.config
     end
 
     # @param sym [Symbol] the file or directory to look up and execute
@@ -49,14 +53,14 @@ module Wolverine
     end
 
     def define_directory_method path, sym
-      dir = PathComponent.new(path)
+      dir = PathComponent.new(path, @options)
       define_metaclass_method(sym) { dir }
     end
 
     def define_script_method path, sym, *args
-      script = Wolverine::Script.new(path)
+      script = Wolverine::Script.new(path, @options)
       define_metaclass_method(sym) { |*args|
-        script.call(Wolverine.redis, *args)
+        script.call(@redis, *args)
       }
     end
 

data/lib/wolverine/script.rb

@@ -2,7 +2,7 @@ require 'pathname'
 require 'benchmark'
 require 'digest/sha1'
 
-module Wolverine
+class Wolverine
   # {Script} represents a lua script in the filesystem. It loads the script
   # from disk and handles talking to redis to execute it. Error handling
   # is handled by {LuaError}.
@@ -11,10 +11,11 @@ module Wolverine
     # Loads the script file from disk and calculates its +SHA1+ sum.
     #
     # @param file [Pathname] the full path to the indicated file
-    def initialize file
+    def initialize file, options = {}
       @file = Pathname.new(file)
       @content = load_lua file
       @digest = Digest::SHA1.hexdigest @content
+      @config = options[:config] || Wolverine.config
     end
 
     # Passes the script and supplied arguments to redis for evaulation.
@@ -59,12 +60,12 @@ module Wolverine
     def instrument eval_type
       ret = nil
       runtime = Benchmark.realtime { ret = yield }
-      Wolverine.config.instrumentation.call relative_path.to_s, runtime, eval_type
+      @config.instrumentation.call relative_path.to_s, runtime, eval_type
       ret
     end
 
     def relative_path
-      path = @file.relative_path_from(Wolverine.config.script_path)
+      @path ||= @file.relative_path_from(@config.script_path)
     end
 
     def load_lua file

data/lib/wolverine/version.rb

@@ -1,3 +1,3 @@
-module Wolverine
-  VERSION = "0.2.3"
+class Wolverine
+  VERSION = "0.2.5"
 end

data/test/integration/wolverine_integration_test.rb

@@ -8,10 +8,10 @@ class WolverineIntegrationTest < MiniTest::Unit::TestCase
     stub.tap do |redis|
       redis.expects(:evalsha).
         with('fe24f4dd4ba7881608cca4b846f009195e06d79a', 2, :a, :b).
-        raises("NOSCRIPT")
+        raises("NOSCRIPT").once
       redis.expects(:eval).
         with(CONTENT, 2, :a, :b).
-        returns([1, 0])
+        returns([1, 0]).once
     end
   end
 
@@ -22,4 +22,12 @@ class WolverineIntegrationTest < MiniTest::Unit::TestCase
     assert_equal [1, 0], Wolverine.util.mexists(:a, :b)
   end
 
+  def test_everything_instantiated
+    script_path = Pathname.new(File.expand_path('../lua', __FILE__))
+    config = Wolverine::Configuration.new(mock_redis, script_path)
+
+    wolverine = Wolverine.new(config)
+    assert_equal [1, 0], wolverine.util.mexists(:a, :b)
+  end
+
 end

data/test/wolverine/configuration_test.rb

@@ -7,7 +7,7 @@ module Rails
   end
 end
 
-module Wolverine
+class Wolverine
   class ConfigurationTest < MiniTest::Unit::TestCase
 
     def test_default_redis

data/test/wolverine/path_component_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.expand_path('../../test_helper', __FILE__))
 
-module Wolverine
+class Wolverine
   class PathComponentTest < MiniTest::Unit::TestCase
 
     def root

data/test/wolverine/script_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.expand_path('../../test_helper', __FILE__))
 require 'digest/sha1'
 
-module Wolverine
+class Wolverine
   class ScriptTest < MiniTest::Unit::TestCase
     CONTENT = "return 1"
     DIGEST = Digest::SHA1.hexdigest(CONTENT)

data/test/wolverine_test.rb

@@ -14,4 +14,14 @@ class WolverineTest < MiniTest::Unit::TestCase
     refute_equal Wolverine.root_directory, dir
   end
 
+  def test_instantiate_wolverine_with_config
+    r = Struct.new(:Redis)
+    config = Wolverine::Configuration.new(r, 'path')
+    wolverine = Wolverine.new(config)
+
+    assert_equal r, wolverine.config.redis
+    assert_equal r, wolverine.redis
+    assert_equal 'path', wolverine.config.script_path
+  end
+
 end

data/wolverine.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency     'redis',    '~> 2.2.2'
+  s.add_runtime_dependency     'redis',    '>= 2.2.2'
   s.add_development_dependency 'mocha',    '~> 0.10.5'
   s.add_development_dependency 'minitest', '~> 2.11.3'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolverine
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70155163744540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70155163744540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70155163743720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.10.5
   type: :development
   prerelease: false
-  version_requirements: *70155163743720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70155163743080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70155163743080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70155163742680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155163742680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70155163742180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155163742180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wolverine provides a simple way to run server-side redis scripts from
   a rails app
 email:
@@ -119,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wolverine
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Wolverine provides a simple way to run server-side redis scripts from a rails
@@ -132,4 +157,3 @@ test_files:
 - test/wolverine/path_component_test.rb
 - test/wolverine/script_test.rb
 - test/wolverine_test.rb
-has_rdoc: