rafka 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd21afb5b92c9e7c0e712459ca3f3af0ce3fe823
-  data.tar.gz: 1c5868fa247da36d91d14b176586620e6c7a1298
+  metadata.gz: e4861900561edde1a7a43bbb8319ec89c980e428
+  data.tar.gz: 732c4291171910e6d85041533906978f81737319
 SHA512:
-  metadata.gz: 3fe0b6acbf267039e172a49f8022e9d1a90ea8f33b7e472f7fb442b645a9bfe8105bc5151943fc7fb309fd6abcbf0ce6c9d066658190a7d590cdb5e2f49bdead
-  data.tar.gz: 07cc6ca0d115cf69cd8e189756583dbe2325a74ac90bfc7cc27c9326df41c1f079f73a267e4f2b7d637a9e870000a5d7a683a72f54efccaf8e3231193de015e5
+  metadata.gz: 3f96fcd1767372afbb7148322391588db0d88de704896a7fcc832ed4d630ebdd5992ede361817d4c9c959d227ad84733d6ddf784853c16722e7478fa5c773f6b
+  data.tar.gz: a72191d83e658f7c98f32fdc17deab84f5dfc8f1ab157bddc71c7ba453ca7e3c3d0c13fa23ce038d9c886da7060d6469dafcab0f79efe117b27fa6cacf1af0a1

data/lib/rafka/consumer.rb

@@ -31,21 +31,24 @@ module Rafka
     #
     # @param timeout [Fixnum] the time in seconds to wait for a message
     #
-    # @raise [MalformedMessage] if the message from Rafka cannot be parsed
+    # @raise [MalformedMessageError] if the message cannot be parsed
     #
     # @return [nil, Message] the message, if any
     #
     # @example
     #   consume(5) { |msg| puts "I received #{msg.value}" }
     def consume(timeout=5)
-      msg = @redis.blpop(@topic, timeout: timeout)
+      raised = false
+      msg = nil
 
-      return if !msg
+      Rafka.wrap_errors do
+        msg = @redis.blpop(@topic, timeout: timeout)
+      end
 
-      msg = Message.new(msg)
+      return if !msg
 
       begin
-        raised = false
+        msg = Message.new(msg)
         yield(msg) if block_given?
       rescue => e
         raised = true
@@ -55,7 +58,9 @@ module Rafka
       msg
     ensure
       if msg && !raised
-        @redis.rpush("acks", "#{msg.topic}:#{msg.partition}:#{msg.offset}")
+        Rafka.wrap_errors do
+          @redis.rpush("acks", "#{msg.topic}:#{msg.partition}:#{msg.offset}")
+        end
       end
     end
 

data/lib/rafka/errors.rb

@@ -2,7 +2,7 @@ module Rafka
   class Error < StandardError
   end
 
-  class MalformedMessage < Error
+  class MalformedMessageError < Error
     def initialize(msg)
       @msg = msg
     end
@@ -11,4 +11,14 @@ module Rafka
       "The message #{@msg.inspect} could not be parsed"
     end
   end
+
+  # Generic command error
+  class CommandError < Error
+  end
+
+  class ProduceError < CommandError
+  end
+
+  class ConsumeError < CommandError
+  end
 end

data/lib/rafka/generic_commands.rb

@@ -6,8 +6,10 @@ module Rafka
       @redis.ping
     end
 
+    # Closes the connection.
+    #
     # @see https://redis.io/commands/quit
-    def quit
+    def close
       @redis.quit
     end
   end

data/lib/rafka/message.rb

@@ -5,7 +5,7 @@ module Rafka
 
     def initialize(msg)
       if !msg.is_a?(Array) || msg.size != 8
-        raise MalformedMessage.new(msg)
+        raise MalformedMessageError.new(msg)
       end
 
       @topic     = msg[1]

data/lib/rafka/producer.rb

@@ -1,5 +1,7 @@
 module Rafka
   class Producer
+    include GenericCommands
+
     # Access the underlying Redis client object
     attr_reader :redis
 
@@ -18,15 +20,17 @@ module Rafka
       @redis = Redis.new(host: opts[:host], port: opts[:port])
     end
 
-    # Produce a message. This is a non-blocking operation.
+    # Produce a message. This is an asynchronous operation.
     #
     # @param topic [String]
-    # @param message [#to_s]
+    # @param msg [#to_s]
     #
     # @example
     #   produce("greetings", "Hello there!")
-    def produce(topic, message)
-      @redis.rpushx("topics:#{topic}", message.to_s)
+    def produce(topic, msg)
+      Rafka.wrap_errors do
+        @redis.rpushx("topics:#{topic}", msg.to_s)
+      end
     end
 
     # Flush any buffered messages. Blocks until all messages are flushed or
@@ -36,14 +40,16 @@ module Rafka
     #
     # @return [Fixnum] The number of unflushed messages
     def flush(timeout_ms=5000)
-      @redis.dump(timeout_ms.to_s)
+      Rafka.wrap_errors do
+        @redis.dump(timeout_ms.to_s)
+      end
     end
 
     private
 
+    # @return [Hash]
     def parse_opts(opts)
-      options = DEFAULTS.dup.merge(opts).merge(opts[:redis_opts])
-      options
+      DEFAULTS.dup.merge(opts).merge(opts[:redis_opts])
     end
   end
 end

data/lib/rafka/version.rb

@@ -1,3 +1,3 @@
 module Rafka
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

data/lib/rafka.rb

@@ -14,5 +14,18 @@ module Rafka
     port: 6380,
     reconnect_attempts: 0,
   }
+
+  def self.wrap_errors
+    yield
+  rescue Redis::CommandError => e
+    case
+    when e.message.start_with?("PROD ")
+      raise ProduceError, e.message[5..-1]
+    when e.message.start_with?("CONS ")
+      raise ConsumeError, e.message[5..-1]
+    else
+      raise CommandError, e.message
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rafka
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Agis Anastasopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis