influxdb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5122c2a56a46565d1ee7481c6d20e1647035e94d
-  data.tar.gz: e4c1e752d0d49a5d3749e92f6c1afd1fbc269549
+  metadata.gz: fd312f5542686ccddcc5913b25f6cd55b6c892ac
+  data.tar.gz: 63bbe7b5008a916da5bd411b5c4a0f0a0f8705a8
 SHA512:
-  metadata.gz: d4053245ecd16e82ee75055a407099a4ab44740722abc225d2a27fa1c3c562f6b703c07dae3322f523ec4cb3181ec69c991c17d2b8842af58970df10a343f717
-  data.tar.gz: adcf58659107dfc6ef3c99a4628c33662cbabc2782e06eb47cdfa90e345c2946d2e56af2e5849641221b5971cfad8ebc83d2cae4149a6a5bd778fe21270f6211
+  metadata.gz: 2d4c579c9af119065cb5d1d30f1d5caf6c3b1b368864d537231ec63ef0a092d543141af4daf8a2860cbb22ad0a6e326aa647aef19b43db79932502c3091c34d3
+  data.tar.gz: 1857f6d61f6475e0330acc86e2baa5502cb9c2b59f7f18c9d414d375da0c3dc5e332d7fc7b4a662f1ea983599770cefde6fb1fed3021ad763df998e40e7a69a3

data/lib/influxdb/point_value.rb

@@ -4,9 +4,9 @@ module InfluxDB
     attr_reader :series, :values, :tags, :timestamp
 
     def initialize(data)
-      @series    = data[:series].gsub(/\s/, '\ ').gsub(',','\,')
-      @values    = stringify(data[:values])
-      @tags      = stringify(data[:tags])
+      @series    = data[:series].gsub(/\s/, '\ ').gsub(',', '\,')
+      @values    = data_to_string(data[:values], true)
+      @tags      = data_to_string(data[:tags])
       @timestamp = data[:timestamp]
     end
 
@@ -20,19 +20,30 @@ module InfluxDB
 
     private
 
-    def stringify(hash)
-      return nil unless hash && !hash.empty?
-      hash.map do |k, v|
-        key = k.to_s.gsub(/\s/, '\ ').gsub(',','\,')
-        val = v
-        if val.is_a?(String)
-          val.gsub!(/\s/, '\ ')
-          val.gsub!(',', '\,')
-          val.gsub!('"', '\"')
-          val = '"' + val + '"'
-        end
+    def data_to_string(data, quote_escape = false)
+      return nil unless data && !data.empty?
+      mappings = map(data, quote_escape)
+      mappings.join(',')
+    end
+
+    def map(data, quote_escape)
+      data.map do |k, v|
+        key = escape_key(k)
+        val = v.is_a?(String) ? escape_value(v, quote_escape) : v
         "#{key}=#{val}"
-      end.join(',')
+      end
+    end
+
+    def escape_value(value, quote_escape)
+      value.gsub!(/\s/, '\ ')
+      value.gsub!(',', '\,')
+      value.gsub!('"', '\"')
+      value = %("#{value}") if quote_escape
+      value
+    end
+
+    def escape_key(key)
+      key.to_s.gsub(/\s/, '\ ').gsub(',', '\,')
     end
   end
 end

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/influxdb/cases/udp_client_spec.rb

@@ -6,7 +6,7 @@ describe InfluxDB::Client do
   specify { expect(client.writer).to be_a(InfluxDB::Writer::UDP) }
 
   describe "#write" do
-    let(:message) { 'responses,region="eu" value=5' }
+    let(:message) { 'responses,region=eu value=5' }
 
     it "sends a UPD packet" do
       s = UDPSocket.new

data/spec/influxdb/point_value_spec.rb

@@ -17,7 +17,7 @@ describe InfluxDB::PointValue do
       point = InfluxDB::PointValue.new(series: "responses",
                                        values: { response_time: 0.34343 },
                                        tags: { city: "Twin Peaks" })
-      expect(point.tags.split("=").last).to eq('"Twin\\ Peaks"')
+      expect(point.tags.split("=").last).to eq("Twin\\ Peaks")
     end
   end
 
@@ -37,24 +37,14 @@ describe InfluxDB::PointValue do
       point = InfluxDB::PointValue.new(series: "responses",
                                        values: { response_time: 0.34343 },
                                        tags: { city: "Twin Peaks," })
-      expect(point.tags.split("=").last).to eq('"Twin\\ Peaks\\,"')
+      expect(point.tags.split("=").last).to eq("Twin\\ Peaks\\,")
     end
   end
 
-  describe "double quote escaping" do
-    it 'should escape passed values' do
-      point = InfluxDB::PointValue.new(series: "responses",
-                                       values: { response_time: 0.34343 },
-                                       tags: { city: "Twin Peaks\"" })
-      expect(point.tags.split("=").last).to eq('"Twin\\ Peaks\\""')
-    end
-  end
-
-
   describe 'dump' do
     context "with all possible data passed" do
       let(:expected_value) do
-        'responses,region="eu",status=200 value=5,threshold=0.54 1436349652'
+        'responses,region=eu,status=200 value=5,threshold=0.54 1436349652'
       end
       it 'should have proper form' do
         point = InfluxDB::PointValue.new(series: "responses",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json