Merge branch 'Vermonster-add-resolve-helper'

lib/fhir_client/ext/model.rb

@@ -92,6 +92,14 @@ def destroy
  nil
  end
 
+ def resolve(reference)
+ if reference.contained?
+ contained.detect { |c| c.id == reference.id }
+ else
+ reference.read
+ end
+ end
+
  private
 
  def self.handle_response(response)

lib/fhir_client/ext/reference.rb

@@ -1,11 +1,28 @@
 module FHIR
  class Reference
+ def contained?
+ reference.to_s.start_with?('#')
+ end
+
+ def id
+ if contained?
+ reference.to_s[1..-1]
+ else
+ reference.to_s.split('/').last
+ end
+ end
+
+ def type
+ reference.to_s.split('/').first unless contained?
+ end
+
+ def resource_class
+ "FHIR::#{type}".constantize unless contained?
+ end
+
  def read
- # TODO: how to follow contained references?
- type, id = reference.to_s.split('/')
- return unless [type, id].all?(&:present?)
- klass = "FHIR::#{type}".constantize
- klass.read(id, client)
+ return if contained? || type.blank? || id.blank?
+ resource_class.read(id, client)
  end
  end
 end