skylight 0.2.0.beta.2 → 0.2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff1d9d8e44d8af2a98286288aec951a38720666
-  data.tar.gz: 6092bd5bbe56c2061083f0b335305ca0665e5fa1
+  metadata.gz: 2b6ffd4680bf0bfa2f2e725a0ed6601c70d8da33
+  data.tar.gz: 7467f5495f63fe61cf9ebf342c1b9970e69f4ac5
 SHA512:
-  metadata.gz: 43a42aef2eccd54531eb14186ceda1b480d06568cb6ccc91fd516be7f9fe9ff11a162dc2db8668d48c0b61e81f2844e9936f2799292f48392d6c0979af776dff
-  data.tar.gz: 52079fa8a4a2a6c32913681088059f216769098ff1e5553b8d3b38ff074695616a52e635b6ca1265ccaba743c1e86df4ac805be9bd89ff479a475c8c13a75ace
+  metadata.gz: 63aac94d7f9c0ed6f337901c37b8bbe3e4a519d800092a6a1c023e7881d095740130d299b23e9def21e7c2e9cc7c89664c26c425e6b4fdbcebd76f101a099de5
+  data.tar.gz: 93b7b2607ddc3a677b04b648c6246b5c8201b46355c01d34892e9291d0cf1555c97308e21019cdf5ec2609b85c10821c644e86dc0f9d6cbe5096fcf2136e476c

data/lib/skylight.rb

@@ -99,6 +99,15 @@ module Skylight
     inst.instrument(category, title, desc, &blk)
   end
 
+  def self.disable(&block)
+    unless inst = Instrumenter.instance
+      return yield if block_given?
+      return
+    end
+
+    inst.disable(&block)
+  end
+
   RUBYBIN = File.join(
     RbConfig::CONFIG['bindir'],
     "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")

data/lib/skylight/instrumenter.rb

@@ -115,6 +115,17 @@ module Skylight
       end
     end
 
+    def disable
+      @disabled = true
+      yield
+    ensure
+      @disabled = false
+    end
+
+    def disabled?
+      @disabled
+    end
+
     def instrument(cat, *args)
       unless trace = @trace_info.current
         return yield if block_given?

data/lib/skylight/subscriber.rb

@@ -36,6 +36,7 @@ module Skylight
     end
 
     def start(name, id, payload)
+      return if @instrumenter.disabled?
       return unless trace = @instrumenter.current_trace
 
       cat, title, desc, annot = normalize(trace, name, payload)
@@ -61,6 +62,7 @@ module Skylight
     end
 
     def finish(name, id, payload)
+      return if @instrumenter.disabled?
       return unless trace = @instrumenter.current_trace
 
       while curr = trace.notifications.pop

data/lib/skylight/version.rb

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

data/lib/skylight/worker/collector.rb

@@ -68,7 +68,7 @@ module Skylight
         res = @http_auth.post("/agent/error?hostname=#{escape(config[:'hostname'])}", reason: msg.reason, body: msg.body)
 
         unless res.success?
-          if (400..499).include? @res.status
+          if (400..499).include? res.status
             warn "error wasn't sent successfully; status=%s", res.status
           end
 
@@ -109,7 +109,7 @@ module Skylight
         res = @http_auth.get("/agent/authenticate?hostname=#{escape(config[:'hostname'])}")
 
         unless res.success?
-          if (400..499).include? @res.status
+          if (400..499).include? res.status
             warn "token request rejected; status=%s", res.status
             @http_report = nil
           end

data/lib/sql_lexer/lexer.rb

@@ -16,6 +16,7 @@ module SqlLexer
     OpPart        = %q<\+|\-(?!-)|\*|/(?!\*)|\<|\>|=|~|!|@|#|%|\^|&|\||\?|\.|,|\(|\)>
     WS            = %q< \t\r\n>
     OptWS         = %Q<[#{WS}]*>
+    End           = %Q<;|$>
 
     InOp          = %q<IN>
     SpecialOps    = %Q<#{InOp}(?=[#{WS}])>
@@ -24,7 +25,11 @@ module SqlLexer
     StartTickedID = %Q<`>
     StartString   = %Q<'>
     StartDigit    = %q<[\p{Digit}\.]>
-    StartBind     = %Q<#{StartString}|#{StartDigit}|#{SpecialOps}|N(?=ULL(?:[#{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}>
+
     StartNonBind  = %Q<#{StartQuotedID}|#{StartTickedID}|\\$(?=\\p{Digit})>
     TableNext     = %Q<(#{OptWS}((?=#{StartQuotedID})|(?=#{StartTickedID}))|[#{WS}]+(?=[#{StartID}]))>
     StartAnyId    = %Q<"#{StartID}>
@@ -52,7 +57,7 @@ module SqlLexer
 
     Number        = %Q<#{HeadDecimal}|#{TailDecimal}|#{ExpDecimal}|#{Digits}>
 
-    Null          = %Q<NULL(?=(?:[#{WS}]|#{OpPart}))>
+    Literals      = %Q<(?:NULL|TRUE|FALSE)(?=(?:[#{WS}]|#{OpPart}|#{End}))>
 
     TkWS          = %r<[#{WS}]+>
     TkOptWS       = %r<[#{WS}]*>
@@ -66,7 +71,7 @@ module SqlLexer
     TkFromTable   = %r<FROM#{TableNext}>i
     TkID          = %r<#{ID}>
     TkEnd         = %r<;?[#{WS}]*>
-    TkBind        = %r<#{String}|#{Number}|#{Null}>
+    TkBind        = %r<#{String}|#{Number}|#{Literals}>
     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.2
+  version: 0.2.0.beta.3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport