wolverine 0.0.4 → 0.1.0

data/README.md

@@ -26,10 +26,10 @@ cd redis && make
 gem 'wolverine'
 ```
 
-3) Add your lua scripts to `app/redis`:
+3) Add your lua scripts to `app/wolverine`:
 
 ```lua
--- app/redis/util/mexists.lua
+-- app/wolverine/util/mexists.lua
 local exists = {}
 local existence
 for _, key in ipairs(KEYS) do
@@ -41,9 +41,12 @@ return exists
 4) Call wolverine from your code:
 
 ```ruby
-Wolverine.call('util/mexists', 'key1', 'key2', 'key3') #=> [0, 1, 0]
+Wolverine.util.mexists('key1', 'key2', 'key3') #=> [0, 1, 0]
 ```
 
+Methods are available on `Wolverine` paralleling the directory structure
+of wolverine's `script_path`.
+
 ## Configuration
 
 Available configuration options:

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
+
+task default: :test

data/TODO

@@ -1 +1,2 @@
-* Support calling templates like: `Wolverine.util.mexists('key1', 'key2', 'key3')`
+- Tests for Wolverine::PathComponent
+- Think of more TODO items

data/lib/wolverine.rb

@@ -1,32 +1,12 @@
 require 'redis'
+require 'pathname'
 
 require 'wolverine/version'
 require 'wolverine/configuration'
 require 'wolverine/script'
+require 'wolverine/path_component'
 
 module Wolverine
-
-  class Directory
-    class MissingTemplate < StandardError ; end
-    def initialize path
-      @path = path
-    end
-
-    def method_missing sym, *args
-      resolve sym, *args
-    end
-
-    def resolve sym, *args
-      if File.directory?(path = @path + sym.to_s)
-        Directory.new(path)
-      elsif File.exists?(path = @path + "#{sym}.lua")
-        Wolverine.call path, *args
-      else
-        raise MissingTemplate
-      end
-    end
-  end
-
   def self.config
     @config ||= Configuration.new
   end
@@ -35,20 +15,14 @@ module Wolverine
     config.redis
   end
 
-  def self.method_missing sym, *args
-    Directory.new(config.script_path).resolve(sym, *args)
-  rescue Directory::MissingTemplate
-    super 
-  end
-
-  def self.call(file, *args)
-    pathname = file.kind_of?(Pathname) ? file : full_path(file)
-    Script.new(pathname).call(redis, *args)
+  def self.root_directory
+    @root_directory ||= PathComponent.new(config.script_path)
   end
 
-  def self.full_path(file)
-    file << ".lua" unless file =~ /\.lua$/
-    config.script_path + file
+  def self.method_missing sym, *args
+    root_directory.send(sym, *args) 
+  rescue PathComponent::MissingTemplate
+    super 
   end
 
 end

data/lib/wolverine/path_component.rb

@@ -0,0 +1,53 @@
+module Wolverine
+  class PathComponent
+    class MissingTemplate < StandardError ; end
+
+    def initialize path
+      @path = path
+    end
+
+    def method_missing sym, *args
+      create_method sym, *args
+      send sym, *args
+    end
+
+    private
+
+    def create_method sym, *args
+      if directory?(path = @path + sym.to_s)
+        define_directory_method path, sym
+      elsif file?(path = @path + "#{sym}.lua")
+        define_script_method path, sym, *args
+      else
+        raise MissingTemplate
+      end
+    end
+
+    def directory?(path)
+      File.directory?(path)
+    end
+
+    def file?(path)
+      File.exists?(path) && !File.directory?(path)
+    end
+
+    def define_directory_method path, sym
+      dir = PathComponent.new(path)
+      define_metaclass_method(sym) { dir }
+    end
+
+    def define_script_method path, sym, *args
+      script = Wolverine::Script.new(path)
+      define_metaclass_method(sym) { |*args|
+        script.call(Wolverine.redis, *args)
+      }
+    end
+
+    def define_metaclass_method sym, &block
+      metaclass = class << self; self; end
+      metaclass.send(:define_method, sym, &block)
+    end
+
+  end
+
+end

data/lib/wolverine/script.rb

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 module Wolverine
   class Script
     attr_reader :content, :digest

data/lib/wolverine/version.rb

@@ -1,3 +1,3 @@
 module Wolverine
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/test/integration/lua/util/mexists.lua

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

data/test/integration/wolverine_integration_test.rb

@@ -0,0 +1,25 @@
+require_relative '../test_helper'
+
+class WolverineIntegrationTest < MiniTest::Unit::TestCase
+
+  CONTENT = File.read(File.expand_path('../lua/util/mexists.lua', __FILE__))
+
+  def mock_redis
+    stub.tap do |redis|
+      redis.expects(:evalsha).
+        with('fe24f4dd4ba7881608cca4b846f009195e06d79a', 2, :a, :b).
+        raises("NOSCRIPT")
+      redis.expects(:eval).
+        with(CONTENT, 2, :a, :b).
+        returns([1, 0])
+    end
+  end
+
+  def test_everything
+    Wolverine.config.redis = mock_redis
+    Wolverine.config.script_path = Pathname.new(File.expand_path('../lua', __FILE__))
+
+    assert_equal [1, 0], Wolverine.util.mexists(:a, :b)
+  end
+
+end

data/test/wolverine/path_component_test.rb

@@ -0,0 +1,30 @@
+require_relative '../test_helper'
+
+module Wolverine
+  class PathComponentTest < MiniTest::Unit::TestCase
+
+    def root
+      @root ||= Pathname.new('.')
+    end
+
+    def pc
+      @pc ||= Wolverine::PathComponent.new(root)
+    end
+    
+    def test_directory_caching
+      pc.expects(:directory?).with(root + 'bar').returns(true)
+      assert_equal pc.bar.object_id, pc.bar.object_id
+    end
+
+    def test_script_caching
+      pc.expects(:directory?).with(root + 'bar').returns(false)
+      pc.expects(:file?).with(root + 'bar.lua').returns(true)
+      script = stub
+      Wolverine::Script.expects(:new).once.returns(script)
+      script.expects(:call).twice.returns(:success)
+
+      assert_equal pc.bar, pc.bar
+    end
+
+  end
+end

data/test/wolverine_test.rb

@@ -1,29 +1,10 @@
 require_relative 'test_helper'
 
 class WolverineTest < MiniTest::Unit::TestCase
-
-  def setup
-    Wolverine.config.redis = :redis
-    Wolverine.config.script_path = Pathname.new('foo')
-  end
-
-  def test_adds_extension_if_none_present
-    assert_equal Pathname.new('foo/bar.lua'), Wolverine.full_path('bar')
-  end
-
-  def test_finding_a_file
-    assert_equal 3, Wolverine.three
-  end
-
+  
   def test_redis
+    Wolverine.config.redis = :redis
     assert_equal :redis, Wolverine.redis
   end
 
-  def test_call
-    script = stub
-    script.expects(:call).with(:redis, :a, :b).returns(:return)
-    Wolverine::Script.expects(:new).with(Pathname.new('foo/bar.lua')).returns(script)
-    assert_equal :return, Wolverine.call('bar', :a, :b)
-  end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolverine
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   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: &70182207074200 !ruby/object:Gem::Requirement
+  requirement: &70166214008280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182207074200
+  version_requirements: *70166214008280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70182207088260 !ruby/object:Gem::Requirement
+  requirement: &70166214007720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182207088260
+  version_requirements: *70166214007720
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70182207086280 !ruby/object:Gem::Requirement
+  requirement: &70166214007120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182207086280
+  version_requirements: *70166214007120
 description: Wolverine provides a simple way to run server-side redis scripts from
   a rails app
 email:
@@ -61,10 +61,14 @@ files:
 - examples/mexists.lua
 - lib/wolverine.rb
 - lib/wolverine/configuration.rb
+- lib/wolverine/path_component.rb
 - lib/wolverine/script.rb
 - lib/wolverine/version.rb
+- test/integration/lua/util/mexists.lua
+- test/integration/wolverine_integration_test.rb
 - test/test_helper.rb
 - test/wolverine/configuration_test.rb
+- test/wolverine/path_component_test.rb
 - test/wolverine/script_test.rb
 - test/wolverine_test.rb
 - wolverine.gemspec
@@ -94,7 +98,10 @@ specification_version: 3
 summary: Wolverine provides a simple way to run server-side redis scripts from a rails
   app
 test_files:
+- test/integration/lua/util/mexists.lua
+- test/integration/wolverine_integration_test.rb
 - test/test_helper.rb
 - test/wolverine/configuration_test.rb
+- test/wolverine/path_component_test.rb
 - test/wolverine/script_test.rb
 - test/wolverine_test.rb