influxparser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599f27d2ff8251400b2b593b79e0ca7facad4aff
-  data.tar.gz: 84c2792855209669e2bc8e4a41aec43c393be2e1
+  metadata.gz: 8a35192cf489f487d8a42343384e1528d5168047
+  data.tar.gz: fa965f4209d17c97bf4bde7508c5cc9fe07cfcd0
 SHA512:
-  metadata.gz: a5a8a3e29905ac2f31915e7be9dc2e7dcb987f5375a0a80f871720b8e859386397d70c1e73a2b58982db45946a04d0146a82660d6c95dd3f646a2460c3be4335
-  data.tar.gz: 1f97c90e05e42b503ef03283f72cb22ba176f00564c18e356cd998a5dd587f78f2990aa732da1e1e985c8f3f054263149d306efaa15851641c8862c93952d365
+  metadata.gz: 870efd15c7c9df408b15a2da2dc11134c6c2bd45ff69bdd213b30a3913fb402b0d992626c42bfee7a944dbbfe4624a922baffe6e0c6d5c2cb995170c9a6c74d5
+  data.tar.gz: 194488b6bcb2ed5ce444c603789c6db5ce8b321f2ed15b70567f19b35afd7a0fb5e15cc78be828bf99d30809f0f23ea845a10d5b9da5d0949fe53db4ac43eae6

data/lib/influxparser.rb

@@ -1,13 +1,13 @@
 # TODO: the tags hash should be absent when there are no tags
-# TODO: numbers shouldn't be strings
-# TODO: numbers which aren't strings are floats
-# TODO: numbers with a trailing i are integers -- ALERT this is actually broken
 # TODO: optional timestamp parsing
 # TODO: time key shouldn't exist if there is no time
 # TODO: deal with improper line protocol
 class InfluxParser
     class << self
-        def parse_point(s)
+        def parse_point(s, options = {})
+            default_options = {:parse_types => true}
+            options = default_options.merge(options)
+
             point = {}
             point['_raw'] = s
             s = s.strip # trim whitespace
@@ -26,29 +26,30 @@ class InfluxParser
             end
             
             # now iterate over the values
-            last_value = ''
+            last_value_raw = ''
             last_key = ''
             point['values'] = {}
             vparts = s[measurement_end+1..-1].split(/(?<!\\),/)
+            # puts "vparts:#{vparts}"
             vparts.each do |v|
                 value = v.split(/(?<!\\)=/)
-                last_value = unescape_point value[1]
+                last_value_raw = value[1]
                 last_key = unescape_tag value[0]
-                # puts "kv:#{last_key}==#{last_value}"
-                point['values'][last_key] = last_value
+                # puts "last k/v #{last_key}==#{last_value_raw}"
+                point['values'][last_key] = unescape_point(value[1],options)
             end
-            
+            # puts "-----\n#{point['values'].to_yaml}\n"
             # check for a timestamp in the last value
             # TODO: I hate this, but it's late and I just want to move past it for now
             # TODO: what happens if the last character of the last value is an escaped quote?
-            has_space = last_value.rindex(/ /)
+            has_space = last_value_raw.rindex(/ /)
             if has_space
-                time_stamp = last_value[has_space+1..-1] # take everything from the space to the end
+                time_stamp = last_value_raw[has_space+1..-1] # take everything from the space to the end
                 if time_stamp.index(/"/)
                     point['time'] = nil
                 else
                     # it was a timestamp, strip it from the last value and set the timestamp
-                    point['values'][last_key] = unescape_point last_value[0..has_space-1]
+                    point['values'][last_key] = unescape_point(last_value_raw[0..has_space-1],options)
                     point['time'] = time_stamp
                 end    
             else
@@ -64,16 +65,24 @@ class InfluxParser
             t = unescape_measurement s
             t.gsub(/\\=/,'=')
         end
-        def unescape_point(s)
-            if s[-1,1] == '"'
+        def unescape_point(s,options)
+            # puts "unescape:#{s}"
+            # s = s.gsub(/\\\\/,'\\').gsub(/\\"/,'""') # handle escaped characters if present
 
-                # it's a quoted string and should be unescaped
-                s = s[1..-2] # take the wrapping quotes off
-                return s.gsub(/\\\\/,'\\').gsub(/\\"/,',')
-            else
-                # it's a number and if it's trailing an i we need to strip it because we're not handling precision here
-                return s.chomp('i')
-            end
+            # it is a string, return it
+            return s[1..-2].gsub(/\\\\/,'\\').gsub(/\\"/,'""') if s[0,1] == '"'
+
+            return s.sub(/(?<=\d)i/,'') if (!options[:parse_types]) # the customer doesn't care about types so just return it, but strip the trailing i from an integer because we care
+
+            # handle the booleans
+            return true if ['t','T','true','True','TRUE'].include?(s)
+            return false if ['f','F','false','False','FALSE'].include?(s)
+
+            # by here we have either an unquoted string or some numeric
+            
+            return s.to_f if s =~ /^(\d|\.)+$/ # floats are only digits and dots
+            return s.chomp('i').to_i if s[0..-2] =~ /^(\d)+$/ # trailing i is an integer remove it
+            return s.gsub(/\\\\/,'\\').gsub(/\\"/,'"')
         end
     end
 end

data/test/test_parse_point_from_docs.rb

@@ -30,7 +30,7 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
 
     # value
     assert_equal(true,point['values'].key?('temperature'))
-    assert_equal('82',point['values']['temperature'])
+    assert_equal(82,point['values']['temperature'])
     
     # time
     assert_equal('1465839830100400200',point['time'])
@@ -50,7 +50,7 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
 
     # value
     assert_equal(true,point['values'].key?('temperature'))
-    assert_equal('82',point['values']['temperature'])
+    assert_equal(82,point['values']['temperature'])
     
     # time
     assert_equal('1465839830100400200',point['time'])
@@ -72,10 +72,10 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
     assert_equal(2,point['values'].length)
 
     assert_equal(true,point['values'].key?('temperature'))
-    assert_equal('82',point['values']['temperature'])
+    assert_equal(82,point['values']['temperature'])
 
     assert_equal(true,point['values'].key?('humidity'))
-    assert_equal('71',point['values']['humidity'])
+    assert_equal(71,point['values']['humidity'])
 
     # time
     assert_equal('1465839830100400200',point['time'])
@@ -90,12 +90,12 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
   def test_float
     point = InfluxParser.parse_point('weather,location=us-midwest temperature=82 1465839830100400200')
     assert_not_equal(false,point)   # a straight up parse error will false
-    assert_equal('82',point['values']['temperature'])
+    assert_equal(82.0,point['values']['temperature'])
   end
   def test_integer
     point = InfluxParser.parse_point('weather,location=us-midwest temperature=82i 1465839830100400200')
     assert_not_equal(false,point)   # a straight up parse error will false
-    assert_equal('82',point['values']['temperature'])
+    assert_equal(82,point['values']['temperature'])
   end
 
   def test_string
@@ -118,36 +118,45 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
   end
 
   def test_boolean
-    # TODO: validate the parsed booleans are bools and expected
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=t 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(true,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=T 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(true,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=true 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(true,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=True 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(true,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=TRUE 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(true,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=f 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(false,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=F 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(false,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=false 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(false,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=False 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(false,point['values']['temperature'])
 
     point = InfluxParser.parse_point("weather,location=us-midwest temperature=FALSE 1465839830100400200")
     assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(false,point['values']['temperature'])
 
   end
   def test_ridiculous_quotes
@@ -165,7 +174,7 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
     # check values
 
     assert_equal(true,point['values'].key?('"temperature"'))
-    assert_equal('82',point['values']['"temperature"'])
+    assert_equal(82,point['values']['"temperature"'])
 
     # time
     assert_equal('1465839830100400200',point['time'])
@@ -186,7 +195,7 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
     # check values
 
     assert_equal(true,point['values'].key?("'temperature'"))
-    assert_equal('82',point['values']["'temperature'"])
+    assert_equal(82,point['values']["'temperature'"])
 
     # time
     assert_equal('1465839830100400200',point['time'])
@@ -200,7 +209,7 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
 
     point = InfluxParser.parse_point('weather,location=us-midwest temp\=rature=82 1465839830100400200')
     assert_not_equal(false,point)   # a straight up parse error will false
-    assert_equal('82',point['values']['temp=rature'])
+    assert_equal(82,point['values']['temp=rature'])
 
     point = InfluxParser.parse_point('weather,location\ place=us-midwest temperature=82 1465839830100400200')
     assert_not_equal(false,point)   # a straight up parse error will false
@@ -214,6 +223,11 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
     assert_not_equal(false,point)   # a straight up parse error will false
     assert_equal('wea ther',point['measurement'])
 
+    point = InfluxParser.parse_point('weather temperature=toohot\"')
+    assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal('toohot"',point['values']['temperature'])
+
+    
     # so many slashes -- note they're extra terrible because I need to escape ruby slashes in the test strings
 
     # forward slash
@@ -247,4 +261,21 @@ class TestParsePointFromDocs < Test::Unit::TestCase  # def setup
     assert_equal("too hot\\\\\\cold",point['values']['temperature_str'])
 
   end
+  def test_types
+    point = InfluxParser.parse_point('weather float=82,integer=82i,impliedstring=helloworld,explicitstring="hello world" 1465839830100400200')
+    assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal(82.0,point['values']['float'])
+    assert_equal(82,point['values']['integer'])
+    assert_equal('helloworld',point['values']['impliedstring'])
+    assert_equal('hello world',point['values']['explicitstring'])
+
+    # do it again but this time without type parsing
+    point = InfluxParser.parse_point('weather float=82,integer=82i,impliedstring=helloworld,explicitstring="hello world" 1465839830100400200',{:parse_types => false})
+    assert_not_equal(false,point)   # a straight up parse error will false
+    assert_equal('82',point['values']['float'])
+    assert_equal('82',point['values']['integer'])
+    assert_equal('helloworld',point['values']['impliedstring'])
+    assert_equal('hello world',point['values']['explicitstring'])
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxparser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Robert Labrie