fhir_client 1.8.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1422a8f5a8fde728e4d0eff36ee916e27a5915c
-  data.tar.gz: 50ad100815d6349da9acd460c1ed7996ac0945d2
+  metadata.gz: d67d432c6a1baf6217c47ecd7aca2c5e58cf43aa
+  data.tar.gz: e369651e25ebde3e51202a030efa05e460e855cd
 SHA512:
-  metadata.gz: 2c023874bcbec48a8d01fb0ccf5fc0dabc968a949a3b89dd386d044bcf7c03693d69b7f80e5d74291b8cdd2436fa8e07450e07b4ef95e870a23df31a562f9c46
-  data.tar.gz: 5ac8f2376cec84379adafe44f1a6eac60b57dec0650e3172ffd5b952053b439fa704ed6fffafce4d511e23efcefbf935260769fc210da02b8c3af4a7225bbda3
+  metadata.gz: aadd0e4070a562928dae58ef4061adf9b1c5de89b1f6be12f589422f410ec18587a8ddc1f1ce550d9e5f0aa984e1157513793d9c75237d2eb25285f610463405
+  data.tar.gz: b44369795be44588b0ef780047600d4561b002ec1ba5208896995f6ab2a103dcd0fa159f9a0f1c70920091d3348d10b7af0f280ef724e6d29990e9a7d240fcc3

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - "2.0.0"
   - "2.1.10"
   - "2.2.5"
   - "2.3.1"
 before_install:
+  - gem update --system
   - gem install bundler
 services: mongodb
 script:

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 ruby RUBY_VERSION
 
 # gem 'fhir_models', :path => '../fhir_models'
+# gem 'fhir_models', git: 'https://github.com/fhir-crucible/fhir_models.git', :branch => '3.0.0-release'
 
 gemspec
 

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/fhir_client.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'fhir_client'
   spec.version       = FHIR::Client::VERSION
   spec.authors       = ['Andre Quina', 'Jason Walonoski', 'Janoo Fernandes']
-  spec.email         = ['aquina@mitre.org']
+  spec.email         = ['jwalonoski@mitre.org']
 
   spec.summary       = %q{A Gem for handling FHIR client requests in ruby}
   spec.description   = %q{A Gem for handling FHIR client requests in ruby}
@@ -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.8.0'
+  spec.add_dependency 'fhir_models', '>= 3.0.0'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'oauth2', '~> 1.1'
   spec.add_dependency 'rack', '>= 1.5'

data/lib/fhir_client/client.rb

@@ -7,7 +7,6 @@ module FHIR
   class Client
     include FHIR::Sections::History
     include FHIR::Sections::Crud
-    include FHIR::Sections::Validate
     include FHIR::Sections::Tags
     include FHIR::Sections::Feed
     include FHIR::Sections::Search

data/lib/fhir_client/fhir_api_validation.json

@@ -204,7 +204,7 @@
     }
   },{      
     "interaction": "transaction",
-    "path": ["/"],
+    "path": ["^/$"],
     "verb": "POST",
     "request": {
       "headers": {

data/lib/fhir_client/model/client_reply.rb

@@ -1,6 +1,5 @@
 module FHIR
   class ClientReply
-    @@validation_rules = JSON.parse(File.open(File.join(File.expand_path('..', File.dirname(File.absolute_path(__FILE__))), 'fhir_api_validation.json'), 'r:UTF-8', &:read))
     @@path_regexes = {
       '[type]' => "(#{FHIR::RESOURCES.join('|')})",
       '[id]' => FHIR::PRIMITIVES['id']['regex'],
@@ -97,8 +96,11 @@ module FHIR
     end
 
     def validate
+      rules = File.open(File.join(File.expand_path('..', File.dirname(File.absolute_path(__FILE__))), 'fhir_api_validation.json'), 'r:UTF-8', &:read)
+      validation_rules = JSON.parse(rules)
+
       errors = []
-      @@validation_rules.each do |rule|
+      validation_rules.each do |rule|
         next unless rule['verb'] == @request[:method].to_s.upcase
         rule_match = false
         rule['path'].each do |path|
@@ -129,7 +131,7 @@ module FHIR
     def validate_headers(name, headers, header_rules)
       errors = []
       header_rules.each do |header, present|
-        value = headers[header]
+        value = headers.detect{|x, _y| x.downcase==header.downcase}.try(:last)
         if present == true
           if value
             errors << "#{name}: Malformed value for header #{header}: #{value}" unless @@header_regexes[header] =~ value

data/lib/fhir_client/resource_address.rb

@@ -52,6 +52,7 @@ module FHIR
       url += "/#{options[:resource].try(:name).try(:demodulize) || options[:resource].split('::').last}" if options[:resource]
       url += "/#{options[:id]}" if options[:id]
       url += '/$validate' if options[:validate]
+      url += '/$match' if options[:match]
 
       if options[:operation]
         opr = options[:operation]
@@ -76,7 +77,8 @@ module FHIR
 
       if options[:history]
         history = options[:history]
-        url += "/_history/#{history[:id]}"
+        url += '/_history'
+        url += "/#{history[:id]}" if history.key?(:id)
         params[:_count] = history[:count] if history[:count]
         params[:_since] = history[:since].iso8601 if history[:since]
       end

data/lib/fhir_client/sections/crud.rb

@@ -78,7 +78,7 @@ module FHIR
         options[:format] = format
         options[:id] = id
         reply = put resource_url(options), resource, fhir_headers(options)
-        reply.resource = parse_reply(resource.class, format, reply)
+        reply.resource = parse_reply(resource.class, format, reply) if reply.body.present?
         reply.resource_class = resource.class
         reply
       end
@@ -107,8 +107,10 @@ module FHIR
       # Delete the resource with the given ID.
       #
       def destroy(klass, id = nil, options = {})
-        options = { resource: klass, id: id, format: nil }.merge options
-        reply = delete resource_url(options), fhir_headers(options)
+        options = { resource: klass, id: id, format: @default_format }.merge options
+        headers = fhir_headers(options)
+        headers.delete('Content-Type')
+        reply = delete resource_url(options), headers
         reply.resource_class = klass
         reply
       end
@@ -145,12 +147,12 @@ module FHIR
         options[:format] = format
         reply = post resource_url(options), resource, fhir_headers(options)
         if [200, 201].include? reply.code
-          type = reply.response[:headers][:content_type]
+          type = reply.response[:headers].detect{|x, _y| x.downcase=='content-type'}.try(:last)
           if !type.nil?
             reply.resource = if type.include?('xml') && !reply.body.empty?
-                               resource.class.from_xml(reply.body)
+                               FHIR::Xml.from_xml(reply.body)
                              elsif type.include?('json') && !reply.body.empty?
-                               resource.class.from_fhir_json(reply.body)
+                               FHIR::Json.from_json(reply.body)
                              else
                                resource # just send back the submitted resource
                              end

data/lib/fhir_client/sections/operations.rb

@@ -113,7 +113,57 @@ module FHIR
         reply
       end
 
-      # Batch Mode Validation	[base]/ValueSet/$batch
+      def match(resource, options = {}, format = @default_format)
+        options.merge!(resource: resource.class, match: true, format: format)
+        params = FHIR::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)
+        post resource_url(options), params, fhir_headers(options)
+      end
+
+      #
+      # Validate resource payload.
+      #
+      # @param resourceClass
+      # @param resource
+      # @param id
+      # @return
+      #
+      # public <T extends Resource> AtomEntry<OperationOutcome> validate(Class<T> resourceClass, T resource, String id);
+
+      def validate(resource, options = {}, format = @default_format)
+        options.merge!(resource: resource.class, validate: true, format: format)
+        params = FHIR::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)
+      end
+
+      def validate_existing(resource, id, options = {}, format = @default_format)
+        options.merge!(resource: resource.class, id: id, validate: true, format: format)
+        params = FHIR::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)
+      end
+
+      private
+
+      def add_parameter(params, name, type, value)
+        params.parameter ||= []
+        parameter = FHIR::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.resource = resource
+        params.parameter << parameter
+      end
+
     end
   end
 end

data/lib/fhir_client/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   class Client
-    VERSION = '1.8.0'
+    VERSION = '3.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andre Quina
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
         version: '0'
 description: A Gem for handling FHIR client requests in ruby
 email:
-- aquina@mitre.org
+- jwalonoski@mitre.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -249,7 +249,6 @@ files:
 - lib/fhir_client/sections/search.rb
 - lib/fhir_client/sections/tags.rb
 - lib/fhir_client/sections/transactions.rb
-- lib/fhir_client/sections/validate.rb
 - lib/fhir_client/tasks/tasks.rake
 - lib/fhir_client/version.rb
 homepage: https://github.com/fhir-crucible/fhir_client

data/lib/fhir_client/sections/validate.rb

@@ -1,46 +0,0 @@
-module FHIR
-  module Sections
-    module Validate
-      #
-      # Validate resource payload.
-      #
-      # @param resourceClass
-      # @param resource
-      # @param id
-      # @return
-      #
-      # public <T extends Resource> AtomEntry<OperationOutcome> validate(Class<T> resourceClass, T resource, String id);
-      def validate(resource, options = {}, format = @default_format)
-        options.merge!(resource: resource.class, validate: true, format: format)
-        params = FHIR::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)
-      end
-
-      def validate_existing(resource, id, options = {}, format = @default_format)
-        options.merge!(resource: resource.class, id: id, validate: true, format: format)
-        params = FHIR::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)
-      end
-
-      private
-
-      def add_parameter(params, name, type, value)
-        params.parameter ||= []
-        parameter = FHIR::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.resource = resource
-        params.parameter << parameter
-      end
-    end
-  end
-end