fhir_client 4.0.6 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a320805ef8a57a99df11a56953314c3fd6243d0e05becea117695bd350965b3
-  data.tar.gz: 8f313d29a48f593964f28b1029fb7abb02f8de7131237815be1fe248ab326147
+  metadata.gz: 9842da03d68bf3f56e22b6c8c6e6645c88f0a25e876233f0ab45f95517362c43
+  data.tar.gz: f202c9a2252b630b13afc67adce9c314f42eec3b2da88bec05ccff227211e73b
 SHA512:
-  metadata.gz: 756910586865db0f779cbafde0d65d56ba5fd4549de71dddd15319e87363518cae11601912dd346d65474eec1ef6a0fc8caf7514ff72ef4c987c003014069f4c
-  data.tar.gz: 96548027100932535419c6d8fd403e75997669cb3b83c644b66b195053f53e4af78d0ca7ef4bd15c06fb37e317e67b0aaa008a08426f38324391e7f5f14f812c
+  metadata.gz: 3e71f7c84fa1b9559fe085ef8d26317a29d3ab902c666694880d2d545deb8dbfeb645d961cb667a4a60408a50fc8754e6c8a3fabe06e2aa7e8954030992e8e26
+  data.tar.gz: c87f346a09f1ac9a2a5f84cd80489e014cbaa768679061831e87900a7608da3d954157b4c76bb1fe97519595f8b00090230da5021f8b31dc25c3b4af71023b66

data/Rakefile

@@ -19,8 +19,4 @@ task :rubocop do
   RuboCop::RakeTask.new
 end
 
-task :test do
-  system('open coverage/index.html')
-end
-
 task default: [:test]

data/fhir_client.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 3'
   spec.add_dependency 'addressable', '>= 2.3'
-  spec.add_dependency 'fhir_models', '>= 4.0.2'
-  spec.add_dependency 'fhir_stu3_models', '>= 3.0.1'
-  spec.add_dependency 'fhir_dstu2_models', '>= 1.0.10'
+  spec.add_dependency 'fhir_models', '>= 4.2.1'
+  spec.add_dependency 'fhir_stu3_models', '>= 3.1.1'
+  spec.add_dependency 'fhir_dstu2_models', '>= 1.1.1'
   spec.add_dependency 'nokogiri', '>= 1.10.4'
   spec.add_dependency 'oauth2', '~> 1.1'
   spec.add_dependency 'rack', '>= 1.5'

data/lib/fhir_client/client.rb

@@ -315,35 +315,46 @@ module FHIR
     def parse_reply(klass, format, response)
       FHIR.logger.debug "Parsing response with {klass: #{klass}, format: #{format}, code: #{response.code}}."
       return nil unless [200, 201].include? response.code
-      res = nil
-      begin
-        res = if(@fhir_version == :dstu2 || klass&.ancestors&.include?(FHIR::DSTU2::Model))
-                if(format.include?('xml'))
-                  FHIR::DSTU2::Xml.from_xml(response.body)
-                else
-                  FHIR::DSTU2::Json.from_json(response.body)
-                end
-              elsif(@fhir_version == :r4 || klass&.ancestors&.include?(FHIR::Model))
-                if(format.include?('xml'))
-                  FHIR::Xml.from_xml(response.body)
-                else
-                  FHIR::Json.from_json(response.body)
-                end
-              else
-                if(format.include?('xml'))
-                  FHIR::STU3::Xml.from_xml(response.body)
-                else
-                  FHIR::STU3::Json.from_json(response.body)
-                end
-              end
-        res.client = self unless res.nil?
-      rescue => e
-        FHIR.logger.error "Failed to parse #{format} as resource #{klass}: #{e.message}"
-        res = nil
-      end
+      res =
+        begin
+          if(@fhir_version == :dstu2 || klass&.ancestors&.include?(FHIR::DSTU2::Model))
+            if(format.include?('xml'))
+              FHIR::DSTU2::Xml.from_xml(response.body)
+            else
+              FHIR::DSTU2::Json.from_json(response.body)
+            end
+          elsif(@fhir_version == :r4 || klass&.ancestors&.include?(FHIR::Model))
+            if(format.include?('xml'))
+              FHIR::Xml.from_xml(response.body)
+            else
+              FHIR::Json.from_json(response.body)
+            end
+          else
+            if(format.include?('xml'))
+              FHIR::STU3::Xml.from_xml(response.body)
+            else
+              FHIR::STU3::Json.from_json(response.body)
+            end
+          end
+        rescue => e
+          FHIR.logger.error "Failed to parse #{format} as resource #{klass}: #{e.message}"
+          nil
+        end
+      set_client_on_resource(res) unless res.nil?
       res
     end
 
+    def set_client_on_resource(resource)
+      return if resource.nil?
+
+      resource.client = self
+      resource.each_element do |element, _, _|
+        if element.is_a?(Reference) || element.is_a?(STU3::Reference) || element.is_a?(DSTU2::Reference) || element.respond_to?(:resourceType)
+          element.client = self
+        end
+      end
+    end
+
     def strip_base(path)
       path.gsub(@base_service_url, '')
     end

data/lib/fhir_client/ext/model.rb

@@ -2,17 +2,14 @@ module FHIR
   module ModelExtras
 
     def self.included base
-      base.send :include, InstanceMethods
+      base.include InstanceMethods
       base.extend ClassMethods
+      base.attr_writer :client
     end
 
     module InstanceMethods
       def client
-        FHIR::Model.client
-      end
-
-      def client=(client)
-        FHIR::Model.client = client
+        @client || FHIR::Model.client
       end
 
       def vread(version_id)
@@ -146,4 +143,4 @@ module FHIR
       include FHIR::ModelExtras
     end
   end
-end
+end

data/lib/fhir_client/ext/reference.rb

@@ -54,7 +54,7 @@ module FHIR
       parts[:base_uri]
     end
 
-    def read
+    def read(client = self.client)
       return if !(relative? || absolute?)
       if relative? || reference == client.full_resource_url(resource: resource_class, id: reference_id)
         read_client = client
@@ -64,7 +64,7 @@ module FHIR
       resource_class.read(reference_id, read_client)
     end
 
-    def vread
+    def vread(client = self.client)
       return if !(relative? || absolute?) || version_id.blank?
       if relative? || reference == client.full_resource_url(resource: resource_class, id: reference_id)
         read_client = client

data/lib/fhir_client/sections/crud.rb

@@ -226,7 +226,7 @@ module FHIR
           resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.self_link)
           reply.resource = resource # just send back the submitted resource
         end
-        reply.resource.client = self
+        set_client_on_resource(reply.resource)
         reply.resource_class = resource.class
         reply
       end

data/lib/fhir_client/sections/operations.rb

@@ -132,8 +132,11 @@ module FHIR
         add_resource_parameter(params, 'resource', resource)
         add_parameter(params, 'onlyCertainMatches', 'Boolean', options[:onlyCertainMatches]) unless options[:onlyCertainMatches].nil?
         add_parameter(params, 'count', 'Integer', options[:matchCount]) if options[:matchCount].is_a?(Integer)
-        post resource_url(options), params, fhir_headers({content_type: "#{format || @default_format}",
-                                                          accept: "#{format || @default_format}"})
+        post(
+          resource_url(options),
+          params,
+          fhir_headers({content_type: "#{format || @default_format}", accept: "#{format || @default_format}"})
+        ).tap { |reply| set_client_on_resource(reply.resource) }
       end
 
       #
@@ -154,7 +157,8 @@ module FHIR
         params = versioned_resource_class('Parameters').new
         add_resource_parameter(params, 'resource', resource)
         add_parameter(params, 'profile', 'Uri', options[:profile_uri]) unless options[:profile_uri].nil?
-        post resource_url(options), params, fhir_headers(headers)
+        post(resource_url(options), params, fhir_headers(headers))
+          .tap { |reply| set_client_on_resource(reply.resource) }
       end
 
       def validate_existing(resource, id, options = {}, format = @default_format)
@@ -165,7 +169,8 @@ module FHIR
         params = versioned_resource_class('Parameters').new
         add_resource_parameter(params, 'resource', resource)
         add_parameter(params, 'profile', 'Uri', options[:profile_uri]) unless options[:profile_uri].nil?
-        post resource_url(options), params, fhir_headers(headers)
+        post(resource_url(options), params, fhir_headers(headers))
+          .tap { |reply| set_client_on_resource(reply.resource) }
       end
 
       private

data/lib/fhir_client/sections/transactions.rb

@@ -74,6 +74,7 @@ module FHIR
         rescue
           reply.resource = nil
         end
+        set_client_on_resource(reply.resource)
         reply.resource_class = reply.resource.class
         reply
       end

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '4.0.6'.freeze
+    VERSION = '5.0.3'.freeze
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 5.0.3
 platform: ruby
 authors:
 - Andre Quina
 - Jason Walonoski
 - Robert Scanlon
 - Reece Adamson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,42 +47,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: fhir_stu3_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: fhir_dstu2_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +287,7 @@ homepage: https://github.com/fhir-crucible/fhir_client
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -302,8 +302,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby
 test_files: []