rails-webprofiler 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5d3d3fec249c55feee97e07f90502654799248
-  data.tar.gz: 9add6f25af392583b805641dab95d3b5d040f761
+  metadata.gz: 9a63d72241be08bb543bd3f463571bd7c560acf3
+  data.tar.gz: 2baccab9e96c4377e5be9d61e23e68bc4500218d
 SHA512:
-  metadata.gz: c0d62734e506066c976b4cf9aa4cab9998f294b1a2a3e164c89042a5afb7ba7ec11eaee105556212b71e5bc7deab2b8aadaea9ac8f306a6ca5f2a4eb2523e3da
-  data.tar.gz: 29d2f4fbb9512d3fae65f52b9cfeedaa73e39c46559aa25983374468449c92037359897069777573db087c09c20392de3fc347a0dac5ea49b728190d3d662fcf
+  metadata.gz: 07ddd1fb120f61f05023d3aa1146a64a7292261e0089a186ffa36d9d3d719155f2da6110584f6d8abf2cb190d0d15eb9038e66b7036edc7dc6d7785ee3fa994a
+  data.tar.gz: b1836c45195e1dfae91d31723beb449f2c6fc8027d70e6e32e64ea67eeb4da4dbdb00a43e0f02697dbc551edc2b351baf09663e607273eb775bead4e0406bb30

data/CHANGELOG.md

@@ -9,6 +9,22 @@
   * Create a collector to show the Rails logger informations.
 
 
+## v0.1.1
+
+Use `rack-webprofiler` >= `0.1.3`.
+
+### Features
+
+  * Show connection informations on ActiveRecordCollector.
+
+### Fixes
+
+  * Optimize the Railtie implementation.
+  * Optimize ActionViewCollector (#10).
+  * Load profiler only for Rails 4.2+.
+  * Small code cleanup.
+
+
 ## v0.1.0
 
 ### Features

data/README.md

@@ -1,6 +1,6 @@
 # Rails WebProfiler
 
-A web profiler for Rails applications based on
+A web profiler for Rails +4.2 applications based on
 [`rack-webprofiler`](https://github.com/rack-webprofiler/rack-webprofiler/).
 
 [![Version         ](http://img.shields.io/gem/v/rails-webprofiler.svg)                               ](https://rubygems.org/gems/rails-webprofiler)
@@ -27,7 +27,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rails-webprofiler. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/rack-webprofiler/rails-webprofiler. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/rails/web_profiler.rb

@@ -1,16 +1,21 @@
 require "rack/webprofiler"
+require "rails/version"
+require "rails/railtie"
 
-class Rails::WebProfiler
+module Rails
+  class WebProfiler
+    autoload :VERSION,             "rails/web_profiler/version"
+    autoload :NotificationHandler, "rails/web_profiler/notification_handler"
 
-  autoload :VERSION, "rails/web_profiler/version"
-  autoload :NotificationHandler, "rails/web_profiler/notification_handler"
-
-  module Collectors
-    autoload :ActionViewCollector, "rails/web_profiler/collectors/action_view_collector"
-    autoload :ActiveRecordCollector, "rails/web_profiler/collectors/active_record_collector"
-    autoload :RailsCollector, "rails/web_profiler/collectors/rails_collector"
-    autoload :RequestCollector, "rails/web_profiler/collectors/request_collector"
+    module Collectors
+      autoload :ActionViewCollector,   "rails/web_profiler/collectors/action_view_collector"
+      autoload :ActiveRecordCollector, "rails/web_profiler/collectors/active_record_collector"
+      autoload :RailsCollector,        "rails/web_profiler/collectors/rails_collector"
+      autoload :RequestCollector,      "rails/web_profiler/collectors/request_collector"
+    end
   end
 end
 
-require "rails/web_profiler/railtie" if defined? Rails
+if defined?(::Rails) && ::Rails.version >= "4.2.0"
+  require "rails/web_profiler/railtie"
+end

data/lib/rails/web_profiler/collectors/action_view_collector.rb

@@ -10,11 +10,16 @@ ICON
     label      "ActionView"
     position   9
 
-    collect do |_request, _response|
+    collect do
       data = ::Rack::WebProfiler.data("rails.events")
 
       events = []
-      events = data.by_event_names(%w(render_template.action_view render_partial.action_view)) unless data.nil?
+      if !data.nil?
+        events = data.by_event_names(%w(render_template.action_view render_partial.action_view))
+        events.each do |e|
+          e.payload.delete_if { |k, _v| !%w( identifier layout ).include?(k.to_s) }
+        end
+      end
 
       total_duration = events.inject(0) { |sum, e| sum + e.duration }
 
@@ -25,7 +30,7 @@ ICON
 
     template __FILE__, type: :DATA
 
-    is_enabled? -> { defined? ::ActiveRecord }
+    is_enabled? -> { defined? ::ActionView }
   end
 end
 

data/lib/rails/web_profiler/collectors/active_record_collector.rb

@@ -10,12 +10,18 @@ ICON
     label      "ActiveRecord"
     position   10
 
-    collect do |_request, _response|
+    collect do
       data = ::Rack::WebProfiler.data("rails.events")
 
       events = []
       events = data.by_event_name("sql.active_record") unless data.nil?
 
+      ar_conn = ActiveRecord::Base.connection
+      store :connection, {
+        adapter_class: ar_conn.class.name,
+        adapter_name:  ar_conn.adapter_name,
+      }
+
       total_duration = events.inject(0) { |sum, e| sum + e.duration }
 
       store :events,         events
@@ -85,4 +91,22 @@ __END__
     <p><span class="text__no-value">No queries executed.</span></p>
     <% end %>
   </div>
+
+  <div class="block">
+    <h3>Connection</h3>
+
+    <% conn = data(:connection) %>
+    <table>
+      <tbody>
+        <tr>
+          <th>Adapter class</th>
+          <td><code><%=h conn[:adapter_class] %></code></td>
+        </tr>
+        <tr>
+          <th>Adapter name</th>
+          <td><%=h conn[:adapter_name] %></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 <% end %>

data/lib/rails/web_profiler/collectors/rails_collector.rb

@@ -11,7 +11,7 @@ ICON
     label      "Rails"
     position   1
 
-    collect do |request, _response|
+    collect do |request|
       store :rack_version, ::Rack.release
 
       store :rails_version, Rails.version

data/lib/rails/web_profiler/notification_handler.rb

@@ -20,7 +20,6 @@ class Rails::WebProfiler::NotificationHandler
         end
       end
     end
-
     alias by_event_names by_event_name
   end
 end

data/lib/rails/web_profiler/railtie.rb

@@ -1,20 +1,15 @@
-require "rails"
-
 module Rails
-  # WebProfiler::Railtie
-  class WebProfiler::Railtie < ::Rails::Railtie # :nodoc:
-    initializer "rails-webprofiler.configure_rails_initialization" do |app|
-      app.middleware.use ::Rack::WebProfiler do |c|
-        c.tmp_dir = ::File.expand_path(::File.join(Rails.root, "tmp"), __FILE__)
-      end
+  class WebProfiler
+    def self.initialize!(app)
+      raise "Rails::WebProfiler initialized twice. Set `require: false' for rails-webprofiler in your Gemfile" if @already_initialized
 
-      ::Rack::WebProfiler.unregister_collector [
-        # ::Rack::WebProfiler::Collectors::ExceptionCollector,
-        ::Rack::WebProfiler::Collectors::RackCollector,
-        ::Rack::WebProfiler::Collectors::RequestCollector,
-      ]
+      app.middleware.insert(0, ::Rack::WebProfiler)
 
-      ::Rack::WebProfiler.register_collector [
+      ::Rack::WebProfiler.reset_collectors!
+
+      ::Rack::WebProfiler.register_collectors [
+        ::Rack::WebProfiler::Collectors::RubyCollector,
+        ::Rack::WebProfiler::Collectors::TimeCollector,
         Rails::WebProfiler::Collectors::ActionViewCollector,
         Rails::WebProfiler::Collectors::ActiveRecordCollector,
         Rails::WebProfiler::Collectors::RailsCollector,
@@ -24,6 +19,18 @@ module Rails
       # Subscrine all Rails notifications.
       handler = Rails::WebProfiler::NotificationHandler.new
       ActiveSupport::Notifications.subscribe(/.+/, handler)
+
+      c = ::Rack::WebProfiler.config
+
+      c.tmp_dir = ::File.expand_path(::File.join(Rails.root, "tmp"), __FILE__)
+
+      @already_initialized = true
+    end
+
+    class Railtie < ::Rails::Railtie # :nodoc:
+      initializer "rails-webprofiler.configure_rails_initialization" do |app|
+        Rails::WebProfiler.initialize!(app)
+      end
     end
   end
 end

data/lib/rails/web_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rails
   class WebProfiler
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/rails-webprofiler.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ">= 5.0.0"
-  spec.add_dependency "rack-webprofiler", "~> 0.1.0"
+  spec.add_dependency "rack-webprofiler", "~> 0.1.3"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-webprofiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nicolas Brousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A web profiler for Rails applications.