rack-mini-profiler 0.1.10 → 0.1.11.pre

data/CHANGELOG

@@ -44,3 +44,6 @@
   * Added option to disable profiler for the current session (pp=disable / pp=enable)
   * yajl compatability contributed by Sven Riedel 
 
+10-August-2012 - Sam 
+
+  * Added basic prepared statement profiling for postgres 

data/lib/mini_profiler/storage/file_store.rb

@@ -13,6 +13,7 @@ module Rack
             data = ::File.open(path(key),"rb") {|f| f.read}
             return Marshal.load data
           rescue => e
+            p e
             return nil
           end
         end

data/lib/mini_profiler/timer_struct.rb

@@ -22,12 +22,9 @@ module Rack
       end
 
       def to_json(*a)
-        if a[0] == nil
-          # YAJL doesnt like nil as options
-          ::JSON.generate( @attributes )
-        else
-          ::JSON.generate(@attributes, a[0])
-        end
+        # this does could take in an option hash, but the only interesting there is max_nesting.
+        #   if this becomes an option we could increase
+        ::JSON.generate( @attributes, :max_nesting => 100 )
       end
 
     end

data/lib/patches/sql_patches.rb

@@ -91,6 +91,23 @@ if SqlPatches.class_exists? "PG::Result"
   class PG::Connection
     alias_method :exec_without_profiling, :exec
     alias_method :async_exec_without_profiling, :async_exec
+    alias_method :exec_prepared_without_profiling, :exec_prepared
+    alias_method :send_query_prepared_without_profiling, :send_query_prepared
+    alias_method :prepare_without_profiling, :prepare
+
+    def prepare(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return prepare_without_profiling(*args,&blk) unless current
+
+      @prepare_map ||= {}
+      @prepare_map[args[0]] = args[1]
+
+      # dont leak more than 10k ever
+      @prepare_map = {} if @prepare_map.length > 10000
+
+      prepare_without_profiling(*args,&blk) 
+
+    end
 
     def exec(*args,&blk)
       current = ::Rack::MiniProfiler.current
@@ -104,6 +121,34 @@ if SqlPatches.class_exists? "PG::Result"
       result
     end
 
+    def exec_prepared(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return exec_prepared_without_profiling(*args,&blk) unless current
+
+      start = Time.now
+      result = exec_prepared_without_profiling(*args,&blk)
+      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
+      mapped = args[0]
+      mapped = @prepare_map[mapped] || args[0] if @prepare_map
+      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(mapped, elapsed_time))
+
+      result
+    end
+    
+    def send_query_prepared(*args,&blk)
+      current = ::Rack::MiniProfiler.current
+      return send_query_prepared_without_profiling(*args,&blk) unless current
+
+      start = Time.now
+      result = send_query_prepared_without_profiling(*args,&blk)
+      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
+      mapped = args[0]
+      mapped = @prepare_map[mapped] || args[0] if @prepare_map
+      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(mapped, elapsed_time))
+
+      result
+    end
+    
     def async_exec(*args,&blk)
       current = ::Rack::MiniProfiler.current
       return exec_without_profiling(*args,&blk) unless current

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.10"
+	s.version = "0.1.11.pre"
 	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."

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.10
-  prerelease: 
+  version: 0.1.11.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Aleks Totic
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -130,16 +130,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -296105007
+      hash: -126757873
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -296105007
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24