fhir_client 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca5034549cd3701de8ed7699a41387ac34e9496d
-  data.tar.gz: 3fd1afe26dbcc66e3750a189b5c445ea7914741e
+  metadata.gz: 12367a6e525d762523753593264ba095cd3ba579
+  data.tar.gz: 693ef7d5a3c56d599d38fb1c1f28fc848a4e1d7b
 SHA512:
-  metadata.gz: 8f1ee6ef766ea9838c169a20b1701e4d314ee25a206789f5bf240b858df421eb43cdc023b237e8271e7301a8abf53b14a740fa78117b992f59ed266eb3df41f1
-  data.tar.gz: 84745b444f063d2a36b06e0fb0293efd81fe47b46a3e0c79f5b4daf9dcc5aab6b96aa3d08f891e61dcd8443314850b2bfb4c4a56f47615a2f7af2069c52b8fc4
+  metadata.gz: 0291e7fd065516d8c9ec4d139c1728b3c808b8a17ea92b7c0a315c80fe6dac0ddb20a1933c68da97a47ee6d0b0300ff2d8fdb55ee5b637b9fc9231de2444df05
+  data.tar.gz: d41df661d9eef8b2462ba43e9648d4b29845f989e63fae4f6afe01b00833e26245b4e3df0e9d9c3fd43b497cba8ea38c0919f1c5301147decec9e3a586eb949b

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 ruby RUBY_VERSION
+
+# gem 'fhir_models', :path => '../fhir_models'
+
 gemspec
 
 group :test do

data/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.6'
+  spec.add_dependency 'fhir_models', '>= 1.6.8'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'oauth2', '~> 1.1'
   spec.add_dependency 'rack', '>= 1.5'

data/lib/fhir_client/client.rb

@@ -162,9 +162,14 @@ module FHIR
       options
     end
 
+    # Method returns a capability statement for the system queried.
+    def capability_statement(format = @default_format)
+      conformance_statement(format)
+    end
+
     # Method returns a conformance statement for the system queried.
     # @return
-    def conformance_statement(format = FHIR::Formats::ResourceFormat::RESOURCE_XML)
+    def conformance_statement(format = @default_format)
       if @cached_conformance.nil? || format != @default_format
         try_conformance_formats(format)
       end

data/lib/fhir_client/ext/model.rb

@@ -1,15 +1,15 @@
 module FHIR
   class Model
     class << self
-      cattr_accessor :client
+      cattr_accessor :client, instance_accessor: false
     end
 
     def client
-      @client || self.class.client
+      @@client
     end
 
     def client=(client)
-      @client = client
+      @@client = client
 
       # Ensure the client-setting cascades to all child models
       instance_values.each do |_key, values|
@@ -21,44 +21,44 @@ module FHIR
       end
     end
 
-    def self.read(id, client = self.client)
+    def self.read(id, client = @@client)
       handle_response client.read(self, id)
     end
 
-    def self.read_with_summary(id, summary, client = self.client)
+    def self.read_with_summary(id, summary, client = @@client)
       handle_response client.read(self, id, client.default_format, summary)
     end
 
-    def self.vread(id, version_id, client = self.client)
+    def self.vread(id, version_id, client = @@client)
       handle_response client.vread(self, id, version_id)
     end
 
-    def self.resource_history(client = self.client)
+    def self.resource_history(client = @@client)
       handle_response client.resource_history(self)
     end
 
-    def self.resource_history_as_of(last_update)
+    def self.resource_history_as_of(last_update, client = @@client)
       handle_response client.resource_history_as_of(self, last_update)
     end
 
-    def self.resource_instance_history(id, client = self.client)
+    def self.resource_instance_history(id, client = @@client)
       handle_response client.resource_instance_history(self, id)
     end
 
-    def self.resource_instance_history_as_of(id, last_update, client = self.client)
+    def self.resource_instance_history_as_of(id, last_update, client = @@client)
       handle_response client.resource_instance_history_as_of(self, id, last_update)
     end
 
-    def self.search(params = {}, client = self.client)
+    def self.search(params = {}, client = @@client)
       handle_response client.search(self, search: { parameters: params })
     end
 
-    def self.create(model, client = self.client)
+    def self.create(model, client = @@client)
       model = new(model) unless model.is_a?(self)
       handle_response client.create(model)
     end
 
-    def self.conditional_create(model, params, client = self.client)
+    def self.conditional_create(model, params, client = @@client)
       model = new(model) unless model.is_a?(self)
       handle_response client.conditional_create(model, params)
     end

data/lib/fhir_client/sections/crud.rb

@@ -154,12 +154,13 @@ module FHIR
                              else
                                resource # just send back the submitted resource
                              end
+            resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.self_link)
           else
-            resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.response[:headers]['location'])
+            resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.self_link)
             reply.resource = resource # don't know the content type, so return the resource provided
           end
         else
-          resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.response[:headers]['location'])
+          resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.self_link)
           reply.resource = resource # just send back the submitted resource
         end
         reply.resource.client = self

data/lib/fhir_client/tasks/tasks.rake

@@ -40,6 +40,7 @@ namespace :fhir do
   desc 'count all resources for a given server'
   task :count, [:url, :display_zero] do |_t, args|
     client = FHIR::Client.new(args.url)
+    client.try_conformance_formats(FHIR::Formats::ResourceFormat::RESOURCE_JSON)
     display_zero = (args.display_zero == 'true')
     counts = {}
     fhir_resources.each do |klass|
@@ -59,6 +60,7 @@ namespace :fhir do
   desc 'delete all resources for a given server'
   task :clean, [:url] do |_t, args|
     client = FHIR::Client.new(args.url)
+    client.try_conformance_formats(FHIR::Formats::ResourceFormat::RESOURCE_JSON)
     fhir_resources.each do |klass|
       puts "Reading #{klass.name.demodulize}..."
       skipped = []

data/lib/fhir_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement