rack-useful_procline 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5789281f880a804629b7efb859f4873b88a2149a
-  data.tar.gz: 0991ec2800518435f9413a7e2bb1b62342432050
+  metadata.gz: 9436d55de443b7dd527b513a9406182e6fc15c98
+  data.tar.gz: 0d19a60460afcded878b46ed93782fb232dc311d
 SHA512:
-  metadata.gz: c08f84c878b7016cfaa61f16cbb20d02491e33d87a133b34ad3092bb433bd72bb8f117248575bb1c52066232e9766d873cb995c9dbf0865825f2ec5adf350731
-  data.tar.gz: 6ae5560e7f5eaf1ad12ddc72d2c48d70c94d0a30e787de911c96318863fc3246e5e49f79dda1a605a22a62ec73b00e1e15ae240ecb3e4cf8945f8e1b731fe350
+  metadata.gz: 66351b202efc0420e225f57e31240aa974a77c38c93326bc03c2f30fffcd81ffc3497ab5913c5695a7d591841538d8bfc26be75b3d22ca2098c3f85dae901557
+  data.tar.gz: cfcbf2a21340326721267c79a9afc5cbeca35f5250e8bfa394f7775e5b31b8b743b265685d0acb103934a47e1552e44a99c811f6f1db138b9924a78908e8591d

data/lib/rack/ext/request.rb

@@ -0,0 +1,7 @@
+module Rack
+  class Request
+    def uuid(env_key = nil)
+      @env[env_key] if env_key
+    end
+  end
+end

data/lib/rack/useful_procline.rb

@@ -1,8 +1,10 @@
 require 'rack'
+require 'rack/request'
+require 'rack/ext/request'
 
 module Rack
   class UsefulProcline
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
     
     class << self
       attr_accessor :config
@@ -36,16 +38,18 @@ module Rack
     
     # Public
     def call(env)
-      prefix = $0.split(']')[0] + "] "
+      @request = Request.new(env)
+      
+      prefix = $0.split(']')[0] + "]"
       procline = prefix.dup
-      procline = procline_before_request(procline, env)
+      procline = procline_before_request(procline)
       
       set_procline(procline[0..200])
       
       status, headers, body = @app.call(env)
       
       procline = prefix.dup
-      procline = procline_after_request(procline, env, status)
+      procline = procline_after_request(procline, status)
       set_procline(procline)
       
       [status, headers, body]
@@ -60,34 +64,35 @@ module Rack
       string.chars.select(&:valid_encoding?).join.force_encoding('utf-8')
     end
     
-    def procline_before_request(procline, env)
-      if @config.opts[:show_request_method]
-        procline.concat(" : #{env['REQUEST_METHOD']}")
+    def procline_before_request(procline)
+      if @config.opts[:show_request_method] && @request
+        procline.concat(" : #{@request.request_method}")
       end
       
-      if @config.opts[:show_request_path]
-        procline.concat(" : #{env['REQUEST_PATH']}")
+      if @config.opts[:show_request_path] && @request
+        procline.concat(" : #{@request.path_info}")
       end
       
       if @config.opts[:show_request_uuid]
-        request_uuid = request_uuid_from(env) || "No request uuid found"
-        procline.concat(" : #{request_uuid_from(env)}")
+        uuid = request_uuid || "No request uuid found"
+        procline.concat(" : #{uuid}")
       end
       
       procline
     end
     
-    def request_uuid_from(env)
-      request_uuid = env[@config.opts[:request_uuid_key]]
-      request_uuid = request_uuid[0..7] if request_uuid
-      request_uuid
+    def request_uuid
+      if @request
+        uuid = @request.uuid(@config.opts[:request_uuid_key])
+        uuid[0..7] if uuid
+      end
     end
     
-    def procline_after_request(procline, env, status)
-      procline.concat(": last status: #{status}.")
+    def procline_after_request(procline, status)
+      procline.concat(" : last status: #{status}.")
       if @config.opts[:show_request_uuid]
-        request_uuid = request_uuid_from(env) || "No request uuid found"
-        procline += " last request_uuid: #{request_uuid}."
+        uuid = request_uuid || "No request uuid found"
+        procline += " last request_uuid: #{uuid}."
       end
       procline += " Waiting for req."
     end

data/spec/rack/useful_procline_spec.rb

@@ -65,16 +65,19 @@ describe Rack::UsefulProcline do
     # or here
   end
   
-  describe '#request_uuid_from' do
+  describe '#request_uuid' do
     it 'should retrieve the truncated request uuid' do
       env = {'action_dispatch.request_id' => 'my_request_uuid'}
-      expect(subject.request_uuid_from(env).length).to eql(8)
+      subject.instance_variable_set(:@request, Rack::Request.new(env))
+      expect(subject.request_uuid.length).to eql(8)
     end
   end
   
   describe '#procline_before_request' do
     subject do 
-      Rack::UsefulProcline.new(rack_app).procline_before_request("", rack_env)
+      s = Rack::UsefulProcline.new(rack_app)
+      s.instance_variable_set(:@request, Rack::Request.new(rack_env))
+      s.procline_before_request("")
     end
     
     describe "with default config (everything true)" do
@@ -90,7 +93,7 @@ describe Rack::UsefulProcline do
           config.opts[:show_request_path] = false
           config.opts[:show_request_uuid] = false
         end
-        Rack::UsefulProcline.new(rack_app).procline_before_request("", rack_env)
+        Rack::UsefulProcline.new(rack_app).procline_before_request("")
       end
       
       it do 
@@ -104,7 +107,10 @@ describe Rack::UsefulProcline do
       subject do
         key = "my_request_uuid_key"
         Rack::UsefulProcline.configure { |config| config.opts[:request_uuid_key] = key }
-        Rack::UsefulProcline.new(rack_app).procline_before_request("", rack_env(request_uuid_key: key))
+        s = Rack::UsefulProcline.new(rack_app)
+        env = rack_env(request_uuid_key: key)
+        s.instance_variable_set(:@request, Rack::Request.new(env))
+        s.procline_before_request("")
       end
       
       it { expect(subject).to include("12345678") }
@@ -116,7 +122,9 @@ describe Rack::UsefulProcline do
       def create_subject(opts = {})
         opts[:rack_app] ||= rack_app
         opts[:rack_env] ||= rack_env
-        Rack::UsefulProcline.new(opts[:rack_app]).procline_after_request("", opts[:rack_env], "200")
+        s = Rack::UsefulProcline.new(opts[:rack_app])
+        s.instance_variable_set(:@request, Rack::Request.new(opts[:rack_env]))
+        s.procline_after_request("", "200")
       end
     end
     
@@ -151,7 +159,7 @@ describe Rack::UsefulProcline do
       end
     end
     
-    describe "with custom request uuid key" do
+    describe "with custom request_uuid_key" do
       subject do
         key = 'my_request_uuid_key'
         Rack::UsefulProcline.configure { |config| config.opts[:request_uuid_key] = key }

data/spec/spec_helper.rb

@@ -17,8 +17,8 @@ RSpec.configure do |config|
     opts[:request_uuid_key] ||= 'action_dispatch.request_id'
     {
       opts[:request_uuid_key] => '12345678 longish string',
-      'REQUEST_METHOD' => 'GET',
-      'REQUEST_PATH' => '/path/to/things'
+      'REQUEST_METHOD'        => 'GET',
+      'PATH_INFO'             => '/path/to/things'
     }
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-useful_procline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Aaron Wallis
@@ -81,6 +81,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/rack/ext/request.rb
 - lib/rack/useful_procline.rb
 - rack-useful_procline.gemspec
 - spec/rack/useful_procline_spec.rb