circuit_client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e1508915ce91398ef199c6f21c03eb84f0c614
-  data.tar.gz: b94c3dd4990da34a3ac0b34a7ea5d7869214c1b2
+  metadata.gz: 07c5becef6eac99b973f2e39351fc53e4d9633a9
+  data.tar.gz: 4208a620334d4645e5e54ba0ff1d3614fa518387
 SHA512:
-  metadata.gz: 177e67970945a50d5468c57adcb8530d24096b877113a048f731b2d1265f95bdc32f4675bc10ced3a1e6936040ccc2e3e5a409db8d632899acf73c939c34f7ae
-  data.tar.gz: 19b15b3cfb43e6799cfa2676888a2017fdfd1cb26de7c4f0b7341316ef939da1a1798ab479fb97336eb3234ae4f6258e04f7556cf15b8d7368db5d6a8a321043
+  metadata.gz: 68b9c6b6d0a09117bdc9937528cbb2d234f0d9ec587b8ff17a0e5342c7f7a8d3d9590508407e803cd997af9453a19baedc7727aa136a8c5629e3f529463a2a9a
+  data.tar.gz: 7a0d273864893ddb6fb698f8ff18bc069bb386b41cfe35ba682af0b5cc8bd720663f65983cdd7dbacaeea119e8042b26363d25b2067e8321666e6998b27936d0

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/circuit_client.svg)](https://badge.fury.io/rb/circuit_client)
+
 # Circuit Client
 
 circuit\_client is a minimal client for the Circuit REST API.

data/lib/circuit_client/client.rb

@@ -4,6 +4,8 @@ require 'typhoeus/adapters/faraday'
 require 'uri'
 require 'json'
 
+require 'circuit_client/error_middleware'
+
 module CircuitClient
   class Client
     # Set the hostname of the circuit system
@@ -54,7 +56,7 @@ module CircuitClient
     def connection
       @connection ||= Faraday.new(url: base_uri.to_s) do |faraday|
         faraday.response :logger if @trace
-        faraday.use Faraday::Response::RaiseError
+        faraday.use CircuitClient::ErrorMiddleware
         faraday.adapter :typhoeus
       end
     end

data/lib/circuit_client/error_middleware.rb

@@ -0,0 +1,23 @@
+require 'circuit_client/errors'
+
+module CircuitClient
+  class ErrorMiddleware < Faraday::Response::Middleware
+    ClientErrorStatuses = 400...600
+
+    def on_complete(env)
+      case env[:status]
+      when 404
+        raise Faraday::Error::ResourceNotFound, response_values(env)
+      when 407
+        # mimic the behavior that we get with proxy requests with HTTPS
+        raise Faraday::Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
+      when ClientErrorStatuses
+        raise CircuitClient::ClientError, response_values(env)
+      end
+    end
+
+    def response_values(env)
+      {:status => env.status, :headers => env.response_headers, :body => env.body}
+    end
+  end 
+end

data/lib/circuit_client/errors.rb

@@ -0,0 +1,19 @@
+require 'json'
+
+module CircuitClient
+  class ClientError < Faraday::Error::ClientError
+    def initialize(ex, response = nil)
+      content_type = ex[:headers]['Content-Type']
+      if !content_type.nil? && content_type.match(/application\/json/)
+        begin
+          error = JSON.parse(ex[:body])
+          super("server response: #{error['errorDescription']} (status: #{ex[:status]})")
+        rescue JSON::ParserError
+          super("server response with status #{ex[:status]} and malformed JSON")
+        end
+      else
+        super(ex, response)
+      end
+    end
+  end
+end

data/lib/circuit_client/send_message_cli.rb

@@ -118,7 +118,12 @@ END_USAGE
       options = {}
       options[:subject] = @subject unless @subject.nil?
       puts "sending message to #{conv}..."
-      client.create_message( conv, body, **options )
+      begin
+        client.create_message( conv, body, **options )
+      rescue CircuitClient::ClientError => e
+        puts "Could not send message: #{e.message}"
+        exit 1
+      end
     end
 
     def client

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: circuit_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Markus Benning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: 
 email: ich@markusbenning.de
 executables:
@@ -94,6 +94,8 @@ files:
 - bin/send-circuit
 - lib/circuit_client.rb
 - lib/circuit_client/client.rb
+- lib/circuit_client/error_middleware.rb
+- lib/circuit_client/errors.rb
 - lib/circuit_client/send_message_cli.rb
 homepage: https://github.com/benningm/circuit_client
 licenses: