rack-mini-profiler 0.1.22 → 0.1.23

data/Ruby/lib/mini_profiler/custom_timer_struct.rb

@@ -0,0 +1,22 @@
+require 'mini_profiler/timer_struct'
+
+module Rack
+  class MiniProfiler
+
+    # Timing system for a custom timers such as cache, redis, RPC, external API
+    # calls, etc.
+    class CustomTimerStruct < TimerStruct
+      def initialize(type, duration_ms, page, parent)
+        @parent = parent
+        @page = page
+        @type = type
+
+        super("Type" => type,
+              "StartMilliseconds" => ((Time.now.to_f * 1000).to_i - page['Started']) - duration_ms,
+              "DurationMilliseconds" => duration_ms,
+              "ParentTimingId" => nil)
+      end
+    end
+
+  end
+end

data/Ruby/lib/mini_profiler/page_timer_struct.rb

@@ -7,6 +7,7 @@ module Rack
     #   Root: RequestTimer
     #     :has_many RequestTimer children
     #     :has_many SqlTimer children
+    #     :has_many CustomTimer children
     class PageTimerStruct < TimerStruct
       def initialize(env)
         super("Id" => MiniProfiler.generate_id,
@@ -27,7 +28,10 @@ module Rack
               "HasDuplicateSqlTimings" => false,
               "ExecutedReaders" => 0,
               "ExecutedScalars" => 0,
-              "ExecutedNonQueries" => 0)
+              "ExecutedNonQueries" => 0,
+              "CustomTimingNames" => [],
+              "CustomTimingStats" => {}
+             )
         name = "#{env['REQUEST_METHOD']} http://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}#{env['SCRIPT_NAME']}#{env['PATH_INFO']}"
         self['Root'] = RequestTimerStruct.createRoot(name, self)
       end
@@ -43,7 +47,8 @@ module Rack
       def to_json(*a)
         attribs = @attributes.merge(
           "Started" => '/Date(%d)/' % @attributes['Started'], 
-          "DurationMilliseconds" => @attributes['Root']['DurationMilliseconds']
+          "DurationMilliseconds" => @attributes['Root']['DurationMilliseconds'],
+          "CustomTimingNames" => @attributes['CustomTimingStats'].keys.sort
         )        
         ::JSON.generate(attribs, :max_nesting => 100)
       end

data/Ruby/lib/mini_profiler/profiler.rb

@@ -2,8 +2,10 @@ require 'json'
 require 'timeout'
 require 'thread'
 
+require 'mini_profiler/version'
 require 'mini_profiler/page_timer_struct'
 require 'mini_profiler/sql_timer_struct'
+require 'mini_profiler/custom_timer_struct'
 require 'mini_profiler/client_timer_struct'
 require 'mini_profiler/request_timer_struct'
 require 'mini_profiler/storage/abstract_store'
@@ -19,11 +21,8 @@ require 'mini_profiler/gc_profiler'
 
 module Rack
 
-	class MiniProfiler
-
-    # we really should add a cleaner way to version JS and includes
-		VERSION = '108'.freeze
-
+  class MiniProfiler
+    
     class << self 
       
       include Rack::MiniProfiler::ProfilingMethods
@@ -79,6 +78,29 @@ module Rack
       def request_authorized?
         Thread.current[:mp_authorized]
       end
+
+      # Add a custom timing. These are displayed similar to SQL/query time in
+      # columns expanding to the right.
+      #
+      # type        - String counter type. Each distinct type gets its own column.
+      # duration_ms - Duration of the call in ms. Either this or a block must be
+      #               given but not both.
+      #
+      # When a block is given, calculate the duration by yielding to the block
+      # and keeping a record of its run time.
+      #
+      # Returns the result of the block, or nil when no block is given.
+      def counter(type, duration_ms=nil)
+        result = nil
+        if block_given?
+          start = Time.now
+          result = yield
+          duration_ms = (Time.now - start).to_f * 1000
+        end
+        return result if current.nil? || !request_authorized?
+        current.current_timer.add_custom(type, duration_ms, current.page_struct)
+        result
+      end
     end
 
 		#
@@ -127,7 +149,7 @@ module Rack
         html.gsub!(/\{json\}/, result_json)
         html.gsub!(/\{includes\}/, get_profile_script(env))
         html.gsub!(/\{name\}/, page_struct['Name'])
-        html.gsub!(/\{duration\}/, page_struct.duration_ms.round(1).to_s)
+        html.gsub!(/\{duration\}/, "%.1f" % page_struct.duration_ms)
         
         [200, {'Content-Type' => 'text/html'}, [html]]
       end
@@ -209,6 +231,8 @@ module Rack
         client_settings.disable_profiling = true
         client_settings.write!(headers)
         return [status,headers,body]
+      else
+        client_settings.disable_profiling = false
       end
 
       if query_string =~ /pp=profile-gc/
@@ -316,6 +340,7 @@ module Rack
       end
       
       page_struct = current.page_struct
+      page_struct['User'] = user(env)
 			page_struct['Root'].record_time((Time.now - start) * 1000)
 
       if backtraces
@@ -325,7 +350,7 @@ module Rack
       
 
       # no matter what it is, it should be unviewed, otherwise we will miss POST
-      @storage.set_unviewed(user(env), page_struct['Id']) 
+      @storage.set_unviewed(page_struct['User'], page_struct['Id'])
 			@storage.save(page_struct)
 			
       # inject headers, script
@@ -369,13 +394,29 @@ module Rack
 		end
 
     def inject(fragment, script)
-      fragment.sub(/<\/body>/i) do 
-        # if for whatever crazy reason we dont get a utf string, 
-        #   just force the encoding, no utf in the mp scripts anyway 
+      if fragment.match(/<\/body>/i)
+        # explicit </body>
+
+        regex = /<\/body>/i
+        close_tag = '</body>'
+      elsif fragment.match(/<\/html>/i)
+        # implicit </body>
+
+        regex = /<\/html>/i
+        close_tag = '</html>'
+      else
+        # implicit </body> and </html>. Just append the script.
+
+        return fragment + script
+      end
+
+      fragment.sub(regex) do
+        # if for whatever crazy reason we dont get a utf string,
+        #   just force the encoding, no utf in the mp scripts anyway
         if script.respond_to?(:encoding) && script.respond_to?(:force_encoding)
-          (script + "</body>").force_encoding(fragment.encoding)
+          (script + close_tag).force_encoding(fragment.encoding)
         else
-          script + "</body>"
+          script + close_tag
         end
       end
     end
@@ -449,6 +490,12 @@ module Rack
       ::JSON.generate(ids.uniq)
     end
 
+    def ids_comma_separated(env)
+      # cap at 10 ids, otherwise there is a chance you can blow the header
+      ids = [current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])[0..8]
+      ids.join(",")
+    end
+
 		# get_profile_script returns script to be injected inside current html page
 		# By default, profile_script is appended to the end of all html requests automatically.
 		# Calling get_profile_script cancels automatic append for the current page
@@ -456,7 +503,7 @@ module Rack
 		# * you have disabled auto append behaviour throught :auto_inject => false flag
 		# * you do not want script to be automatically appended for the current page. You can also call cancel_auto_inject
 		def get_profile_script(env)
-			ids = ids_json(env)
+			ids = ids_comma_separated(env)
 			path = @config.base_url_path
 			version = MiniProfiler::VERSION
 			position = @config.position
@@ -466,16 +513,13 @@ module Rack
 			showControls = false
 			currentId = current.page_struct["Id"]
 			authorized = true
-			useExistingjQuery = @config.use_existing_jquery
 			# TODO : cache this snippet 
 			script = IO.read(::File.expand_path('../html/profile_handler.js', ::File.dirname(__FILE__)))
 			# replace the variables
-			[:ids, :path, :version, :position, :showTrivial, :showChildren, :maxTracesToShow, :showControls, :currentId, :authorized, :useExistingjQuery].each do |v|
+			[:ids, :path, :version, :position, :showTrivial, :showChildren, :maxTracesToShow, :showControls, :currentId, :authorized].each do |v|
 				regex = Regexp.new("\\{#{v.to_s}\\}")
 				script.gsub!(regex, eval(v.to_s).to_s)
 			end
-			# replace the '{{' and '}}''
-			script.gsub!(/\{\{/, '{').gsub!(/\}\}/, '}')
 			current.inject_js = false
 			script
 		end

data/Ruby/lib/mini_profiler/request_timer_struct.rb

@@ -33,7 +33,9 @@ module Rack
               "Depth"=> parent ? parent.depth + 1 : 0,
               "ExecutedReaders"=> 0,
               "ExecutedScalars"=> 0,
-              "ExecutedNonQueries"=> 0)
+              "ExecutedNonQueries"=> 0,
+              "CustomTimingStats" => {},
+              "CustomTimings" => {})
         @children_duration = 0
         @start = Time.now
         @parent = parent
@@ -79,6 +81,23 @@ module Rack
         timer
       end
 
+      def add_custom(type, elapsed_ms, page)
+        timer = CustomTimerStruct.new(type, elapsed_ms, page, self)
+        timer['ParentTimingId'] = self['Id']
+        self['CustomTimings'][type] ||= []
+        self['CustomTimings'][type].push(timer)
+
+        self['CustomTimingStats'][type] ||= {"Count" => 0, "Duration" => 0.0}
+        self['CustomTimingStats'][type]['Count'] += 1
+        self['CustomTimingStats'][type]['Duration'] += elapsed_ms
+
+        page['CustomTimingStats'][type] ||= {"Count" => 0, "Duration" => 0.0}
+        page['CustomTimingStats'][type]['Count'] += 1
+        page['CustomTimingStats'][type]['Duration'] += elapsed_ms
+
+        timer
+      end
+
       def record_time(milliseconds = nil)
         milliseconds ||= (Time.now - @start) * 1000
         self['DurationMilliseconds'] = milliseconds

data/Ruby/lib/mini_profiler/storage/redis_store.rb

@@ -1,44 +1,44 @@
-module Rack
-  class MiniProfiler
-    class RedisStore < AbstractStore
-
-      EXPIRE_SECONDS = 60 * 60 * 24
-     
-      def initialize(args)
-        args ||= {}
-        @prefix = args[:prefix] || 'MPRedisStore'
-      end
-
-      def save(page_struct)
-        redis.setex "#{@prefix}#{page_struct['Id']}", EXPIRE_SECONDS, Marshal::dump(page_struct) 
-      end
-
-      def load(id)
-        raw = redis.get "#{@prefix}#{id}"
-        if raw
-          Marshal::load raw
-        end
-      end
-
-      def set_unviewed(user, id)
-        redis.sadd "#{@prefix}-#{user}-v", id
-      end
-
-      def set_viewed(user, id)
-        redis.srem "#{@prefix}-#{user}-v", id
-      end
-
-      def get_unviewed_ids(user)
-        redis.smembers "#{@prefix}-#{user}-v"
-      end
-
-      private 
-
-      def redis
-        require 'redis' unless defined? Redis
-        Redis.new 
-      end
-
-    end
-  end
-end
+module Rack
+  class MiniProfiler
+    class RedisStore < AbstractStore
+
+      EXPIRE_SECONDS = 60 * 60 * 24
+     
+      def initialize(args)
+        @args = args || {}
+        @prefix = @args.delete(:prefix) || 'MPRedisStore'
+      end
+
+      def save(page_struct)
+        redis.setex "#{@prefix}#{page_struct['Id']}", EXPIRE_SECONDS, Marshal::dump(page_struct) 
+      end
+
+      def load(id)
+        raw = redis.get "#{@prefix}#{id}"
+        if raw
+          Marshal::load raw
+        end
+      end
+
+      def set_unviewed(user, id)
+        redis.sadd "#{@prefix}-#{user}-v", id
+      end
+
+      def set_viewed(user, id)
+        redis.srem "#{@prefix}-#{user}-v", id
+      end
+
+      def get_unviewed_ids(user)
+        redis.smembers "#{@prefix}-#{user}-v"
+      end
+
+      private 
+
+      def redis
+        require 'redis' unless defined? Redis
+        Redis.new @args
+      end
+
+    end
+  end
+end

data/Ruby/lib/mini_profiler/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  class MiniProfiler 
+    VERSION = '33d69ecf833daec8db07a9a0b6cf0bd3'.freeze
+  end
+end

data/Ruby/lib/mini_profiler_rails/railtie.rb

@@ -9,7 +9,7 @@ module MiniProfilerRails
 
       # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
       c.pre_authorize_cb = lambda { |env|
-        Rails.env.development? || Rails.env.production?  
+        !Rails.env.test?
       }
 
       c.skip_paths ||= []

data/Ruby/lib/patches/net_patches.rb

@@ -0,0 +1,14 @@
+if (defined?(Net) && defined?(Net::HTTP))
+
+  Net::HTTP.class_eval do
+    def request_with_mini_profiler(*args, &block)
+      request = args[0]
+      Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
+        request_without_mini_profiler(*args, &block)
+      end
+    end
+    alias request_without_mini_profiler request
+    alias request request_with_mini_profiler
+  end
+
+end

data/Ruby/lib/patches/sql_patches.rb

@@ -169,6 +169,25 @@ if SqlPatches.class_exists? "PG::Result"
 end
 
 
+# Mongoid 3 patches
+if SqlPatches.class_exists?("Moped::Node")
+  class Moped::Node
+    alias_method :process_without_profiling, :process
+    def process(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return process_without_profiling(*args,&blk) unless current
+
+      start = Time.now
+      result = process_without_profiling(*args,&blk)
+      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
+      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(args[0].log_inspect, elapsed_time))
+
+      result
+    end
+  end
+end
+
+
 
 # Fallback for sequel
 if SqlPatches.class_exists?("Sequel::Database") && !SqlPatches.patched?
@@ -186,7 +205,7 @@ end
 
 ## based off https://github.com/newrelic/rpm/blob/master/lib/new_relic/agent/instrumentation/active_record.rb
 ## fallback for alls sorts of weird dbs
-if SqlPatches.module_exists?('ActiveRecord')
+if SqlPatches.module_exists?('ActiveRecord') && !SqlPatches.patched?
   module Rack
     class MiniProfiler  
       module ActiveRecordInstrumentation

data/Ruby/lib/rack-mini-profiler.rb

@@ -1,5 +1,6 @@
 require 'mini_profiler/profiler'
 require 'patches/sql_patches'
+require 'patches/net_patches'
 
 if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
   require 'mini_profiler_rails/railtie'

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.22"
+	s.version = "0.1.23"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
 	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -87,6 +87,7 @@ extra_rdoc_files:
 - Ruby/CHANGELOG
 files:
 - rack-mini-profiler.gemspec
+- Ruby/lib/mini_profiler/version.rb
 - Ruby/lib/mini_profiler/sql_timer_struct.rb
 - Ruby/lib/mini_profiler/request_timer_struct.rb
 - Ruby/lib/mini_profiler/timer_struct.rb
@@ -103,6 +104,7 @@ files:
 - Ruby/lib/mini_profiler/storage/redis_store.rb
 - Ruby/lib/mini_profiler/storage/abstract_store.rb
 - Ruby/lib/mini_profiler/storage/memcache_store.rb
+- Ruby/lib/mini_profiler/custom_timer_struct.rb
 - Ruby/lib/rack-mini-profiler.rb
 - Ruby/lib/html/jquery.1.7.1.js
 - Ruby/lib/html/includes.tmpl
@@ -117,6 +119,7 @@ files:
 - Ruby/lib/html/list.js
 - Ruby/lib/mini_profiler_rails/railtie.rb
 - Ruby/lib/patches/sql_patches.rb
+- Ruby/lib/patches/net_patches.rb
 - Ruby/README.md
 - Ruby/CHANGELOG
 homepage: http://miniprofiler.com
@@ -133,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -138209491
+      hash: -387077425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -138209491
+      hash: -387077425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24