scout_apm 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da3e8194a4123e62f0a2ecc81cdcd0e34a8c59f8
-  data.tar.gz: 3f1b5006c5b01ff013237bd3d1049e94e2aea2d8
+  metadata.gz: e79b5f288da544777712971294bf8c37adf7bf64
+  data.tar.gz: 5ca3cb606fee63ad83d31b48458c815024d10a91
 SHA512:
-  metadata.gz: 23a1b46036c8b7597f148b1a48b57c6015bb6ba6b95ec99fd4c83f0c76aad186989a12ee8a5a24ab56d02aa02f33a5a5dff7dfd382c87a1b5e771fa105f415d7
-  data.tar.gz: 5f0e06ed2699252ff6eb07581e76cf5e2283b5f459521249b29546caa9c58271257766f6d320b8087c171983d5f8da09e91bc97d6101181a90ce0ab3ff66145f
+  metadata.gz: 388a1865dbcd8dd8be6a93d8a6229ac1560e8b235af4599f58a6c75f69815b186dff72ebbb5d3ad60cac25a59bb7e88827e7e820e703ef6ebd7ece760ac96e68
+  data.tar.gz: 57785a9a9027acbbb5c6c6c6b4a8b7659dd3df47ded3b29705d3b215fb27dcf0613a6880a8f98a6247c165e3b60b8b044e2b676a0a2f4d019c5d2489797901ef

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.1.6
+
+* Fix issues with Ruby 1.8.7 regexes
+
 # 0.1.5
 
 * SQL sanitization now collapses IN (?,?,?) to a single (?)

data/lib/scout_apm/environment.rb

@@ -165,6 +165,10 @@ module ScoutApm
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)
     end
 
+    def ruby_187?
+      defined?(RUBY_VERSION) && RUBY_VERSION.match(/^1\.8\.7/)
+    end
+
     ### framework checks
 
     def sinatra?

data/lib/scout_apm/utils/sql_sanitizer.rb

@@ -5,6 +5,13 @@ require 'scout_apm/environment'
 module ScoutApm
   module Utils
     class SqlSanitizer
+      if ScoutApm::Environment.new.ruby_187?
+        require 'scout_apm/utils/sql_sanitizer_regex_1_8_7'
+      else
+        require 'scout_apm/utils/sql_sanitizer_regex'
+      end
+      include ScoutApm::Utils::SqlRegex
+
       attr_reader :sql
       attr_accessor :database_engine
 
@@ -24,16 +31,6 @@ module ScoutApm
 
       private
 
-      MULTIPLE_SPACES    = %r|\s+|.freeze
-      MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
-      TRAILING_SPACES    = /\s+$/.freeze
-
-      PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-      PSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-      PSQL_PLACEHOLDER = /\$\d+/.freeze
-      PSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
-
       def to_s_postgres
         sql.gsub!(PSQL_PLACEHOLDER, '?')
         sql.gsub!(PSQL_VAR_INTERPOLATION, '')
@@ -45,12 +42,6 @@ module ScoutApm
         sql
       end
 
-      MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
-      MYSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
-
       def to_s_mysql
         sql.gsub!(MYSQL_VAR_INTERPOLATION, '')
         sql.gsub!(MYSQL_REMOVE_SINGLE_QUOTE_STRINGS, '?')
@@ -62,10 +53,6 @@ module ScoutApm
         sql
       end
 
-      SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-      SQLITE_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-
       def to_s_sqlite
         sql.gsub!(SQLITE_VAR_INTERPOLATION, '')
         sql.gsub!(SQLITE_REMOVE_STRINGS, '?')

data/lib/scout_apm/utils/sql_sanitizer_regex.rb

@@ -0,0 +1,28 @@
+
+module ScoutApm
+  module Utils
+    module SqlRegex
+      MULTIPLE_SPACES    = %r|\s+|.freeze
+      MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
+      TRAILING_SPACES    = /\s+$/.freeze
+
+      PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
+      PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
+
+      PSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
+
+      PSQL_PLACEHOLDER = /\$\d+/.freeze
+      PSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+
+      MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
+      MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
+      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
+      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
+      MYSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+
+      SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
+      SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
+      SQLITE_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
+    end
+  end
+end

data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb

@@ -0,0 +1,27 @@
+
+module ScoutApm
+  module Utils
+    module SqlRegex
+      MULTIPLE_SPACES    = %r|\s+|.freeze
+      MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
+      TRAILING_SPACES    = /\s+$/.freeze
+
+      PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
+      PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
+      PSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
+      PSQL_PLACEHOLDER = /\$\d+/.freeze
+      PSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+
+      MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
+      MYSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
+      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
+      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
+      MYSQL_IN_CLAUSE = /IN\s+\((\s*\?,?\s*)*\)/.freeze
+
+      SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
+      SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
+      SQLITE_REMOVE_INTEGERS = /\b\d+\b/.freeze
+
+    end
+  end
+end

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -93,6 +93,8 @@ files:
 - lib/scout_apm/tracer.rb
 - lib/scout_apm/utils/null_logger.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
+- lib/scout_apm/utils/sql_sanitizer_regex.rb
+- lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb
 - lib/scout_apm/version.rb
 - scout_apm.gemspec
 - test/data/config_test_1.yml