shapkeep 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e5e37117c826802b5ebe29ba7f9fbb0525715c6
-  data.tar.gz: 8b23acf69f30e5ebcb2f9aba40d95d8ba5925f38
+  metadata.gz: ea90acf8097d5ef116cc325be6d7abb35fcaf52d
+  data.tar.gz: 1171724f33cfd62b827532305e39cb56a156245c
 SHA512:
-  metadata.gz: 7882ad2314d0e4efcf81838f4eba8465c4b64634e7ec786780c0e9410bf20bc3b937e6ccafcb7cc9ebe2194cc25a8345dbfe7a370e90bd4890d7a372f9a450f4
-  data.tar.gz: 523ae2407eb0fd8d5b4873032b5844f58491636a933cfa41c4139d25aefc8a04fef4c6a5c732d11bb3c4180a609ab4b445a683ca7bc94ac047a11da6dd376292
+  metadata.gz: a5209adce06728a4383b1d438b3ddd57b3dc784531f64582e830c01f098a76548dcebe316ce9c8184877539827a3c0cc45e12ee3ed53a7b7ad9d8dae31a17d1e
+  data.tar.gz: 2cf976a9b348c96283211bef1939ce5a9e502d8a7e9a0cbba4cfebc6aad4a98ce82b4ab385a13c419082657457a06ccedd384506db193058e2e50da471bd9ec8

data/README.md

@@ -57,6 +57,10 @@ Or as a wrapper (uses SimpleDelegator)
 
      redis.eval_script(:one, ['key1'], ['arg1'])
 
+Your YAML file should represent a Hash that looks like:
+
+     {:script_name =>  {:script => "script or filename"}}
+
 ## Contributing
 
 1. Fork it

data/lib/shapkeep.rb

@@ -13,7 +13,7 @@ class Shapkeep
   def eval(redis, name, keys = [], args = [])
     begin
       invalid_script_name!(name) unless script_available?(name)
-      redis.evalsha(sha_for_script(name), keys, args)
+      redis.evalsha(sha_for_script_name(name), keys, args)
     rescue Redis::CommandError => boom
       raise boom unless boom.message.include?('NOSCRIPT')
 
@@ -36,16 +36,24 @@ class Shapkeep
 
   private
 
-  def sha_for_script(name)
-    script_store[name.to_sym][:sha] ||= sha_script(name)
+  def sha_for_script_name(name)
+    script_store[name.to_sym][:sha] ||= script_sha(script_for_name(name))
   end
 
-  def sha_script(name)
-    Digest::SHA1.hexdigest(script_for_name(name))
+  def script_sha(script)
+    Digest::SHA1.hexdigest(script)
   end
 
   def script_for_name(name)
-    script_store[name.to_sym][:script]
+    potential_script = script_store[name.to_sym][:script]
+
+    return potential_script unless lua_filename?(potential_script)
+
+    File.read(potential_script)
+  end
+
+  def lua_filename?(string)
+    ['.lua', '.LUA'].include?(string[-4..-1])
   end
 
   def load_script(redis, name)

data/lib/shapkeep/version.rb

@@ -1,3 +1,3 @@
 class Shapkeep
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/fixtures/return_two.lua

@@ -0,0 +1 @@
+return 2

data/spec/fixtures/store.yml

@@ -3,3 +3,5 @@
   :script: return 0
 :one:
   :script: return 1
+:file:
+  :script: spec/fixtures/return_two.lua

data/spec/shapkeep_spec.rb

@@ -5,7 +5,7 @@ describe Shapkeep do
   subject { Shapkeep.new('spec/fixtures/store.yml') }
 
   context 'script store' do
-    specify { expect(subject.script_store.keys).to eq([:zero, :one]) }
+    specify { expect(subject.script_store.keys).to eq([:zero, :one, :file]) }
   end
 
   context 'script available' do
@@ -16,8 +16,8 @@ describe Shapkeep do
   describe 'load scripts' do
     before { redis.script(:flush); subject.load_scripts!(redis) }
     specify do
-      expect(redis.script(:exists, [subject.send(:sha_for_script, :zero),
-        subject.send(:sha_for_script, :one)])).to be_true
+      expect(redis.script(:exists, [subject.send(:sha_for_script_name, :zero),
+        subject.send(:sha_for_script_name, :one)])).to be_true
     end
   end
 
@@ -46,6 +46,11 @@ describe Shapkeep do
       end
     end
 
+    context 'script is filename' do
+      before { redis.script(:flush) }
+      specify { expect(subject.eval(redis, :file)).to eq(2) }
+    end
+
     context 'script errors' do
       subject { Shapkeep.new('spec/fixtures/store_error.yml') }
       specify do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shapkeep
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - j-wilkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -82,8 +82,8 @@ files:
 - lib/shapkeep.rb
 - lib/shapkeep/version.rb
 - lib/shapkeep/wrapper.rb
-- sha_file.yml
 - shapkeep.gemspec
+- spec/fixtures/return_two.lua
 - spec/fixtures/store.yml
 - spec/fixtures/store_error.yml
 - spec/shapkeep/wrapper_spec.rb
@@ -114,6 +114,7 @@ signing_key:
 specification_version: 4
 summary: EVAL Lua scripts in Redis by name
 test_files:
+- spec/fixtures/return_two.lua
 - spec/fixtures/store.yml
 - spec/fixtures/store_error.yml
 - spec/shapkeep/wrapper_spec.rb

data/sha_file.yml

@@ -1,5 +0,0 @@
----
-:zero:
-  :script: return 0
-:one:
-  :script: return 1