fhir_client 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f74ff0812b021eac3244300451f4970bf4eb12b81fc647a7abd8f6d270c310
-  data.tar.gz: 10f8902a26af03ed539b80631621210d9bbdae5664ef37abcc41a59054d4b55d
+  metadata.gz: 7031a100f52d6a39207aeb7d33cd6f891ffd20f9fc920455bffcf7c18939a573
+  data.tar.gz: eea574c3405cf4796b81af0c828169e59e53371fa26862a35756fb5c430d2e91
 SHA512:
-  metadata.gz: 824e2cf15a2387215ddf7d21ce1b03be870700f9eec697850360579d4405351d94b7710e3146baad5150c3b9ccf4ffe79d0a0f990c42e80663213b459bd3281b
-  data.tar.gz: c57df2cd3af870ec55470ee8536947b2601c2328ac7e1c41071ae8bda12d107e3cac96edf94ee6f8f8c2bf9e10c947e7373336dedccee036615c782518461f6c
+  metadata.gz: 1b456acf0953615754397c38f1b5bd4c05d8150f41a73f9269dc005f4829c5001c2eae92d5f8e3600e56d9c330178d67231bca4ee6d39f7a235081fa7c655afa
+  data.tar.gz: 637593dc2f61702e28a2853b1cb073dc7af8ebe12bfca4f1f3b33fac88e0766370a0a1218106ac6ded1393398bd2ba7fedd2d05192a8c4dcd25e8e1e2830d07d

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 2.4
-  - 2.5
   - 2.6
+  - 2.7
 before_install:
   - gem update --system
   - gem install bundler

data/README.md

@@ -151,9 +151,14 @@ client.destroy(FHIR::Patient, patient_id)
 
 ### Searching
 ```ruby
+# via GET
 reply = client.search(FHIR::Patient, search: {parameters: {name: 'P'}})
+
+# via POST
+reply = client.search(FHIR::Patient, search: {body: {name: 'P'}})
+
 bundle = reply.resource
-patient = bundle.entry.first.resource
+patient = bundle&.entry&.first&.resource
 ```
 
 ### Fetching a Bundle
@@ -215,7 +220,7 @@ end
 
 # License
 
-Copyright 2014-2019 The MITRE Corporation
+Copyright 2014-2022 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/fhir_client.gemspec

@@ -6,8 +6,9 @@ require 'fhir_client/version'
 Gem::Specification.new do |spec|
   spec.name          = 'fhir_client'
   spec.version       = FHIR::Client::VERSION
-  spec.authors       = ['Andre Quina', 'Jason Walonoski', 'Janoo Fernandes']
+  spec.authors       = ['Andre Quina', 'Jason Walonoski', 'Robert Scanlon', 'Reece Adamson']
   spec.email         = ['jwalonoski@mitre.org']
+  spec.licenses      = ['Apache-2.0']
 
   spec.summary       = %q{A Gem for handling FHIR client requests in ruby}
   spec.description   = %q{A Gem for handling FHIR client requests in ruby}
@@ -32,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tilt', '>= 1.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'test-unit'

data/lib/fhir_client.rb

@@ -3,6 +3,11 @@ require 'fhir_dstu2_models'
 require 'fhir_stu3_models'
 require 'active_support/all'
 
+# Default to INFO level logging for all FHIR namespaced logging. Since there is
+# no single gem that 'owns' the FHIR namespace, we use the client as the spot
+# to set the default. Otherwise the default is set to DEBUG, which is too high.
+FHIR.logger.level = Logger::INFO
+
 root = File.expand_path '.', File.dirname(File.absolute_path(__FILE__))
 Dir.glob(File.join(root, 'fhir_client', 'sections', '**', '*.rb')).each do |file|
   require file

data/lib/fhir_client/client.rb

@@ -374,6 +374,7 @@ module FHIR
     end
 
     # Extract the request payload in the specified format, defaults to XML
+    # Note that the payload is usually a resource, but could be a form post for searches depending on content type
     def request_payload(resource, headers)
       if headers
         format_specified = headers['Content-Type']
@@ -383,6 +384,10 @@ module FHIR
           resource.to_xml
         elsif format_specified.downcase.include?('json')
           resource.to_json
+        elsif format_specified.downcase == 'application/x-www-form-urlencoded'
+          # Special case where this is a search body and not a resource.
+          # Leave as hash because underlying libraries automatically URL encode it.
+          resource
         else
           resource.to_xml
         end

data/lib/fhir_client/sections/search.rb

@@ -12,40 +12,28 @@ module FHIR
         options[:resource] = klass
         options[:format] = format
 
-        reply = if options[:search] && options[:search][:flag]
-                  post resource_url(options), nil, fhir_headers({content_type: 'application/x-www-form-urlencoded'})
-                else
+        reply = if options.dig(:search, :flag).nil? && options.dig(:search, :body).nil?
                   get resource_url(options), fhir_headers
+                else
+                  options[:search][:flag] = true
+                  post resource_url(options), options.dig(:search, :body), fhir_headers({content_type: 'application/x-www-form-urlencoded'})
                 end
-        # reply = get resource_url(options), fhir_headers(options)
+
         reply.resource = parse_reply(klass, format, reply)
         reply.resource_class = klass
         reply
       end
 
+      # It does not appear that this is part of the specification (any more?)
+      # Investigate removing in next major version.
       def search_existing(klass, id, options = {}, format = @default_format)
-        options.merge!(resource: klass, id: id, format: format)
-        # if options[:search][:flag]
-        reply = if options[:search] && options[:search][:flag]
-                  post resource_url(options), nil, fhir_headers({content_type: 'application/x-www-form-urlencoded'})
-                else
-                  get resource_url(options), fhir_headers
-                end
-        reply.resource = parse_reply(klass, format, reply)
-        reply.resource_class = klass
-        reply
+        options[:id] = id
+        search(klass, options, format)
       end
 
       def search_all(options = {}, format = @default_format)
         options[:format] = format
-        reply = if options[:search] && options[:search][:flag]
-                  post resource_url(options), nil, fhir_headers({content_type: 'application/x-www-form-urlencoded'})
-                else
-                  get resource_url(options), fhir_headers
-                end
-        reply.resource = parse_reply(nil, format, reply)
-        reply.resource_class = nil
-        reply
+        search(nil, options, format)
       end
     end
   end

data/lib/fhir_client/version.rb

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

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Andre Quina
 - Jason Walonoski
-- Janoo Fernandes
+- Robert Scanlon
+- Reece Adamson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,16 +171,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +284,8 @@ files:
 - lib/fhir_client/version.rb
 - lib/fhir_client/version_management.rb
 homepage: https://github.com/fhir-crucible/fhir_client
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -300,8 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby