roqua-healthy 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65abd168ac44778d8529b3fdf30028f5f508507
-  data.tar.gz: bb8b7cb307d96912b1b1b459fa65bfe7029dbea9
+  metadata.gz: 9671caf50e1efc23c7bf188c74fc55d5898c1a16
+  data.tar.gz: ad836d232fc0c15c81b866b3953eefd42f92e13d
 SHA512:
-  metadata.gz: 0727c1968cb9f8373a823fbdb82f3d8d0f85e41524b72d63aed0c7c04fd0a3abe1e6284a4979a6fd0700abe1a1651bbc26ccdb39ebcee3812304238874d29805
-  data.tar.gz: e3d1b61925ab1b0825605aa72e11e74147b9b3bc877f05a327324c4151e37042e08f27998b381b5555f1f8cf5bbe4d8bda6cbfea083fb3b4b7738ae423be8bdf
+  metadata.gz: cb328e0dc13e579ec37a399aee4811d251703830693048d135eb6557313eb9847c16167a8289d0f4df51df951d7a91a02569f5aec6c7044c26efbd93137cb861
+  data.tar.gz: 920ee8298069a93fe883f13d882f9ed07ba4f2a3010bfc3e61c45eaaf99fa43b5adf0b61bcad8cfa268e68812e470c0b3bd9fc8f865330d5eefe2795340ecc1a

data/.gitignore

@@ -2,6 +2,7 @@
 .idea
 .yardoc
 Gemfile.lock
+gemfiles/*.lock
 doc/
 pkg/
 tmp/

data/.rubocop_todo.yml

@@ -15,6 +15,10 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Max: 104
 
+# Offense count: 9
+Metrics/BlockLength:
+  Max: 184
+
 # Offense count: 80
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails41" do
+  gem "activesupport", "4.1"
+end
+
+appraise "rails42" do
+  gem "activesupport", "4.2"
+end
+
+appraise "rails50" do
+  gem "activesupport", "5.0"
+end

data/circle.yml

@@ -3,7 +3,16 @@ machine:
     Europe/Amsterdam
   ruby:
     version: 2.3.1
+dependencies:
+  override:
+    - bundle install
+    - gem install appraisal
+    - appraisal
 test:
+  override:
+    - appraisal rails41 bundle exec rspec
+    - appraisal rails42 bundle exec rspec
+    - appraisal rails50 bundle exec rspec
   post:
     - bundle exec rubocop
     - bundle exec codeclimate-test-reporter

data/gemfiles/rails41.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
+gem "activesupport", "4.1"
+
+gemspec :path => "../"

data/gemfiles/rails42.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
+gem "activesupport", "4.2"
+
+gemspec :path => "../"

data/gemfiles/rails50.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", "~> 1.0.0", :group => :test, :require => nil
+gem "activesupport", "5.0"
+
+gemspec :path => "../"

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

@@ -18,7 +18,8 @@ module Roqua
         private
 
         def parsed_body
-          @parsed_body ||= Hash.from_xml(response.body)
+          # from_xml will throw 'IOError: not modifiable string' without using dup in ActiveSupport 4.*
+          @parsed_body ||= Hash.from_xml(response.body.dup)
         rescue REXML::ParseException => e
           raise IllegalMirthResponse, e.message
         end

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

@@ -5,10 +5,27 @@ module Roqua
   module Healthy
     module A19
       class ResponseValidator
+        require 'roqua/healthy/errors'
+
         attr_reader :response_code
         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
@@ -46,11 +63,9 @@ module Roqua
         end
 
         def validate_500
-          failure = parser.fetch("failure")
-          raise ::Roqua::Healthy::Timeout, failure["error"]           if failure["error"] == "Timeout waiting for ACK" || failure["error"] == 'ERROR: Timeout waiting for response'
-          raise ::Roqua::Healthy::Timeout, failure["error"]           if failure["error"] == "Unable to connect to destination\tSocketTimeoutException\tconnect timed out"
-          raise ::Roqua::Healthy::ConnectionRefused, failure["error"] if failure["error"] == "Unable to connect to destination\tConnectException\tConnection refused" || failure["error"] == 'ERROR: ConnectException: Connection refused'
-          raise ::Roqua::Healthy::UnknownFailure, failure["error"]
+          error = parser.fetch('failure')['error']
+          raise ERRORS[error], error if ERRORS[error]
+          raise ::Roqua::Healthy::UnknownFailure, error
         end
 
         private

data/lib/roqua/healthy/version.rb

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

data/roqua-healthy.gemspec

@@ -3,7 +3,6 @@
 
 require File.expand_path('../lib/roqua/healthy/version', __FILE__)
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |gem|
   gem.name          = "roqua-healthy"
   gem.version       = Roqua::Healthy::VERSION
@@ -21,14 +20,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activesupport', '>= 3.2', '< 5.0'
+  gem.add_dependency 'activesupport', '>= 3.2', '< 6'
   gem.add_dependency 'addressable', '~> 2.3'
-  gem.add_dependency 'roqua-support', '~> 0.1.18'
+  gem.add_dependency 'roqua-support', '~> 0.1.22'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'rspec', '~> 3.3.0'
   gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency 'appraisal'
 
   # Required for the tests
   gem.add_development_dependency 'webmock', '~> 1.13'

data/spec/unit/a19/response_validator_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Roqua::Healthy::A19::ResponseValidator do
+  describe '#validate' do
+    subject { Roqua::Healthy::A19::ResponseValidator.new('500', double(fetch: {'error' => error}), 123) }
+    let(:error) { self.class.description }
+
+    context "Timeout waiting for ACK" do
+      it 'raises ::Roqua::Healthy::Timeout' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::Timeout)
+      end
+    end
+
+    context 'ERROR: Timeout waiting for response' do
+      it 'raises ::Roqua::Healthy::Timeout' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::Timeout)
+      end
+    end
+
+    context "Unable to connect to destination\tSocketTimeoutException\tconnect timed out" do
+      it 'raises ::Roqua::Healthy::Timeout' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::Timeout)
+      end
+    end
+
+    context 'ERROR: SocketTimeoutException: connect timed out' do
+      it 'raises ::Roqua::Healthy::Timeout' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::Timeout)
+      end
+    end
+
+    context "Unable to connect to destination\tConnectException\tConnection refused" do
+      it 'raises ::Roqua::Healthy::Timeout' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::ConnectionRefused)
+      end
+    end
+
+    context 'ERROR: ConnectException: Connection refused' do
+      it 'raises ::Roqua::Healthy::Timeout' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::ConnectionRefused)
+      end
+    end
+
+    context 'Unknown error' do
+      it 'raises ::Roqua::Healthy::UnknownFailure' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::UnknownFailure)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,7 +22,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +270,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".yardopts"
+- Appraisals
 - ChangeLog.md
 - Gemfile
 - Guardfile
@@ -267,6 +282,9 @@ files:
 - bin/get_xml_for_patient
 - bin/parse_local_xml
 - circle.yml
+- gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/roqua/healthy.rb
 - lib/roqua/healthy/a19.rb
 - lib/roqua/healthy/a19/address_parser.rb
@@ -328,6 +346,7 @@ files:
 - spec/unit/a19/address_parser_spec.rb
 - spec/unit/a19/correct_patient_check_spec.rb
 - spec/unit/a19/fetcher_spec.rb
+- spec/unit/a19/response_validator_spec.rb
 - spec/unit/a19_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/message_cleaner_spec.rb
@@ -351,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
@@ -400,6 +419,7 @@ test_files:
 - spec/unit/a19/address_parser_spec.rb
 - spec/unit/a19/correct_patient_check_spec.rb
 - spec/unit/a19/fetcher_spec.rb
+- spec/unit/a19/response_validator_spec.rb
 - spec/unit/a19_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/message_cleaner_spec.rb