roqua-healthy 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3959d17316a51405355769df7a3bd596599676b
-  data.tar.gz: 4d4192a2c29410a69420e98e611c9c56ab590e3d
+  metadata.gz: 72774ae40a9addc4ac31ab7ee7470b9ad251bf5f
+  data.tar.gz: 4f867af413282b3ac97041bd8a56b5f95a492025
 SHA512:
-  metadata.gz: 9977ba10cb3b7b6f267231f8f910713fb989614019d6d44b4cc2c09e6ca9671924b80373c30e33a78d331dae3599dd2761a2005fefa1cebba5c389220eac9df9
-  data.tar.gz: 7241aae05b61c2f276f86ba5ce34c24b3abd8ee788084ac1e7cd746788ef7469be58643084dd25c4790e0e8087a9fc704c680599e1296b266fede1a88f57a205
+  metadata.gz: 48b2c55af9044ccc8395c87d71e9e1d4f201f98643646f0f70fdd5b2fabbe3d200293e61a6607909b52d9cdd533fc6cc3f285d2026a39b98218a270b03c51eb8
+  data.tar.gz: 6034a23f518d4db1d59aa7430c5c0ad594312f0e6bd50f09c50a1eb87828742f01cf8eb7de42eddac596c9aabc6a0201ee93ac4e9ab47e540a4999d8a9fa2451

data/.gitlab-ci.yml

@@ -0,0 +1,18 @@
+image: "roqua/roqua-build-images:ruby-2.3.3-phantomjs-2.1.1-bundler-gemnasium"
+
+before_script:
+  - ruby -v
+  - bundle-cache
+  - gem install appraisal
+  - bundle exec appraisal
+
+rubocop:
+  script:
+  - bundle exec rubocop -D
+  
+rspec:
+  script:
+    - bundle exec appraisal rails41 bundle exec rspec
+    - bundle exec appraisal rails42 bundle exec rspec
+    - bundle exec appraisal rails50 bundle exec rspec
+

data/.rubocop.yml

@@ -23,7 +23,7 @@ MethodLength:
 SignalException:
   Enabled: False
 
-Style/EmptyLineAfterMagicComment:
+Layout/EmptyLineAfterMagicComment:
   Enabled: False
 
 Style/FileName:

data/Gemfile

@@ -7,3 +7,6 @@ gemspec
 # Normal development dependencies should go in the gemspec. People shouldn't
 # need to use bundler to develop on our gem.
 gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
+
+gem 'builder'
+gem 'rest-client'

data/lib/roqua/healthy.rb

@@ -4,6 +4,7 @@ require 'roqua/support'
 require 'roqua/healthy/version'
 require 'roqua/healthy/message_cleaner'
 require 'roqua/healthy/a19'
+require 'roqua/healthy/oru'
 require 'roqua/healthy/client'
 require 'roqua/healthy/errors'
 

data/lib/roqua/healthy/a19/fetcher.rb

@@ -25,18 +25,14 @@ module Roqua
         end
 
         def mirth_response
-          Net::HTTP.start(remote_url.host, remote_url.port, use_ssl: use_ssl?) do |http|
-            request = Net::HTTP::Post.new(remote_url.path)
-            request.basic_auth(@client.a19_username, @client.a19_password) if @client.use_basic_auth?
-            request.set_form_data(mirth_params)
-            http.request request
+          Roqua::Healthy.convert_generic_errors_to_healthy_errors do
+            Net::HTTP.start(remote_url.host, remote_url.port, use_ssl: use_ssl?) do |http|
+              request = Net::HTTP::Post.new(remote_url.path)
+              request.basic_auth(@client.a19_username, @client.a19_password) if @client.use_basic_auth?
+              request.set_form_data(mirth_params)
+              http.request request
+            end
           end
-        rescue ::Timeout::Error, Errno::ETIMEDOUT => error
-          raise ::Roqua::Healthy::Timeout, error.message
-        rescue Errno::EHOSTUNREACH => error
-          raise ::Roqua::Healthy::HostUnreachable, error.message
-        rescue Errno::ECONNREFUSED => error
-          raise ::Roqua::Healthy::ConnectionRefused, error.message
         end
 
         private

data/lib/roqua/healthy/a19/response_validator.rb

@@ -11,21 +11,6 @@ module Roqua
         attr_reader :parser
         attr_reader :patient_id
 
-        ERRORS = {
-          'Timeout waiting for ACK' =>
-            ::Roqua::Healthy::Timeout,
-          "Unable to connect to destination\tSocketTimeoutException\tconnect timed out" =>
-            ::Roqua::Healthy::Timeout,
-          'ERROR: Timeout waiting for response' =>
-            ::Roqua::Healthy::Timeout,
-          'ERROR: SocketTimeoutException: connect timed out' =>
-            ::Roqua::Healthy::Timeout,
-          "Unable to connect to destination\tConnectException\tConnection refused" =>
-            ::Roqua::Healthy::ConnectionRefused,
-          'ERROR: ConnectException: Connection refused' =>
-            ::Roqua::Healthy::ConnectionRefused
-        }.freeze
-
         def initialize(response_code, parser, patient_id)
           @response_code = response_code
           @parser        = parser
@@ -64,7 +49,7 @@ module Roqua
 
         def validate_500
           error = parser.fetch('failure')['error']
-          raise ERRORS[error], error if ERRORS[error]
+          raise ::Roqua::Healthy::ERRORS[error], error if ::Roqua::Healthy::ERRORS[error]
           raise ::Roqua::Healthy::UnknownFailure, error
         end
 

data/lib/roqua/healthy/errors.rb

@@ -3,6 +3,7 @@ module Roqua
   module Healthy
     class Error < StandardError; end
     class ConnectionError < Error; end
+    class NACK < Error; end
 
     class IllegalMirthResponse < ConnectionError; end
     class Timeout < ConnectionError; end
@@ -17,5 +18,34 @@ module Roqua
     module MirthErrors
       class WrongPatient < Error; end
     end
+
+    def self.convert_generic_errors_to_healthy_errors
+      yield
+    rescue RestClient::Exceptions::ReadTimeout, RestClient::Exceptions::OpenTimeout => error
+      raise ::Roqua::Healthy::Timeout, error.message
+    rescue ::Timeout::Error => error
+      raise ::Roqua::Healthy::Timeout, error.message
+    rescue Errno::ETIMEDOUT => error
+      raise ::Roqua::Healthy::Timeout, error.message
+    rescue Errno::EHOSTUNREACH => error
+      raise ::Roqua::Healthy::HostUnreachable, error.message
+    rescue Errno::ECONNREFUSED => error
+      raise ::Roqua::Healthy::ConnectionRefused, error.message
+    end
+
+    ERRORS = {
+      'Timeout waiting for ACK' =>
+        ::Roqua::Healthy::Timeout,
+      "Unable to connect to destination\tSocketTimeoutException\tconnect timed out" =>
+        ::Roqua::Healthy::Timeout,
+      'ERROR: Timeout waiting for response' =>
+        ::Roqua::Healthy::Timeout,
+      'ERROR: SocketTimeoutException: connect timed out' =>
+        ::Roqua::Healthy::Timeout,
+      "Unable to connect to destination\tConnectException\tConnection refused" =>
+        ::Roqua::Healthy::ConnectionRefused,
+      'ERROR: ConnectException: Connection refused' =>
+        ::Roqua::Healthy::ConnectionRefused
+    }.freeze
   end
 end

data/lib/roqua/healthy/oru.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Roqua
+  module Healthy
+    module Oru
+    end
+  end
+end
+
+require_relative 'oru/client'

data/lib/roqua/healthy/oru/client.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'cgi'
+require 'rest-client'
+
+module Roqua
+  module Healthy
+    module Oru
+      class Client
+        def self.execute(url, data, timeout:)
+          Roqua::Healthy.convert_generic_errors_to_healthy_errors do
+            deliver_data(url, data, timeout: timeout)
+          end
+        end
+
+        def self.deliver_data(url, data, timeout:)
+          xml = CGI.escape(data.to_xml)
+          RestClient::Request.execute(
+            method: :post,
+            url: url.to_s,
+            payload: xml,
+            headers: {content_type: 'text/xml'},
+            timeout: timeout.to_i
+          ) do |response, _request, _result|
+
+            xml_response = Hash.from_xml(response.body)
+
+            if response.code == 200 && xml_response['oru']['status'] == 'ACK'
+              response.body
+            else
+              handle_error(response, xml_response)
+            end
+          end
+        end
+
+        def self.handle_error(response, xml_response)
+          error = xml_response.dig('oru', 'error')
+          raise ::Roqua::Healthy::ERRORS[error], error if ::Roqua::Healthy::ERRORS[error]
+          raise ::Roqua::Healthy::NACK, error if error.present?
+          raise ::Roqua::Healthy::UnknownFailure, response.body
+        end
+      end
+    end
+  end
+end

data/lib/roqua/healthy/version.rb

@@ -2,6 +2,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

data/spec/unit/oru/client_spec.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Roqua::Healthy::Oru::Client do
+  def stub_oru_response(status, body = '<oru><status>ACK</status></oru>')
+    stub_request(:post, oru_url)
+      .with(
+        body: \
+          '%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%0A%3C' \
+          'hash%3E%0A++%3Coru+type%3D%22symbol%22%3Edata%3C%2Foru%3E%0A%3C%2Fhash%3E%0A',
+        headers: {
+          'Accept' => '*/*',
+          'Accept-Encoding' => 'gzip, deflate',
+          'Content-Length' => '140',
+          'Content-Type' => 'text/xml'
+        }
+      )
+      .to_return(status: status, body: body, headers: {})
+  end
+
+  def stub_500_response
+    stub_request(:post, oru_url)
+      .to_return(status: 500, body: '<oru><status>NACK</status><error>ERROR</error></oru>', headers: {})
+  end
+
+  def stub_404_response
+    stub_request(:post, oru_url)
+      .to_return(status: 404, body: '<oru><status>NACK</status><error>ERROR</error></oru>', headers: {})
+  end
+
+  let(:subject) { Roqua::Healthy::Oru::Client }
+  let(:oru_url) { 'https://example.com' }
+  let(:timeout) { 5.seconds }
+
+  def execute_request
+    subject.execute(oru_url, {oru: :data}, timeout: timeout)
+  end
+
+  context 'when Errno::ETIMEDOUT is triggered' do
+    it 'will raise an ::Roqua::Healthy::Timeout exception' do
+      expect(Roqua::Healthy::Oru::Client).to receive(:deliver_data).and_raise(Errno::ETIMEDOUT)
+      expect { execute_request }.to raise_error(::Roqua::Healthy::Timeout)
+    end
+  end
+
+  it 'sets the correct timeout' do
+    expect(RestClient::Request).to receive(:execute).with(
+      method: :post,
+      url: 'https://example.com',
+      payload: '%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%0A%3Chash%3E%0A++%3C' \
+               'oru+type%3D%22symbol%22%3Edata%3C%2Foru%3E%0A%3C%2Fhash%3E%0A',
+      headers: {content_type: 'text/xml'},
+      timeout: timeout.to_i
+    ).and_return(double(body: '<oru><status>ACK</status></oru>'))
+
+    execute_request
+  end
+
+  context "when upstream is responding" do
+    it "does not raise an exception" do
+      stub_oru_response 200, '<oru><status>ACK</status></oru>'
+      execute_request
+    end
+
+    context 'when a nack is received' do
+      before { stub_oru_response 200, '<oru><status>NACK</status><error>NACK</error></oru>' }
+
+      it 'raises a NACK exception' do
+        expect { execute_request }.to raise_error(Roqua::Healthy::NACK)
+      end
+    end
+  end
+
+  context "when upstream is giving connection refused" do
+    before do
+      stub_request(:any, oru_url).to_raise Errno::ECONNREFUSED
+    end
+
+    it "should raise Oru::ConnectionRefused" do
+      expect { execute_request }.to raise_exception(Roqua::Healthy::ConnectionRefused)
+    end
+  end
+
+  context "when upstream is giving connection timeouts" do
+    before do
+      stub_request(:any, oru_url).to_timeout
+    end
+
+    it "should raise Oru::Timeout" do
+      expect { execute_request }.to raise_exception(Roqua::Healthy::Timeout)
+    end
+  end
+
+  context "when upstream is giving waiting for ack timeouts" do
+    before do
+      stub_oru_response \
+        500,
+        "<oru><status>FAILURE</status><channel>RGOC - Outbound port 60102</channel>" \
+        "<error>Timeout waiting for ACK</error></oru>"
+    end
+
+    it "raises a NACK exception" do
+      expect { execute_request }.to raise_error(::Roqua::Healthy::Timeout, /Timeout waiting for ACK/)
+    end
+  end
+
+  context 'when upstream responds with a 500 status' do
+    before { stub_500_response }
+
+    it 'transforms the exception to a NACK' do
+      expect { execute_request }.to raise_error Roqua::Healthy::NACK
+    end
+  end
+
+  context 'when upstream responds with a 404 status' do
+    before { stub_404_response }
+
+    it 'transforms the exception to a NACK' do
+      expect { execute_request }.to raise_error Roqua::Healthy::NACK
+    end
+  end
+
+  context "when the response doesn't contain an error portion" do
+    it 'will raise a ... exception' do
+      stub_request(:post, oru_url)
+        .to_return(status: 500, body: '<oru><status>Internal server error</status></oru>', headers: {})
+
+      expect { execute_request }.to raise_error Roqua::Healthy::UnknownFailure
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,6 +266,7 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -285,6 +286,7 @@ files:
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- lib/roqua/errors.rb
 - lib/roqua/healthy.rb
 - lib/roqua/healthy/a19.rb
 - lib/roqua/healthy/a19/address_parser.rb
@@ -299,6 +301,8 @@ files:
 - lib/roqua/healthy/client.rb
 - lib/roqua/healthy/errors.rb
 - lib/roqua/healthy/message_cleaner.rb
+- lib/roqua/healthy/oru.rb
+- lib/roqua/healthy/oru/client.rb
 - lib/roqua/healthy/version.rb
 - lib/roqua_healthy.rb
 - roqua-healthy.gemspec
@@ -350,6 +354,7 @@ files:
 - spec/unit/a19_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/message_cleaner_spec.rb
+- spec/unit/oru/client_spec.rb
 homepage: https://github.com/roqua/healthy
 licenses:
 - MIT
@@ -423,3 +428,4 @@ test_files:
 - spec/unit/a19_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/message_cleaner_spec.rb
+- spec/unit/oru/client_spec.rb