skylight 0.2.0.beta.1 → 0.2.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64f9d0eb45e48301e2b937366229e63bc339af3
-  data.tar.gz: 39656e4d86ac0d4f3496101643105fba58fdf4a6
+  metadata.gz: eff1d9d8e44d8af2a98286288aec951a38720666
+  data.tar.gz: 6092bd5bbe56c2061083f0b335305ca0665e5fa1
 SHA512:
-  metadata.gz: 3fe73155548f5bca71d6fab4049809fe354c8c6b205f9e26001595dd6454920a3c3fdbcab7b224a6069336ab25c3d38090f19133ba4665b523d63ca120ca0b6f
-  data.tar.gz: f6f4ab23ae9c2771d2eb702725e54dce515885319e13b442e02db549af99a349014cb45b17e370125e79b2f412005cd239e919c4ab266839cba9ab8aca49e1ce
+  metadata.gz: 43a42aef2eccd54531eb14186ceda1b480d06568cb6ccc91fd516be7f9fe9ff11a162dc2db8668d48c0b61e81f2844e9936f2799292f48392d6c0979af776dff
+  data.tar.gz: 52079fa8a4a2a6c32913681088059f216769098ff1e5553b8d3b38ff074695616a52e635b6ca1265ccaba743c1e86df4ac805be9bd89ff479a475c8c13a75ace

data/lib/skylight/normalizers.rb

@@ -46,14 +46,16 @@ module Skylight
 
       def normalize_render(category, payload, annotations)
         if path = payload[:identifier]
-          title = relative_path(path)
+          title = relative_path(path, annotations)
           path = nil if path == title
         end
 
-        [ category, title, path, annotations ]
+        [ category, title, nil, annotations ]
       end
 
-      def relative_path(path)
+      def relative_path(path, annotations)
+        return path if Pathname.new(path).relative?
+
         root = @paths.find { |p| path.start_with?(p) }
 
         if root
@@ -61,7 +63,8 @@ module Skylight
           relative = relative[1..-1] if relative.start_with?("/")
           relative
         else
-          path
+          annotations[:skylight_error] = ["absolute_path", path]
+          "Absolute Path"
         end
       end
     end

data/lib/skylight/normalizers/send_file.rb

@@ -20,8 +20,12 @@ module Skylight
             disposition: normalize_disposition(payload),
             status:      normalize_status(payload) }
 
-          # These will eventually be different
-          title = desc = "send file: #{path}"
+          title = "send file"
+
+          # depending on normalization, we probably want this to eventually
+          # include the full path, but we need to make sure we have a good
+          # deduping strategy first.
+          desc = nil
 
           [ "app.controller.send_file", title, desc, annotations ]
         end

data/lib/skylight/railtie.rb

@@ -43,7 +43,7 @@ module Skylight
       configure_logging(config, app)
 
       config['agent.sockfile_path'] = tmp
-      config['normalizers.render.view_paths'] = existent_paths(app.config.paths["app/views"])
+      config['normalizers.render.view_paths'] = existent_paths(app.config.paths["app/views"]) + [Rails.root.to_s]
       config.validate!
       config
 

data/lib/skylight/subscriber.rb

@@ -40,7 +40,7 @@ module Skylight
 
       cat, title, desc, annot = normalize(trace, name, payload)
 
-      if cat != :skip && error = annot[:skylight_error]
+      if cat != :skip && error = annot.delete(:skylight_error)
         @instrumenter.error(*error)
       end
 

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.2.0.beta.1'
+  VERSION = '0.2.0.beta.2'
 end
 

data/lib/sql_lexer/lexer.rb

@@ -18,13 +18,13 @@ module SqlLexer
     OptWS         = %Q<[#{WS}]*>
 
     InOp          = %q<IN>
-    SpecialOps    = %Q<#{InOp}>
+    SpecialOps    = %Q<#{InOp}(?=[#{WS}])>
 
     StartQuotedID = %Q<">
     StartTickedID = %Q<`>
     StartString   = %Q<'>
     StartDigit    = %q<[\p{Digit}\.]>
-    StartBind     = %Q<#{StartString}|#{StartDigit}|#{SpecialOps}>
+    StartBind     = %Q<#{StartString}|#{StartDigit}|#{SpecialOps}|N(?=ULL(?:[#{WS}]|#{OpPart}))>
     StartNonBind  = %Q<#{StartQuotedID}|#{StartTickedID}|\\$(?=\\p{Digit})>
     TableNext     = %Q<(#{OptWS}((?=#{StartQuotedID})|(?=#{StartTickedID}))|[#{WS}]+(?=[#{StartID}]))>
     StartAnyId    = %Q<"#{StartID}>
@@ -39,7 +39,8 @@ module SqlLexer
     NonBind       = %Q<#{ID}|#{Op}|#{QuotedID}|#{TickedID}|#{Placeholder}>
     QuotedTable   = %Q<#{TickedID}|#{QuotedID}>
 
-    String        = %Q<#{StartString}(?:[^']|'')*'>
+    StringBody    = %q<(?:''|\x5C'|[^'])*>
+    String        = %Q<#{StartString}#{StringBody}'>
 
     Digits        = %q<\p{Digit}+>
     OptDigits     = %q<\p{Digit}*>
@@ -51,6 +52,8 @@ module SqlLexer
 
     Number        = %Q<#{HeadDecimal}|#{TailDecimal}|#{ExpDecimal}|#{Digits}>
 
+    Null          = %Q<NULL(?=(?:[#{WS}]|#{OpPart}))>
+
     TkWS          = %r<[#{WS}]+>
     TkOptWS       = %r<[#{WS}]*>
     TkOp          = %r<[#{OpPart}]>
@@ -63,7 +66,7 @@ module SqlLexer
     TkFromTable   = %r<FROM#{TableNext}>i
     TkID          = %r<#{ID}>
     TkEnd         = %r<;?[#{WS}]*>
-    TkBind        = %r<#{String}|#{Number}>
+    TkBind        = %r<#{String}|#{Number}|#{Null}>
     TkIn          = %r<#{InOp}>i
     TkSpecialOp   = %r<#{SpecialOps}>i
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.1
+  version: 0.2.0.beta.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport