garelic 0.1.1 → 0.2.0

data/lib/garelic.rb

@@ -1,9 +1,38 @@
 require "garelic/version"
-require "garelic/dispatcher"
+require "garelic/middleware"
 
 class Garelic
   Timing = '<!-- /* GARELIC DATA */ -->'.html_safe
 
+  @@deployed_version_slot = 5
+
+  cattr_accessor :deployed_version, :deployed_version_slot, instance_accessor: false
+
+  def self.monitoring(profile_id)
+    buffer = <<-HTML
+      <script type="text/javascript">
+          var _gaq = _gaq || [];
+          _gaq.push(['_setAccount', '#{profile_id}']);
+          _gaq.push(['_setSiteSpeedSampleRate', 100]);
+          #{report_deployed_version}
+          _gaq.push(['_trackPageview']);
+
+          #{Garelic::Timing}
+
+          (function() {
+              var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+              ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+          })();
+      </script>
+    HTML
+    buffer.html_safe
+  end
+
+  def self.report_deployed_version
+    "_gaq.push(['_setCustomVar', #{deployed_version_slot}, 'Garelic (Deployed version)', '#{deployed_version}', 3])" unless deployed_version.blank?
+  end
+
   def self.report_user_timing_from_metrics(metrics)
     reports = report_user_timing_for_action(metrics[:action], metrics.action_identifier)
     reports += report_user_timing_for_active_record(metrics[:active_record], metrics.action_identifier)
@@ -35,8 +64,10 @@ class Garelic
   end
 
   class Railtie < Rails::Railtie
-    initializer 'garelic.install_instrumentation' do
-      Garelic::Metrics.reset!
+    initializer 'garelic.install_instrumentation' do |app|
+      app.middleware.use Garelic::Middleware
+
+      Garelic::deployed_version = deployed_version_from_git || deployed_version_from_revision_file
 
       ActiveSupport::Notifications.subscribe('process_action.action_controller') do |_, start, finish, _, payload|
         Garelic::Metrics.report(:action, :db_runtime, payload[:db_runtime] || 0)
@@ -50,6 +81,14 @@ class Garelic
         Garelic::Metrics.report(:active_record, type, (finish - start) * 1000) if type != 'CACHE'
       end
     end
+
+    def deployed_version_from_git
+      `git log --pretty=format:"%cd %h" --date=iso -1 2>/dev/null`.strip.presence
+    end
+
+    def deployed_version_from_revision_file
+      `cat #{Rails.root}/REVISION 2>/dev/null`.strip.presence
+    end
   end
 
   class Metrics
@@ -77,6 +116,7 @@ class Garelic
 
     private
     def self.metrics
+      Thread.current[:garelic] ||= {}
       Thread.current[:garelic]
     end
   end

data/lib/garelic/middleware.rb

@@ -0,0 +1,19 @@
+class Garelic::Middleware
+  def initialize(app)
+    @app = app
+    Garelic::Metrics.reset!
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+
+    if headers["Content-Type"] =~ /text\/html|application\/xhtml\+xml/
+      body = response.body.gsub(Garelic::Timing, Garelic.report_user_timing_from_metrics(Garelic::Metrics))
+      response = [body]
+    end
+
+    Garelic::Metrics.reset!
+
+    [status, headers, response]
+  end
+end

data/lib/garelic/version.rb

@@ -1,3 +1,3 @@
 class Garelic
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garelic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Use Google Analytics for Rails App Performance Monitoring
 email:
@@ -25,7 +25,7 @@ files:
 - Rakefile
 - garelic.gemspec
 - lib/garelic.rb
-- lib/garelic/dispatcher.rb
+- lib/garelic/middleware.rb
 - lib/garelic/version.rb
 homepage: https://github.com/jsuchal/garelic
 licenses: []

data/lib/garelic/dispatcher.rb

@@ -1,20 +0,0 @@
-module ActionController
-  class Metal < AbstractController::Base
-    alias :dispatch_without_garelic :dispatch
-
-    def dispatch(*args)
-      Garelic::Metrics.reset!
-
-      response = dispatch_without_garelic(*args)
-
-      timing_data = Garelic.report_user_timing_from_metrics(Garelic::Metrics)
-
-      _, _, chunks = response
-      chunks.each do |chunk|
-        chunk.gsub!(Garelic::Timing, timing_data)
-      end
-
-      response
-    end
-  end
-end