statuspageio 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec421c4e88d18d4fc0895107ce63e3d81ae6b4d
-  data.tar.gz: 0a79a02b7197521c53fc52b4d8980981a1a2f1f6
+  metadata.gz: 0caf8c784355d8fc2004397fe2139773a2d9aef7
+  data.tar.gz: 2edf2c57f1ccc345f4aca38b9e2a500ed47efcb2
 SHA512:
-  metadata.gz: 82b6707f58b5f53abe9af0454d4ea4a03af8d254b5ce8ac8383e0e984b7e89ff116b18d4b8f022174420ded0f531b9e4ec0cfdd0d679e8c2b35540e0d4de937e
-  data.tar.gz: b7ab5e90dda41a0a89f2ae1d11650555489ce2a77a6ea36751fc2c2e3c78fb9ae2eb65fdd3d85042853ec8b8b41dfcc2a27725864140ee69b1fad19a3e7f9fb9
+  metadata.gz: c84864826dea97ead1b424a414682ed89aa2afca35bc57f637d6fc0762c21e60a83b1ff6e75171e8dd7e8a5f61e69d2cf7ffc63feb43ad29fd3a4e9fdc01833c
+  data.tar.gz: dbed2abf04dd767beeed0943b03b63d963e6ecba5b778b184f4263864238de1cca1d2f3c5892ff3728b4448251b599cb0ef2ca29899978d8e093801f5f116a0f

data/lib/statuspageio/client.rb

@@ -1,11 +1,13 @@
+require 'httparty'
 require 'statuspageio/configuration'
-require 'statuspageio/request'
+require 'statuspageio/response_error'
 
 module Statuspageio
   class Client
-    require 'statuspageio/client/incident'
+    include HTTParty
+    base_uri 'api.statuspage.io/v1'
 
-    include Statuspageio::Request
+    require 'statuspageio/client/incident'
     include Statuspageio::Client::Incident
 
     attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
@@ -16,5 +18,42 @@ module Statuspageio
         send("#{key}=", options[key])
       end
     end
+
+    def self.handle_response(response)
+      if response.success?
+        JSON.parse(response.body)
+      else
+        bad_response(response)
+      end
+    end
+
+    def self.bad_response(response)
+      if response.class == HTTParty::Response
+        raise ResponseError, response
+      end
+      raise StandardError, "Unknown error"
+    end
+
+    def delete(path)
+      self.class.handle_response(self.class.delete("#{path}.json", headers: headers))
+    end
+
+    def get(path)
+      self.class.handle_response(self.class.get("#{path}.json", headers: headers))
+    end
+
+    def post(path, data = {})
+      self.class.handle_response(self.class.post("#{path}.json", data, headers: headers))
+    end
+
+    def put(path, data = {})
+      self.class.handle_response(self.class.put("#{path}.json", data, headers: headers))
+    end
+
+    private
+
+    def headers
+      { 'Authorization' => "OAuth #{self.api_key}" }
+    end
   end
 end

data/lib/statuspageio/response_error.rb

@@ -0,0 +1,41 @@
+module Statuspageio
+  # Error raised on a bad response
+  class ResponseError < StandardError
+
+    attr_reader :response, :code, :errors
+
+    # @param [HTTParty::Response] res
+    # @return [CloudApp::ResponseError]
+    def initialize(res)
+      @response = res.response
+      @code     = res.code
+      begin
+        @errors = parse_errors(res.parsed_response)
+      rescue JSON::ParserError
+        @errors = [res.response.body]
+      end
+    end
+
+    # Returns error code and message
+    #
+    # @return [String]
+    def to_s
+      "#{code.to_s} #{response.msg}".strip
+    end
+
+    private
+
+    def parse_errors(errors)
+      return case errors
+        when Hash
+          errors.collect{|k,v| "#{k}: #{v}"}
+        when String
+          [errors]
+        when Array
+          errors
+        else
+          []
+      end
+    end
+  end
+end

data/lib/statuspageio/version.rb

@@ -1,3 +1,3 @@
 module Statuspageio
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statuspageio
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Nixon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -71,7 +71,7 @@ files:
 - lib/statuspageio/client.rb
 - lib/statuspageio/client/incident.rb
 - lib/statuspageio/configuration.rb
-- lib/statuspageio/request.rb
+- lib/statuspageio/response_error.rb
 - lib/statuspageio/version.rb
 - statuspageio.gemspec
 homepage: https://github.com/dasnixon/statuspageio

data/lib/statuspageio/request.rb

@@ -1,30 +0,0 @@
-require 'httparty'
-
-module Statuspageio
-  module Request
-    include HTTParty
-    base_uri 'api.statuspage.io/v1'
-
-    def delete(path, data = {})
-      self.class.delete("#{path}.json", data, headers: headers)
-    end
-
-    def get(path, data = {})
-      self.class.get("#{path}.json", data, headers: headers)
-    end
-
-    def post(path, data = {})
-      self.class.post("#{path}.json", data, headers: headers)
-    end
-
-    def put(path, data = {})
-      self.class.put("#{path}.json", data, headers: headers)
-    end
-
-    private
-
-    def headers
-      { Authorization: "OAuth #{self.api_key}" }
-    end
-  end
-end