Merge pull request fhir-crucible#110 from fhir-crucible/history-bundle

History bundle
parachutehealth · Mar 15, 2019 · 8fd1cbd · 8fd1cbd
2 parents 759a22b + 5c3bc90
commit 8fd1cbd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
- TargetRubyVersion: 2.2
+ TargetRubyVersion: 2.3
  Exclude:
  - '*.gemspec'
  - 'Gemfile*'

diff --git a/lib/fhir_client/client.rb b/lib/fhir_client/client.rb
@@ -322,7 +322,7 @@ def parse_reply(klass, format, response)
  return nil unless [200, 201].include? response.code
  res = nil
  begin
- res = if(@fhir_version == :dstu2 || klass.ancestors.include?(FHIR::DSTU2::Model))
+ res = if(@fhir_version == :dstu2 || klass&.ancestors&.include?(FHIR::DSTU2::Model))
  if(format.include?('xml'))
  FHIR::DSTU2::Xml.from_xml(response.body)
  else

diff --git a/lib/fhir_client/sections/history.rb b/lib/fhir_client/sections/history.rb
@@ -26,7 +26,15 @@ module History
  def history(options)
  options = {format: @default_format}.merge(options)
  reply = get resource_url(options), fhir_headers
- reply.resource = parse_reply(options[:resource], options[:format], reply)
+
+ # The history reply should be a bundle
+ bundle_klass = if @fhir_version == :stu3
+ FHIR::Bundle
+ else
+ FHIR::DSTU2::Bundle
+ end
+
+ reply.resource = parse_reply(bundle_klass, options[:format], reply)
  reply.resource_class = options[:resource]
  reply
  end

diff --git a/lib/fhir_client/version.rb b/lib/fhir_client/version.rb
@@ -1,5 +1,5 @@
 module FHIR
  class Client
- VERSION = '3.1.0'
+ VERSION = '3.1.1'
  end
 end