roqua-healthy 1.5.13 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b61faf958cac88da6cfa1aeb5e5399b304035cdf8b10504032db95a94d69bf3
-  data.tar.gz: 6ff72116dcf9d778ec6ca08c26f5b14c71efdb000d86813027c39d8f70d531dc
+  metadata.gz: 676e3d78e93d705fbf01f1e7eb726ca8c250b64fb7e226262b8bebd9d4ca540d
+  data.tar.gz: 5a5eac93225350b7446eaf8c3c22f29d53d3673437488fe04e4c8d8b9ccc25ca
 SHA512:
-  metadata.gz: 980c9941379027fd03236735a1ec93ee41e3143e022ed54f76271f71658a69128f1389060ee90ed32286e4396c45d76971d6f3b3560cc096ca18c6eb7c175699
-  data.tar.gz: 22349d8f91cd0dd30d99aa36c28d6c4280ee61326f168bbc8dd659ea60f6f014a26eaccf0c5b057d1380d07083a2c6082cb2734010dd6578cb75c80bbf020263
+  metadata.gz: 7b54a9724e9035399b542b8d034cde91808a32938293c1da699dc1ab9d5ba626bc5a56bc0afc047fc1989b12e307e728562abc87d1d04147691791327f99a01b
+  data.tar.gz: d992da02d82847037d5881ead65ee81281ccc1a1eb111f44b5f68600f26c6af31e31f0b5acf2304fba34bf48db98dfe8bf44f9dd90188bbcb972a955ad4509c0

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "registry.roqua.nl/roqua/docker-base-images:ruby-2.6-builder"
+image: "registry.roqua.nl/roqua/docker-base-images:ruby-2.7-builder"
 
 cache:
   paths:
@@ -15,22 +15,6 @@ rubocop:
   script:
   - bundle exec rubocop -D
 
-rails41:
-  script:
-    - bundle exec appraisal rails41 bundle exec rspec
-
-rails42:
-  script:
-    - bundle exec appraisal rails42 bundle exec rspec
-
-rails50:
-  script:
-    - bundle exec appraisal rails50 bundle exec rspec
-
-rails51:
-  script:
-    - bundle exec appraisal rails51 bundle exec rspec
-
 rails52:
   script:
     - bundle exec appraisal rails52 bundle exec rspec
@@ -38,3 +22,7 @@ rails52:
 rails60:
   script:
     - bundle exec appraisal rails60 bundle exec rspec
+
+rails61:
+  script:
+    - bundle exec appraisal rails61 bundle exec rspec

data/.rubocop.yml

@@ -27,6 +27,9 @@ SignalException:
 Layout/EmptyLineAfterMagicComment:
   Enabled: False
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Naming/FileName:
   Exclude:
     - Appraisals

data/Appraisals

@@ -1,25 +1,14 @@
 # frozen_string_literal: true
 
-appraise "rails41" do
-  gem "activesupport", "4.1"
-end
-
-appraise "rails42" do
-  gem "activesupport", "4.2"
-end
-
-appraise "rails50" do
-  gem "activesupport", "5.0"
-end
-
-appraise "rails51" do
-  gem "activesupport", "5.1"
-end
-
 appraise "rails52" do
   gem "activesupport", "5.2"
+  gem "roqua-support", "~> 0.3.0"
 end
 
 appraise "rails60" do
   gem "activesupport", "6.0"
 end
+
+appraise "rails61" do
+  gem "activesupport", "6.1"
+end

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 1.6.0
+
+* ActiveSupport 6.1 support
+* Removed ActiveSupport 4.1, 4.2, 5.0 and 5.1
+* Add roqua_support 0.4 support.
+
 ### 1.5.12
 
 * ActiveSupport 6.0 support

data/gemfiles/rails52.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
 gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "5.2"
+gem "roqua-support", "~> 0.3.0"
 
 gemspec path: "../"

data/gemfiles/{rails41.gemfile → rails61.gemfile}

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
 gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "4.1"
+gem "activesupport", "6.1"
 
 gemspec path: "../"

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

@@ -9,8 +9,7 @@ module Roqua
   module Healthy
     module A19
       class Fetcher
-        attr_reader :patient_id
-        attr_reader :client
+        attr_reader :client, :patient_id
 
         def initialize(patient_id, client)
           @patient_id = patient_id

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

@@ -28,7 +28,7 @@ module Roqua
         end
 
         def self.strip_non_phone_number_characters(number)
-          number.gsub(/[-\s\.]/, '')
+          number.gsub(/[-\s.]/, '')
         end
       end
     end

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

@@ -7,9 +7,7 @@ module Roqua
       class ResponseValidator
         require 'roqua/healthy/errors'
 
-        attr_reader :response_code
-        attr_reader :parser
-        attr_reader :patient_id
+        attr_reader :parser, :patient_id, :response_code
 
         def initialize(response_code, parser, patient_id)
           @response_code = response_code
@@ -20,41 +18,41 @@ module Roqua
         def validate
           case response_code
           when '200'
-            validate_200
+            validate200
           when '401', '403'
-            validate_403
+            validate403
           when '404'
-            validate_404
+            validate404
           when '500'
-            validate_500
+            validate500
           else
             raise ::Roqua::Healthy::UnknownFailure, "Unexpected HTTP response code #{response_code}."
           end
         end
 
-        def validate_200
+        private
+
+        def validate200
           parsed_message = parser.fetch("HL7Message")
           ensure_patient_found(parsed_message)
           ensure_correct_patient(parsed_message)
           true
         end
 
-        def validate_403
+        def validate403
           raise ::Roqua::Healthy::AuthenticationFailure
         end
 
-        def validate_404
+        def validate404
           raise ::Roqua::Healthy::PatientNotFound
         end
 
-        def validate_500
+        def validate500
           error = parser.fetch('failure')['error']
           raise ::Roqua::Healthy::ERRORS[error], error if ::Roqua::Healthy::ERRORS[error]
           raise ::Roqua::Healthy::UnknownFailure, error
         end
 
-        private
-
         def ensure_patient_found(parsed_message)
           raise ::Roqua::Healthy::PatientNotFound if parsed_message.key?("ERR") && parsed_message.fetch("ERR").fetch("ERR.1").fetch("ERR.1.4").fetch("ERR.1.4.2") =~ /Patient \(@\) niet gevonden\(.*\)/
           raise ::Roqua::Healthy::PatientNotFound if parsed_message.key?("QAK") && parsed_message.fetch("QAK").fetch("QAK.2").fetch("QAK.2.1") == "NF"

data/lib/roqua/healthy/version.rb

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

data/roqua-healthy.gemspec

@@ -20,12 +20,12 @@ 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', '< 6.1'
+  gem.add_dependency 'activesupport', '>= 5.1', '< 6.2'
   gem.add_dependency 'addressable', '~> 2.3'
   gem.add_dependency 'builder'
   gem.add_dependency 'phonelib', '~> 0.6'
   gem.add_dependency 'rest-client', '>= 2.0.2'
-  gem.add_dependency 'roqua-support', '~> 0.3.0'
+  gem.add_dependency 'roqua-support', '>= 0.3.0', '< 0.5.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'bundler'
@@ -38,8 +38,8 @@ Gem::Specification.new do |gem|
 
   # Workflow and tools
   gem.add_development_dependency 'guard', '~> 2.1'
-  gem.add_development_dependency 'guard-rspec', '~> 4.2.4'
-  gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
+  gem.add_development_dependency 'guard-rspec', '~> 4.2'
+  gem.add_development_dependency 'guard-rubocop', '~> 1.2'
   gem.add_development_dependency 'listen', '~> 2.1'
   gem.add_development_dependency 'simplecov'
 

data/spec/unit/oru/client_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Roqua::Healthy::Oru::Client do
 
   let(:subject) { Roqua::Healthy::Oru::Client }
   let(:oru_url) { 'https://example.com' }
-  let(:timeout) { 5.seconds }
+  let(:timeout) { 5 }
 
   def execute_request
     subject.execute(oru_url, {oru: :data}, timeout: timeout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.6.0
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,20 +19,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -93,16 +93,22 @@ dependencies:
   name: roqua-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -207,28 +213,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -297,13 +303,9 @@ files:
 - bin/get_xml_for_patient
 - bin/parse_local_xml
 - circle.yml
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
-- lib/roqua/errors.rb
+- gemfiles/rails61.gemfile
 - lib/roqua/healthy.rb
 - lib/roqua/healthy/a19.rb
 - lib/roqua/healthy/a19/address_parser.rb
@@ -398,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua

data/gemfiles/rails42.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
-gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "4.2"
-
-gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
-gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "5.0"
-
-gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codeclimate-test-reporter", "~> 1.0.0", group: :test, require: nil
-gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "5.1"
-
-gemspec path: "../"