rafka 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4861900561edde1a7a43bbb8319ec89c980e428
-  data.tar.gz: 732c4291171910e6d85041533906978f81737319
+  metadata.gz: 99ead695e270579988fd23cf24916e200cd2b1ef
+  data.tar.gz: 81c104c0bb873885639a859769524376e9d8227f
 SHA512:
-  metadata.gz: 3f96fcd1767372afbb7148322391588db0d88de704896a7fcc832ed4d630ebdd5992ede361817d4c9c959d227ad84733d6ddf784853c16722e7478fa5c773f6b
-  data.tar.gz: a72191d83e658f7c98f32fdc17deab84f5dfc8f1ab157bddc71c7ba453ca7e3c3d0c13fa23ce038d9c886da7060d6469dafcab0f79efe117b27fa6cacf1af0a1
+  metadata.gz: d51fc45275b94bd15380da3ac7206cf5712be5721503ff7a2057f193f26ad0c3ab7ccd795ffa48933b204cc51c8359f7cb50dd2084e70a8332c70c9f93fb5042
+  data.tar.gz: 640b09f1ec736eb9388370452181a7d32567673d4ce668684a3ea9a0f3b4d883284cd54e864910f3aeb572af1d35af187058c522219a931ffa4f2cf475442b33

data/lib/rafka/consumer.rb

@@ -17,13 +17,10 @@ module Rafka
     # @option opts [String] :topic Kafka topic to consume (required)
     # @option opts [String] :group Kafka consumer group name (required)
     # @option opts [String] :id (random) Kafka consumer id
-    # @option opts [Hash] :redis_opts ({}) Optional configuration for the
+    # @option opts [Hash] :redis ({}) Optional configuration for the
     #   underlying Redis client
     def initialize(opts={})
-      opts[:redis_opts] = {} if !opts[:redis_opts]
-      opts = parse_opts(opts)
-      client_id = "#{opts[:group]}:#{opts[:id]}"
-      @redis = Redis.new(host: opts[:host], port: opts[:port], id: client_id)
+      @redis = Redis.new(parse_opts(opts))
       @topic = "topics:#{opts[:topic]}"
     end
 
@@ -66,14 +63,18 @@ module Rafka
 
     private
 
+    # @return [Hash]
     def parse_opts(opts)
-      options = DEFAULTS.dup.merge(opts).merge(opts[:redis_opts])
-      options[:id] = SecureRandom.hex if !options[:id]
-
       REQUIRED.each do |opt|
-        raise "#{opt.inspect} option not provided" if !options[opt]
+        raise "#{opt.inspect} option not provided" if opts[opt].nil?
       end
 
+      rafka_opts = opts.reject { |k| k == :redis }
+      redis_opts = opts[:redis] || {}
+
+      options = DEFAULTS.dup.merge(rafka_opts).merge(redis_opts)
+      options[:id] = SecureRandom.hex if options[:id].nil?
+      options[:id] = "#{options[:group]}:#{options[:id]}"
       options
     end
   end

data/lib/rafka/producer.rb

@@ -10,14 +10,12 @@ module Rafka
     # @param [Hash] opts
     # @option opts [String] :host ("localhost") server hostname
     # @option opts [Fixnum] :port (6380) server port
-    # @options opts [Hash] :redis_opts Configuration options for the underlying
+    # @options opts [Hash] :redis Configuration options for the underlying
     #   Redis client
     #
     # @return [Producer]
     def initialize(opts = {})
-      opts[:redis_opts] = {} if !opts[:redis_opts]
-      opts = parse_opts(opts)
-      @redis = Redis.new(host: opts[:host], port: opts[:port])
+      @redis = Redis.new(parse_opts(opts))
     end
 
     # Produce a message. This is an asynchronous operation.
@@ -49,7 +47,9 @@ module Rafka
 
     # @return [Hash]
     def parse_opts(opts)
-      DEFAULTS.dup.merge(opts).merge(opts[:redis_opts])
+      rafka_opts = opts.reject { |k| k == :redis }
+      redis_opts = opts[:redis] || {}
+      DEFAULTS.dup.merge(opts).merge(opts[:redis])
     end
   end
 end

data/lib/rafka/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rafka
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Agis Anastasopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement