Merge 8a3d533 into 6fe1d0a

razum2um · Feb 15, 2016 · cce958f · cce958f
2 parents 6fe1d0a + 8a3d533
commit cce958f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/lurker/request.rb b/lib/lurker/request.rb
@@ -22,8 +22,8 @@ def self.build_from_action_dispatch(request)
         path_info: request.path_info,
         path_params: request.env["#{PREFIX}.path_parameters"].stringify_keys.except('format'),
         query_params: request.env["#{PREFIX}.query_parameters"],
-        payload: request.env["#{PREFIX}.request_parameters"].merge(
-          request.env["#{PREFIX}.query_parameters"]
+        payload: request.env.fetch("#{PREFIX}.request_parameters", {}).merge(
+          request.env.fetch("#{PREFIX}.query_parameters", {})
         ).stringify_keys.except('action', "controller", 'format', '_method')
       )
     end

diff --git a/lib/lurker/spy.rb b/lib/lurker/spy.rb
@@ -46,7 +46,7 @@ def extensions
         path_info: request.path_info,
         method: request.verb,
       }
-      unless request.query_params.empty?
+      unless request.query_params.blank?
         extensions[:query_params] = request.query_params
       end
       if suffix.present?