fastly_nsq 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950954fc2bf0edcea6b24e7c364003e49c9e63e4
-  data.tar.gz: c38bb4c70dc6f506f6c9a34f69bde87f52c5ca81
+  metadata.gz: 7d55c09a395246d423966f21f8dc1d7ee1b29da7
+  data.tar.gz: d1499d0fee9093424f9134137e80637f0459c490
 SHA512:
-  metadata.gz: da7ead45aae0e4f3d60ce118f72caff6f5c3aa51906a22de672a76e232a18803d9ee1a63c9f2e362710239a611ba302ad63bf398414136921b7f6441e4031e50
-  data.tar.gz: 2fef46fb498b71900ad877ccfcd614f9e1b8dafc2efd48e8cbfef0cd4e438ae831299142c26036f6336f8ecaf4c77feeffe62663a526036bdac4a25fb499c583
+  metadata.gz: 646415b3b22eca19dc1cf8882ec7dde9187baee661f802fa73703ef74638ee38c45561489aa747380d48e9357b83a20286c4d29d581b58700dd42848370bf653
+  data.tar.gz: 3549a0dfd59543708a28185358d36cd48a5880eb2695b1b0a99408822267b31139a2700e90964547d179386244d9184e3628f6de0df504665aafe2a0c6d21f12

data/fastly_nsq.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rubocop', '~> 0.39.0'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
 
-  gem.add_dependency 'nsq-ruby', '~> 1.5.0', '>= 1.5.0'
+  gem.add_dependency 'nsq-ruby', '~> 1.6.0', '>= 1.6.0'
 end

data/lib/fastly_nsq/fake_message_queue.rb

@@ -22,7 +22,7 @@ module FakeMessageQueue
   end
 
   class Producer
-    def initialize(nsqd:, topic:)
+    def initialize(nsqd:, topic:, ssl_context: nil)
     end
 
     def write(string)
@@ -44,7 +44,7 @@ module FakeMessageQueue
   class Consumer
     SECONDS_BETWEEN_QUEUE_CHECKS = 0.5
 
-    def initialize(nsqlookupd:, topic:, channel:)
+    def initialize(nsqlookupd:, topic:, channel:, ssl_context: nil)
     end
 
     def pop

data/lib/fastly_nsq/message_queue.rb

@@ -4,6 +4,7 @@ require_relative 'message_queue/listener'
 require_relative 'message_queue/producer'
 require_relative 'message_queue/consumer'
 require_relative 'message_queue/strategy'
+require_relative 'ssl_context'
 
 module MessageQueue
   FALSY_VALUES = [false, 0, '0', 'false', 'FALSE', 'off', 'OFF', nil].freeze

data/lib/fastly_nsq/message_queue/consumer.rb

@@ -2,9 +2,10 @@ class InvalidParameterError < StandardError; end
 
 module MessageQueue
   class Consumer
-    def initialize(topic:, channel:)
+    def initialize(topic:, channel:, ssl_context: nil)
       @topic = topic
       @channel = channel
+      @ssl_context = SSLContext.new(ssl_context)
     end
 
     def connection
@@ -17,7 +18,7 @@ module MessageQueue
 
     private
 
-    attr_reader :channel, :topic
+    attr_reader :channel, :topic, :ssl_context
 
     def consumer
       Strategy.for_queue::Consumer
@@ -28,6 +29,7 @@ module MessageQueue
         nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
         topic: topic,
         channel: channel,
+        ssl_context: ssl_context.to_h,
       }
     end
   end

data/lib/fastly_nsq/message_queue/producer.rb

@@ -2,8 +2,9 @@ class InvalidParameterError < StandardError; end
 
 module MessageQueue
   class Producer
-    def initialize(topic:)
+    def initialize(topic:, ssl_context: nil)
       @topic = topic
+      @ssl_context = SSLContext.new(ssl_context)
     end
 
     def connection
@@ -16,7 +17,7 @@ module MessageQueue
 
     private
 
-    attr_reader :topic
+    attr_reader :topic, :ssl_context
 
     def producer
       Strategy.for_queue::Producer
@@ -26,6 +27,7 @@ module MessageQueue
       {
         nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
         topic: topic,
+        ssl_context: ssl_context.to_h,
       }
     end
   end

data/lib/fastly_nsq/ssl_context.rb

@@ -0,0 +1,44 @@
+class SSLContext
+  def initialize(context = nil)
+    @context = context || {}
+  end
+
+  def to_h
+    merge_contexts
+    if empty_context?
+      nil
+    else
+      @context
+    end
+  end
+
+  private
+
+  def env_key
+    ENV.fetch('NSQ_SSL_KEY', nil)
+  end
+
+  def env_certificate
+    ENV.fetch('NSQ_SSL_CERTIFICATE', nil)
+  end
+
+  def env_ca_certificate
+    ENV.fetch('NSQ_SSL_CA_CERTIFICATE', nil)
+  end
+
+  def env_default_hash
+    {
+      key: env_key,
+      certificate: env_certificate,
+      ca_certificate: env_ca_certificate,
+    }
+  end
+
+  def merge_contexts
+    @context = env_default_hash.merge(@context)
+  end
+
+  def empty_context?
+    @context.all? { |_key, value| value.nil? }
+  end
+end

data/lib/fastly_nsq/version.rb

@@ -1,3 +1,3 @@
 module FastlyNsq
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/lib/fastly_nsq/message_queue/consumer_spec.rb

@@ -15,6 +15,7 @@ RSpec.describe MessageQueue::Consumer do
             nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
             topic: topic,
             channel: channel,
+            ssl_context: nil,
           ).at_least(:once)
       end
     end
@@ -32,6 +33,7 @@ RSpec.describe MessageQueue::Consumer do
             nsqlookupd: ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS'),
             topic: topic,
             channel: channel,
+            ssl_context: nil,
           ).at_least(:once)
       end
     end

data/spec/lib/fastly_nsq/message_queue/producer_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe MessageQueue::Producer do
           with(
             nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
             topic: topic,
+            ssl_context: nil,
           ).at_least(:once)
       end
     end
@@ -28,6 +29,7 @@ RSpec.describe MessageQueue::Producer do
           with(
             nsqd: ENV.fetch('NSQD_TCP_ADDRESS'),
             topic: topic,
+            ssl_context: nil,
           ).at_least(:once)
       end
     end

data/spec/lib/fastly_nsq/ssl_context_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+RSpec.describe SSLContext do
+  describe 'when SSL ENV variables are not set' do
+    describe '.to_h' do
+      it 'returns nil when initialized without parameters' do
+        context = SSLContext.new
+
+        expect(context.to_h).to be_nil
+      end
+
+      it 'returns an equivalent hash when all variables are defined' do
+        ssl_context_hash = {
+          key: 'key',
+          certificate: 'certificate',
+          ca_certificate: 'ca_certificate',
+        }
+        context = SSLContext.new(ssl_context_hash)
+
+        expect(context.to_h).to eq(ssl_context_hash)
+      end
+
+      it 'does not add keys with nil values' do
+        ssl_context_hash = {
+          key: 'key',
+          certificate: 'certificate',
+        }
+        context = SSLContext.new(ssl_context_hash)
+        ca_certificate = context.to_h[:ca_certificate]
+
+        expect(ca_certificate).to be_nil
+      end
+    end
+  end
+
+  describe 'when SSL ENV variables are set' do
+    before do
+      ENV['NSQ_SSL_KEY'] = '/some/key'
+      ENV['NSQ_SSL_CERTIFICATE'] = '/some/certificate'
+      ENV['NSQ_SSL_CA_CERTIFICATE'] = '/some/ca_certificate'
+    end
+
+    after do
+      ENV['NSQ_SSL_KEY'] = nil
+      ENV['NSQ_SSL_CERTIFICATE'] = nil
+      ENV['NSQ_SSL_CA_CERTIFICATE'] = nil
+    end
+
+    describe '.to_h' do
+      it 'returns a hash of the env variables when no parameters are passed' do
+        expected_hash = {
+          key: ENV['NSQ_SSL_KEY'],
+          certificate: ENV['NSQ_SSL_CERTIFICATE'],
+          ca_certificate: ENV['NSQ_SSL_CA_CERTIFICATE'],
+        }
+        context = SSLContext.new
+
+        expect(context.to_h).to eq(expected_hash)
+      end
+
+      it 'merges passed parameters and env variables' do
+        passed_certificate = '/passed/certificate'
+        expected_hash = {
+          key: ENV['NSQ_SSL_KEY'],
+          certificate: passed_certificate,
+          ca_certificate: ENV['NSQ_SSL_CA_CERTIFICATE'],
+        }
+        context = SSLContext.new(certificate: passed_certificate)
+
+        expect(context.to_h).to eq(expected_hash)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -157,20 +157,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 description: Helper classes for Fastly's NSQ Services
 email: tommy@fastly.com
 executables: []
@@ -203,6 +203,7 @@ files:
 - lib/fastly_nsq/message_queue/strategy.rb
 - lib/fastly_nsq/rake_task.rb
 - lib/fastly_nsq/sample_message_processor.rb
+- lib/fastly_nsq/ssl_context.rb
 - lib/fastly_nsq/version.rb
 - spec/lib/fastly_nsq/fake_message_queue_spec.rb
 - spec/lib/fastly_nsq/fastly_nsq_spec.rb
@@ -213,6 +214,7 @@ files:
 - spec/lib/fastly_nsq/message_queue_spec.rb
 - spec/lib/fastly_nsq/rake_task_spec.rb
 - spec/lib/fastly_nsq/sample_message_processor_spec.rb
+- spec/lib/fastly_nsq/ssl_context_spec.rb
 - spec/spec_helper.rb
 - spec/support/env_helpers.rb
 homepage: https://github.com/fastly/fastly-nsq