rails_performance 1.2.0.alpha3 → 1.2.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cc5606eeacc1d036f322a9eda07cea2d2151c23ad96052f2e7a695ea288e5a
-  data.tar.gz: 51fe7e76287eb361e0d2135039f4f95c03f559ca575bae8883b1a94c107762e2
+  metadata.gz: 71e33d8156df40c792e33f03eae39a06c12f1622aa2c8071291c4e81c803d3ac
+  data.tar.gz: 288c78335fec92abede6d72f82b841fd128ff079baad62d3a1ea3900003c5171
 SHA512:
-  metadata.gz: fc80d1c5713b87b6338778086bc6b4180f36bfd9d38b96753bf92e733f985fa9101ea53c8a426a0cf41c1916dc83266d7f53868b2ceaf6aa4c7c7be11f3ab158
-  data.tar.gz: 8a54a10c63673d143fe07cfddf03db2000d6f957b3d913edfebf5f0c06f598c5808732dedbb0e3b37e4b280cd00f21b5ba21dbe36248103c5f930015870e81f9
+  metadata.gz: 2617feffb5ceeb2c644679a4de52ecc60797350c883776cfd706b4d7a3c4fca77c93e15ad7243f4fe18c2612728b241f9584a5a7135947b7e8f66dec6f05ae59
+  data.tar.gz: 8bff9d4b572f7bb41de93850651c210e0e59d6e03395e78d10ca777ace00ad31fb85f40c1153fe60062d3ac1a4094b1e6c0e64bef3c44757b3b8f102a776afb6

data/app/assets/images/bot.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M21.928 11.607c-.202-.488-.635-.605-.928-.633V8c0-1.103-.897-2-2-2h-6V4.61c.305-.274.5-.668.5-1.11a1.5 1.5 0 0 0-3 0c0 .442.195.836.5 1.11V6H5c-1.103 0-2 .897-2 2v2.997l-.082.006A1 1 0 0 0 1.99 12v2a1 1 0 0 0 1 1H3v5c0 1.103.897 2 2 2h14c1.103 0 2-.897 2-2v-5a1 1 0 0 0 1-1v-1.938a1.006 1.006 0 0 0-.072-.455zM5 20V8h14l.001 3.996L19 12v2l.001.005.001 5.995H5z"/><ellipse cx="8.5" cy="12" rx="1.5" ry="2"/><ellipse cx="15.5" cy="12" rx="1.5" ry="2"/><path d="M8 16h8v2H8z"/></svg>

data/app/assets/images/user.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M12 2A10.13 10.13 0 0 0 2 12a10 10 0 0 0 4 7.92V20h.1a9.7 9.7 0 0 0 11.8 0h.1v-.08A10 10 0 0 0 22 12 10.13 10.13 0 0 0 12 2zM8.07 18.93A3 3 0 0 1 11 16.57h2a3 3 0 0 1 2.93 2.36 7.75 7.75 0 0 1-7.86 0zm9.54-1.29A5 5 0 0 0 13 14.57h-2a5 5 0 0 0-4.61 3.07A8 8 0 0 1 4 12a8.1 8.1 0 0 1 8-8 8.1 8.1 0 0 1 8 8 8 8 0 0 1-2.39 5.64z"/><path d="M12 6a3.91 3.91 0 0 0-4 4 3.91 3.91 0 0 0 4 4 3.91 3.91 0 0 0 4-4 3.91 3.91 0 0 0-4-4zm0 6a1.91 1.91 0 0 1-2-2 1.91 1.91 0 0 1 2-2 1.91 1.91 0 0 1 2 2 1.91 1.91 0 0 1-2 2z"/></svg>

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -55,6 +55,25 @@ module RailsPerformance
         db          = @datasource.db
         @data       = RailsPerformance::Reports::RecentRequestsReport.new(db).data(params[:from_timei])
 
+        # example
+        # :controller=>"HomeController",
+        # :action=>"index",
+        # :format=>"html",
+        # :status=>"200",
+        # :method=>"GET",
+        # :path=>"/",
+        # :request_id=>"9c9bff5f792a5b3f77cb07fa325f8ddf",
+        # :datetime=>2023-06-24 21:22:46 +0300,
+        # :datetimei=>1687630966,
+        # :duration=>207.225830078125,
+        # :db_runtime=>2.055999994277954,
+        # :view_runtime=>67.8370000096038,
+        # :exception=>nil,
+        # :backtrace=>nil,
+        # :http_referer=>nil,
+        # "email"=>nil,
+        # "user_agent"=>"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"}]
+
         respond_to do |page|
           page.html
           page.js

data/app/helpers/rails_performance/application_helper.rb

@@ -92,9 +92,31 @@ module RailsPerformance
       end
     end
 
+    def bot_icon(user_agent)
+      return nil if user_agent.blank?
+
+      # TODO: clean this up
+      # user_agent = "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/W.X.Y.Z Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+
+      browser = Browser.new(user_agent)
+
+      if browser.bot? || rand(2) == 1
+        content_tag(:span, class: "user-agent-icon", title: browser.bot&.name) do
+          icon("bot")
+        end
+      else
+        content_tag(:span, class: "user-agent-icon") do
+          icon("user")
+        end
+      end
+    end
+
     def icon(name)
-      # https://www.iconfinder.com/iconsets/vivid
-      raw File.read(File.expand_path(File.dirname(__FILE__) +  "/../../assets/images/#{name}.svg"))
+      @icons ||= {}
+      @icons[name] ||= begin
+        # https://www.iconfinder.com/iconsets/vivid
+        raw File.read(File.expand_path(File.dirname(__FILE__) +  "/../../assets/images/#{name}.svg"))
+      end
     end
 
     def insert_css_file(file)

data/app/views/rails_performance/rails_performance/_recent_row.html.erb

@@ -7,6 +7,7 @@
     <% end %>
   </td>
   <td><%= format_datetime e[:datetime] %></td>
+  <td><%= bot_icon e["user_agent"] %></td>
   <td>
     <% controller_action_info = e[:controller] + '#' + e[:action]%>
     <%= link_to truncate(controller_action_info, length: 40), rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true, title: controller_action_info %>

data/app/views/rails_performance/rails_performance/recent.html.erb

@@ -19,6 +19,7 @@
         <tr>
           <th data-sort="string"></th>
           <th data-sort="string">Datetime</th>
+          <th></th>
           <th data-sort="string">Controller#action</th>
           <th data-sort="string">Method</th>
           <th data-sort="string">Format</th>

data/app/views/rails_performance/rails_performance/slow.html.erb

@@ -13,6 +13,7 @@
         <tr>
           <th data-sort="string"></th>
           <th data-sort="string">Datetime</th>
+          <th></th>
           <th data-sort="string">Controller#action</th>
           <th data-sort="string">Method</th>
           <th data-sort="string">Format</th>

data/app/views/rails_performance/stylesheets/style.css

@@ -56,6 +56,11 @@
   height: 24px;
 }
 
+.user-agent-icon svg {
+  width: 12px;
+  height: 12px;
+}
+
 .chart {
   height: 245px;
 }

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = '1.2.0.alpha3'
+  VERSION = '1.2.0.alpha4'
   SCHEMA  = '1.0.1'
 end

data/lib/rails_performance.rb

@@ -1,5 +1,6 @@
 require "redis"
 require "redis-namespace"
+require "browser"
 require_relative "./rails_performance/version.rb"
 require_relative "rails_performance/rails/query_builder.rb"
 require_relative "rails_performance/rails/middleware.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha3
+  version: 1.2.0.alpha4
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +233,7 @@ files:
 - Rakefile
 - app/assets/config/rails_performance_manifest.js
 - app/assets/images/activity.svg
+- app/assets/images/bot.svg
 - app/assets/images/close.svg
 - app/assets/images/export.svg
 - app/assets/images/git.svg
@@ -227,6 +242,7 @@ files:
 - app/assets/images/import.svg
 - app/assets/images/menu.svg
 - app/assets/images/stat.svg
+- app/assets/images/user.svg
 - app/controllers/rails_performance/base_controller.rb
 - app/controllers/rails_performance/rails_performance_controller.rb
 - app/helpers/rails_performance/application_helper.rb