fhir_client 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ea696abc5f4af913b2cd11a96299090f49fcd5859e53631bff94e48e68a665
-  data.tar.gz: 0e3b5a443b3f71bd73c0183f964a832b6eabe67e6e4b2e2b961087cefd320dee
+  metadata.gz: e672a83cc2c6d38d9b7b907e593fcee05ecead0a75320f79a8a65627deff0df7
+  data.tar.gz: 79219638d996eaa08b9ec7b38957da73eb1e6e5c5d26b428480178ee2e939fc4
 SHA512:
-  metadata.gz: 2099e5b55c14de2726db9cac85f042f1974d51f6621fdd3589c6c25e52d4f6a05f2a375dde770b60b1aa8b0cf783e714714fb989901ff2e3c4e1314e43aa0312
-  data.tar.gz: 9ad4e0543eda624b54653aa6ac7cfa9bb4371426757af02a1df4012e1b33cc80083d74940f4758f333d5f158588ee1fa1a3663a06e0339109014109c55f57f5f
+  metadata.gz: 904a33c45ee559acfbc0372435c9ee31e76412ef840d3616ae6f8e584aa9381d8a43cb81d937a3818891a82fe26ca5acbcaa74778602bbbe42c01c78d2e7ea35
+  data.tar.gz: ad3ec868c7c139105890e4091e1780efffb30649df4b7e63a5fbc8ed599dcfa249cfac2d7b84f12236712a32ec4d69b4a58c5d8fb1891330a6fc30907dfddae2

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-ruby RUBY_VERSION
 
 # gem 'fhir_models', :path => '../fhir_models'
 # gem 'fhir_dstu2_models', :path => '../fhir_dstu2_models'

data/lib/fhir_client/ext/reference.rb

@@ -1,43 +1,77 @@
 module FHIR
   module ReferenceExtras
+    def parts
+      return if contained?
+      if has_version?
+        *base_uri, type, id, _, version = reference.to_s.split '/'
+      else
+        *base_uri, type, id = reference.to_s.split '/'
+      end
+      {
+        base_uri: (base_uri.empty?) ? nil : base_uri.join('/'),
+        type: type,
+        id: id,
+        version: version
+      }
+    end
+
     def contained?
       reference.to_s.start_with?('#')
     end
 
+    def absolute?
+      /^https?:\/\//.match reference.to_s
+    end
+
+    def relative?
+      !(reference.blank? || contained? || absolute?)
+    end
+
     def has_version?
-      /history/.match reference.to_s
+      /_history/.match reference.to_s
     end
 
     def reference_id
       if contained?
         reference.to_s[1..-1]
-      elsif has_version?
-        reference.to_s.split('/').second
       else
-        reference.to_s.split('/').last
+        parts[:id]
       end
     end
 
     def type
-      reference.to_s.split('/').first unless contained?
+      return if contained?
+      parts[:type]
     end
 
     def version_id
-      if has_version?
-         reference.to_s.split('/').last
-      end
+      return if contained?
+      parts[:version]
+    end
+
+    def base_uri
+      return if !absolute? || contained?
+      parts[:base_uri]
     end
 
     def read
-      return if contained? || type.blank? || (id.blank? && reference.blank?)
-      rid = id || reference_id
-      resource_class.read(rid, client)
+      return if !(relative? || absolute?)
+      if relative? || reference == client.full_resource_url(resource: resource_class, id: reference_id)
+        read_client = client
+      else
+        read_client = FHIR::Client.new base_uri, default_format: client.default_format
+      end
+      resource_class.read(reference_id, read_client)
     end
 
     def vread
-      return if contained? || type.blank? || (id.blank? && reference.blank?) || version_id.blank?
-      rid = id || reference_id
-      resource_class.vread(rid, version_id, client)
+      return if !(relative? || absolute?) || version_id.blank?
+      if relative? || reference == client.full_resource_url(resource: resource_class, id: reference_id)
+        read_client = client
+      else
+        read_client = FHIR::Client.new base_uri, default_format: client.default_format
+      end
+      resource_class.vread(reference_id, version_id, read_client)
     end
 
   end

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '3.0.6'
+    VERSION = '3.0.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport