rack-traffic-logger 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4602c2181807d0305806dda404a27aca2715695
-  data.tar.gz: 5fc0fa9b637279c1be407da67f3af6b7e5667190
+  metadata.gz: 95df94c0e6e4f16211e08262d0ed06ccc45fed89
+  data.tar.gz: e8312544b46d51e6bea937b8062d3a4a8e3e762d
 SHA512:
-  metadata.gz: 0c35048dcf21d51d2b727007d0e311dee8cfa4bc42e65fc8302c44c9f6d1b8cf0271da2239cf68e6d54aa7c369292e0b56b048748e2ada9a148ab1e6a5b5a9e7
-  data.tar.gz: 6a7fd9b6535e0976e9bd28b3eed605eda8346c166f421dab5ef1f7b5c06e69e1ecbe0ad273e16ee59ae81f82b1bb0440e56ab547347cd6437647864ea1198722
+  metadata.gz: 385da06efb3efe17184385ebac636c28359b5786787c930faa50228384b1c887bfcb1349e60298947264c4067ebf5b4ce7c31205be2d37fc7b2df868f7cccb6a
+  data.tar.gz: 09ceb2fc87385411262dbc9cb922c9340b5b6a568dd67e438e909636ca22dbb1b639d4642061158cd0043602d17b9fa6dba00aee83b57bb0d46a750073fb5b64

data/lib/rack/traffic_logger/stream_simulator.rb

@@ -18,8 +18,8 @@ module Rack
       private
 
       REQUEST_TEMPLATES = {
-          true => "\e[35m:verb \e[36m:path:qs\e[0m :http",
-          false => ':verb :path:qs :http'
+          true => "\e[35m:verb \e[36m:scheme://:hostname\e[1m:path\e[0;36m:qs\e[0m :http",
+          false => ':verb :scheme://:hostname:path:qs :http'
       }
 
       RESPONSE_TEMPLATES = {
@@ -36,6 +36,8 @@ module Rack
 
       def format_request(input)
         result = render REQUEST_TEMPLATES[@color],
+                        scheme: input['HTTPS'] ? 'https' : 'http',
+                        hostname: host_with_port(input),
                         verb: input['REQUEST_METHOD'],
                         path: input['PATH_INFO'],
                         qs: (q = input['QUERY_STRING'] || '').empty? ? '' : "?#{q}",
@@ -91,6 +93,17 @@ module Rack
         end
       end
 
+      def host_with_port(input)
+        result = input['SERVER_NAME']
+        result = input['SERVER_ADDR'] unless result && !result.empty?
+        port = input['SERVER_PORT']
+        if port && port.to_i != (input['HTTPS'] ? 443 : 80)
+          "#{result}:#{port}"
+        else
+          result
+        end
+      end
+
     end
   end
 end

data/lib/rack/traffic_logger/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class TrafficLogger
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-traffic-logger
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Neil E. Pearson