delivery_boy 0.1.5 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd80f951111ad29fdbf5ff8bbc02aef63b59d176
-  data.tar.gz: b9c6b8209940ef36ce24e8aec5261483100726bf
+  metadata.gz: cbb2e9c4ceb1a7b4cac859fa21f33eb69d43b1ba
+  data.tar.gz: a8c55dc6eb604a71dbdf83a8f80334693e6ec144
 SHA512:
-  metadata.gz: ddc0d55c7acb75817794d542c1ac132292c39d466f5d65ddc969f51c57815bd8e5951d9e12aa3391263c3bfc3312f4db86e814e13c905c8c790ef19155328070
-  data.tar.gz: 0ae524907b55be94d29b2c2849c87ea8d81ba28b80d8f94d9e0ff12822258ced4a0f9581e40e803db5557058b4ab58cf0905a5a8b01cd83e4a9883bd3fa0d00f
+  metadata.gz: 6cd6a9bb4def19bcf1fe9bbba80bdc70e2a8f9df0211fb8f65b776fef784e1c914114159d3e13ecb837e61e25d51356edab0fdb62b7399fc2105c5f1c359b5a8
+  data.tar.gz: 06dc18208a20403c71d810a8b7488a15a4aae1ad7f14fd1ec18b2bffa3703d32fc6aef28c61b78a7f522d177795b38407eb6a26e47f70b3b1101ffced3369d23

data/delivery_boy.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "ruby-kafka", "~> 0.4"
+  spec.add_runtime_dependency "king_konf", "~> 0.1.2"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/delivery_boy.rb

@@ -70,6 +70,8 @@ module DeliveryBoy
     # @return [DeliveryBoy::Config]
     def config
       @config ||= DeliveryBoy::Config.new(env: ENV)
+    rescue KingKonf::ConfigError => e
+      raise ConfigError, e.message
     end
 
     def test_mode!

data/lib/delivery_boy/config.rb

@@ -1,100 +1,26 @@
-require "erb"
-require "yaml"
-require "delivery_boy/env_config_loader"
-require "delivery_boy/config_file_loader"
-require "delivery_boy/config_error"
+require "king_konf"
 
 module DeliveryBoy
-  class Config
-    VARIABLES = %w[
-      ack_timeout
-      brokers
-      client_id
-      compression_codec
-      compression_threshold
-      connect_timeout
-      delivery_interval
-      delivery_threshold
-      max_buffer_bytesize
-      max_buffer_size
-      max_queue_size
-      max_retries
-      required_acks
-      retry_backoff
-      socket_timeout
-      ssl_ca_cert
-      ssl_client_cert
-      ssl_client_cert_key
-    ]
-
-    DEFAULTS = {
-      ack_timeout: 5,
-      brokers: ["localhost:9092"],
-      client_id: "delivery_boy",
-      compression_threshold: 1,
-      connect_timeout: 10,
-      max_buffer_bytesize: 10_000_000,
-      max_buffer_size: 1000,
-      max_retries: 2,
-      required_acks: :all,
-      retry_backoff: 1,
-      socket_timeout: 30,
-      delivery_interval: 10,
-      delivery_threshold: 100,
-      max_queue_size: 1000,
-    }
-
-    attr_accessor(*VARIABLES)
-
-    def initialize(env: {})
-      load_config(DEFAULTS)
-      load_env(env)
-    end
-
-    def load_file(path, environment)
-      loader = ConfigFileLoader.new(self)
-      loader.load_file(path, environment)
-    end
-
-    def set(variable, value)
-      unless VARIABLES.include?(variable.to_s)
-        raise ConfigError, "unknown configuration variable #{variable}"
-      end
-
-      instance_variable_set("@#{variable}", value)
-    end
-
-    private
-
-    def load_config(config)
-      config.each do |variable, value|
-        set(variable, value)
-      end
-    end
-
-    def load_env(env)
-      loader = EnvConfigLoader.new(env, self)
-
-      loader.string :client_id
-      loader.string_list :brokers
-      loader.integer :ack_timeout
-      loader.symbol :compression_codec
-      loader.integer :compression_threshold
-      loader.integer :connect_timeout
-      loader.integer :delivery_interval
-      loader.integer :delivery_threshold
-      loader.integer :max_buffer_bytesize
-      loader.integer :max_buffer_size
-      loader.integer :max_queue_size
-      loader.integer :max_retries
-      loader.integer :required_acks
-      loader.integer :retry_backoff
-      loader.integer :socket_timeout
-      loader.string :ssl_ca_cert
-      loader.string :ssl_client_cert
-      loader.string :ssl_client_cert_key
-
-      loader.validate!
-    end
+  class Config < KingKonf::Config
+    prefix :delivery_boy
+
+    integer :ack_timeout, default: 5
+    integer :compression_threshold, default: 1
+    integer :connect_timeout, default: 10
+    integer :delivery_interval, default: 10
+    integer :delivery_threshold, default: 100
+    integer :max_buffer_bytesize, default: 10_000_000
+    integer :max_buffer_size, default: 1000
+    integer :max_queue_size, default: 1000
+    integer :max_retries, default: 2
+    integer :required_acks, default: -1
+    integer :retry_backoff, default: 1
+    integer :socket_timeout, default: 30
+    string :client_id, default: "delivery_boy"
+    string :compression_codec, default: nil
+    string :ssl_ca_cert, default: nil
+    string :ssl_client_cert, default: nil
+    string :ssl_client_cert_key, default: nil
+    list :brokers, items: :string, sep: ",", default: ["localhost:9092"]
   end
 end

data/lib/delivery_boy/fake.rb

@@ -2,14 +2,14 @@ module DeliveryBoy
 
   # A fake implementation that is useful for testing.
   class Fake
-    FakeMessage = Struct.new(:value, :key, :topic, :partition, :partition_key)
+    FakeMessage = Struct.new(:value, :topic, :key, :partition, :partition_key)
 
     def initialize
       @messages = Hash.new {|h, k| h[k] = [] }
     end
 
-    def deliver(value, topic:, **options)
-      message = FakeMessage.new(value: value, topic: topic, **options)
+    def deliver(value, topic:, key: nil, partition: nil, partition_key: nil)
+      message = FakeMessage.new(value, topic, key, partition, partition_key)
       @messages[topic] << message
 
       nil

data/lib/delivery_boy/version.rb

@@ -1,3 +1,3 @@
 module DeliveryBoy
-  VERSION = "0.1.5"
+  VERSION = "0.2.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delivery_boy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-kafka
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: king_konf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +102,6 @@ files:
 - lib/delivery_boy.rb
 - lib/delivery_boy/config.rb
 - lib/delivery_boy/config_error.rb
-- lib/delivery_boy/config_file_loader.rb
-- lib/delivery_boy/env_config_loader.rb
 - lib/delivery_boy/fake.rb
 - lib/delivery_boy/instance.rb
 - lib/delivery_boy/railtie.rb
@@ -111,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1

data/lib/delivery_boy/config_file_loader.rb

@@ -1,20 +0,0 @@
-module DeliveryBoy
-  class ConfigFileLoader
-    def initialize(config)
-      @config = config
-    end
-
-    def load_file(path, environment)
-      # First, load the ERB template from disk.
-      template = ERB.new(File.new(path).read)
-
-      # The last argument to `safe_load` allows us to use aliasing to share
-      # configuration between environments.
-      processed = YAML.safe_load(template.result(binding), [], [], true)
-
-      processed.fetch(environment).each do |variable, value|
-        @config.set(variable, value)
-      end
-    end
-  end
-end

data/lib/delivery_boy/env_config_loader.rb

@@ -1,57 +0,0 @@
-require "delivery_boy/config_error"
-
-module DeliveryBoy
-  class EnvConfigLoader
-    KEY_PREFIX = "DELIVERY_BOY"
-
-    def initialize(env, config)
-      @env = env
-      @config = config
-      @loaded_keys = []
-    end
-
-    def string(name)
-      set(name) {|value| value }
-    end
-
-    def symbol(name)
-      set(name) {|value| value.to_sym }
-    end
-
-    def integer(name)
-      set(name) do |value|
-        begin
-          Integer(value)
-        rescue ArgumentError
-          raise ConfigError, "#{value.inspect} is not an integer"
-        end
-      end
-    end
-
-    def string_list(name)
-      set(name) {|value| value.split(",") }
-    end
-
-    def validate!
-      # Make sure the user hasn't made a typo and added a key we don't know
-      # about.
-      @env.keys.grep(/^#{KEY_PREFIX}_/).each do |key|
-        unless @loaded_keys.include?(key)
-          raise ConfigError, "unknown config variable #{key}"
-        end
-      end
-    end
-
-    private
-
-    def set(name)
-      key = "#{KEY_PREFIX}_#{name.upcase}"
-
-      if @env.key?(key)
-        value = yield @env.fetch(key)
-        @config.set(name, value)
-        @loaded_keys << key
-      end
-    end
-  end
-end