Merge pull request #56 from fhir-crucible/update_1_8

Update client to FHIR v1.8

Author: arscan

fhir_client.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 3'
   spec.add_dependency 'addressable', '>= 2.3'
-  spec.add_dependency 'fhir_models', '>= 1.6.8'
+  spec.add_dependency 'fhir_models', '>= 1.8.0'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'oauth2', '~> 1.1'
   spec.add_dependency 'rack', '>= 1.5'

lib/fhir_client/client.rb

@@ -23,7 +23,7 @@ class Client
 
     attr_accessor :default_format
 
-    attr_accessor :cached_conformance
+    attr_accessor :cached_capability_statement
 
     # Call method to initialize FHIR client. This method must be invoked
     # with a valid base server URL prior to using the client.
@@ -98,9 +98,9 @@ def set_oauth2_auth(client, secret, authorize_path, token_path)
       @client = client.client_credentials.get_token
     end
 
-    # Get the OAuth2 server and endpoints from the conformance statement
+    # Get the OAuth2 server and endpoints from the capability statement
     # (the server should not require OAuth2 or other special security to access
-    # the conformance statement).
+    # the capability statement).
     # <rest>
     #   <mode value="server"/>
     #   <documentation value="All the functionality defined in FHIR"/>
@@ -134,8 +134,7 @@ def get_oauth2_metadata_from_conformance
       authorize_extension = 'authorize'
       token_extension = 'token'
       begin
-        conformance = conformance_statement
-        conformance.rest.each do |rest|
+        capability_statement.rest.each do |rest|
           rest.security.service.each do |service|
             service.coding.each do |coding|
               next unless coding.code == 'SMART-on-FHIR'
@@ -170,10 +169,10 @@ def capability_statement(format = @default_format)
     # Method returns a conformance statement for the system queried.
     # @return
     def conformance_statement(format = @default_format)
-      if @cached_conformance.nil? || format != @default_format
+      if @cached_capability_statement.nil? || format != @default_format
         try_conformance_formats(format)
       end
-      @cached_conformance
+      @cached_capability_statement
     end
 
     def try_conformance_formats(default_format)
@@ -185,13 +184,13 @@ def try_conformance_formats(default_format)
                  'application/json']
       formats.insert(0, default_format)
 
-      @cached_conformance = nil
+      @cached_capability_statement = nil
       @default_format = nil
 
       formats.each do |frmt|
         reply = get 'metadata', fhir_headers(format: frmt)
         next unless reply.code == 200
-        @cached_conformance = parse_reply(FHIR::Conformance, frmt, reply)
+        @cached_capability_statement = parse_reply(FHIR::CapabilityStatement, frmt, reply)
         @default_format = frmt
         break
       end

lib/fhir_client/fhir_api_validation.json

@@ -127,7 +127,7 @@
       "body": false      
     },
     "response": {
-      "status": [200,403],
+      "status": [200,401],
       "headers": {
         "Content-Type": true,
         "Location": false,
@@ -149,7 +149,7 @@
       "body": "form data"      
     },
     "response": {
-      "status": [200,403],
+      "status": [200,401],
       "headers": {
         "Content-Type": true,
         "Location": false,
@@ -160,7 +160,7 @@
     }
   },{
     "interaction": "search-all",
-    "path": ["/_search?"],
+    "path": ["?"],
     "verb": "GET",
     "request": {
       "headers": {
@@ -171,7 +171,7 @@
       "body": false      
     },
     "response": {
-      "status": [200,403],
+      "status": [200,401],
       "headers": {
         "Content-Type": true,
         "Location": false,
@@ -181,7 +181,7 @@
       "body": { "types": ["Bundle"] }
     }
   },{
-    "interaction": "conformance",
+    "interaction": "capabilities",
     "path": ["/","/metadata"],
     "verb": ["GET","OPTIONS"],
     "request": {
@@ -200,7 +200,7 @@
         "ETag": false,
         "Last-Modified": false
       },
-      "body": { "types": ["Conformance"] }
+      "body": { "types": ["CapabilityStatement"] }
     }
   },{      
     "interaction": "transaction",

lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '1.6.10'
+    VERSION = '1.8.0'
   end
 end

test/fixtures/conformance-example.json

@@ -5,17 +5,6 @@ def client
     @client ||= FHIR::Client.new('capability-test')
   end
 
-  def test_metadata_returns_conformance
-    root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
-    conformance = File.read(File.join(root, 'fixtures', 'conformance-example.json'))
-    stub_request(:get, /capability-test/).to_return(body: conformance)
-    statement = client.conformance_statement
-    assert statement.is_a?(FHIR::Conformance)
-    statement = client.capability_statement
-    assert statement.is_a?(FHIR::Conformance)
-  end
-
-
   def test_metadata_returns_capability_statement
     root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
     capabilitystatement = File.read(File.join(root, 'fixtures', 'capabilitystatement-example.json'))