simple-rack-logger 0.0.4 → 0.0.5

data/lib/simple-rack-logger.rb

@@ -1,5 +1,6 @@
 require "simple_rack_logger/version"
 require 'cgi'
+require 'uuid'
 
 require 'simple_rack_logger/rack_logger'
 require 'simple_rack_logger/request_logger'

data/lib/simple_rack_logger/request_logger.rb

@@ -8,14 +8,24 @@ module Rack
     end
 
     def call(env)
+
+      uuid = unique_identy
+
       request = Rack::Request.new(env)
       block   = @filters.select { |filter| filter.respond_to?(:filter) && filter.send(:filter, request) }
       if block.empty?
-        logger.info(expose(request, env))
+        logger.info("IDENT:|#{uuid}| REQUEST_VALUE:|#{expose(request, env)}|")
+        logger.flush
+      end
+
+      return_value = @app.call(env)
+
+      if block.empty?
+        logger.info("IDENT:|#{uuid}| RETURN_VALUE:|#{expose_return(return_value).to_s}|")
         logger.flush
       end
 
-      @app.call(env)
+      return_value
     end
 
     private
@@ -26,10 +36,22 @@ module Rack
       show << "[params: #{params.join('; ')}]" unless params.empty?
 
       headers = env.select { |key, value| key.start_with?('HTTP_') }
-      show << " [heades: #{headers.collect { |pair| pair.join("=") }}" unless headers.empty?
+      show << " [headers: #{headers.collect { |pair| pair.join("=") }}" unless headers.empty?
 
       show
     end
 
+    def expose_return(return_value)
+      return_value = [return_value] unless return_value.is_a? Array
+
+      return_value.map do |item|
+        (item.is_a? Rack::BodyProxy) ? item.send(:body) : item.to_s
+      end
+    end
+
+    def unique_identy
+      UUID.new.generate
+    end
   end
 end
+

data/lib/simple_rack_logger/version.rb

@@ -1,3 +1,3 @@
 module SimpleRackLogger
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/simple-rack-logger.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'uuid'
+
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'guard-rspec'

data/spec/simple_rack_logger/request_logger_spec.rb

@@ -41,8 +41,13 @@ describe Rack::RequestLogger do
     }
 
     it 'log request information from env' do
-      app.should_receive(:call)
-      logger.should_receive(:info).with('GET: http://localhost:9393/v1/crachas.xml for 127.0.0.1 [heades: ["HTTP_USER_AGENT=curl/7.22.0 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 librtmp/2.3", "HTTP_HOST=localhost:9393", "HTTP_ACCEPT=*/*", "HTTP_VERSION=HTTP/1.1"]')
+
+      subject.should_receive(:unique_identy).and_return('1234')
+
+      app.should_receive(:call).and_return("Something")
+      logger.should_receive(:info).with('IDENT:|1234| REQUEST_VALUE:|GET: http://localhost:9393/v1/crachas.xml for 127.0.0.1 [headers: ["HTTP_USER_AGENT=curl/7.22.0 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 librtmp/2.3", "HTTP_HOST=localhost:9393", "HTTP_ACCEPT=*/*", "HTTP_VERSION=HTTP/1.1"]|')
+      logger.should_receive(:info).with('IDENT:|1234| RETURN_VALUE:|["Something"]|')
+
       subject.call(env)
     end
   end
@@ -63,5 +68,4 @@ describe Rack::RequestLogger do
     end
 
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-rack-logger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement