fhir_client 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd32d205caf439bcf1c52533a7895fd925aa06ac
-  data.tar.gz: 097032ec57bf8adbb5ce6ac9f39e1310ccd73ff8
+SHA256:
+  metadata.gz: b3ea696abc5f4af913b2cd11a96299090f49fcd5859e53631bff94e48e68a665
+  data.tar.gz: 0e3b5a443b3f71bd73c0183f964a832b6eabe67e6e4b2e2b961087cefd320dee
 SHA512:
-  metadata.gz: 3dc8c145f536e64d7066647d3f99631bdf55a73f5b214699c6c66568a6734ed7ccfb704a527b690583789bbd99d79f228d8539db110ecb4702a767b467e212f3
-  data.tar.gz: 3450841cfcca5d8249624ee1d43dc30109b77461c4c03cd94773945dfff618da5fc69eb673309a65a5539a156d793036dec3e721617d3051647831bfd32dcd8f
+  metadata.gz: 2099e5b55c14de2726db9cac85f042f1974d51f6621fdd3589c6c25e52d4f6a05f2a375dde770b60b1aa8b0cf783e714714fb989901ff2e3c4e1314e43aa0312
+  data.tar.gz: 9ad4e0543eda624b54653aa6ac7cfa9bb4371426757af02a1df4012e1b33cc80083d74940f4758f333d5f158588ee1fa1a3663a06e0339109014109c55f57f5f

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.2
   Exclude:
     - '*.gemspec'
     - 'Gemfile*'
@@ -20,4 +21,7 @@ Layout:
   Enabled: false
 
 Performance/Casecmp:
+  Enabled: false
+
+Naming:
   Enabled: false

data/Gemfile

@@ -8,6 +8,6 @@ gemspec
 
 group :test do
   gem 'codeclimate-test-reporter', require: nil
-  gem 'rubocop', '~> 0.49.0', require: false
+  gem 'rubocop', '~> 0.56.0', require: false
   gem 'awesome_print', require: 'ap'
 end

data/README.md

@@ -175,7 +175,7 @@ options = client.get_oauth2_metadata_from_conformance
 if options.empty?
   puts 'This server does not support the expected OAuth2 extensions.'
 else
-  client.set_oauth2_auth(client_id,client_secret,options[:site],options[:authorize_url],options[:token_url])
+  client.set_oauth2_auth(client_id, client_secret, options[:authorize_url] ,options[:token_url], options[:site])
   reply = client.read_feed(FHIR::Patient)
   puts reply.body
 end

data/lib/fhir_client/client.rb

@@ -2,7 +2,6 @@ require 'rest_client'
 require 'nokogiri'
 require 'addressable/uri'
 require 'oauth2'
-
 module FHIR
   class Client
     include FHIR::Sections::History
@@ -23,6 +22,7 @@ module FHIR
     attr_accessor :default_format
     attr_accessor :fhir_version
     attr_accessor :cached_capability_statement
+    attr_accessor :additional_headers
 
     # Call method to initialize FHIR client. This method must be invoked
     # with a valid base server URL prior to using the client.
@@ -130,13 +130,13 @@ module FHIR
     # secret -- client secret
     # authorize_path -- absolute path of authorization endpoint
     # token_path -- absolute path of token endpoint
-    def set_oauth2_auth(client, secret, authorize_path, token_path)
+    def set_oauth2_auth(client, secret, authorize_path, token_path, site = nil)
       FHIR.logger.info 'Configuring the client to use OpenID Connect OAuth2 authentication.'
       @use_oauth2_auth = true
       @use_basic_auth = false
       @security_headers = {}
       options = {
-        site: @base_service_url,
+        site: site || @base_service_url,
         authorize_url: authorize_path,
         token_url: token_path,
         raise_errors: true
@@ -172,32 +172,22 @@ module FHIR
     #   </service>
     #   <description value="SMART on FHIR uses OAuth2 for authorization"/>
     # </security>
-    def get_oauth2_metadata_from_conformance
+    def get_oauth2_metadata_from_conformance(strict=true)
       options = {
         authorize_url: nil,
         token_url: nil
       }
-      oauth_extension = 'http://fhir-registry.smarthealthit.org/StructureDefinition/oauth-uris'
-      authorize_extension = 'authorize'
-      token_extension = 'token'
       begin
         capability_statement.rest.each do |rest|
-          rest.security.service.each do |service|
-            service.coding.each do |coding|
-              next unless coding.code == 'SMART-on-FHIR'
-              rest.security.extension.find{|x| x.url == oauth_extension}.extension.each do |ext|
-                case ext.url
-                when authorize_extension
-                  options[:authorize_url] = ext.value
-                when "#{oauth_extension}\##{authorize_extension}"
-                  options[:authorize_url] = ext.value
-                when token_extension
-                  options[:token_url] = ext.value
-                when "#{oauth_extension}\##{token_extension}"
-                  options[:token_url] = ext.value
-                end
+          if strict
+            rest.security.service.each do |service|
+              service.coding.each do |coding|
+                next unless coding.code == 'SMART-on-FHIR'
+                 options.merge! get_oauth2_metadata_from_service_definition(rest)
               end
             end
+          else
+            options.merge! get_oauth2_metadata_from_service_definition(rest)
           end
         end
       rescue => e
@@ -208,6 +198,29 @@ module FHIR
       options
     end
 
+    def get_oauth2_metadata_from_service_definition(rest)
+      oauth_extension = 'http://fhir-registry.smarthealthit.org/StructureDefinition/oauth-uris'
+      authorize_extension = 'authorize'
+      token_extension = 'token'
+      options = {
+        authorize_url: nil,
+        token_url: nil
+      }
+      rest.security.extension.find{|x| x.url == oauth_extension}.extension.each do |ext|
+        case ext.url
+        when authorize_extension
+          options[:authorize_url] = ext.value
+        when "#{oauth_extension}\##{authorize_extension}"
+          options[:authorize_url] = ext.value
+        when token_extension
+          options[:token_url] = ext.value
+        when "#{oauth_extension}\##{token_extension}"
+          options[:token_url] = ext.value
+        end
+      end
+      options
+    end
+
     # Method returns a capability statement for the system queried.
     def capability_statement(format = @default_format)
       conformance_statement(format)
@@ -267,6 +280,8 @@ module FHIR
     end
 
     def fhir_headers(options = {})
+      options.merge!(additional_headers) unless additional_headers.nil?
+
       FHIR::ResourceAddress.new.fhir_headers(options, @use_format_param)
     end
 
@@ -685,7 +700,7 @@ module FHIR
     end
 
     def build_url(path)
-      if path =~ /^\w+:\/\//
+      if /^\w+:\/\//.match? path
         path
       else
         "#{base_path(path)}#{path}"

data/lib/fhir_client/ext/model.rb

@@ -56,7 +56,7 @@ module FHIR
     end
 
     module ClassMethods
- 
+
       def client
         FHIR::Model.client
       end
@@ -107,6 +107,10 @@ module FHIR
         handle_response client.conditional_create(model, params)
       end
 
+      def partial_update(id, patchset, options = {})
+        handle_response client.partial_update(self, id, patchset, options)
+      end
+
       def all(client = self.client)
         handle_response client.read_feed(self)
       end

data/lib/fhir_client/ext/reference.rb

@@ -4,9 +4,15 @@ module FHIR
       reference.to_s.start_with?('#')
     end
 
+    def has_version?
+      /history/.match reference.to_s
+    end
+
     def reference_id
       if contained?
         reference.to_s[1..-1]
+      elsif has_version?
+        reference.to_s.split('/').second
       else
         reference.to_s.split('/').last
       end
@@ -16,11 +22,24 @@ module FHIR
       reference.to_s.split('/').first unless contained?
     end
 
+    def version_id
+      if has_version?
+         reference.to_s.split('/').last
+      end
+    end
+
     def read
       return if contained? || type.blank? || (id.blank? && reference.blank?)
       rid = id || reference_id
       resource_class.read(rid, client)
     end
+
+    def vread
+      return if contained? || type.blank? || (id.blank? && reference.blank?) || version_id.blank?
+      rid = id || reference_id
+      resource_class.vread(rid, version_id, client)
+    end
+
   end
 end
 
@@ -38,7 +57,7 @@ module FHIR
   module DSTU2
     class Reference
       include FHIR::ReferenceExtras
-      
+
       def resource_class
         "FHIR::DSTU2::#{type}".constantize unless contained?
       end

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '3.0.5'
+    VERSION = '3.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby