Merge pull request #2 from zgalor/return_gen_id

Change .get() return value to entire http response body

Author: zgalor

.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
     Exclude:
-        - lib/prometheus/api_client/version.rb
+        - lib/prometheus/alert_buffer_client/version.rb
 
 AlignHash:
     EnforcedHashRocketStyle: table
@@ -22,6 +22,7 @@ Metrics/BlockLength:
         - 'spec/**/*.rb'
 
 Metrics/LineLength:
+    Max: 120
     Exclude:
         - 'spec/**/*.rb'
 

Gemfile

@@ -7,6 +7,7 @@ def ruby_version?(constraint)
 end
 
 gem 'faraday'
+gem 'faraday_middleware'
 
 group :test do
   gem 'coveralls'

README.md

@@ -37,6 +37,10 @@ alerts = prometheus.get()
 
 alerts = prometheus.get(generation_id: '12497ca8-b597-4590-ac5d-d55af7f3d185', from_index: 34)
 
+Alerts will be returned in a Hash with following keys:
+* generationID
+* messages
+
 #### Posting alerts
 \# post an alert JSON to server
 

examples/get_alerts.rb

@@ -4,4 +4,6 @@
 prometheus = Prometheus::AlertBufferClient::Client.new(url: 'http://localhost:9099', path: '/topics/test')
 
 alerts = prometheus.get(generation_id: '12497ca8-b597-4590-ac5d-d55af7f3d185', from_index: 1)
-puts alerts
+
+puts "Generation Id: #{alerts['generationID']}"
+puts "Alerts: #{alerts['messages']}"

examples/post_alerts.rb

@@ -5,4 +5,3 @@
 
 prometheus.post '{"posted":"alert"}'
 prometheus.post '{"alertId":12}'
-

lib/prometheus/alert_buffer_client.rb

@@ -5,13 +5,10 @@
 require 'prometheus/alert_buffer_client/client'
 
 module Prometheus
-
   # Alert Client is a ruby implementation for a Prometheus-alert-buffer client.
   module AlertBufferClient
-
     def self.client(options = {})
       Client.new(options)
     end
-
   end
 end

lib/prometheus/alert_buffer_client/client.rb

@@ -2,6 +2,7 @@
 
 require 'json'
 require 'faraday'
+require 'faraday_middleware'
 
 module Prometheus
   # Alert Client is a ruby implementation for a Prometheus-alert-buffer client.
@@ -20,7 +21,6 @@ class RequestError < StandardError; end
         },
       }.freeze
 
-
       # Create a Prometheus Alert client:
       #
       # @param [Hash] options
@@ -39,24 +39,27 @@ def initialize(options = {})
 
         @client = Faraday.new(
           faraday_options(options),
-        )
+        ) do |conn|
+          conn.response(:json)
+          conn.adapter(Faraday.default_adapter)
+        end
       end
 
-
       # Get alerts:
       #
       # @param [Hash] options
       # @option options [String] :generation_id Database generation Id.
       # @option options [Integer] :from_index Minimal index of alerts to fetch.
       #
+      # @return [Hash] response with keys: generationID, messages
       # All alerts will be fetched if options are omitted.
       def get(options = {})
         response = @client.get do |req|
           req.params['generationID'] = options[:generation_id]
           req.params['fromIndex'] = options[:from_index]
         end
 
-        JSON.parse(response.body)['messages']
+        response.body
       end
 
       # post alert:
@@ -65,8 +68,6 @@ def post(alert)
         @client.post do |req|
           req.body = alert
         end
-      rescue
-        raise RequestError, 'Bad response from server'
       end
 
       # Helper function to evalueate the low level proxy option
@@ -98,7 +99,7 @@ def faraday_headers(options)
         return unless headers && headers[:token]
 
         {
-          Authorization: "Bearer #{headers[:token].to_s}",
+          Authorization: "Bearer #{headers[:token]}",
         }
       end
 
@@ -125,7 +126,6 @@ def faraday_options(options)
           request: faraday_request(options),
         }
       end
-
     end
   end
 end

lib/prometheus/alert_buffer_client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module AlertBufferClient
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end