mn_middleware_gem 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6609128eb17a1b95d8ea9972f2267e3ce443ef7a4a8b7c9f2ecff8597b55d071
-  data.tar.gz: def274482bf188098ed5a22b18fae4b18359b572d44a39c1d6cd6a1ecfc1d2da
+  metadata.gz: 0dcc70086267dde8dd81032660c7722a9a43dc1ea585ba7f8cab8c760691eaea
+  data.tar.gz: 7e848ae5a0e189cbed0285eaac80252dddce0b56bcecdb144c668e8ad9bd1768
 SHA512:
-  metadata.gz: 372cfd18068c85f1a8630fe1cf824b9692822afa115626a8753ccbe5d91150b2e0f0934547fdc0d181cbee114790e32f47b094d7ba843d282cb20a939139355a
-  data.tar.gz: ddc969067be15fd56268caa51e7a50547dc8e301a3e11966dc695e4cde5c2988aada9872f3b1a7c946c1c56f07c531b794e1700b388e8785fd5d4ee6a5367ace
+  metadata.gz: e656029783ef8e62180d7bf08d240ed5f0db42eccf982f1ef262cc55598d2ccafc05aad0446d9d8796a9d7b77e85ca14d74abd8c0ab97c078580a3ae1e11d747
+  data.tar.gz: 1fd1d5f8bf712c45ce18df4b536691c4d1c1243fe357f80889202ee2d7da95966e995906b2993f74f087df22de5e45b32fb29cdd632497791333f3ac9442a9e1

data/lib/mn_middleware_gem/mn_middleware/correlation_id.rb

@@ -1,42 +1,44 @@
 require 'securerandom'
 require 'net/http'
 
-class MnMiddleware::CorrelationId
-  def initialize app
-    @app = app
-  end
-
-  def call(env)
-    request_id = nil
-
-    # see if you can get an existing request id
-    # from these sources, in order of priority
-    if env['HTTP_X_REQUEST_ID']
-      request_id = env['HTTP_X_REQUEST_ID']
-      Rails.logger.debug "Found HTTP_X_REQUEST_ID #{request_id}"
-    elsif env['HTTP_X_AMZN_TRACE_ID']
-      request_id = env['HTTP_X_REQUEST_ID'] = env['HTTP_X_AMZN_TRACE_ID'].match(/^.*Root=([^;]*).*$/).captures[0]
-      Rails.logger.debug "Found HTTP_X_AMZN_TRACE_ID #{request_id}"
+module MnMiddleware
+  class CorrelationId
+    def initialize app
+      @app = app
     end
 
-    # if no request id is available, generate one
-    if request_id.nil?
-      request_id = env['HTTP_X_REQUEST_ID'] = SecureRandom.uuid
-      Rails.logger.debug "Set request_id #{request_id}"
+    def call(env)
+      request_id = nil
+
+      # see if you can get an existing request id
+      # from these sources, in order of priority
+      if env['HTTP_X_REQUEST_ID']
+        request_id = env['HTTP_X_REQUEST_ID']
+        Rails.logger.debug "Found HTTP_X_REQUEST_ID #{request_id}"
+      elsif env['HTTP_X_AMZN_TRACE_ID']
+        request_id = env['HTTP_X_REQUEST_ID'] = env['HTTP_X_AMZN_TRACE_ID'].match(/^.*Root=([^;]*).*$/).captures[0]
+        Rails.logger.debug "Found HTTP_X_AMZN_TRACE_ID #{request_id}"
+      end
+
+      # if no request id is available, generate one
+      if request_id.nil?
+        request_id = env['HTTP_X_REQUEST_ID'] = SecureRandom.uuid
+        Rails.logger.debug "Set request_id #{request_id}"
+      end
+
+      # set the request id in the request store
+      # so we can use it later in the Net::HTTPHeader monkey patch
+      RequestStore.store[:request_id] = request_id
+
+      # call the superclass and get the app return values
+      status, headers, response = @app.call(env)
+
+      # set the request id in the response header
+      headers['X-Request-Id'] = request_id
+
+      # return all the values back up
+      [status, headers, response]
     end
-
-    # set the request id in the request store
-    # so we can use it later in the Net::HTTPHeader monkey patch
-    RequestStore.store[:request_id] = request_id
-
-    # call the superclass and get the app return values
-    status, headers, response = @app.call(env)
-
-    # set the request id in the response header
-    headers['X-Request-Id'] = request_id
-
-    # return all the values back up
-    [status, headers, response]
   end
 end
 

data/lib/mn_middleware_gem/mn_middleware/remote_ip_logger.rb

@@ -1,15 +1,17 @@
-class MnMiddleware::RemoteIpLogger
-  def initialize(app)
-    @app = app
-  end
+module MnMiddleware
+  class RemoteIpLogger
+    def initialize(app)
+      @app = app
+    end
 
-  def call(env)
-    if env["HTTP_X_FORWARDED_FOR"]
-      remote_ip = env["HTTP_X_FORWARDED_FOR"].split(",")[0]
-      env['REMOTE_ADDR'] = env["action_dispatch.remote_ip"] = env["HTTP_X_FORWARDED_FOR"] = remote_ip
-      @app.call(env)
-    else
-      @app.call(env)
+    def call(env)
+      if env["HTTP_X_FORWARDED_FOR"]
+        remote_ip = env["HTTP_X_FORWARDED_FOR"].split(",")[0]
+        env['REMOTE_ADDR'] = env["action_dispatch.remote_ip"] = env["HTTP_X_FORWARDED_FOR"] = remote_ip
+        @app.call(env)
+      else
+        @app.call(env)
+      end
     end
   end
 end

data/lib/mn_middleware_gem/version.rb

@@ -1,3 +1,3 @@
 module MnMiddlewareGem
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mn_middleware_gem
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Shamim Mirzai