onelinejson 0.0.3 → 0.0.4

data/README.md

@@ -38,13 +38,19 @@ It has the following top level entries: `request`, `response` and `debug_info`.
 
 Add this line to your application's Gemfile:
 
-    gem "lograge", git: "git@github.com:i0rek/lograge.git", branch: "config_subscriber"
-    gem 'onelinejson'
+```
+group :production do
+  gem "lograge", git: "git@github.com:i0rek/lograge.git", branch: "before_format"
+  gem 'onelinejson'
+end
+```
 
 You need my lograge repo for now, until my PR got merged which I hope will happen eventually.
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 ## Contributing
 

data/lib/onelinejson/version.rb

@@ -1,3 +1,3 @@
 module Onelinejson
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/onelinejson.rb

@@ -13,20 +13,24 @@ module Onelinejson
         request.headers.env
       elsif request.headers.respond_to?(:to_hash)
         request.headers.to_hash
-      end.reject {|k, v| !k.starts_with?("HTTP_") || k == "HTTP_AUTHORIZATION"}
+      end.reject do |k, v|
+        !k.starts_with?("HTTP_") || k == "HTTP_AUTHORIZATION"
+      end
+      parameters = params.reject do |k,v|
+        k == 'controller' ||
+          k == 'action' ||
+          v.is_a?(ActionDispatch::Http::UploadedFile)
+      end
 
       payload[:request] = {
-        params: params.reject { |k,v|
-          k == 'controller' || k == 'action' || v.is_a?(ActionDispatch::Http::UploadedFile)
-        },
+        params: parameters,
         headers: headers,
         ip: request.ip,
         uuid: request.env['action_dispatch.request_id'],
         controller: self.class.name,
         date: Time.now.utc.iso8601,
       }
-      payload[:request][:user_id] = current_user.id if defined?(current_user) && current_user
-
+      payload[:request][:user_id] = @current_user_id || (@current_user && @current_user.id)
     end
   end
 
@@ -35,19 +39,19 @@ module Onelinejson
     config.lograge.formatter = ::Lograge::Formatters::Json.new
     config.lograge.enabled = true
     config.lograge.before_format = lambda do |data, payload|
-      data.merge(payload)
-      request = payload[:request].merge(data.select{ |k,_|
+      request = data.select{ |k,_|
         [:method, :path, :format, :controller, :action].include?(k)
-      })
+      }.merge(payload[:request])
       response = data.select{ |k,_|
         [:status, :duration, :view, :view_runtime].include?(k)
       }
-      Hash[{
+      {
+        debug_info: payload[:debug_info] || {},
         request: request,
         response: response,
-        debug_info: payload[:debug_info]
-      }.sort]
+      }
     end
+
     ActiveSupport.on_load(:action_controller) do
       include AppControllerMethods
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onelinejson
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge