remnant 0.2.4 → 0.3.0

data/lib/remnant/base.rb

@@ -1,5 +1,16 @@
 class Remnant
   module ClassMethods
+    def color(default = false, heading = false)
+      return "\033[0m" if default
+      return "\033[0;01;33m" if heading
+
+      @current_color ||= "\033[0;01;36m"
+      @next_color ||= "\033[0;01;35m"
+
+      @current_color, @next_color = @next_color, @current_color
+      @current_color
+    end
+
     def configure(&block)
       configuration.instance_eval(&block)
     end
@@ -37,7 +48,7 @@ class Remnant
         end
       else
         # always log in development mode
-        Rails.logger.info "--------------Remnants Discovered--------------"
+        Rails.logger.info "#{color(false, true)}--------------Remnants Discovered--------------#{color(true)}"
 
         Remnant::Discover.results.map do |remnant_key, ms|
           key = [
@@ -45,10 +56,30 @@ class Remnant
                  remnant_key
                 ].compact.join('.')
 
-          Rails.logger.info "#{ms.to_i}ms\t#{key}"
+          Rails.logger.info "#{Remnant.color}#{ms.to_i}ms#{Remnant.color(true)}\t#{key}"
+        end
+
+        if Remnant::Template.enabled?
+          Rails.logger.info ""
+          Rails.logger.info "#{color(false, true)}----- Templates -----#{color(true)}"
+          Remnant::Template.trace.root.children.map do |rendering|
+            Remnant::Template.trace.log(Rails.logger, rendering, 0)
+          end
+        end
+
+        if Remnant::Database.enabled?
+          Rails.logger.info ""
+          Rails.logger.info("#{color(false, true)}---- Database (%.2fms) -----#{color(true)}" % (Remnant::Database.queries.map(&:time).sum * 1000))
+          if Remnant::Database.suppress?
+            Rails.logger.info "queries suppressed in development mode"
+          else
+            Remnant::Database.queries.map do |query|
+              Rails.logger.info("#{color}%.2fms#{color(true)}\t#{query.sql}" % (query.time * 1000))
+            end
+          end
         end
 
-        Rails.logger.info "-----------------------------------------------"
+        Rails.logger.info "#{color(false, true)}-----------------------------------------------#{color(true)}"
       end
 
       # run hook if given
@@ -56,6 +87,8 @@ class Remnant
         Remnant.configuration.custom_hook.call(Remnant::Discover.results)
       end
 
+      Remnant::Database.reset
+      Remnant::Template.reset
       Remnant::Discover.results.clear
     end
   end

data/lib/remnant/database/query.rb

@@ -0,0 +1,19 @@
+class Remnant
+  class Database
+    class Query
+      attr_reader :sql
+      attr_reader :time
+      attr_reader :backtrace
+
+      def initialize(sql, time, backtrace = [])
+        @sql = sql
+        @time = time
+        @backtrace = backtrace
+      end
+
+      def inspectable?
+        sql.strip =~ /^SELECT /i
+      end
+    end
+  end
+end

data/lib/remnant/database.rb

@@ -0,0 +1,49 @@
+class Remnant
+  class Database
+    module ClassMethods
+      def disable!
+        @enabled = false
+      end
+
+      def enable!
+        @enabled = true
+      end
+
+      def enabled?
+        @enabled
+      end
+
+      def unsuppress!
+        @suppress = false
+      end
+
+      def suppress?
+        @suppress || true
+      end
+
+      def record(sql, backtrace = [], &block)
+        return block.call unless Remnant::Database.enabled?
+
+        start_time = Time.now
+        result = block.call
+        queries << Remnant::Database::Query.new(sql, Time.now - start_time, backtrace)
+
+        return result
+      end
+
+      def reset
+        @suppress = true
+        Thread.current['remnant.database.queries'] = []
+      end
+
+      def queries
+        Thread.current['remnant.database.queries'] ||= []
+      end
+
+      def total_time
+        @total_time ||= (queries.inject(0) {|memo, query| memo + query.time}) * 1000
+      end
+    end
+    extend ClassMethods
+  end
+end

data/lib/remnant/discover.rb

@@ -3,7 +3,10 @@ class Remnant
     module ClassMethods
       def find(key, klass, method, instance = true)
         rediscover(key, klass, method, instance) if ActiveSupport::Dependencies.will_unload?(klass)
+        _inject(key, klass, method, instance)
+      end
 
+      def _inject(key, klass, method, instance)
         klass.class_eval <<-EOL, __FILE__, __LINE__
           #{"class << self" unless instance}
           def #{method}_with_remnant(*args, &block)
@@ -17,6 +20,11 @@ class Remnant
         EOL
       end
 
+      def find_with(klass, &block)
+        rediscover(klass, block) if ActiveSupport::Dependencies.will_unload?(klass)
+        block.call
+      end
+
       def measure(key, &block)
         if Remnant::Discover.running.include?(key)
           yield
@@ -51,8 +59,13 @@ class Remnant
       end
 
       def rediscover!
-        remnants_to_rediscover.map do |(key, klass_name, method, instance)|
-          find(key, klass_name.constantize, method, instance)
+        remnants_to_rediscover.map do |remnant|
+          if remnant.size == 4
+            key, klass_name, method, instance = remnant
+            _inject(key, klass_name.constantize, method, instance)
+          else
+            remant.first.call
+          end
         end
       end
     end

data/lib/remnant/rails.rb

@@ -38,6 +38,40 @@ class Remnant
         Remnant::Discover.find('view',     ActionController::Base,                  :render)
         Remnant::Discover.find('filters',  ActionController::Filters::AfterFilter,  :call)
 
+        #
+        # Template rendering
+        #
+        if defined?(ActionView) && defined?(ActionView::Template)
+          Remnant::Discover.find_with(ActionView::Template) do
+            ActionView::Template.class_eval do
+              def render_template_with_remnant(*args, &block)
+                ::Remnant::Template.record(path_without_format_and_extension) do
+                  render_template_without_remnant(*args, &block)
+                end
+              end
+
+              alias_method_chain :render_template, :remnant
+            end
+          end
+        end
+
+        #
+        # database query time
+        #
+        if ::Rails::VERSION::MAJOR == 2
+          Remnant::Discover.find_with(ActiveRecord::ConnectionAdapters::AbstractAdapter) do
+            ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+              def log_with_remnant(sql, name, &block)
+                ::Remnant::Database.record(sql, Kernel.caller) do
+                  log_without_remnant(sql, name, &block)
+                end
+              end
+
+              alias_method_chain :log, :remnant
+            end
+          end
+        end
+
         # last hook into request cycle for sending results
         ::ActionController::Dispatcher.class_eval do
           def call_with_remnant_discovery(*args, &block) #:nodoc:

data/lib/remnant/template/rendering.rb

@@ -0,0 +1,42 @@
+class Remnant
+  class Template
+    class Rendering
+      attr_accessor :name
+      attr_accessor :start_time
+      attr_accessor :end_time
+      attr_accessor :parent
+      attr_accessor :children
+
+      def initialize(name)
+        @name = name
+        @children = []
+      end
+
+      def add(rendering)
+        @children << rendering
+        rendering.parent = self
+      end
+
+      def time
+        @end_time - @start_time
+      end
+
+      def exclusive_time
+        time - child_time
+      end
+
+      def child_time
+        children.inject(0.0) {|memo, c| memo + c.time}
+      end
+
+      def results
+        @results ||= {name.to_s => {
+            'time' => time * 1000.0,
+            'exclusive' => exclusive_time * 1000.0,
+            'children' => children.map(&:results)
+          }
+        }
+      end
+    end
+  end
+end

data/lib/remnant/template/trace.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+class Remnant
+  class Template
+    class Trace
+      def start(template_name)
+        rendering = Remnant::Template::Rendering.new(template_name)
+        rendering.start_time = Time.now
+        @current.add(rendering)
+        @current = rendering
+      end
+
+      def finished(template_name)
+        @current.end_time = Time.now
+        @current = @current.parent
+      end
+
+      def initialize
+        @current = root
+      end
+
+      def total_time
+        root.child_time
+      end
+
+      def root
+        @root ||= Remnant::Template::Rendering.new('root')
+      end
+
+      def log(logger, rendering, depth = 0)
+        rendering.results.map do |key, result|
+
+          #
+          line = Remnant.color
+          line += "#{'   ' * depth}#{depth != 0 ? '└ ' : ''}"
+          line += "#{result['time'].to_i}ms (#{result['exclusive'].to_i}ms)"
+          line += Remnant.color(true)
+          line += ' ' * ((line.size >= 50 ? 10 : 50 - line.size) - (depth == 0 ? 2 : 0))
+          line += "#{key}"
+
+          logger.info line
+
+          rendering.children.map do |child|
+            log(logger, child, depth + 1)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/remnant/template.rb

@@ -0,0 +1,39 @@
+class Remnant
+  class Template
+
+    module ClassMethods
+      def disable!
+        @enabled = false
+      end
+
+      def enable!
+        @enabled = true
+      end
+
+      def enabled?
+        @enabled
+      end
+
+      def record(template)
+        return yield unless Remnant::Template.enabled?
+
+        trace.start(template)
+        begin
+          result = yield
+        ensure
+          trace.finished(template)
+        end
+        return result
+      end
+
+      def reset
+        Thread.current['remnant.template.trace'] = Remnant::Template::Trace.new
+      end
+
+      def trace
+        Thread.current['remnant.template.trace'] ||= Remnant::Template::Trace.new
+      end
+    end
+    extend ClassMethods
+  end
+end

data/lib/remnant/version.rb

@@ -1,3 +1,3 @@
 class Remnant
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/lib/remnant.rb

@@ -3,6 +3,14 @@ require 'statsd'
 require 'remnant/base'
 require 'remnant/configuration'
 require 'remnant/discover'
+
+require 'remnant/template'
+require 'remnant/template/trace'
+require 'remnant/template/rendering'
+
+require 'remnant/database'
+require 'remnant/database/query'
+
 require 'remnant/rails'
 require 'remnant/version'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remnant
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -140,9 +140,14 @@ files:
 - lib/remnant.rb
 - lib/remnant/base.rb
 - lib/remnant/configuration.rb
+- lib/remnant/database.rb
+- lib/remnant/database/query.rb
 - lib/remnant/discover.rb
 - lib/remnant/rails.rb
 - lib/remnant/railtie.rb
+- lib/remnant/template.rb
+- lib/remnant/template/rendering.rb
+- lib/remnant/template/trace.rb
 - lib/remnant/version.rb
 - remnant.gemspec
 - spec/app/some/klass.rb