redis_open3 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060a708ef7b2533866b91169cd1b2890500f7315
-  data.tar.gz: 370b16a073547778f1c8c66a03ea0d281c20907f
+  metadata.gz: 394d841ea55842e0efe813e5e2734f27d852cd20
+  data.tar.gz: 812e91f841ba305844b47091dbea610200f4c905
 SHA512:
-  metadata.gz: 39d569cdc09b5295fcc10c14ecb40d0faafed89548b5d936a3c678b123a631f0d453354aa10e9df91171a1c7a8f310bfc152dcb37f9fa3ef795449f444f0dc6e
-  data.tar.gz: e4e8d305f0fb35b8b77c69a21a6a1bb4d1e920941190adb79db01d704a8690e58a061604aa24eb4585bac0345d462859745e6169270f5ece947e4a735fe33d57
+  metadata.gz: 8d56133410c8fc67db16af3cc23918dccab6ef0f352e9b7c5c1183247e496e3f86a05b2e0649a0ff336c0ed677554085e2ec07e02d11100060e93bb3bdaa56f7
+  data.tar.gz: 42894d54ed96ebe807e13323f0cad450a9362db8f6c779432fcd7f16ae6eebee01a25531cba0432f93bc7a1e3659695c7741c64a023f03483971f4c8bfe5ee89

data/lib/redis_open3.rb

@@ -1,9 +1,7 @@
-require "redis_open3/version"
-require 'redis'
+require 'redis_open3/version'
+require 'redis_open3/enum'
 
 class RedisOpen3
-  class Error < StandardError; end
-
   IN_KEY  = 'redis_open3_in'
   OUT_KEY = 'redis_open3_out'
   ERR_KEY = 'redis_open3_err'
@@ -17,11 +15,14 @@ class RedisOpen3
     with_enums(generated_uuids) do |redis_in, redis_out, redis_err, uuids|
       begin
         yield redis_in, redis_out, redis_err, uuids
+      rescue Exception => e
+        redis_in.fail
+        raise e
       ensure
-        redis_in.close
         redis_out.delete
         redis_err.delete
       end
+      redis_in.close
     end
   end
 
@@ -30,13 +31,14 @@ class RedisOpen3
       begin
         yield redis_in, redis_out, redis_err
       rescue Exception => e
+        redis_out.fail
         ([e.inspect] + e.backtrace).each { |row| redis_err << row }
         raise e
       ensure
         redis_in.delete
-        redis_out.close
         redis_err.close
       end
+      redis_out.close
     end
   end
 

data/lib/redis_open3/enum.rb

@@ -1,9 +1,10 @@
 require 'redis'
-require 'redis_open3'
+require 'redis_open3/error'
 
 class RedisOpen3
   class Enum
     class TimeoutError < RedisOpen3::Error; end
+    class Error < RedisOpen3::Error; end
 
     include Enumerable
     attr_reader :list_name
@@ -12,6 +13,9 @@ class RedisOpen3
     EOF = '90829c12-3ac3-4af9-aeb4-8b63d1cc1d23'
     EOF_REGX = /\A#{EOF}\z/
 
+    ERR = '7ce43256-a6ed-4890-9352-956ab8816dbd'
+    ERR_REGX = /\A#{ERR}\z/
+
     def initialize(list_name, opts={})
       @list_name = list_name
       @timeout   = opts[:timeout]
@@ -29,6 +33,7 @@ class RedisOpen3
     def each(&block)
       Enumerator.new do |y|
         until (line = pop.chomp) =~ EOF_REGX
+          raise Error, "Received error signal." if line =~ ERR_REGX
           y << line
         end
       end.each(&block)
@@ -38,6 +43,10 @@ class RedisOpen3
       @redis.del(list_name)
     end
 
+    def fail
+      push(ERR)
+    end
+
     private
 
     def push(string)

data/lib/redis_open3/error.rb

@@ -0,0 +1,3 @@
+class RedisOpen3
+  class Error < StandardError; end
+end

data/lib/redis_open3/version.rb

@@ -1,3 +1,3 @@
 class RedisOpen3
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/redis_open3/enum_spec.rb

@@ -63,9 +63,30 @@ describe RedisOpen3::Enum do
     end
   end
 
+  describe '#fail' do
+    let(:err) { RedisOpen3::Enum::ERR }
+
+    it 'adds the ERR uuid to the redis list' do
+      RedisConn.with do |redis|
+        expect {
+          enum.fail
+        }.to change {
+          redis.lpop(list_name)
+        }.from(nil).to(err)
+      end
+    end
+  end
+
   context 'timeout' do
     it 'raises a timeout error if the timeout expires' do
       expect { enum.each.to_a }.to raise_error(RedisOpen3::Enum::TimeoutError)
     end
   end
+
+  context 'when an error signal is sent' do
+    it 'raises a command failed error' do
+      RedisConn.with { |redis| redis.lpush(enum.list_name, RedisOpen3::Enum::ERR)}
+      expect { enum.each.to_a }.to raise_error(RedisOpen3::Enum::Error)
+    end
+  end
 end

data/spec/lib/redis_open3_spec.rb

@@ -5,7 +5,7 @@ describe RedisOpen3 do
   let(:conns) { RedisConn.method(:with) }
 
   describe '#popen3' do
-    it 'yields 3 redis enum objects and an array with their list uuids' do
+    it 'yields 3 redis enum objects and a hash with their list uuids' do
       ropen.open3 do |r_in, r_out, r_err, uuids|
         expect(uuids[RedisOpen3::IN_KEY]).to  eq r_in.list_name
         expect(uuids[RedisOpen3::OUT_KEY]).to eq r_out.list_name
@@ -35,6 +35,17 @@ describe RedisOpen3 do
         expect(redis.exists(err_name)).to eq false
       end
     end
+
+    context 'an exception is raised' do
+      it 'sends fail to redis_in' do
+        expect {
+          ropen.open3 do |redis_in|
+            expect(redis_in).to receive(:fail)
+            raise 'fail'
+          end
+        }.to raise_error RuntimeError, 'fail'
+      end
+    end
   end
 
   describe '#process3' do
@@ -69,5 +80,16 @@ describe RedisOpen3 do
         expect(redis.exists(uuids[RedisOpen3::IN_KEY])).to eq false
       end
     end
+
+    context 'an exception is raised' do
+      it 'sends fail to redis_out' do
+        expect {
+          ropen.process3(uuids) do |_, redis_out|
+            expect(redis_out).to receive(:fail)
+            raise 'fail'
+          end
+        }.to raise_error RuntimeError, 'fail'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_open3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tyler Hartland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - lib/redis_open3.rb
 - lib/redis_open3/enum.rb
+- lib/redis_open3/error.rb
 - lib/redis_open3/version.rb
 - redis_open3.gemspec
 - spec/lib/redis_open3/enum_spec.rb