wavefront-sdk 1.3.0 → 1.3.1

data/spec/spec_helper.rb

@@ -9,10 +9,10 @@ end
 require 'minitest/autorun'
 require 'webmock/minitest'
 
-CREDS = {
-  endpoint: 'test.example.com',
-  token:    '0123456789-ABCDEF'
-}
+# rubocop:disable Style/MutableConstant
+CREDS = { endpoint: 'test.example.com',
+          token:    '0123456789-ABCDEF' }
+# rubocop:enable Style/MutableConstant
 
 POST_HEADERS = {
   'Content-Type': 'text/plain', Accept: 'application/json'
@@ -101,6 +101,8 @@ class WavefrontTestBase < MiniTest::Test
     assert_requested(call, uri, headers: headers)
     WebMock.reset!
   end
+  # rubocop:enable Metrics/PerceivedComplexity
+  # rubocop:enable Metrics/ParameterLists
 
   def standard_exception
     Object.const_get('Wavefront::Exception')

data/spec/wavefront-sdk/credentials_spec.rb

@@ -53,7 +53,6 @@ class WavefrontCredentialsTest < MiniTest::Test
     assert_equal(c.creds[:token], '12345678-abcd-1234-abcd-123456789012')
     assert_equal(c.creds[:endpoint], 'endpoint.wavefront.com')
   end
-
 end
 
 # Test individual methods. We must override the constructor to do
@@ -63,6 +62,8 @@ class Giblets < Wavefront::Credentials
   def initialize; end
 end
 
+# And here are the tests
+#
 class GibletsTest < MiniTest::Test
   attr_reader :wf, :raw
 
@@ -86,7 +87,7 @@ class GibletsTest < MiniTest::Test
     ENV['WAVEFRONT_ENDPOINT'] = 'env_ep'
 
     assert_equal(wf.env_override(raw),
-      { endpoint: 'env_ep', token: 'raw_tok', proxy: 'raw_proxy' })
+                 endpoint: 'env_ep', token: 'raw_tok', proxy: 'raw_proxy')
   end
 
   def test_env_override_env_endpoint_and_token
@@ -94,7 +95,7 @@ class GibletsTest < MiniTest::Test
     ENV['WAVEFRONT_TOKEN'] = 'env_tok'
 
     assert_equal(wf.env_override(raw),
-      { endpoint: 'env_ep', token: 'env_tok', proxy: 'raw_proxy' })
+                 endpoint: 'env_ep', token: 'env_tok', proxy: 'raw_proxy')
   end
 
   def test_env_override_env_proxy
@@ -102,8 +103,8 @@ class GibletsTest < MiniTest::Test
     x = wf.env_override(raw)
 
     assert_instance_of(Hash, x)
-    assert_equal(x, { endpoint: 'raw_ep', token: 'raw_tok', proxy:
-                      'env_proxy' })
+    assert_equal(x, endpoint: 'raw_ep', token: 'raw_tok', proxy:
+                      'env_proxy')
   end
 
   def test_populate
@@ -144,10 +145,11 @@ class GibletsTest < MiniTest::Test
 
   def test_load_from_file
     assert_equal(wf.load_from_file(
-      [Pathname.new('/no/file/1'), Pathname.new('/no/file/2')]), {})
+                   [Pathname.new('/no/file/1'), Pathname.new('/no/file/2')]
+    ), {})
 
     assert_equal(wf.load_from_file([CONF], 'noprofile'),
-                 { file: CONF })
+                 file: CONF)
 
     x = wf.load_from_file([CONF2, CONF], 'default')
     assert_instance_of(Hash, x)

data/spec/wavefront-sdk/externallink_spec.rb

@@ -9,10 +9,12 @@ EXTERNAL_LINK_BODY = {
   description: 'an imaginary link for unit testing purposes'
 }.freeze
 
+# rubocop:disable Style/MutableConstant
 EXTERNAL_LINK_BODY_2 = {
   name:        'test link',
   template:    'https://example.com/link/{{value}}'
 }
+# rubocop:enable Style/MutableConstant
 
 # Unit tests for ExternalLink class
 #

data/spec/wavefront-sdk/mixins_spec.rb

@@ -9,18 +9,18 @@ require 'spy/integration'
 class WavefrontMixinsTest < MiniTest::Test
   include Wavefront::Mixins
 
+  # rubocop:disable Lint/UnifiedInteger
   def test_parse_time
     base_t = Time.now.to_i
     assert_equal parse_time(1_469_711_187), 1_469_711_187
     assert_equal parse_time('2016-07-28 14:25:36 +0100'), 1_469_712_336
-    assert_equal parse_time('2016-07-28'), 1_469_664_000
     assert_instance_of Fixnum, parse_time(Time.now)
     assert_instance_of Fixnum, parse_time(Time.now, true)
     assert parse_time(Time.now) >= base_t
     assert parse_time(Time.now, true) >= base_t * 1000
     assert parse_time(Time.now, true) < base_t * 1001
-    assert_instance_of Fixnum, parse_time(DateTime.now)
-    assert_instance_of Fixnum, parse_time(DateTime.now, true)
+    assert_instance_of Fixnum, parse_time(Time.now)
+    assert_instance_of Fixnum, parse_time(Time.now, true)
     assert_raises(Wavefront::Exception::InvalidTimestamp) do
       parse_time('nonsense')
     end
@@ -32,6 +32,7 @@ class WavefrontMixinsTest < MiniTest::Test
 
     assert_equal trt_spy.calls.length, 2
   end
+  # rubocop:enable Lint/UnifiedInteger
 
   def test_relative_time
     base = Time.now

data/spec/wavefront-sdk/parse_time_spec.rb

@@ -3,11 +3,15 @@
 require_relative '../spec_helper'
 require_relative '../../lib/wavefront-sdk/parse_time'
 
+# rubocop:disable Style/NumericLiterals
 TSS = 1517151869
 TSM = 1517151869523
+# rubocop:enable Style/NumericLiterals
 
-# Test parse_time class
+# Test parse_time class. Rubocop gets in the way a bit here.
 #
+# rubocop:disable Lint/UnifiedInteger
+# rubocop:disable Style/DateTime
 class WavefrontParseTimeTest < MiniTest::Test
   attr_reader :pts, :ptm
 
@@ -16,44 +20,44 @@ class WavefrontParseTimeTest < MiniTest::Test
     @ptm = Wavefront::ParseTime.new(TSM, true)
   end
 
-  def test_parse_time_Fixnum
-    assert_equal(pts.parse_time_Fixnum, TSS)
-    assert_equal(ptm.parse_time_Fixnum, TSM)
+  def test_parse_time_fixnum
+    assert_equal(pts.parse_time_fixnum, TSS)
+    assert_equal(ptm.parse_time_fixnum, TSM)
   end
 
-  def test_parse_time_Integer
-    assert_equal(pts.parse_time_Integer, TSS)
-    assert_equal(ptm.parse_time_Integer, TSM)
+  def test_parse_time_integer
+    assert_equal(pts.parse_time_integer, TSS)
+    assert_equal(ptm.parse_time_integer, TSM)
   end
 
-  def test_parse_time_String
+  def test_parse_time_string
     ptss = Wavefront::ParseTime.new(TSS.to_s, false)
     ptms = Wavefront::ParseTime.new(TSM.to_s, true)
-    assert_instance_of(Fixnum, ptss.parse_time_String, TSS)
-    assert_instance_of(Fixnum, ptms.parse_time_String, TSM)
-    assert_equal(ptss.parse_time_String, TSS)
-    assert_equal(ptms.parse_time_String, TSM)
+    assert_instance_of(Fixnum, ptss.parse_time_string, TSS)
+    assert_instance_of(Fixnum, ptms.parse_time_string, TSM)
+    assert_equal(ptss.parse_time_string, TSS)
+    assert_equal(ptms.parse_time_string, TSM)
     assert_instance_of(Fixnum, ptss.parse!)
     assert_instance_of(Fixnum, ptms.parse!)
   end
 
-  def test_parse_time_Time
+  def test_parse_time_time
     ptst = Wavefront::ParseTime.new(Time.at(TSS), false)
     ptmt = Wavefront::ParseTime.new(DateTime.strptime(TSM.to_s,
                                                       '%Q').to_time, true)
-    assert_equal(ptst.parse_time_Time, TSS)
-    assert_equal(ptmt.parse_time_Time, TSM)
+    assert_equal(ptst.parse_time_time, TSS)
+    assert_equal(ptmt.parse_time_time, TSM)
     assert_instance_of(Fixnum, ptst.parse!)
     assert_instance_of(Fixnum, ptmt.parse!)
   end
 
-  def test_parse_time_DateTime
+  def test_parse_time_datetime
     ptsd = Wavefront::ParseTime.new(Time.at(TSS).to_datetime, false)
     ptmd = Wavefront::ParseTime.new(DateTime.strptime(TSM.to_s, '%Q'), true)
-    assert_instance_of(Fixnum, ptsd.parse_time_DateTime, TSS)
-    assert_instance_of(Fixnum, ptmd.parse_time_DateTime, TSM)
-    assert_equal(ptsd.parse_time_DateTime, TSS)
-    assert_equal(ptmd.parse_time_DateTime, TSM)
+    assert_instance_of(Fixnum, ptsd.parse_time_datetime, TSS)
+    assert_instance_of(Fixnum, ptmd.parse_time_datetime, TSM)
+    assert_equal(ptsd.parse_time_datetime, TSS)
+    assert_equal(ptmd.parse_time_datetime, TSM)
     assert_instance_of(Fixnum, ptsd.parse!)
     assert_instance_of(Fixnum, ptmd.parse!)
   end
@@ -63,3 +67,5 @@ class WavefrontParseTimeTest < MiniTest::Test
     assert_instance_of(Fixnum, ptm.parse!)
   end
 end
+# rubocop:enable Lint/UnifiedInteger
+# rubocop:enable Style/DateTime

data/spec/wavefront-sdk/query_spec.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'cgi'
 require 'date'
 require_relative '../spec_helper'
 
@@ -9,7 +10,7 @@ T_MS = T.to_datetime.strftime('%Q').freeze
 TE = (T + 10).freeze
 TE_MS = TE.to_datetime.strftime('%Q')
 Q = "ts(\"#{SERIES}\")".freeze
-QE = URI.encode(Q).freeze
+QE = CGI.escape(Q).freeze
 
 # Unit tests for Query class
 #

data/spec/wavefront-sdk/response_spec.rb

@@ -9,7 +9,7 @@ WF_JSON = '{"status":{"result":"OK","message":"","code":200},' \
           '"limit":100,"totalItems":3,"moreItems":false}}'.freeze
 
 # Unit tests for Response class
-
+#
 class WavefrontResponseTest < MiniTest::Test
   def test_initialize_good_data
     wf = Wavefront::Response.new(WF_JSON, 200)
@@ -24,4 +24,16 @@ class WavefrontResponseTest < MiniTest::Test
   end
 
   def test_initialize_bad_data; end
+
+  def test_build_response
+    wf = Wavefront::Response.new(WF_JSON, 200)
+    assert_equal(Map.new, wf.build_response({}))
+    assert_equal(Map.new, wf.build_response([]))
+    assert_equal(Map.new, wf.build_response('string'))
+    assert_equal(Map.new(key: 123), wf.build_response(key: 123))
+    assert_equal(123, wf.build_response(response: 123))
+    assert_equal([1, 2], wf.build_response(response: [1, 2]))
+    assert_equal(Map.new(key: 123),
+                 wf.build_response(response: { key: 123 }))
+  end
 end

data/spec/wavefront-sdk/validators_spec.rb

@@ -6,6 +6,8 @@ require_relative '../spec_helper'
 require_relative '../../lib/wavefront-sdk/constants'
 require_relative '../../lib/wavefront-sdk/validators'
 
+# Validator tests, obviously. Happy now Rubocop?
+#
 class WavefrontValidatorsTest < MiniTest::Test
   include Wavefront::Validators
 
@@ -21,7 +23,7 @@ class WavefrontValidatorsTest < MiniTest::Test
             '"slash/allowed_in_quotes"', '"comma,allowed_in_quotes"',
             "#{DELTA}deltas.must.pass", "\"#{DELTA}quoted.delta\""]
     bad  = ['metric.is.(>_<)', { key: 'val' }, 'no/slash', 'no,comma',
-            [] , "not.a.#{DELTA}"]
+            [], "not.a.#{DELTA}"]
     good_and_bad('wf_metric_name?', 'InvalidMetricName', good, bad)
   end
 
@@ -51,12 +53,14 @@ class WavefrontValidatorsTest < MiniTest::Test
     good_and_bad('wf_value?', 'InvalidMetricValue', good, bad)
   end
 
+  # rubocop:disable Style/DateTime
   def test_wf_ts?
     good = [Time.now, Date.today, DateTime.now]
     bad  = ['2017-03-25 23:52:22 +0000', 1_490_485_946,
             '#<Date: 2017-03-25 ((2457838j,0s,0n),+0s,2299161j)>']
     good_and_bad('wf_ts?', 'InvalidTimestamp', good, bad)
   end
+  # rubocop:enable Style/DateTime
 
   def test_wf_ms_ts?
     good = [Time.now.to_i * 1000]
@@ -188,7 +192,8 @@ class WavefrontValidatorsTest < MiniTest::Test
   end
 
   def test_wf_user_id?
-    good = %w[Some.User@example.com general99+specific@somewhere.net someone@somewhere.com]
+    good = %w[Some.User@example.com general99+specific@somewhere.net
+              someone@somewhere.com]
     bad = %w[word Name]
     good_and_bad('wf_user_id?', 'InvalidUserId', good, bad)
   end
@@ -250,10 +255,12 @@ class WavefrontValidatorsTest < MiniTest::Test
   def test_notificant_id
     good = %w[CHTo47HvsPzSaGhh]
     bad = ['CTo47HvsPzSaGhh', [], {}, nil, 'bad id']
+    good_and_bad('wf_notificant_id?', 'InvalidNotificantId', good, bad)
   end
 
   def test_integration_id
     good = %w[aws tutorial elasticsearch cassandra go]
     bad = ['CTo47HvsPzSaGhh', [], {}, nil, 'bad id']
+    good_and_bad('wf_integration_id?', 'InvalidIntegrationId', good, bad)
   end
 end

data/spec/wavefront-sdk/write_spec.rb

@@ -25,11 +25,9 @@ POINT_A = [
 
 POINTS = [POINT.dup,
           { path:   'test.other_metric',
-           value:  89,
-           ts:     1_469_987_572,
-           source: 'otherhost'}]
-
-POINT_L = 'test.metric 123456 1469987572 source=testhost t1="v1" t2="v2"'.freeze
+            value:  89,
+            ts:     1_469_987_572,
+            source: 'otherhost' }].freeze
 
 # This class is sufficiently different to the API calling classes
 # that it doesn't use spec helper or inherit anything.
@@ -87,6 +85,20 @@ class WavefrontWriteTest < MiniTest::Test
     assert mocket_spy.has_been_called?
   end
 
+  def test_prepped_points
+    assert_equal wf.prepped_points(%w[p1 p2 p3 p4]), %w[p1 p2 p3 p4]
+    assert_equal wf.prepped_points([%w[p1 p2 p3 p4]]), %w[p1 p2 p3 p4]
+    assert_equal wf.prepped_points('p1'), %w[p1]
+    assert_equal wf.prepped_points(
+      [{ path: 'p1' }, { path: 'p2' }, { path: 'p3' }], 'prefix'
+    ),
+                 [{ path: 'prefix.p1' }, { path: 'prefix.p2' },
+                  { path: 'prefix.p3' }]
+
+    assert_equal wf.prepped_points({ path: 'p1' }, 'prefix'),
+                 [{ path: 'prefix.p1' }]
+  end
+
   def test_write_array
     mocket = Mocket.new
     Spy.on(TCPSocket, :new).and_return(mocket)
@@ -179,7 +191,7 @@ end
 # A mock socket
 #
 class Mocket
-  def puts(s); end
+  def puts(socket); end
 
   def close; end
 end

data/wavefront-sdk.gemspec

@@ -2,6 +2,7 @@ require 'pathname'
 require 'date'
 require_relative 'lib/wavefront-sdk/version'
 
+# rubocop:disable Metrics/BlockLength:
 Gem::Specification.new do |gem|
   gem.name          = 'wavefront-sdk'
   gem.version       = WF_SDK_VERSION
@@ -15,24 +16,24 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/snltd/wavefront-sdk'
   gem.license       = 'BSD-2-Clause'
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files    = gem.files.grep(/^spec/)
-  gem.require_paths = %w(lib)
+  gem.require_paths = %w[lib]
   gem.bindir        = 'bin'
 
+  gem.add_dependency 'addressable', '~> 2.4'
   gem.add_dependency 'faraday', '~> 0.14.0'
   gem.add_dependency 'inifile', '~> 3.0'
-  gem.add_dependency 'addressable', '~> 2.4'
   gem.add_dependency 'map', '~> 6.6'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
+  gem.add_development_dependency 'minitest', '~> 5.11'
   gem.add_development_dependency 'rake', '~> 12.0'
-  gem.add_development_dependency 'yard', '~> 0.9.5'
   gem.add_development_dependency 'rubocop', '~> 0.54.0'
-  gem.add_development_dependency 'webmock', '~> 3.0'
-  gem.add_development_dependency 'minitest', '~> 5.11'
-  gem.add_development_dependency 'spy', '~> 0.4.0'
   gem.add_development_dependency 'simplecov', '~> 0.16.0'
+  gem.add_development_dependency 'spy', '~> 0.4.0'
+  gem.add_development_dependency 'webmock', '~> 3.0'
+  gem.add_development_dependency 'yard', '~> 0.9.5'
 
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -123,61 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.54.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: spy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: spy
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.9.5
 description: 'SDK for Wavefront (wavefront.com) API v2 '
 email: slackboy@gmail.com
 executables: []