Fix build.

Author: jawalonoski

test/simplecov.rb .simplecov

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    fhir_client (1.6.0)
+    fhir_client (1.6.1)
       activesupport (>= 3)
       addressable (>= 2.3)
-      fhir_models (>= 1.6.0)
+      fhir_models (>= 1.6.1)
       oauth2 (~> 1.1)
+      rack (~> 1.6)
       rest-client (~> 1.8)
       tilt (>= 1.1)
 
@@ -30,7 +31,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fhir_models (1.6.0)
+    fhir_models (1.6.1)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 1.16, < 3)
@@ -39,7 +40,7 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    json (1.8.2)
+    json (2.0.2)
     jwt (1.5.4)
     method_source (0.8.2)
     mime-types (2.99.2)
@@ -69,9 +70,9 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    simplecov (0.10.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
@@ -80,7 +81,7 @@ GEM
     turn (0.9.7)
       ansi
       minitest (~> 4)
-    tzinfo (0.3.49)
+    tzinfo (0.3.51)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
@@ -97,4 +98,4 @@ DEPENDENCIES
   turn
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

Gemfile.lock

@@ -7,16 +7,17 @@ Gem::Specification.new do |s|
   s.email = "[email protected]"
   s.homepage = "https://github.com/hl7-fhir/fhir-svn"
   s.authors = ["Andre Quina", "Jason Walonoski", "Janoo Fernandes"]
-  s.version = '1.6.0'
+  s.version = '1.6.1'
 
   s.files = s.files = `git ls-files`.split("\n")
 
-  s.add_dependency 'fhir_models', '>= 1.6.0'
+  s.add_dependency 'fhir_models', '>= 1.6.1'
   s.add_dependency 'tilt', '>= 1.1'
   s.add_dependency 'rest-client', '~> 1.8'
   s.add_dependency 'oauth2', '~> 1.1'
   s.add_dependency 'activesupport', '>= 3'
   s.add_dependency 'addressable', '>= 2.3'
+  s.add_dependency 'rack', '~> 1.6'
   s.add_development_dependency 'pry'
 end
 

fhir_client.gemspec

@@ -30,7 +30,7 @@ class Client
   # @return
   #
   def initialize(baseServiceUrl)
-    $LOG.info "Initializing client with #{@baseServiceUrl}"
+    FHIR.logger.info "Initializing client with #{@baseServiceUrl}"
     @baseServiceUrl = baseServiceUrl
     @use_format_param = false
     @default_format = FHIR::Formats::ResourceFormat::RESOURCE_XML
@@ -40,7 +40,7 @@ def initialize(baseServiceUrl)
 
   # Set the client to use no authentication mechanisms
   def set_no_auth
-    $LOG.info "Configuring the client to use no authentication."
+    FHIR.logger.info "Configuring the client to use no authentication."
     @use_oauth2_auth = false
     @use_basic_auth = false
     @security_headers = {}
@@ -49,7 +49,7 @@ def set_no_auth
 
   # Set the client to use HTTP Basic Authentication
   def set_basic_auth(client,secret)
-    $LOG.info "Configuring the client to use HTTP Basic authentication."
+    FHIR.logger.info "Configuring the client to use HTTP Basic authentication."
     token = Base64.encode64("#{client}:#{secret}")
     value = "Basic #{token}"
     @security_headers = { 'Authorization' => value }
@@ -60,7 +60,7 @@ def set_basic_auth(client,secret)
 
   # Set the client to use Bearer Token Authentication
   def set_bearer_token(token)
-    $LOG.info "Configuring the client to use Bearer Token authentication."
+    FHIR.logger.info "Configuring the client to use Bearer Token authentication."
     value = "Bearer #{token}"
     @security_headers = { 'Authorization' => value }
     @use_oauth2_auth = false
@@ -74,7 +74,7 @@ def set_bearer_token(token)
   # authorizePath -- absolute path of authorization endpoint
   # tokenPath -- absolute path of token endpoint
   def set_oauth2_auth(client,secret,authorizePath,tokenPath)
-    $LOG.info "Configuring the client to use OpenID Connect OAuth2 authentication."
+    FHIR.logger.info "Configuring the client to use OpenID Connect OAuth2 authentication."
     @use_oauth2_auth = true
     @use_basic_auth = false
     @security_headers = {}
@@ -146,7 +146,7 @@ def get_oauth2_metadata_from_conformance
         end
       end
     rescue Exception => e
-      $LOG.error 'Failed to locate SMART-on-FHIR OAuth2 Security Extensions.'
+      FHIR.logger.error 'Failed to locate SMART-on-FHIR OAuth2 Security Extensions.'
     end
     options.delete_if{|k,v|v.nil?}
     options.clear if options.keys.size!=2
@@ -199,15 +199,15 @@ def fhir_headers(options={})
   end
 
   def parse_reply(klass, format, response)
-    $LOG.info "Parsing response with {klass: #{klass}, format: #{format}, code: #{response.code}}."
+    FHIR.logger.info "Parsing response with {klass: #{klass}, format: #{format}, code: #{response.code}}."
     return nil if ![200,201].include? response.code
     res = nil
     begin
       res = FHIR.from_contents(response.body)
       res.client = self if !res.nil?
-      $LOG.warn "Expected #{klass} but got #{res.class}" if res.class!=klass
+      FHIR.logger.warn "Expected #{klass} but got #{res.class}" if res.class!=klass
     rescue Exception => e
-      $LOG.error "Failed to parse #{format} as resource #{klass}: #{e.message} %n #{e.backtrace.join("\n")} #{response}"
+      FHIR.logger.error "Failed to parse #{format} as resource #{klass}: #{e.message} %n #{e.backtrace.join("\n")} #{response}"
       nil
     end
     res
@@ -290,7 +290,7 @@ def scrubbed_response_headers(result)
 
     def get(path, headers)
       url = URI(build_url(path)).to_s
-      $LOG.info "GETTING: #{url}"
+      FHIR.logger.info "GETTING: #{url}"
       headers = clean_headers(headers)
       if @use_oauth2_auth
         # @client.refresh!
@@ -311,7 +311,7 @@ def get(path, headers)
           :headers => response.headers,
           :body => response.body
         }
-        $LOG.info "GET - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
+        FHIR.logger.info "GET - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
         @reply = FHIR::ClientReply.new(req, res)
       else
         headers.merge!(@security_headers) if @use_basic_auth
@@ -321,7 +321,7 @@ def get(path, headers)
           response = e.response if e.response
         end
 
-        $LOG.info "GET - Request: #{response.request.to_json}, Response: #{response.body.force_encoding("UTF-8")}"
+        FHIR.logger.info "GET - Request: #{response.request.to_json}, Response: #{response.body.force_encoding("UTF-8")}"
         response.request.args[:path] = response.request.args[:url].gsub(@baseServiceUrl,'')
         headers = response.headers.inject({}){ |h,(k,v)| h[k.to_s.gsub('_','-')] = v.to_s; h}
         res = {
@@ -336,7 +336,7 @@ def get(path, headers)
 
     def post(path, resource, headers)
       url = URI(build_url(path)).to_s
-      $LOG.info "POSTING: #{url}"
+      FHIR.logger.info "POSTING: #{url}"
       headers = clean_headers(headers)
       payload = request_payload(resource, headers) if resource
       if @use_oauth2_auth
@@ -358,12 +358,12 @@ def post(path, resource, headers)
           :headers => response.headers,
           :body => response.body
         }
-        $LOG.info "POST - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
+        FHIR.logger.info "POST - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
         @reply = FHIR::ClientReply.new(req, res)
       else
         headers.merge!(@security_headers) if @use_basic_auth
         @client.post(url, payload, headers){ |response, request, result|
-          $LOG.info "POST - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
+          FHIR.logger.info "POST - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
           request.args[:path] = url.gsub(@baseServiceUrl,'')
           res = {
             :code => result.code,
@@ -377,7 +377,7 @@ def post(path, resource, headers)
 
     def put(path, resource, headers)
       url = URI(build_url(path)).to_s
-      $LOG.info "PUTTING: #{url}"
+      FHIR.logger.info "PUTTING: #{url}"
       headers = clean_headers(headers)
       payload = request_payload(resource, headers) if resource
       if @use_oauth2_auth
@@ -399,12 +399,12 @@ def put(path, resource, headers)
           :headers => response.headers,
           :body => response.body
         }
-        $LOG.info "PUT - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
+        FHIR.logger.info "PUT - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
         @reply = FHIR::ClientReply.new(req, res)
       else
         headers.merge!(@security_headers) if @use_basic_auth
         @client.put(url, payload, headers){ |response, request, result|
-          $LOG.info "PUT - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
+          FHIR.logger.info "PUT - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
           request.args[:path] = url.gsub(@baseServiceUrl,'')
           res = {
             :code => result.code,
@@ -418,7 +418,7 @@ def put(path, resource, headers)
 
     def patch(path, patchset, headers)
       url = URI(build_url(path)).to_s
-      $LOG.info "PATCHING: #{url}"
+      FHIR.logger.info "PATCHING: #{url}"
       headers = clean_headers(headers)
       payload = request_patch_payload(patchset, headers['format'])
       if @use_oauth2_auth
@@ -440,13 +440,13 @@ def patch(path, patchset, headers)
           :headers => response.headers,
           :body => response.body
         }
-        $LOG.info "PATCH - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
+        FHIR.logger.info "PATCH - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
         @reply = FHIR::ClientReply.new(req, res)
       else
         headers.merge!(@security_headers) if @use_basic_auth
         # url = 'http://requestb.in/o8juy3o8'
         @client.patch(url, payload, headers){ |response, request, result|
-          $LOG.info "PATCH - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
+          FHIR.logger.info "PATCH - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
           request.args[:path] = url.gsub(@baseServiceUrl,'')
           res = {
             :code => result.code,
@@ -460,7 +460,7 @@ def patch(path, patchset, headers)
 
     def delete(path, headers)
       url = URI(build_url(path)).to_s
-      $LOG.info "DELETING: #{url}"
+      FHIR.logger.info "DELETING: #{url}"
       headers = clean_headers(headers)
       if @use_oauth2_auth
         # @client.refresh!
@@ -481,12 +481,12 @@ def delete(path, headers)
           :headers => response.headers,
           :body => response.body
         }
-        $LOG.info "DELETE - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
+        FHIR.logger.info "DELETE - Request: #{req.to_s}, Response: #{response.body.force_encoding("UTF-8")}"
         @reply = FHIR::ClientReply.new(req, res)
       else
         headers.merge!(@security_headers) if @use_basic_auth
         @client.delete(url, headers){ |response, request, result|
-          $LOG.info "DELETE - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
+          FHIR.logger.info "DELETE - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
           request.args[:path] = url.gsub(@baseServiceUrl,'')
           res = {
             :code => result.code,
@@ -501,9 +501,9 @@ def delete(path, headers)
     def head(path, headers)
       headers.merge!(@security_headers) unless @security_headers.blank?
       url = URI(build_url(path)).to_s
-      $LOG.info "HEADING: #{url}"
+      FHIR.logger.info "HEADING: #{url}"
       RestClient.head(url, headers){ |response, request, result|
-        $LOG.info "HEAD - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
+        FHIR.logger.info "HEAD - Request: #{request.to_json}, Response: #{response.force_encoding("UTF-8")}"
         request.args[:path] = url.gsub(@baseServiceUrl,'')
         res = {
           :code => result.code,

lib/client_interface.rb

@@ -9,10 +9,6 @@
 require 'oauth2'
 require 'active_support/core_ext'
 
-# Simple and verbose loggers
-RestClient.log = Logger.new("fhir_client.log", 10, 1024000)
-$LOG = Logger.new("fhir_client_verbose.log", 10, 1024000)
-
 root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
 Dir.glob(File.join(root, 'lib','sections','**','*.rb')).each do |file|
   require file

lib/fhir_client.rb

@@ -1,4 +1,4 @@
-require_relative "./simplecov"
+require 'simplecov'
 require_relative '../lib/fhir_client'
 
 require 'pry'