roqua-healthy 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8816a868a01da4c523089c72f78f23e62026280
-  data.tar.gz: 408c2a873db4743e7937eadb234a526f2c271427
+  metadata.gz: 8eb7c6e8f253cbe1f2a7768a9cff7f8fceef6c15
+  data.tar.gz: 6489b577b4f97629a98df40bcc8feab3cb9e4701
 SHA512:
-  metadata.gz: ff8b9b02d19b29025d07bf7177c037fb4c3d2c19a901d15e6112619d4fbcbb66fbe4fd5313f92ae9009ada39cfdeafc90e20220284c573ed557f279b53ecb569
-  data.tar.gz: 61ebbe34d3a25fdb81182d0f6108d301df5a0488d1f8fc34f46e8ed9c5004d832798d3e2b53366318eeddd058353864b11e750085bdfc2fdbab0abb44e011fee
+  metadata.gz: ba34e6ff1aeb443ed8dc03fcdd45a93e9e53de4a131f9a43eb82d9091265c174170a9436cf5ae90fad387251ddaa7cd196a9da7afd95771b322243a2825de31e
+  data.tar.gz: 9ffccccbbfbaa6f553c0729e23918e5de2cdb0ae730fa23cb63ff9bac521dd4beeb750340c87e8deb8f2696d138ece366ebe47974581ede2bb1676a72297c182

data/Guardfile

@@ -5,7 +5,7 @@ guard 'rspec', cmd: 'bundle exec rspec -f Fuubar' do
   watch(%r{^spec/fixtures/([^_]+)_.*.xml}) { |m| "spec/integration/#{m[1]}_spec.rb" }
 end
 
-guard :rubocop do
+guard :rubocop, cli: ['-D'] do
   watch(%r{.+\.rb$})
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/README.md

@@ -8,6 +8,13 @@
 Healthy::A19.fetch(patient_identifier)
 ```
 
+or if you need multiple configurations
+
+```ruby
+client = Healthy::A19::Client(a19_endpoint: 'https://...')
+client.fetch_a19(patient_identifier)
+```
+
 ### Adding integration tests
 
 If you find any A19 response that Healthy currently does not handle correctly, please add a fixture and integration test for it.

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

@@ -9,9 +9,11 @@ module Roqua
     module A19
       class Fetcher
         attr_reader :patient_id
+        attr_reader :client
 
-        def initialize(patient_id)
+        def initialize(patient_id, client)
           @patient_id = patient_id
+          @client = client
         end
 
         def fetch
@@ -50,7 +52,7 @@ module Roqua
         def remote_url
           return @remote_url if @remote_url
 
-          url = Addressable::URI.parse(Healthy.a19_endpoint)
+          url = Addressable::URI.parse(client.a19_endpoint)
           url.path = "/"
 
           @remote_url = URI.parse(url.to_s)

data/lib/roqua/healthy/a19.rb

@@ -1,8 +1,6 @@
 module Roqua
   module Healthy
     module A19
-      extend ::Roqua::Logging
-
       # Fetches a patient record given a `patient_id` and returns a hash containing
       # the interesting information that was returned from an upstream `ADR^A19`
       # response.
@@ -10,11 +8,7 @@ module Roqua
       # @param  patient_id [String] the patient identifier
       # @return [Hash] the patient details.
       def self.fetch(patient_id)
-        eventlog.lifecycle('roqua.hl7.a19', patient_id: patient_id) do
-          message = Fetcher.new(patient_id).fetch
-          patient = Transformer.new(message).to_patient
-          patient
-        end
+        Client.new.fetch_a19(patient_id)
       end
     end
   end

data/lib/roqua/healthy/client.rb

@@ -0,0 +1,27 @@
+module Roqua
+  module Healthy
+    class Client
+      include ::Roqua::Logging
+
+      attr_accessor :a19_endpoint
+
+      def initialize(options = {})
+        @a19_endpoint = options[:a19_endpoint]
+      end
+
+      def a19_endpoint
+        @a19_endpoint || Roqua::Healthy.a19_endpoint
+      end
+
+      def fetch_a19(patient_id)
+        eventlog.lifecycle('roqua.hl7.a19', patient_id: patient_id) do
+          message = A19::Fetcher.new(patient_id, self).fetch
+          patient = A19::Transformer.new(message).to_patient
+          patient
+        end
+      end
+    end
+  end
+end
+
+require_relative 'a19'

data/lib/roqua/healthy/version.rb

@@ -1,6 +1,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/roqua/healthy.rb

@@ -3,6 +3,7 @@ require 'roqua/support'
 require 'roqua/healthy/version'
 require 'roqua/healthy/message_cleaner'
 require 'roqua/healthy/a19'
+require 'roqua/healthy/client'
 require 'roqua/healthy/errors'
 
 module Roqua

data/roqua-healthy.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard-rspec', '~> 4.2.4'
   gem.add_development_dependency 'listen', '~> 2.1'
   gem.add_development_dependency 'guard-rubocop', '~> 1.0.1'
-  gem.add_development_dependency 'rubocop', '~> 0.15'
+  gem.add_development_dependency 'rubocop', '~> 0.17'
   gem.add_development_dependency 'fuubar'
 
   # Documentation generation

data/spec/unit/a19/fetcher_spec.rb

@@ -1,54 +1,70 @@
 require 'spec_helper'
 
 describe Roqua::Healthy::A19::Fetcher do
+  let(:client) { Roqua::Healthy::Client.new }
+
+  subject { Roqua::Healthy::A19::Fetcher.new("123", client) }
+
   it 'succeeds when upstream returns XML' do
     stub_mirth_response("<HL7Message></HL7Message>")
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.not_to raise_error
+    expect { subject.fetch }.not_to raise_error
   end
 
   it "raises when upstream does not return HTTP 200" do
     stub_mirth_response "Request not successful", 500
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception
+    expect { subject.fetch }.to raise_exception
   end
 
   it 'raises when upstream responds with illegal XML' do
     stub_mirth_response "<patient><firstname>Jan & Piet</firstname></patient>"
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_error(Roqua::Healthy::IllegalMirthResponse)
+    expect { subject.fetch }.to raise_error(Roqua::Healthy::IllegalMirthResponse)
 
     stub_mirth_response "<patient><firstname>Jan</patient>"
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_error(Roqua::Healthy::IllegalMirthResponse)
+    expect { subject.fetch }.to raise_error(Roqua::Healthy::IllegalMirthResponse)
   end
 
   it "raises upstream is returning 'Timeout waiting for ACK' messages" do
     stub_mirth_response "<failure><error>Timeout waiting for ACK</error></failure>", 500
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::Timeout)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::Timeout)
   end
 
   it "raises upstream is returning 'connection timeout' messages" do
     stub_mirth_response "<failure><error>Unable to connect to destination\tSocketTimeoutException\tconnect timed out</error></failure>", 500
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::Timeout)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::Timeout)
   end
 
-  it "raises upstream is returning 'connection refuesed' messages" do
+  it "raises upstream is returning 'connection refused' messages" do
     stub_mirth_response "<failure><error>Unable to connect to destination\tConnectException\tConnection refused</error></failure>", 500
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::ConnectionRefused)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::ConnectionRefused)
   end
 
   it "raises when upstream does not accept connections" do
     stub_mirth.to_raise Errno::ECONNREFUSED
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::ConnectionRefused)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::ConnectionRefused)
   end
 
   it 'raises when upstream is unreachable' do
     stub_mirth.to_raise Errno::EHOSTUNREACH
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::HostUnreachable)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::HostUnreachable)
   end
 
   it "raises when upstream is timing out" do
     stub_mirth.to_timeout
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::Timeout)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::Timeout)
 
     stub_mirth.to_raise Errno::ETIMEDOUT
-    expect { Roqua::Healthy::A19::Fetcher.new("123").fetch }.to raise_exception(Roqua::Healthy::Timeout)
+    expect { subject.fetch }.to raise_exception(Roqua::Healthy::Timeout)
+  end
+
+  it 'saves the client' do
+    expect(subject.client).to eq client
+  end
+
+  describe '#remote_url' do
+    let(:fetcher) { Roqua::Healthy::A19::Fetcher.new("123", client) }
+    it 'uses the client config if available' do
+      expect(client).to receive(:a19_endpoint).and_call_original
+      fetcher.send(:remote_url)
+    end
   end
 end

data/spec/unit/a19_spec.rb

@@ -1,4 +1,4 @@
 require 'spec_helper'
 
 describe Roqua::Healthy::A19 do
-end
+end

data/spec/unit/client_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Roqua::Healthy::Client do
+  context 'fully configured client' do
+    subject { Roqua::Healthy::Client.new(a19_endpoint: 'http://a19_endpoint.dev') }
+
+    it { expect(subject.a19_endpoint).to eq 'http://a19_endpoint.dev' }
+  end
+
+  context 'unconfigured client' do
+    subject { Roqua::Healthy::Client.new }
+
+    it 'defaults to system wide config' do
+      expect(subject.a19_endpoint).to eq Roqua::Healthy.a19_endpoint
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +259,7 @@ files:
 - lib/roqua/healthy/a19/response_parser.rb
 - lib/roqua/healthy/a19/response_validator.rb
 - lib/roqua/healthy/a19/transformer.rb
+- lib/roqua/healthy/client.rb
 - lib/roqua/healthy/errors.rb
 - lib/roqua/healthy/message_cleaner.rb
 - lib/roqua/healthy/version.rb
@@ -298,6 +299,7 @@ files:
 - spec/unit/a19/correct_patient_check_spec.rb
 - spec/unit/a19/fetcher_spec.rb
 - spec/unit/a19_spec.rb
+- spec/unit/client_spec.rb
 - spec/unit/message_cleaner_spec.rb
 homepage: https://github.com/roqua/healthy
 licenses:
@@ -359,5 +361,6 @@ test_files:
 - spec/unit/a19/correct_patient_check_spec.rb
 - spec/unit/a19/fetcher_spec.rb
 - spec/unit/a19_spec.rb
+- spec/unit/client_spec.rb
 - spec/unit/message_cleaner_spec.rb
 has_rdoc: