kapacitor-ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79bbedb54161374f17dfd6d1781e1baf8d483760
-  data.tar.gz: 9e0d4b2b4aa32da574f330bb32037918d07256b4
+  metadata.gz: 97fd28ae0c38ca2649dc1aa6caf64d93486148ab
+  data.tar.gz: 87c38785fbf478b9c4bb5bcb1aed5f983173da63
 SHA512:
-  metadata.gz: 6925cab3a4ac82ce9dd82a163b6bce11a45d80b43b871e3e8190749700a403fdb8b1299ff88720343b38910ec905dd3561c8e23722da662f4798a8949e4f8599
-  data.tar.gz: 7c68807eb08758aa8bb953cbf09a6c346681754e764ad647232a0b211676342631dcc9a19e4e6774c1098ad91694b99a0e97571fe025c1f970c0493cd5613f46
+  metadata.gz: 976de61620d4e124b53d5acfc26fcf711ff2fdcb0c9e936fbc85d2cd652262a94f9bf67078205ae6afb88d53fa34733373490617c2a0e7de166821710628e0c4
+  data.tar.gz: 6c2fe44b7f27e0bf7b40b1ce636c057bf3b0fe876c17b51b7e140a3d70ce6ce03c007603401b1332fa60d4238abd0ba1279670d7aea5a12545d6049c6e2a8ca8

data/lib/kapacitor/client.rb

@@ -1,10 +1,10 @@
-require 'net/http'
+require 'httpclient'
 require 'json'
 
 module Kapacitor
   class Client
     # @return [URI] Kapacitor REST API URL
-    attr_reader :uri
+    attr_reader :url
     # @return [Net::HTTP] HTTP client instance
     attr_reader :http
 
@@ -13,9 +13,9 @@ module Kapacitor
     # @param url [String] Kapacitor REST API's URL (defaults to `http://localhost:9092`)
     # @param version [Integer] API version (defaults to `v1preview`)
     #
-    def initialize(url: 'http://localhost:9092', version: 'v1preview')
-      @uri = URI.parse("#{url}/kapacitor/#{version}")
-      @http = Net::HTTP.new(@uri.host, @uri.port)
+    def initialize(url: 'http://localhost:9092/kapacitor', version: 'v1preview')
+      @url = URI.join(url, version)
+      @http = HTTPClient.new
     end
 
     # Define a Kapacitor template
@@ -71,7 +71,7 @@ module Kapacitor
       ret = []
 
       loop do
-        res = api_get(endpoint: "/templates?offset=#{offset}&limit=#{limit}")['templates']
+        res = api_get(endpoint: "templates?offset=#{offset}&limit=#{limit}")['templates']
         break unless res.size > 0
         ret += res
         offset += limit
@@ -162,11 +162,11 @@ module Kapacitor
       tasks = []
 
       loop do
-        res = api_get(endpoint: "/tasks?fields=id&offset=#{offset}&limit=#{limit}")['tasks']
+        res = api_get(endpoint: "tasks?fields=id&offset=#{offset}&limit=#{limit}")['tasks']
         break unless res.size > 0
 
         res.each do |task|
-          tasks << api_get(endpoint: "/tasks/#{task['id']}")
+          tasks << api_get(endpoint: "tasks/#{task['id']}")
         end
 
         offset += limit
@@ -227,28 +227,27 @@ module Kapacitor
     # @return [Array[Hash]] List of handlers
     #
     def topic_handlers(topic:)
-      return api_get(endpoint: "/alerts/topics/#{topic}/handlers")['handlers']
+      api_get(endpoint: "alerts/topics/#{topic}/handlers")['handlers']
     end
 
 private
     # Perform a HTTP GET request
     #
     # @param endpoint [String] HTTP API endpoint
+    # @param query [String] HTTP query
     # @return [Array[Hash], Hash] API response
     #
-    def api_get(endpoint:)
+    def api_get(endpoint:, query: nil)
       begin
-        req = Net::HTTP::Get.new(self.uri.path + endpoint, {'Content-type' => 'application/json', 'Accept' => 'application/json'})
-        resp = self.http.request(req)
-
-        if resp.code == '200'
+        resp = self.http.get([self.url, endpoint].join('/'), query, {'Content-type' => 'application/json', 'Accept' => 'application/json'})
+        if resp.status == 200
           begin
             data = JSON.parse(resp.body)
           rescue JSON::ParserError
             raise Exception, "Failed to decode response message"
           end
         else
-          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.code}, Error: #{resp.message})"
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
         end
       rescue
         raise Exception, "Failed to execute GET request to Kapacitor REST API (#{$!})"
@@ -264,18 +263,15 @@ private
     #
     def api_post(endpoint:, data:)
       begin
-        req = Net::HTTP::Post.new(self.uri.path + endpoint, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        req.body = data.to_json
-        resp = self.http.request(req)
-
-        if resp.code == '200'
+        resp = self.http.post([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
+        if resp.status == 200
           begin
             data = JSON.parse(resp.body)
           rescue JSON::ParserError
             raise Exception, "Failed to decode response message"
           end
         else
-          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.code}, Error: #{resp.message})"
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
         end
       rescue
         raise Exception, "Failed to execute POST request to Kapacitor REST API (#{$!})"
@@ -290,10 +286,8 @@ private
     #
     def api_delete(endpoint:)
       begin
-        req = Net::HTTP::Delete.new(self.uri.path + endpoint, {'Content-type' => 'application/json', 'Accept' => 'application/json'})
-        resp = self.http.request(req)
-
-        if resp.code == '204'
+        resp = self.http.delete([self.url, endpoint].join('/'), {'Content-type' => 'application/json', 'Accept' => 'application/json'})
+        if resp.status == 204
           if resp.body
             begin
               data = JSON.parse(resp.body)
@@ -302,7 +296,7 @@ private
             end
           end
         else
-          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.code}, Error: #{resp.message})"
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
         end
       rescue
         raise Exception, "Failed to execute DELETE request to Kapacitor REST API (#{$!})"
@@ -318,18 +312,15 @@ private
     #
     def api_patch(endpoint:, data:)
       begin
-        req = Net::HTTP::Patch.new(self.uri.path + endpoint, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        req.body = data.to_json
-        resp = self.http.request(req)
-
-        if resp.code == '200'
+        resp = self.http.patch([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
+        if resp.status == 200
           begin
             data = JSON.parse(resp.body)
           rescue JSON::ParserError
             raise Exception, "Failed to decode response message"
           end
         else
-          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.code}, Error: #{resp.message})"
+          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.status}, Reason: #{resp.reason})"
         end
       rescue
         raise Exception, "Failed to execute PATCH request to Kapacitor REST API (#{$!})"
@@ -345,18 +336,15 @@ private
     #
     def api_put(endpoint:, data:)
       begin
-        req = Net::HTTP::Put.new(self.uri.path + endpoint, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        req.body = data.to_json
-        resp = self.http.request(req)
-
-        if resp.code == '200'
+        resp = self.http.put([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
+        if resp.status == 200
           begin
             data = JSON.parse(resp.body)
           rescue JSON::ParserError
             raise Exception, "Failed to decode response message"
           end
         else
-          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.code}, Error: #{resp.message})"
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
         end
       rescue
         raise Exception, "Failed to execute PUT request to Kapacitor REST API (#{$!})"

data/lib/kapacitor/version.rb

@@ -3,7 +3,7 @@
 #
 
 module Kapacitor
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapacitor-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matteo Cerutti
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement