fhir_client 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e5515f97f6b19fc340709f5af79ad808bd6c7a13faa86eda84c2786ce665d01
-  data.tar.gz: 71c3b77d77dd98bada16cf718f858df0022d42f40501429076b3082d17d1a729
+  metadata.gz: de2db655e9aa4f23b90a44efa2d9a146e5727e1fedef627360007d8028afd1fb
+  data.tar.gz: 6f82d636f18c43c3dbee6124614d41d03a94721ba2879c2bb1bc10b57571e989
 SHA512:
-  metadata.gz: b6b9e395abba6a49f1f20a293d33e80c8adb09f91a59fa97c731ff7a49aeb8456c5db20d984782208027b6442ea7acc4f778eb1c58ff243508425ae225ec18fa
-  data.tar.gz: 8049b3442a9f2ff72bce7ede160b5e9249fadf62fc30e99e01958049ea67dfcfe37da6386478f67311b3617262a23162c1a6e56fbe7d161eee70bbd16311b26f
+  metadata.gz: 9f0c5e8cc73b5106950b998d008e4086f9d8338f3acf0a026901fb6d78f8da7b4fef85f3b6fa8d9f13b15072151a82f8f7c5bcbb6764abced0c89138c790d627
+  data.tar.gz: db57bea6921f6a7ba8b7386d5197b1eeff39685b6368df51f8458574da0337532df466a5ad99a16a8d26d04ef8663173bcdfb57c6d1d85584725bed645669569

data/lib/fhir_client/resource_address.rb

@@ -80,7 +80,7 @@ module FHIR
       fhir_headers.merge!(headers) unless headers.empty?
       fhir_headers.merge!(additional_headers)
       if /\Aapplication\/(fhir\+xml|xml\+fhir|fhir\+json|json\+fhir)\z/.match? fhir_headers['Content-Type']
-        fhir_headers['Content-Type'] << ";charset=#{DEFAULT_CHARSET}"
+        fhir_headers['Content-Type'] = "#{fhir_headers['Content-Type']};charset=#{DEFAULT_CHARSET}"
       end
       fhir_headers
     end

data/lib/fhir_client/tasks/tasks.rake

@@ -38,22 +38,26 @@ namespace :fhir do
   end
 
   desc 'count all resources for a given server'
-  task :count, [:url, :display_zero] do |_t, args|
+  task :count, [:url, :display_zero, :include_all] do |_t, args|
     client = FHIR::Client.new(args.url)
     client.try_conformance_formats(FHIR::Formats::ResourceFormat::RESOURCE_JSON)
     display_zero = (args.display_zero == 'true')
+    include_all = (args.include_all == 'true')
     counts = {}
     fhir_resources.each do |klass|
       reply = client.read_feed(klass)
-      if !reply.resource.nil? && (reply.resource.total > 0 || display_zero)
-        counts[klass.name.demodulize.to_s] = reply.resource.total
+      total = reply.resource.nil? ? 0 : reply.resource.total
+      total = reply.resource.each.reduce(0) { |s| s + 1 } if total.nil? && include_all
+      total = 'n/a' if total.nil?
+      if total.to_s != "0" || display_zero
+        counts[klass.name.demodulize.to_s] = total.to_s
       end
     end
-    printf "  %-30s %5s\n", 'Resource', 'Count'
-    printf "  %-30s %5s\n", '--------', '-----'
+    format = "  %-35s %7s\n"
+    printf format, 'Resource', 'Count'
+    printf format, '--------', '-----'
     counts.each do |key, value|
-      # puts "#{key}  #{value}"
-      printf "  %-30s %5s\n", key, value
+      printf format, key, value
     end
   end
 

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '4.0.0'
+    VERSION = '4.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -300,8 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby