rack-mini-profiler 0.10.2 → 0.10.3

data/lib/mini_profiler/timer_struct/sql.rb

@@ -56,16 +56,19 @@ module Rack
         def trim_binds(binds)
           max_len = Rack::MiniProfiler.config.max_sql_param_length
           return if binds.nil? || max_len == 0
-          return binds if max_len.nil?
+          return binds.map{|(name, val)| [name, val]} if max_len.nil?
           binds.map do |(name, val)|
             val ||= name
             if val.nil? || val == true || val == false || val.kind_of?(Numeric)
               # keep these parameters as is
             elsif val.kind_of?(String)
-              val = val[0...max_len] if max_len
+              val = val[0...max_len]+(max_len < val.length ? '...' : '') if max_len
             else
               val = val.class.name
             end
+            if name.kind_of?(String)
+              name = name[0...max_len]+(max_len < name.length ? '...' : '') if max_len
+            end
             [name, val]
           end
         end

data/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '0.10.2'
+    VERSION = '0.10.3'
   end
 end

data/lib/patches/db/mysql2.rb

@@ -3,7 +3,7 @@
 class Mysql2::Result
   alias_method :each_without_profiling, :each
   def each(*args, &blk)
-    return each_without_profiling(*args, &blk) unless @miniprofiler_sql_id
+    return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
 
     start        = Time.now
     result       = each_without_profiling(*args,&blk)

data/lib/patches/db/oracle_enhanced.rb

@@ -1,7 +1,7 @@
 class ActiveRecord::Result
   alias_method :each_without_profiling, :each
   def each(&blk)
-    return each_without_profiling(&blk) unless @miniprofiler_sql_id
+    return each_without_profiling(&blk) unless defined?(@miniprofiler_sql_id)
 
     start        = Time.now
     result       = each_without_profiling(&blk)

data/lib/patches/db/pg.rb

@@ -4,14 +4,14 @@ class PG::Result
   alias_method :values_without_profiling, :values
 
   def values(*args, &blk)
-    return values_without_profiling(*args, &blk) unless @miniprofiler_sql_id
+    return values_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
     mp_report_sql do
       values_without_profiling(*args ,&blk)
     end
   end
 
   def each(*args, &blk)
-    return each_without_profiling(*args, &blk) unless @miniprofiler_sql_id
+    return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
     mp_report_sql do
       each_without_profiling(*args, &blk)
     end
@@ -52,7 +52,7 @@ class PG::Connection
     start        = Time.now
     result       = exec_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
-    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time, get_binds(*args))
     result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
     result
@@ -66,7 +66,7 @@ class PG::Connection
     elapsed_time = SqlPatches.elapsed_time(start)
     mapped       = args[0]
     mapped       = @prepare_map[mapped] || args[0] if @prepare_map
-    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time, get_binds(mapped, args[1]))
     result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
     result
@@ -80,23 +80,48 @@ class PG::Connection
     elapsed_time = SqlPatches.elapsed_time(start)
     mapped       = args[0]
     mapped       = @prepare_map[mapped] || args[0] if @prepare_map
-    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+    record       = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time, get_binds(mapped, args[1]))
     result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
     result
   end
 
   def async_exec(*args,&blk)
-    return exec_without_profiling(*args,&blk) unless SqlPatches.should_measure?
+    return async_exec_without_profiling(*args,&blk) unless SqlPatches.should_measure?
 
     start        = Time.now
     result       = exec_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
-    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+    record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time, get_binds(*args))
     result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
     result
   end
 
+  def get_binds(*args)
+    params = args[1]
+    return if params.nil? || params.empty?
+
+    sql = args[0]
+
+    hh = {}
+    arr = nil
+
+    if sql.match(/\(\$\d/)
+      arr = sql.match(/\((\"\w+\",?\s?)+\)/).to_s.gsub!(/[",()]/, '').split #regular selects list of names from sql query, for ex. ("name1", "name2", "name3")
+    end
+
+    params.each_index do |i|
+      if arr
+        hh[arr[i]]=params[i]
+      else
+        var = sql.match(/[^\s\.]+\s?=?\s\$#{i+1}/).to_s.split[0] #regular selects param name from sql query, like for ex. "name1" = $1
+        var.gsub!(/["]/, '') if var
+        hh[var]=args[1][i]
+      end
+    end
+    return hh
+  end
+
   alias_method :query, :exec
 end

data/rack-mini-profiler.gemspec

@@ -21,14 +21,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack', '>= 1.2.0'
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '< 11'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'activerecord', '~> 3.0'
   s.add_development_dependency 'dalli'
   s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'redis'
-  s.add_development_dependency 'therubyracer'
-  s.add_development_dependency 'less'
+  s.add_development_dependency 'sass'
   s.add_development_dependency 'flamegraph'
 
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,16 +30,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -111,21 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: less
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +151,7 @@ files:
 - README.md
 - lib/html/includes.css
 - lib/html/includes.js
-- lib/html/includes.less
+- lib/html/includes.scss
 - lib/html/includes.tmpl
 - lib/html/jquery.1.7.1.js
 - lib/html/jquery.tmpl.js