md-logstasher 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de357b73d80ace9f66dec3772501f39485116454
-  data.tar.gz: abdf933ca237337395477d5374631b2bceb11571
+  metadata.gz: 1da4bf654fde44e013c54012909145df5a0bcf59
+  data.tar.gz: 21a9cddde75b6ceedad8dcc02f27c269a1d52562
 SHA512:
-  metadata.gz: 633cb72fb229d8a8423ef2a7dc7b89e96d6420d406a94992e6d303fd73f068b66cbf8554c30fe6970921183c0b8a26719344bcf24f6d93b7a69b77c5766f86dd
-  data.tar.gz: 80bde9a5868c345cf24487cf15e2323f34884daa30391ec23a9809aea3f8c4f35f819894b9278819607a2ea315d35b6b0758c276599022a3c92054d912385982
+  metadata.gz: da02d119cab4da5ebcf20030a60a6754881c435217c1018797a0e2158d8ce9a492b76c3d51d1f9b4a02eb633c0f1bd8e1805c04839599a4a5d0ddb8e0a057881
+  data.tar.gz: 85ef7becae5957c2da39587d141b652ed5d874c0e36a5fcdf31fe7831de650d3c51fc88b52838705fbbf9fa5ebe143c9abda4895d89d1974887e6562a41d27fc

data/lib/logstasher/device/redis.rb

@@ -1,23 +1,26 @@
+require 'logstasher/device'
 require 'redis'
 
 module LogStasher
   module Device
     class Redis
+      include ::LogStasher::Device
 
       attr_reader :options, :redis
 
       def initialize(options = {})
-        @options = default_options.merge(options)
+        @options = default_options.merge(stringify_keys(options))
+
         validate_options
         configure_redis
       end
 
       def data_type
-        options[:data_type]
+        options['data_type']
       end
 
       def key
-        options[:key]
+        options['key']
       end
 
       def redis_options
@@ -51,12 +54,12 @@ module LogStasher
       end
 
       def default_options
-        { key: 'logstash', data_type: 'list' }
+        { 'key' => 'logstash', 'data_type' => 'list' }
       end
 
       def validate_options
-        unless ['list', 'channel'].include?(options[:data_type])
-          fail 'Expected :data_type to be either "list" or "channel"'
+        unless ['list', 'channel'].include?(options['data_type'])
+          fail 'Expected data_type to be either "list" or "channel"'
         end
       end
     end

data/lib/logstasher/device/syslog.rb

@@ -1,18 +1,22 @@
 # inspired by [lumberjack](https://github.com/bdurand/lumberjack_syslog_device)
 
+require 'logstasher/device'
 require 'syslog'
 require 'thread'
 
 module LogStasher
   module Device
     class Syslog
+      include ::LogStasher::Device
 
       SEMAPHORE = Mutex.new
 
       attr_reader :options
 
       def initialize(options = {})
-        @options = parse_options(default_options.merge(options))
+        raw_options = default_options.merge(stringify_keys(options))
+
+        @options = parse_options(raw_options)
         @closed  = false
       end
 
@@ -29,19 +33,19 @@ module LogStasher
       end
 
       def facility
-        options[:facility]
+        options['facility']
       end
 
       def flags
-        options[:flags]
+        options['flags']
       end
 
       def identity
-        options[:identity]
+        options['identity']
       end
 
       def priority
-        options[:priority]
+        options['priority']
       end
 
       def write(log)
@@ -56,10 +60,10 @@ module LogStasher
 
       def default_options
         {
-          :identity => 'logstasher',
-          :facility => ::Syslog::LOG_LOCAL0,
-          :priority => ::Syslog::LOG_INFO,
-          :flags    => ::Syslog::LOG_PID | ::Syslog::LOG_CONS
+          'identity' => 'logstasher',
+          'facility' => ::Syslog::LOG_LOCAL0,
+          'priority' => ::Syslog::LOG_INFO,
+          'flags'    => ::Syslog::LOG_PID | ::Syslog::LOG_CONS
         }
       end
 
@@ -75,9 +79,9 @@ module LogStasher
       end
 
       def parse_options(options)
-        options[:facility] = parse_option(options[:facility])
-        options[:priority] = parse_option(options[:priority])
-        options[:flags]    = parse_option(options[:flags])
+        options['facility'] = parse_option(options['facility'])
+        options['priority'] = parse_option(options['priority'])
+        options['flags']    = parse_option(options['flags'])
         options
       end
 

data/lib/logstasher/device.rb

@@ -1,21 +1,27 @@
 module LogStasher
   module Device
     def self.factory(config)
-      config = config.dup
-      type   = config.delete(:type) or fail ArgumentError, "No :type given"
+      config = stringify_keys(config)
+      type   = config.delete('type') or fail ArgumentError, 'No "type" given'
 
       case type
-      when "redis", :redis then
-        require "logstasher/device/redis"
-
+      when 'redis', :redis then
+        require 'logstasher/device/redis'
         ::LogStasher::Device::Redis.new(config)
       when "syslog", :syslog then
-        require "logstasher/device/syslog"
-
+        require 'logstasher/device/syslog'
         ::LogStasher::Device::Syslog.new(config)
       else
         fail ArgumentError, "Unknown type: #{type}"
       end
     end
+
+    def stringify_keys(hash)
+      hash.inject({}) do |stringified_hash, (key, value)|
+        stringified_hash[key.to_s] = value
+        stringified_hash
+      end
+    end
+    module_function :stringify_keys
   end
 end

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

data/spec/lib/logstasher/device/redis_spec.rb

@@ -7,8 +7,8 @@ describe LogStasher::Device::Redis do
   let(:redis_mock) { double('Redis') }
 
   let(:default_options) {{
-    key: 'logstash',
-    data_type: 'list'
+    'key'       => 'logstash',
+    'data_type' => 'list'
   }}
 
   it 'has default options' do
@@ -22,9 +22,9 @@ describe LogStasher::Device::Redis do
   end
 
   it 'assumes unknown options are for redis' do
-    ::Redis.should_receive(:new).with(hash_including(db: '0'))
+    ::Redis.should_receive(:new).with(hash_including('db' => '0'))
     device = LogStasher::Device::Redis.new(db: '0')
-    device.redis_options.should eq(db: '0')
+    device.redis_options.should eq('db' => '0')
   end
 
   it 'has a key' do

data/spec/lib/logstasher/device/syslog_spec.rb

@@ -5,10 +5,10 @@ require 'logstasher/device/syslog'
 describe LogStasher::Device::Syslog do
 
   let(:default_options) {{
-    :identity => 'logstasher',
-    :facility => ::Syslog::LOG_LOCAL0,
-    :priority => ::Syslog::LOG_INFO,
-    :flags    => ::Syslog::LOG_PID | ::Syslog::LOG_CONS
+    'identity' => 'logstasher',
+    'facility' => ::Syslog::LOG_LOCAL0,
+    'priority' => ::Syslog::LOG_INFO,
+    'flags'    => ::Syslog::LOG_PID | ::Syslog::LOG_CONS
   }}
 
   before { ::Syslog.stub(:log) }

data/spec/lib/logstasher/device_spec.rb

@@ -9,15 +9,24 @@ describe LogStasher::Device do
     it "expects a type" do
       expect {
         ::LogStasher::Device.factory(:no => "type given")
-      }.to raise_error(ArgumentError, "No :type given")
+      }.to raise_error(ArgumentError, 'No "type" given')
     end
 
     it "forwards configuration options to the device" do
       ::LogStasher::Device::Redis.should_receive(:new).with(
-        :options => "other", :than => "type"
+        'options' => "other", 'than' => "type"
       )
       ::LogStasher::Device.factory(
-        :type => 'redis', :options => 'other', :than => "type"
+        'type' => 'redis', 'options' => 'other', :than => "type"
+      )
+    end
+
+    it "accepts symbolized configuration keys" do
+      ::LogStasher::Device::Redis.should_receive(:new).with(
+        'options' => "other", 'than' => "type"
+      )
+      ::LogStasher::Device.factory(
+        :type => "redis", :options => "other", :than => "type"
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Devin Christensen