upfluence-utils 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec2cb539b838a39c7070211a24f086723b4cb26a1532ee75f7319dbd303888c
-  data.tar.gz: 6c1ac4ba7d68a192a215ce1a59ca0d566bf0f854a06c137c90f2d4a448419b47
+  metadata.gz: 35be0f17a3c73784afa8e178a740bed54d6491d182d592177904bbfbf31e0b83
+  data.tar.gz: 9d7bebee3fbdead4d8b32e3314adbfba61e282811249b023fc2d0488dfb0a538
 SHA512:
-  metadata.gz: aade8b296ee62ff089107cbd10cca45a0d3059941966505d139b71ebc53901bd3f66938482b535b5fce5d4a1f13c64e48bb8de1fc14430c2741386568804ce4f
-  data.tar.gz: 8ccc8c8e00fe755375357b337b41c582e340b22a0c3b1b33dd3c265d4da9e3c53962b1614bbabc0a939b329b051fc5c27fa0ea1ab557e9d4623bd09ac4d33b52
+  metadata.gz: 423c2ef58a5363705bb5f90ec629648000a2d25c14c2536da02afb1def3f14c946db657ca244887ec3cc5400d2b78feaf6be5c92103b8853a0af420cdf6bbffc
+  data.tar.gz: e559829e31729eaa0ed30bde6d3d4fcda417d7833324a93c1ac923e4bf9e8ff3fcbf0abd0b4f0357f4c967e2d9a9b165d1c33c2fe542a4bb9f36ac5212ac836c

data/lib/upfluence/http/middleware/application_headers.rb

@@ -4,10 +4,7 @@ module Upfluence
       class ApplicationHeaders
         def initialize(app, handler)
           @app = app
-          @headers = {
-            "X-Upfluence-Unit-Name" => handler.getName,
-            "X-Upfluence-Version" => build_version(handler.getVersion)
-          }
+          @headers = handler ? build_headers(handler) : {}
         end
 
         def call(env)
@@ -17,14 +14,19 @@ module Upfluence
 
         private
 
+        def build_headers(handler)
+          {
+            'X-Upfluence-Unit-Name' => handler.getName,
+            'X-Upfluence-Version'   => build_version(handler.getVersion)
+          }
+        end
+
         def build_version(thrift_version)
-          if v = thrift_version.semantic_version
-            return "v#{v.major}.#{v.minor}.#{v.patch}"
-          end
+          v = thrift_version.semantic_version
+          return "v#{v.major}.#{v.minor}.#{v.patch}" if v
 
-          if v = thrift_version.git_version
-            return "v0.0.0-#{v.commit}"
-          end
+          v = thrift_version.git_version
+          return "v0.0.0-#{v.commit}" if v
 
           'undefined'
         end

data/lib/upfluence/http/server.rb

@@ -36,6 +36,11 @@ module Upfluence
       def initialize(options = {}, &block)
         @options = DEFAULT_OPTIONS.dup.merge(options)
         opts = @options
+        base_handler = nil
+
+        if opts[:base_handler_klass]
+          base_handler = opts[:base_handler_klass].new(@options[:interfaces])
+        end
 
         @builder = Builder.new do
           use Middleware::Logger
@@ -54,12 +59,9 @@ module Upfluence
             run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
           end
 
-          if opts[:base_processor_klass] && opts[:base_handler_klass]
+          if opts[:base_processor_klass] && base_handler
             map '/base' do
-              run_thrift(
-                opts[:base_processor_klass],
-                opts[:base_handler_klass].new(@options[:interfaces])
-              )
+              run_thrift(opts[:base_processor_klass], base_handler)
             end
           end
 

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.9.1'.freeze
+    VERSION = '0.9.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Upfluence