rack-profiler 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe1afedae470bb85742aeb3a12c0d254fe85dcae
-  data.tar.gz: 1e70fe3c574df047fecc89476c6ae25ac684ebb9
+  metadata.gz: a343b0c57f979d808c382c43240fab52021e0d2b
+  data.tar.gz: af40d1d74d3b9bcd3bb3e2497ce0173a20e6ea6c
 SHA512:
-  metadata.gz: 873f5b0416871e69754316871703e68ae47df70aab738192dc5d7867460abb755c46834a45cd58182406ec89187a9d07224709e4f7f48e55555bd45ee16fa1cb
-  data.tar.gz: da4315aba4b60ac6807de38c84fbe15ad83eeaedb1c8849b51f84f3c1c6d14aecda2802c8fb4af558d59aa90d18d707a5d17d8cb070ec9af21b5d3a72e015efd
+  metadata.gz: 888e9762b98c4c8a6bb20d0db4eb23c53358b1b32a595e3c7383b585d8fd44854dd5bb03210a9489207e186e381584471b0520a5517a35b9988c1b4947a2ae38
+  data.tar.gz: 9436e633d74ba37e8b347d6f8e5581a8bb7e2a059ca044759c495038367f20c490ce08b7426dcaa6fafe9318831a3dae1061cd34f129b77d9e3439ba2072f034

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/dawanda/rack-profiler.svg)](https://travis-ci.org/dawanda/rack-profiler) [![Code Climate](https://codeclimate.com/github/dawanda/rack-profiler/badges/gpa.svg)](https://codeclimate.com/github/dawanda/rack-profiler) [![Test Coverage](https://codeclimate.com/github/dawanda/rack-profiler/badges/coverage.svg)](https://codeclimate.com/github/dawanda/rack-profiler)
 [![Gem Version](https://badge.fury.io/rb/rack-profiler.svg)](http://badge.fury.io/rb/rack-profiler)
 
-Simple profiler for Rack applications (Sinatra and Ruby on Rails for example).
+Simple profiler for Rack applications (Sinatra, Ruby on Rails, or Grape for example).
 It helps providing an answer to common questions like:
 
   - Where is time spent in requests to my app?
@@ -21,6 +21,11 @@ subscribes by default to the following hooks:
   * [render_partial.action_view](http://guides.rubyonrails.org/active_support_instrumentation.html#render_partial.action_view)
   * [process_action.action_controller](http://guides.rubyonrails.org/active_support_instrumentation.html#process_action.action_controller)
 
+`Rack::Profiler` also automatically subscribes to [Grape's](https://github.com/ruby-grape/grape) Active Support Instrumentation notifications
+  * [endpoint_run.grape](https://github.com/ruby-grape/grape#performance-monitoring)
+  * [endpoint_render.grape](https://github.com/ruby-grape/grape#performance-monitoring)
+  * [endpoint_run_filters.grape](https://github.com/ruby-grape/grape#performance-monitoring)
+
 On top of this, you can also define your own events, by wrapping your code with
 the [`Rack::Profiler.step`](#custom-steps).
 
@@ -46,7 +51,7 @@ Or install it yourself as:
 
     $ gem install rack-profiler
 
-### Rack/Sinatra
+### Rack/Sinatra/Grape
 
 In your `config.ru` use the `Rack::Profiler` middleware at the beginning of your
 middleware stack:

data/lib/grape/endpoint.rb

@@ -0,0 +1,7 @@
+module Grape
+  class Endpoint
+    def as_json(options = nil)
+      body.to_hash.as_json(options)
+    end
+  end
+end

data/lib/rack/profiler.rb

@@ -3,6 +3,7 @@ require "rack/request"
 require "rack/auth/basic"
 require "rack/profiler/version"
 require "active_support/notifications"
+require "grape/endpoint"
 
 module Rack
   class Profiler
@@ -14,8 +15,12 @@ module Rack
                              'render_template.action_view',
                              'render_partial.action_view',
                              'process_action.action_controller',
+                             'endpoint_run.grape',
+                             'endpoint_render.grape',
+                             'endpoint_run_filters.grape',
                              'rack-profiler.total_time',
-                             'rack-profiler.step']
+                             'rack-profiler.step'
+                            ]
 
     class DummyError < StandardError; end
 
@@ -83,6 +88,10 @@ module Rack
         status, headers, body = @app.call(env)
       end
       return [status, headers, body] unless authorized?(env)
+      # Grape will inject the env into the payload.
+      # That'll cause problems with the json, so we'll just remove it.
+      events.each { |e| e[:payload].delete(:env) }
+
       results = {
         events:   events.sort_by { |event| event[:start] },
         response: {

data/lib/rack/profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Profiler
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-profiler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Luca Ongaro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -95,6 +95,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/grape/endpoint.rb
 - lib/rack/profiler.rb
 - lib/rack/profiler/version.rb
 - public/rack-profiler.html
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple profiler for Rack applications