skylight 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38880fd1b62fad365c461e3fb6517e979f14baa6
-  data.tar.gz: 9c62ce619478170a9e1b38e788bc35e61cd41b94
+  metadata.gz: a3bbad2e6ff11878c301f0f6c35a19a700eb873e
+  data.tar.gz: 6c5088d5d960e65149f89ced6ee48a5c7ff3c4dc
 SHA512:
-  metadata.gz: f0aaab6c04ff20b4fcb06da895808f9c84ae9fda59fd33a62639355b9ae5933ad417a80224c2409de46121a5dcd6fe8d45d09434fbd02d04cf7007659e6a0254
-  data.tar.gz: 2c7a866a02d2746130638408246c9d751a46dd7395f6ae98533081e984a7dffd3334de731a8dfa5b88a52b019af25e69c0a32f463d202f0dfa6b68ac7ffb68d8
+  metadata.gz: fd2dd401324a03a77b3ddc63f38d93cb4cfa7740f6603932e8c0b65f119c71d963637ffeb6f299d7eb427515232e230400014d5dec7b198340cf5f05835f4a01
+  data.tar.gz: 746417c9a7a2600875374f2a783add8e2d08f6e5344b7f70f4fc6ba6292a3807535e5d4c0f80b27c1239c2e5e1b099ff250fef544ed7aaeb52a678465359313c

data/lib/skylight/normalizers/process_action.rb

@@ -4,6 +4,7 @@ module Skylight
       register "process_action.action_controller"
 
       CAT = "app.controller.request".freeze
+      PAYLOAD_KEYS = %w[ controller action params format method path ].map(&:to_sym).freeze
 
       def normalize(trace, name, payload)
         trace.endpoint = controller_action(payload)
@@ -19,11 +20,8 @@ module Skylight
       def normalize_payload(payload)
         normalized = {}
 
-        payload.each_key do |key|
-          value = payload[key]
-
-          value = value.inspect unless value.is_a?(String) || value.is_a?(Numeric)
-          normalized[key] = value
+        PAYLOAD_KEYS.each do |key|
+          normalized[key] = payload[key]
         end
 
         normalized

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end
 

data/lib/sql_lexer.rb

@@ -2,5 +2,4 @@ require "sql_lexer/version"
 require "sql_lexer/lexer"
 
 module SqlLexer
-  # Your code goes here...
 end

data/lib/sql_lexer/lexer.rb

@@ -29,6 +29,8 @@ module SqlLexer
     StartString   = %Q<'>
     StartDigit    = %q<[\p{Digit}\.]>
 
+    StartSelect   = %Q<SELECT(?=(?:[#{WS}]|#{OpPart}))>
+
     # Binds that are also IDs do not need to be included here, since AfterOp (which uses StartBind)
     # also checks for StartAnyId
     StartBind     = %Q<#{StartString}|#{StartDigit}|#{SpecialOps}>
@@ -85,7 +87,9 @@ module SqlLexer
     TkArray       = %r<#{ArrayOp}>iu
     TkArrayIndex  = %r<#{ArrayIndexOp}>iu
     TkSpecialOp   = %r<#{SpecialOps}>iu
-    TkStartSelect = %r<SELECT(?=(?:[#{WS}]|#{OpPart}))>iu
+    TkStartSelect = %r<#{StartSelect}>iu
+    TkStartSubquery = %r<\(#{OptWS}#{StartSelect}>iu
+    TkCloseParen  = %r<#{OptWS}\)>u
 
     STATE_HANDLERS = {
       begin:       :process_begin,
@@ -97,6 +101,7 @@ module SqlLexer
       table_name:  :process_table_name,
       end:         :process_end,
       special:     :process_special,
+      subquery:    :process_subquery,
       in:          :process_in,
       array:       :process_array
     }
@@ -351,8 +356,12 @@ module SqlLexer
     def process_special
       if @scanner.skip(TkIn)
         @scanner.skip(TkOptWS)
-        @scanner.skip(/\(/u)
-        @state = :in
+        if @scanner.skip(TkStartSubquery)
+          @state = :subquery
+        else
+          @scanner.skip(/\(/u)
+          @state = :in
+        end
       elsif @scanner.skip(TkArray)
         @scanner.skip(/\[/u)
         @state = :array
@@ -362,11 +371,48 @@ module SqlLexer
         else
           @state = :end
         end
+      elsif @scanner.skip(TkStartSubquery)
+        @state = :subquery
       elsif @scanner.skip(TkArrayIndex)
         @state = :tokens
       end
     end
 
+    def process_subquery
+      nest = 1
+      iterations = 0
+
+      while nest > 0
+        iterations += 1
+
+        if iterations > 10_000
+          raise "The SQL '#{@scanner.string}' could not be parsed because of too many iterations in subquery"
+        end
+
+        if @debug
+          p @state
+          p @scanner
+          p nest
+          p @scanner.peek(1)
+        end
+
+        if @scanner.skip(TkStartSubquery)
+          nest += 1
+          @state = :tokens
+        elsif @scanner.skip(TkCloseParen)
+          nest -= 1
+          break if nest.zero?
+          @state = :tokens
+        elsif @state == :subquery
+          @state = :tokens
+        end
+
+        __send__ STATE_HANDLERS[@state]
+      end
+
+      @state = :tokens
+    end
+
     def process_in
       nest = 1
       iterations = 0
@@ -390,7 +436,7 @@ module SqlLexer
         if @scanner.skip(/\(/u)
           nest += 1
           process_tokens
-        elsif @scanner.skip(/\)/u)
+        elsif @scanner.skip(TkCloseParen)
           nest -= 1
           break if nest.zero?
           process_tokens

data/lib/sql_lexer/version.rb

@@ -1,3 +1,3 @@
 module SqlLexer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: 
@@ -32,6 +32,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
+- bin/skylight
 - lib/skylight.rb
 - lib/skylight/api.rb
 - lib/skylight/cli.rb
@@ -139,9 +142,6 @@ files:
 - lib/sql_lexer.rb
 - lib/sql_lexer/lexer.rb
 - lib/sql_lexer/version.rb
-- CHANGELOG.md
-- README.md
-- bin/skylight
 homepage: http://www.skylight.io
 licenses: []
 metadata: {}
@@ -151,17 +151,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Skylight is a ruby application monitoring tool. Currently in closed beta.