rack-mini-profiler 0.1.18 → 0.1.23

data/{lib → Ruby/lib}/mini_profiler/profiling_methods.rb

@@ -71,8 +71,16 @@ module Rack
           return self.send without_profiling, *args, &orig unless Rack::MiniProfiler.current
 
           name = default_name 
-          name = blk.bind(self).call(*args) if blk
-          
+          if blk
+            name =
+              if respond_to?(:instance_exec)
+                instance_exec(*args, &blk)
+              else
+                # deprecated in Rails 4.x
+                blk.bind(self).call(*args)
+              end
+          end
+
           parent_timer = Rack::MiniProfiler.current.current_timer
           page_struct = Rack::MiniProfiler.current.page_struct
           result = nil

data/{lib → 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/memcache_store.rb

@@ -0,0 +1,51 @@
+module Rack
+  class MiniProfiler
+    class MemcacheStore < AbstractStore
+
+      EXPIRE_SECONDS = 60*60*24
+      MAX_RETRIES = 10
+
+      def initialize(client = nil, prefix = "MPMemcacheStore")
+        require 'dalli' unless defined? Dalli
+        @prefix = prefix
+        @client = client || Dalli::Client.new(['localhost:11211'])
+      end
+
+      def save(page_struct)
+        @client.set("#{@prefix}#{page_struct['Id']}", Marshal::dump(page_struct), EXPIRE_SECONDS)
+      end
+
+      def load(id)
+        raw = @client.get("#{@prefix}#{id}")
+        if raw
+          Marshal::load raw
+        end
+      end
+
+      def set_unviewed(user, id)
+        @client.add("#{@prefix}-#{user}-v", [], EXPIRE_SECONDS)
+        MAX_RETRIES.times do
+          break if @client.cas("#{@prefix}-#{user}-v", EXPIRE_SECONDS) do |ids|
+            ids << id unless ids.include?(id)
+            ids
+          end
+        end
+      end
+
+      def set_viewed(user, id)
+        @client.add("#{@prefix}-#{user}-v", [], EXPIRE_SECONDS)
+        MAX_RETRIES.times do
+          break if @client.cas("#{@prefix}-#{user}-v", EXPIRE_SECONDS) do |ids|
+            ids.delete id
+            ids
+          end
+        end
+      end
+
+      def get_unviewed_ids(user)
+        @client.get("#{@prefix}-#{user}-v") || []
+      end
+
+    end
+  end
+end

data/{lib → 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/{lib → Ruby/lib}/mini_profiler_rails/railtie.rb

@@ -9,11 +9,12 @@ 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 ||= []
+
       if Rails.env.development?
-        c.skip_paths ||= []
         c.skip_paths << "/assets/"
         c.skip_schema_queries = true
       end

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/{lib → 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/{lib → Ruby/lib}/rack-mini-profiler.rb

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

data/rack-mini-profiler.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.18"
+	s.version = "0.1.23"
 	s.summary = "Profiles loading speed for rack applications."
-	s.authors = ["Aleks Totic","Sam Saffron", "Robin Ward"]
-	s.description = "Page loading speed displayed on every page. Optimize while you develop, performance is a feature."
+	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."
 	s.email = "sam.saffron@gmail.com"
 	s.homepage = "http://miniprofiler.com"
 	s.files = [
 		'rack-mini-profiler.gemspec',
-	].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
+	].concat( Dir.glob('Ruby/lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
 	s.extra_rdoc_files = [
-		"README.md",
-    "CHANGELOG"
+		"Ruby/README.md",
+    "Ruby/CHANGELOG"
 	]
 	s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'activerecord', '~> 3.0'
+
+  s.require_paths = ["Ruby/lib"]
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.23
   prerelease: 
 platform: ruby
 authors:
-- Aleks Totic
 - Sam Saffron
 - Robin Ward
+- Aleks Totic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -77,52 +77,57 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Page loading speed displayed on every page. Optimize while you develop,
-  performance is a feature.
+description: Profiling toolkit for Rack applications with Rails integration. Client
+  Side profiling, DB profiling and Server profiling.
 email: sam.saffron@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
-- CHANGELOG
+- Ruby/README.md
+- Ruby/CHANGELOG
 files:
 - rack-mini-profiler.gemspec
-- lib/mini_profiler/sql_timer_struct.rb
-- lib/mini_profiler/request_timer_struct.rb
-- lib/mini_profiler/timer_struct.rb
-- lib/mini_profiler/page_timer_struct.rb
-- lib/mini_profiler/client_settings.rb
-- lib/mini_profiler/context.rb
-- lib/mini_profiler/config.rb
-- lib/mini_profiler/profiling_methods.rb
-- lib/mini_profiler/client_timer_struct.rb
-- lib/mini_profiler/profiler.rb
-- lib/mini_profiler/storage/memory_store.rb
-- lib/mini_profiler/storage/file_store.rb
-- lib/mini_profiler/storage/redis_store.rb
-- lib/mini_profiler/storage/abstract_store.rb
-- lib/rack-mini-profiler.rb
-- lib/html/jquery.1.7.1.js
-- lib/html/includes.tmpl
-- lib/html/share.html
-- lib/html/includes.less
-- lib/html/list.css
-- lib/html/includes.js
-- lib/html/jquery.tmpl.js
-- lib/html/list.tmpl
-- lib/html/profile_handler.js
-- lib/html/includes.css
-- lib/html/list.js
-- lib/mini_profiler_rails/railtie.rb
-- lib/patches/sql_patches.rb
-- README.md
-- CHANGELOG
+- 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
+- Ruby/lib/mini_profiler/page_timer_struct.rb
+- Ruby/lib/mini_profiler/client_settings.rb
+- Ruby/lib/mini_profiler/context.rb
+- Ruby/lib/mini_profiler/config.rb
+- Ruby/lib/mini_profiler/profiling_methods.rb
+- Ruby/lib/mini_profiler/gc_profiler.rb
+- Ruby/lib/mini_profiler/client_timer_struct.rb
+- Ruby/lib/mini_profiler/profiler.rb
+- Ruby/lib/mini_profiler/storage/memory_store.rb
+- Ruby/lib/mini_profiler/storage/file_store.rb
+- 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
+- Ruby/lib/html/share.html
+- Ruby/lib/html/includes.less
+- Ruby/lib/html/list.css
+- Ruby/lib/html/includes.js
+- Ruby/lib/html/jquery.tmpl.js
+- Ruby/lib/html/list.tmpl
+- Ruby/lib/html/profile_handler.js
+- Ruby/lib/html/includes.css
+- 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
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- Ruby/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -322245347
+      hash: -387077425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -322245347
+      hash: -387077425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24