fhir_client 3.0.2 → 3.0.3

data/lib/fhir_client/sections/operations.rb

@@ -11,14 +11,14 @@ module FHIR
       # http://hl7.org/implement/standards/FHIR-Develop/patient-operations.html#everything
       # Fetches resources for a given patient record, scoped by a start and end time, and returns a Bundle of results
       def fetch_patient_record(id = nil, startTime = nil, endTime = nil, method = 'GET', format = @default_format)
-        fetch_record(id, [startTime, endTime], method, FHIR::Patient, format)
+        fetch_record(id, [startTime, endTime], method, versioned_resource_class('Patient'), format)
       end
 
       def fetch_encounter_record(id = nil, method = 'GET', format = @default_format)
-        fetch_record(id, [nil, nil], method, FHIR::Encounter, format)
+        fetch_record(id, [nil, nil], method, versioned_resource_class('Encounter'), format)
       end
 
-      def fetch_record(id = nil, time = [nil, nil], method = 'GET', klass = FHIR::Patient, format = @default_format)
+      def fetch_record(id = nil, time = [nil, nil], method = 'GET', klass = versioned_resource_class('Patient'), format = @default_format)
         options = { resource: klass, format: format, operation: { name: :fetch_patient_record, method: method } }
         options.deep_merge!(id: id) unless id.nil?
         options[:operation][:parameters] = {} if options[:operation][:parameters].nil?
@@ -30,9 +30,9 @@ module FHIR
         else
           # create Parameters body
           if options[:operation] && options[:operation][:parameters]
-            p = FHIR::Parameters.new
+            p = versioned_resource_class('Parameters').new
             options[:operation][:parameters].each do |key, value|
-              parameter = FHIR::Parameters::Parameter.new.from_hash(name: key.to_s)
+              parameter = versioned_resource_class('Parameters::Parameter').new.from_hash(name: key.to_s)
               parameter.method("value#{value[:type]}=").call(value[:value])
               p.parameter << parameter
             end
@@ -40,7 +40,7 @@ module FHIR
           reply = post resource_url(options), p, fhir_headers(options)
         end
 
-        reply.resource = parse_reply(FHIR::Bundle, format, reply)
+        reply.resource = parse_reply(versioned_resource_class('Bundle'), format, reply)
         reply.resource_class = options[:resource]
         reply
       end
@@ -53,7 +53,7 @@ module FHIR
       # http://hl7.org/implement/standards/FHIR-Develop/valueset-operations.html#expand
       # The definition of a value set is used to create a simple collection of codes suitable for use for data entry or validation.
       def value_set_expansion(params = {}, format = @default_format)
-        options = { resource: FHIR::ValueSet, operation: { name: :value_set_expansion } }
+        options = { resource: versioned_resource_class('ValueSet'), operation: { name: :value_set_expansion } }
         options.deep_merge!(params)
         terminology_operation(options, format)
       end
@@ -62,21 +62,26 @@ module FHIR
       # http://hl7.org/implement/standards/FHIR-Develop/valueset-operations.html#validate
       # Validate that a coded value is in the set of codes allowed by a value set.
       def value_set_code_validation(params = {}, format = @default_format)
-        options = { resource: FHIR::ValueSet, operation: { name: :value_set_based_validation } }
+        options = { resource: versioned_resource_class('ValueSet'), operation: { name: :value_set_based_validation } }
         options.deep_merge!(params)
         terminology_operation(options, format)
       end
 
       # Concept Look Up [base]/CodeSystem/$lookup
       def code_system_lookup(params = {}, format = @default_format)
-        options = { resource: FHIR::CodeSystem, operation: { name: :code_system_lookup } }
+        klass = if @fhir_version == :stu3
+                  FHIR::CodeSystem
+                else
+                  FHIR::DSTU2::ValueSet
+                end
+        options = { resource: klass, operation: { name: :code_system_lookup } }
         options.deep_merge!(params)
         terminology_operation(options, format)
       end
 
       # ConceptMap Translation
       def concept_map_translate(params = {}, format = @default_format)
-        options = { resource: FHIR::ConceptMap, operation: { name: :concept_map_translate } }
+        options = { resource: versioned_resource_class('ConceptMap'), operation: { name: :concept_map_translate } }
         options.deep_merge!(params)
         terminology_operation(options, format)
       end
@@ -98,9 +103,9 @@ module FHIR
         else
           # create Parameters body
           if options[:operation] && options[:operation][:parameters]
-            p = FHIR::Parameters.new
+            p = versioned_resource_class('Parameters').new
             options[:operation][:parameters].each do |key, value|
-              parameter = FHIR::Parameters::Parameter.new.from_hash(name: key.to_s)
+              parameter = versioned_resource_class('Parameters::Parameter').new.from_hash(name: key.to_s)
               parameter.method("value#{value[:type]}=").call(value[:value])
               p.parameter << parameter
             end
@@ -115,7 +120,7 @@ module FHIR
 
       def match(resource, options = {}, format = @default_format)
         options.merge!(resource: resource.class, match: true, format: format)
-        params = FHIR::Parameters.new
+        params = versioned_resource_class('Parameters').new
         add_resource_parameter(params, 'resource', resource)
         add_parameter(params, 'onlyCertainMatches', 'Boolean', options[:onlyCertainMatches]) unless options[:onlyCertainMatches].nil?
         add_parameter(params, 'count', 'Integer', options[:matchCount]) if options[:matchCount].is_a?(Integer)
@@ -134,7 +139,7 @@ module FHIR
 
       def validate(resource, options = {}, format = @default_format)
         options.merge!(resource: resource.class, validate: true, format: format)
-        params = FHIR::Parameters.new
+        params = versioned_resource_class('Parameters').new
         add_resource_parameter(params, 'resource', resource)
         add_parameter(params, 'profile', 'Uri', options[:profile_uri]) unless options[:profile_uri].nil?
         post resource_url(options), params, fhir_headers(options)
@@ -142,7 +147,7 @@ module FHIR
 
       def validate_existing(resource, id, options = {}, format = @default_format)
         options.merge!(resource: resource.class, id: id, validate: true, format: format)
-        params = FHIR::Parameters.new
+        params = versioned_resource_class('Parameters').new
         add_resource_parameter(params, 'resource', resource)
         add_parameter(params, 'profile', 'Uri', options[:profile_uri]) unless options[:profile_uri].nil?
         post resource_url(options), params, fhir_headers(options)
@@ -152,14 +157,14 @@ module FHIR
 
       def add_parameter(params, name, type, value)
         params.parameter ||= []
-        parameter = FHIR::Parameters::Parameter.new.from_hash(name: name)
+        parameter = versioned_resource_class('Parameters::Parameter').new.from_hash(name: name)
         parameter.method("value#{type}=").call(value)
         params.parameter << parameter
       end
 
       def add_resource_parameter(params, name, resource)
         params.parameter ||= []
-        parameter = FHIR::Parameters::Parameter.new.from_hash(name: name)
+        parameter = versioned_resource_class('Parameters::Parameter').new.from_hash(name: name)
         parameter.resource = resource
         params.parameter << parameter
       end

data/lib/fhir_client/sections/transactions.rb

@@ -4,14 +4,14 @@ module FHIR
       attr_accessor :transaction_bundle
 
       def begin_transaction
-        @transaction_bundle = FHIR::Bundle.new
+        @transaction_bundle = versioned_resource_class('Bundle').new
         @transaction_bundle.type = 'transaction'
         @transaction_bundle.entry ||= []
         @transaction_bundle
       end
 
       def begin_batch
-        @transaction_bundle = FHIR::Bundle.new
+        @transaction_bundle = versioned_resource_class('Bundle').new
         @transaction_bundle.type = 'batch'
         @transaction_bundle.entry ||= []
         @transaction_bundle
@@ -26,8 +26,8 @@ module FHIR
       end
 
       def add_batch_request(method, url, resource = nil, if_none_exist = nil)
-        request = FHIR::Bundle::Entry::Request.new
-        request.local_method = if FHIR::Bundle::Entry::Request::METADATA['method']['valid_codes'].values.first.include?(method.upcase)
+        request = versioned_resource_class('Bundle::Entry::Request').new
+        request.local_method = if versioned_resource_class('Bundle::Entry::Request::METADATA')['method']['valid_codes'].values.first.include?(method.upcase)
                                  method.upcase
                                else
                                  'POST'
@@ -43,7 +43,7 @@ module FHIR
           request.url = url
         end
 
-        entry = FHIR::Bundle::Entry.new
+        entry = versioned_resource_class('Bundle::Entry').new
         entry.resource = resource
         entry.request = request
 
@@ -65,9 +65,9 @@ module FHIR
         reply = post resource_url(options), @transaction_bundle, fhir_headers(options)
         begin
           reply.resource = if format.downcase.include?('xml')
-                             FHIR::Xml.from_xml(reply.body)
+                             versioned_resource_class('Xml').from_xml(reply.body)
                            else
-                             FHIR::Json.from_json(reply.body)
+                             versioned_resource_class('Json').from_json(reply.body)
                            end
         rescue
           reply.resource = nil

data/lib/fhir_client/tasks/tasks.rake

@@ -4,7 +4,7 @@ FHIR.logger.level = Logger::ERROR
 namespace :fhir do
   desc 'console'
   task :console, [] do
-    sh 'bin/console'
+    exec('ruby bin/console')
   end
 
   #

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '3.0.2'
+    VERSION = '3.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,14 +46,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: fhir_dstu2_models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement