sensible_logging 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573a3b8040fec85373dc5f2a00a82655e51ebe08d28b31c1a4dbfa3f18b0147f
-  data.tar.gz: 4d7d894842e36853317062862cd99577d9f61b78ad73fbbe909315ff14f8ecd6
+  metadata.gz: 64e20e7d13d4881981be87fa54a55d5dd4341a4c2fb3d6288f2ad68a35c1f096
+  data.tar.gz: 07a666fe48011d6c8b76b173161613973fe34bbfaf0994c15a06481744236829
 SHA512:
-  metadata.gz: a8dea52bb2451b3bdcdce68b1ff75f5cfaa385b2321d9027b687f5b8bd27c5cef56d68fa197081a79cc0b4c11303e706867ad3ba6dd3ddba07c2f89b0a3f5004
-  data.tar.gz: 6b1ebcc33d6b13a5e4ce19307d538f4387ccfbd0e5cf5dcbc45d4729786e7ea2f41f917e80bed39d8c4b7aadf521aacb60e49061a23737581d23cfe907baac44
+  metadata.gz: 9e7645eb34a56cfc7f8187c894a7195a9ec60a469c2efe3da221f3e176149a1164a175c433821222cfe8f2294b4c79abd036b759dfb1ceb8155fc6c10d25c4c7
+  data.tar.gz: 62b656360bed805e943fa1b0c8b6ca5614d0c7af8e4caa447ade4f067b8b6f62fef5905faf9dc33f1e5219d2a2bd994020d48dabb9b506b8351b458fbc7f0016

data/{config.ru → examples/config.ru}

@@ -1,7 +1,7 @@
 #\ --quiet
 require 'logger'
-require './app'
-require './lib/sensible_logging'
+require_relative './app'
+require_relative '../lib/sensible_logging'
 
 run sensible_logging(
   app: App,

data/lib/sensible_logging/helpers/subdomain_parser.rb

@@ -0,0 +1,22 @@
+class SubdomainParser
+  attr_reader :tld_length
+
+  def initialize(tld_length: 1)
+    @tld_length = tld_length
+  end
+
+  def parse(host)
+    domain_parts = host.split('.')
+
+    return domain_parts[0] if domain_parts.size == 1
+
+    main_domain_length = tld_length + 1
+    subdomain_length = domain_parts.size - main_domain_length
+
+    subdomain_parts = domain_parts[0...subdomain_length]
+
+    return nil if subdomain_parts.size < 1
+
+    subdomain_parts.join('.')
+  end
+end

data/lib/sensible_logging/middlewares/tagged_logger.rb

@@ -1,4 +1,5 @@
 require 'active_support/tagged_logging'
+require_relative '../helpers/subdomain_parser'
 
 class TaggedLogger
   def initialize(app, logger = Logger.new(STDOUT), tags = [], tld_length = 1)
@@ -6,9 +7,7 @@ class TaggedLogger
     @logger = ActiveSupport::TaggedLogging.new(logger)
 
     @tags = tags
-    @tags = default_tags if tags.empty?
-
-    @tld_length = tld_length
+    @tags = self.class.default_tags(tld_length: tld_length) if tags.empty?
   end
 
   def call(env)
@@ -18,23 +17,17 @@ class TaggedLogger
     end
   end
 
-  def default_tags
+  def self.default_tags(tld_length: 1)
     [lambda { |req|
-      [subdomain(req), ENV['RACK_ENV'], req.env['request_id']]
+      subdomain_parser = SubdomainParser.new(tld_length: tld_length)
+      subdomain = subdomain_parser.parse(req.host)
+
+      [subdomain || 'n/a', ENV['RACK_ENV'], req.env['request_id']]
     }]
   end
 
   private
 
-  def subdomain(req)
-    domain_parts = req.host.split('.')
-
-    main_domain_length = @tld_length + 1
-    subdomain_length = domain_parts.length - main_domain_length
-
-    domain_parts[0...subdomain_length].join('.')
-  end
-
   def generate_tags(env)
     req = Rack::Request.new(env)
     tags = @tags.map do |tag|

data/lib/sensible_logging/version.rb

@@ -1,3 +1,3 @@
 module SensibleLogging
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensible_logging
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Winter
@@ -137,9 +137,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app.rb
-- config.ru
+- examples/app.rb
+- examples/config.ru
 - lib/sensible_logging.rb
+- lib/sensible_logging/helpers/subdomain_parser.rb
 - lib/sensible_logging/middlewares/request_id.rb
 - lib/sensible_logging/middlewares/request_logger.rb
 - lib/sensible_logging/middlewares/tagged_logger.rb