speedup-rails 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79adaf0346b1581840b1cbc3d88f33e31f31b0e
-  data.tar.gz: 877452dc9f81628257b2e844c0f6a53025d368bf
+  metadata.gz: 0bb89c83b0040085db59dece30966f81ad22dfda
+  data.tar.gz: 4858351dc1b7ea0d8b502e337a2951df17fc6746
 SHA512:
-  metadata.gz: 5d94ee85e7b3efbd8461ccb7b78bf86b871a115d5437cd488874b1337a5cebb25347cabb88c2d5f0cfb145373b3bf6575e798dca1b659bd066d450ecf28867e9
-  data.tar.gz: 8a626e5ceb3d20502ddcc69d9fb1e1985bbd160eacd6779720f95be6ac39a95e011326ea3480f72a8bc35d9fea070afa4f7daa9f47ff2719db9f916dd22b213a
+  metadata.gz: 02c1eb941cb18965f599e74fbc2a58ac9126fb9f04de4c6a785c132ae2b0035ccd69b75b2fe4fae7c439b7d444648f4fcabb5f980cccf33d9ce3f7d1fc95d1c9
+  data.tar.gz: 429645d3ce4bf5ad83149a0f49676b83711287517ec9caad8b706187abe950a3d4344036273f9deb4bb95bf2d2434d5a1d0cf2ba5c52413d7cc08321bd63b422

data/app/controllers/speedup_rails/results_controller.rb

@@ -4,13 +4,17 @@ module SpeedupRails
     def show
       @request_id = params[:id]
       @request = Speedup::Request.get(@request_id)
-      @collectors = Speedup.collectors
-      @redirect = params[:redirect]
-      render layout: false
+      if @request
+        @collectors = Speedup.collectors
+        @redirect = params[:redirect]
+        render layout: false
+      else
+        render nothing: true, status: :not_found
+      end
     end
 
     def rubyprof
-      send_file Rails.root.join('tmp', 'rubyprof', params[:id] ), :type => 'text/html', :disposition => 'inline'
+      send_file Rails.root.join('tmp', 'rubyprof', params[:id] + params[:prof_id]), :type => 'text/html', :disposition => 'inline'
     end
 
   end

data/app/views/speedup_rails/collectors/_queries.html.erb

@@ -21,7 +21,7 @@
 </div>
 
 <script type="text/javascript">
-  var traces = document.getElementById("speedup_collectorinfo_<%= key %>").getElementsByClassName('backtrace')
+  var traces = document.getElementById("speedup_<%= request_id %>_collectorinfo_<%= key %>").getElementsByClassName('backtrace')
   for (var j = traces.length - 1; j >= 0; j--) {
     traces[j].onclick = function() {
       var i;

data/app/views/speedup_rails/collectors/_rubyprof.html.erb

@@ -1,3 +1,5 @@
 <span class="speedup_rails_<%= key %>" data-key="<%= key %>">
-  <%= link_to 'ruby-prof', rubyprof_result_path(@request_id) %>
+  <% data.each do |prof_id| %>
+    <%= link_to 'ruby-prof_'+prof_id.to_s, rubyprof_result_path(@request_id, prof_id: prof_id), target: '_blank' %>
+  <% end %>
 </span>

data/app/views/speedup_rails/results/show.html.erb

@@ -1,8 +1,8 @@
-<ul class="speedup_main_bar speedup_main_bar_<%= @redirect %><%= ' redirect' if @redirect %>">
+<ul class="speedup_main_bar <%= ' redirect' if @redirect %>">
   <% @collectors.each do |col| %>
     <% next unless col.render? %>
-    <li id="speedup_collectorinfo_<%= col.key %>">
-      <%= render "speedup_rails/collectors/#{col.key}", data: @request[col.key] || [], key: col.key, request_data: @request[:request], redirect: @redirect %>
+    <li id="speedup_<%= @request_id %>_collectorinfo_<%= col.key %>">
+      <%= render "speedup_rails/collectors/#{col.key}", request_id: @request_id, data: @request[col.key] || [], key: col.key, request_data: @request[:request], redirect: @redirect %>
     </li>
   <% end %>
 </ul>

data/lib/speedup-rails.rb

@@ -86,6 +86,12 @@ module Speedup
     @collectors
   end
 
+  def self.profile(&block)
+    @rubyprof ||= @collectors.detect{|c| c.key == :rubyprof}
+    raise "You need to enable rubyprof collector to profile!" unless @rubyprof
+    @rubyprof.profile(&block)
+  end
+
 end
 
 ActiveSupport.run_load_hooks(:speedup, Speedup) if Speedup.enabled?

data/lib/speedup-rails/engine.rb

@@ -34,6 +34,11 @@ module SpeedupRails
     config.speedup.show_bar = Rails.env.development?
     config.speedup.automount = true
 
+    initializer :assets do |config|
+      Rails.application.config.assets.precompile += %w(speedup_rails/icons.png)
+      Rails.application.config.assets.paths << root.join("app", "assets", "images")
+    end
+
     initializer 'speedup.set_configs' do |app|
       ActiveSupport.on_load(:speedup) do
         app.config.speedup.each do |k,v|

data/lib/speedup/collectors/collector.rb

@@ -70,7 +70,7 @@ module Speedup
       # Uses a event_to_data method.
       def store_event(evt, key=nil)
         key ||= self.key
-        Speedup.request.store_event(key, event_to_data(evt) )
+        Speedup.request.store_event(key, event_to_data(evt) ) if Speedup.request
       end
 
       # Transfer the event to actual stored data.

data/lib/speedup/collectors/rubyprof_collector.rb

@@ -10,7 +10,7 @@ module Speedup
       end
 
       def parse_options
-        # pass
+        @profile_request = !!@options[:profile_request]
       end
 
       # The data results that are inserted at the end of the request for use in
@@ -22,16 +22,12 @@ module Speedup
       end
 
       def setup_subscribes
-        before_request do
-          RubyProf.start if enabled?
-        end
-        after_request do
-          result = RubyProf.stop if enabled?
-
-          # Print a flat profile to text
-          printer = RubyProf::CallStackPrinter.new(result)
-          ::File.open(@results_dir.join( Speedup.request.id ), 'wb') do |file|
-            printer.print(file)
+        if enabled? && @profile_request
+          before_request do
+            start_prof
+          end
+          after_request do
+            end_prof
           end
         end
       end
@@ -41,6 +37,39 @@ module Speedup
         super || evt.payload[:controller].start_with?('Speedup')
       end
 
+      def start_prof
+        RubyProf.start
+      end
+
+      def end_prof(result_id=nil)
+        result = RubyProf.stop
+
+        Speedup.request.store_event(key, result_id )
+
+        # Print a flat profile to text
+        printer = printer_klass.new(result)
+        ::File.open(@results_dir.join( Speedup.request.id + result_id.to_s ), 'wb') do |file|
+          printer.print(file)
+        end
+      end
+
+      def profile(result_id=nil, &block)
+        start_prof
+        yield
+        end_prof(next_id)
+      end
+
+      private
+
+        def next_id
+          @next_id = @next_id.to_i + 1
+        end
+
+        def printer_klass
+          # RubyProf::GraphHtmlPrinter
+          RubyProf::CallStackPrinter
+        end
+
     end
   end
 end

data/lib/speedup/middleware.rb

@@ -31,6 +31,10 @@ module Speedup
       raise exception
     end
 
+    def speedup_request?(env)
+      env['REQUEST_PATH'].starts_with?('/speedup_rails')
+    end
+
     class SpeedupBody
       include Enumerable
 
@@ -88,8 +92,9 @@ module Speedup
         end
         str << "if( typeof jQuery !== 'undefined' ) {
               jQuery(document).ajaxComplete(function(evt, xhr, settings){
-                if(! settings.url.match('#{SpeedupRails::Engine.routes.url_helpers.result_path('')}') )
-                  loadRequestData('#{SpeedupRails::Engine.routes.url_helpers.result_path('REQUEST_ID')}'.replace('REQUEST_ID', xhr.getResponseHeader('X-Request-Id')));
+                var request_id = xhr.getResponseHeader('X-Request-Id');
+                if( request_id && !settings.url.match('#{SpeedupRails::Engine.routes.url_helpers.result_path('')}') )
+                  loadRequestData('#{SpeedupRails::Engine.routes.url_helpers.result_path('REQUEST_ID')}'.replace('REQUEST_ID', request_id));
               });
             }"
         str << '</script>'
@@ -138,7 +143,7 @@ module Speedup
                 right: 0;
                 padding: 5px;
                 display: none;
-                height: 500px;
+                max-height: 500px;
                 max-width: 200%;
                 overflow: scroll;
               }

data/lib/speedup/version.rb

@@ -1,3 +1,3 @@
 module Speedup
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedup-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -562,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SpeedUpRails provide analyzing and motitoring tool for rails.