resource_monitor 0.1.2 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9cff3d45a83f8e83d3297d05360bc74aabf34e7
-  data.tar.gz: 61dd96132acfdf3b75fa5ffd61f11c1e1c538115
+  metadata.gz: eecf07c5ecfe62105544c1ea6346c03217f3c78d
+  data.tar.gz: 3097b646b2ea020215d3fa955d1aaf9e842a7157
 SHA512:
-  metadata.gz: 11843bbb8f9c150e0687f78fdaa7f936d04682e45cf398e5f96cbc56dcd3651088142e1de4ed1a17d4d5b9d8fd3fd0830d261813925f3d9010502f6a3c5868c8
-  data.tar.gz: 117e13d29e5ed610285f992c495256815881b0cce37a5fdd73d9bb2135ccab1f60739f41c9b5302d4d88442d0122a83d966024feb7ff6107eb1585e6cb99621a
+  metadata.gz: e8f10d66a3f4c3f397aa10c0e284a7750b2d3178e2858434450ff4c5a7878e53c02371085e7f2672fb641655971aafd9f768b8616f3f674a406b0088567cdeb0
+  data.tar.gz: 8d9e376abfaacbb956f48896bcd7f670b7d02f827a617d90925c0ffb3a926c08630efb201262b82564c884db71108511afa916962a619c90bdf57ca2fb003b93

data/README.md

@@ -8,9 +8,8 @@ Creates a simple page under /resources/ that is updated with CPU/RAM usage in re
 
 Although not a major performance hog, this should only be run in production when there is evidence of resource overuse, look under the Usage section for instructions for disabling the gem.
 
-Latest Version: 0.1.2
-Last Feature Set: Engine created, no need to manually install dashboard.
-Recommended Installation: Uninstall dashboard, then remove Gemfile.lock and rebundle.
+Latest Version: 1.0
+Last Feature Set: Complete Engine and Simplified Installation. Support for ActionController and ActiveRecord benchmarks.
 
 ## Installation
 
@@ -24,16 +23,22 @@ And then execute:
 
     $ bundle install
 
-Add the following to the top of your application.rb file
-You can also only add it to the controllers you think may be causing some issues.
+Add the following to the top of your application_controller.rb file
+You may also add it to the controllers you think may be causing some issues.
 
 ```ruby
-before_action :resource_monitor_app
-after_action :resource_monitor_app
+# This should be a single line
+around_action def benchmark; ResourceMonitor.benchmark(self); yield; ResourceMonitor.benchmark(self); end
+```
 
-def resource_monitor_app
-  ResourceMonitor.benchmark(self)
-end
+You can also utilize standard callbacks and add only, except conditions
+
+```ruby
+# This should be a single line (enables resource monitoring in the "index")
+around_action def benchmark; ResourceMonitor.benchmark(self); yield; ResourceMonitor.benchmark(self); end, only: :index
+
+# This should be a single line (enables resource monitoring for everything except 'index')
+around_action def benchmark; ResourceMonitor.benchmark(self); yield; ResourceMonitor.benchmark(self); end, except: :index
 ```
 ## Usage
 
@@ -52,19 +57,22 @@ Bundle install and browse to /resources/.
 If you want to disable this, you can easily comment out the contents of resource_monitor_app or use an ENV variable such as below.
 
 ```ruby
-before_action :resource_monitor_app
-after_action :resource_monitor_app
+around_action :resource_monitor_app
 
 def resource_monitor_app
   if ENV['MONITORING_ENABLED']
     ResourceMonitor.benchmark(self)
+    yield
+    ResourceMonitor.benchmark(self)
+  else
+    yield
   end
 end
 ```
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `rake resource_monitor:console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/app/views/resource_monitor/resource/index.html.erb

@@ -14,21 +14,17 @@
           var cpu_percentage = json['cpu_percentage']
           var ram_percentage = json['ram_percentage']
           var ram_usage = json['ram_usage']
-          var last_executed_controller = json['last_executed_controller']
-          var last_executed_action = json['last_executed_action']
+          var details = json['details']
 
 
           var execution_details_td = jQuery('<td/>', {
             text: ""
           });
 
-          var controller_details =  jQuery('<p>',{
-            text: "Controller: " +last_executed_controller
-          })
-
-          var action_details = jQuery('<p>',{
-            text: "Action: "  + last_executed_action
-          })
+          var details = details.split("\n")
+          $.each(details, function(i, v) {
+            $($("<p>").text(details[i])).appendTo(execution_details_td);
+          });
 
           var ram_usage_td = jQuery('<td/>', {
             text: ram_usage + " MB"
@@ -52,8 +48,6 @@
           cpu_percentage_td.appendTo(main_tr)
           ram_percentage_td.appendTo(main_tr)
           ram_usage_td.appendTo(main_tr)
-          controller_details.appendTo(execution_details_td)
-          action_details.appendTo(execution_details_td)
           execution_details_td.appendTo(main_tr)
           main_tr.prependTo(table_body)
         }

data/lib/resource_monitor.rb

@@ -2,16 +2,18 @@ require "resource_monitor/engine"
 require "resource_monitor/version"
 
 module ResourceMonitor
-  def self.benchmark(controller=nil)
+  def self.benchmark(input=nil)
     # Recover the process id and memory usage in KB (http://stackoverflow.com/questions/7220896/get-current-ruby-process-memory-usage)
     pid, size, cpu_per, mem_per = `ps ax -o pid,rss,%cpu,%mem | grep -E "^[[:space:]]*#{$$}"`.strip.split.map(&:to_i)
 
-    if controller
-      last_executed_controller = controller.controller_name  || 'NoController'
-      last_executed_action = controller.action_name || 'NoAction'
+    if input
+      if input.kind_of?(ActionController::Base)
+        details = "Controller: #{input.controller_name}\nAction: #{input.action_name}"
+      elsif input.kind_of?(ActiveRecord::Base)
+        details = "Model: #{input.model_name.human}"
+      end
     else
-      last_executed_controller = 'NoController'
-      last_executed_action = 'NoAction'
+      details = "No details available"
     end
 
     data = {
@@ -19,8 +21,7 @@ module ResourceMonitor
       cpu_percentage: cpu_per,
       ram_percentage: mem_per,
       ram_usage: (size / 1024).to_i,
-      last_executed_controller: last_executed_controller,
-      last_executed_action: last_executed_action
+      details: details
     }
 
     ActionCable.server.broadcast 'resources', data.to_json if defined?(ActionCable)

data/lib/resource_monitor/version.rb

@@ -1,3 +1,3 @@
 module ResourceMonitor
-  VERSION = '0.1.2'
+  VERSION = '1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resource_monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '1.0'
 platform: ruby
 authors:
 - Lazaro Herrera