zq 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49ca8f7f8ee4321b4dddbea8fa4539b25d8655f7
-  data.tar.gz: 6cb7174e7cd4f53820a37ec9c04fc2c1357e1317
+  metadata.gz: de0e824c76676500fcae642c033b9c4093910b82
+  data.tar.gz: 521b5daf99f15c297ae7eb0e76ce467ac9650889
 SHA512:
-  metadata.gz: c5cc0b5fd08e3e4520e76859d3cb98f51ee42dc47d6f219ee4cb42b6c7f2692ae37569203018d9baf9f7127728f722f261efaebb46b01c448d663ec67f8507a8
-  data.tar.gz: 5d3662c0b9b2d3d87dcafd8c9009f6e40eaf2f375372ac64c5afd72e062770f2fa5457cf6afb2c9d77f97c35ff526cf58f5d3e3b95f9177790943119c3d40793
+  metadata.gz: 6e6813574c68da4a4431130cf262572bae91fca7f6b0b5cf7a795e25900da40661a600953917fd271e34bdaff0f757249fbd956a05397f3e01c9e2972976ef04
+  data.tar.gz: f2e92f4c296886fd06cf8a54b8462c54ee53a3be7b68f922711a337a12e2bc51ae37b6939ddc0232ae89e1c63bc674d45f0731dde3cfee78841808d4c4a2402b

data/lib/zq.rb

@@ -15,6 +15,7 @@ require 'zq/composers/json'
 require 'zq/composers/redis'
 require 'zq/composers/io'
 
+require 'zq/sources/mixins'
 require 'zq/sources/io'
 require 'zq/sources/redis'
 

data/lib/zq/orchestra.rb

@@ -103,10 +103,7 @@ module ZQ
         Kernel.sleep(interval)
     end
 
-    def process_until_exhausted
-      loop do
-        item = @source.read_next
-        break if item.nil?
+    def compose(item)
         composite = nil
         begin
           @composers.each do |c|
@@ -115,6 +112,23 @@ module ZQ
         rescue
           raise unless self.class.ignore_errors?
         end
+    end
+
+    def process_until_exhausted
+      this = self
+      catch :exhausted do
+        loop do
+          if @source.transactional?
+            @source.transaction do |item|
+              throw :exhausted if item.nil?
+              this.compose(item)
+            end
+          else
+            item = @source.read_next
+            throw :exhausted if item.nil?
+            compose(item)
+          end
+        end
       end
     end
   end

data/lib/zq/sources/io.rb

@@ -1,6 +1,7 @@
 module ZQ
   module Sources
     class IOSource
+      include NonTransactional
       def initialize file
         @file = file
       end

data/lib/zq/sources/mixins.rb

@@ -0,0 +1,25 @@
+module ZQ
+  module Sources
+    module NonTransactional
+      def transactional?
+        false
+      end
+    end
+    module TransactionalMixin
+      def transactional?
+        true
+      end
+
+      def transaction(&block)
+        item = self.read_next
+        begin
+          self.commit(item) if yield(item)
+        rescue => error
+          self.rollback(item)
+          throw :exhausted # or raise ?
+        end
+      end
+    end
+  end
+end
+

data/lib/zq/sources/redis.rb

@@ -1,14 +1,69 @@
 module ZQ
   module Sources
-    class RedisLPOP
+
+    class RedisListOP
+      include NonTransactional
+
+      class << self
+        attr_accessor :client_method
+      end
+
       def initialize(client, listname)
         @client = client
         @listname = listname
       end
 
       def read_next
-        @client.lpop @listname
+        @client.send(self.class.client_method, *args)
+      end
+
+      def args
+        @listname
+      end
+
+      def self.method(client_method)
+        self.client_method = client_method
       end
     end
+
+    class RedisRPOPLPUSH < RedisListOP
+      include TransactionalMixin
+      method :rpoplpush
+
+      def initialize(client, listname, progress_listname=nil)
+        @client = client
+        @listname = listname
+        @progress_listname = progress_listname
+      end
+
+      def args
+        [@listname, progress_listname]
+      end
+
+      def progress_listname
+        @progress_listname || @listname + '_progress'
+      end
+
+      def rollback(item)
+        @client.rpush(@listname, item)
+      end
+
+      def commit(item)
+        @client.lrem(progress_listname, 0, item)
+      end
+    end
+
+    class RedisTransactionalQueue < RedisRPOPLPUSH
+      method :rpoplpush
+    end
+
+    class RedisLPOP < RedisListOP
+      method :lpop
+    end
+
+    class RedisRPOP < RedisListOP
+      method :rpop
+    end
+
   end
 end

data/lib/zq/version.rb

@@ -1,3 +1,3 @@
 module ZQ
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zq
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -40,12 +40,13 @@ files:
 - lib/zq/orchestra.rb
 - lib/zq/orchestras/echo.rb
 - lib/zq/sources/io.rb
+- lib/zq/sources/mixins.rb
 - lib/zq/sources/redis.rb
 - lib/zq/utils.rb
 - lib/zq/version.rb
 - lib/zq.rb
 - bin/zq
-homepage: https://github.com/kairichard/zimtw
+homepage: https://github.com/kairichard/zq
 licenses:
 - MIT
 metadata: {}
@@ -57,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='