fhir_client 1.6.8 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12367a6e525d762523753593264ba095cd3ba579
-  data.tar.gz: 693ef7d5a3c56d599d38fb1c1f28fc848a4e1d7b
+  metadata.gz: dd3ac124307f2b5ff1a87964f9f54c88769a0d49
+  data.tar.gz: be404fc27a3ea4556eadd151eb4e8c15a7fa8cb1
 SHA512:
-  metadata.gz: 0291e7fd065516d8c9ec4d139c1728b3c808b8a17ea92b7c0a315c80fe6dac0ddb20a1933c68da97a47ee6d0b0300ff2d8fdb55ee5b637b9fc9231de2444df05
-  data.tar.gz: d41df661d9eef8b2462ba43e9648d4b29845f989e63fae4f6afe01b00833e26245b4e3df0e9d9c3fd43b497cba8ea38c0919f1c5301147decec9e3a586eb949b
+  metadata.gz: b3c4aa67026efdad576cf1575564872452c752bb7d510e1c153c240370e8b737d6fbf0484a57308f68a15774ea78b8f99f409630bab6cf76cdb068a6b8d7e233
+  data.tar.gz: d3f6971059658d6f9b0dbd53f5dc2d80a0ec4776ed4fa540af38ee7e0c406db7c965c53f46362ed808a719ffd7d74ee9384f71d58a66d3377bb227940e255a44

data/bin/console

@@ -7,8 +7,8 @@ require 'fhir_client'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
-Pry.start
+# require "pry"
+# Pry.start
 
-# require 'irb'
-# IRB.start
+require 'irb'
+IRB.start

data/lib/fhir_client/client.rb

@@ -324,17 +324,40 @@ module FHIR
           headers: response.headers,
           body: response.body
         }
-        FHIR.logger.info "GET - Request: #{req}, Response: #{response.body.force_encoding('UTF-8')}"
+        if url.end_with?('/metadata')
+          FHIR.logger.info "GET - Request: #{req}, Response: [too large]"
+        else
+          FHIR.logger.info "GET - Request: #{req}, Response: #{response.body.force_encoding('UTF-8')}"
+        end
         @reply = FHIR::ClientReply.new(req, res)
       else
         headers.merge!(@security_headers) if @use_basic_auth
         begin
           response = @client.get(url, headers)
+        rescue RestClient::SSLCertificateNotVerified => sslerr
+          FHIR.logger.error "SSL Error: #{url}"
+          req = {
+            method: :get,
+            url: url,
+            path: url.gsub(@base_service_url, ''),
+            headers: headers,
+            payload: nil
+          }
+          res = {
+            code: nil,
+            headers: nil,
+            body: sslerr.message
+          }
+          @reply = FHIR::ClientReply.new(req, res)
+          return @reply
         rescue => e
           response = e.response if e.response
         end
-
-        FHIR.logger.info "GET - Request: #{response.request.to_json}, Response: #{response.body.force_encoding('UTF-8')}"
+        if url.end_with?('/metadata')
+          FHIR.logger.info "GET - Request: #{response.request.to_json}, Response: [too large]"
+        else
+          FHIR.logger.info "GET - Request: #{response.request.to_json}, Response: #{response.body.force_encoding('UTF-8')}"
+        end
         response.request.args[:path] = response.request.args[:url].gsub(@base_service_url, '')
         headers = response.headers.each_with_object({}) { |(k, v), h| h[k.to_s.tr('_', '-')] = v.to_s; h }
         res = {
@@ -376,7 +399,7 @@ module FHIR
       else
         headers.merge!(@security_headers) if @use_basic_auth
         @client.post(url, payload, headers) do |resp, request, result|
-          FHIR.logger.info "POST - Request: #{request.to_json}, Response: #{resp.force_encoding('UTF-8')}"
+          FHIR.logger.info "POST - Request: #{request.to_json}\nResponse:\nResponse Headers: #{scrubbed_response_headers(result.each_key {})} \nResponse Body: #{resp.force_encoding('UTF-8')}"
           request.args[:path] = url.gsub(@base_service_url, '')
           res = {
             code: result.code,
@@ -457,16 +480,30 @@ module FHIR
         @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) do |resp, request, result|
-          FHIR.logger.info "PATCH - Request: #{request.to_json}, Response: #{resp.force_encoding('UTF-8')}"
-          request.args[:path] = url.gsub(@base_service_url, '')
+        begin
+          @client.patch(url, payload, headers) do |resp, request, result|
+            FHIR.logger.info "PATCH - Request: #{request.to_json}, Response: #{resp.force_encoding('UTF-8')}"
+            request.args[:path] = url.gsub(@base_service_url, '')
+            res = {
+              code: result.code,
+              headers: scrubbed_response_headers(result.each_key {}),
+              body: resp
+            }
+            @reply = FHIR::ClientReply.new(request.args, res)
+          end
+        rescue => e
+          req = {
+            method: :patch,
+            url: url,
+            path: url.gsub(@base_service_url, ''),
+            headers: headers,
+            payload: payload
+          }
           res = {
-            code: result.code,
-            headers: scrubbed_response_headers(result.each_key {}),
-            body: resp
+            body: e.message
           }
-          @reply = FHIR::ClientReply.new(request.args, res)
+          FHIR.logger.error "PATCH Error: #{e.message}"
+          @reply = FHIR::ClientReply.new(req, res)
         end
       end
     end

data/lib/fhir_client/ext/model.rb

@@ -63,7 +63,7 @@ module FHIR
       handle_response client.conditional_create(model, params)
     end
 
-    def self.all
+    def self.all(client = @@client)
       handle_response client.read_feed(self)
     end
 

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '1.6.8'
+    VERSION = '1.6.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby