fhir_client 1.6.3 → 1.6.7

data/lib/{sections → fhir_client/sections}/transactions.rb

@@ -1,7 +1,6 @@
 module FHIR
   module Sections
     module Transactions
-
       attr_accessor :transaction_bundle
 
       def begin_transaction
@@ -22,20 +21,20 @@ module FHIR
       # @param method one of ['GET','POST','PUT','DELETE']
       # @param url relative path, such as 'Patient/123'. Do not include the [base]
       # @param resource The resource if a POST or PUT
-      def add_transaction_request(method, url, resource=nil, if_none_exist=nil)
+      def add_transaction_request(method, url, resource = nil, if_none_exist = nil)
         add_batch_request(method, url, resource, if_none_exist)
       end
 
-      def add_batch_request(method, url, resource=nil, if_none_exist=nil)
+      def add_batch_request(method, url, resource = nil, if_none_exist = nil)
         request = FHIR::Bundle::Entry::Request.new
-        if FHIR::Bundle::Entry::Request::METADATA['method']['valid_codes'].values.first.include?(method.upcase)
-          request.local_method = method.upcase 
-        else
-          request.local_method = 'POST'
-        end
-        request.ifNoneExist = if_none_exist if !if_none_exist.nil?
+        request.local_method = if FHIR::Bundle::Entry::Request::METADATA['method']['valid_codes'].values.first.include?(method.upcase)
+                                 method.upcase
+                               else
+                                 'POST'
+                               end
+        request.ifNoneExist = if_none_exist unless if_none_exist.nil?
         if url.nil? && !resource.nil?
-          options = Hash.new
+          options = {}
           options[:resource] = resource.class
           options[:id] = resource.id if request.local_method != 'POST'
           request.url = resource_url(options)
@@ -53,7 +52,7 @@ module FHIR
       end
 
       # syntactic sugar for end_batch
-      def end_transaction(format=@default_format)
+      def end_transaction(format = @default_format)
         end_batch(format)
       end
 
@@ -61,23 +60,21 @@ module FHIR
       # @param format
       # @return FHIR::ClientReply
       #
-      def end_batch(format=@default_format)
+      def end_batch(format = @default_format)
         options = { format: format, 'Prefer' => 'return=representation' }
         reply = post resource_url(options), @transaction_bundle, fhir_headers(options)
         begin
-          if(format.downcase.include?('xml'))
-            reply.resource = FHIR::Xml.from_xml(reply.body)
-          else
-            reply.resource = FHIR::Json.from_json(reply.body)
-          end
-        rescue Exception => e 
+          reply.resource = if format.downcase.include?('xml')
+                             FHIR::Xml.from_xml(reply.body)
+                           else
+                             FHIR::Json.from_json(reply.body)
+                           end
+        rescue
           reply.resource = nil
         end
         reply.resource_class = reply.resource.class
         reply
       end
-
     end
   end
 end
-

data/lib/{sections → fhir_client/sections}/validate.rb

@@ -3,47 +3,44 @@ module FHIR
     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 })
+      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]) if !options[:profile_uri].nil?
+        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 })
+      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]) if !options[:profile_uri].nil?
+        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)
+
+      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)
+      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/{tasks → fhir_client/tasks}/tasks.rake

@@ -1,8 +1,10 @@
-namespace :fhir do
+require 'fhir_client'
+FHIR.logger.level = Logger::ERROR
 
+namespace :fhir do
   desc 'console'
-  task :console, [] do |t, args|
-    binding.pry
+  task :console, [] do
+    sh 'bin/console'
   end
 
   #
@@ -19,9 +21,9 @@ namespace :fhir do
   #  4. 'client_id' and 'client_secret' variables are the name and secret of the client created in (3)
   #  5. :authorize_url is the authorization endpoint of the OpenID connect server
   #  6. :token_url is the token endpoint of the OpenID connect server
-  #  
+  #
   desc 'OAuth2 Example'
-  task :oauth2, [:url,:client_id,:client_secret] do |t, args|
+  task :oauth2, [:url, :client_id, :client_secret] do |_t, args|
     client = FHIR::Client.new(args.url)
     client_id = args.client_id
     client_secret = args.client_secret
@@ -29,35 +31,35 @@ namespace :fhir do
     if options.empty?
       puts 'This server does not support the expected OAuth2 extensions.'
     else
-      client.set_oauth2_auth(client_id,client_secret,options[:authorize_url],options[:token_url])
+      client.set_oauth2_auth(client_id, client_secret, options[:authorize_url], options[:token_url])
       reply = client.read_feed(FHIR::Patient)
       puts reply.body
     end
   end
 
   desc 'count all resources for a given server'
-  task :count, [:url,:display_zero] do |t, args|
+  task :count, [:url, :display_zero] do |_t, args|
     client = FHIR::Client.new(args.url)
     display_zero = (args.display_zero == 'true')
     counts = {}
-    fhir_resources.each do | klass |
+    fhir_resources.each do |klass|
       reply = client.read_feed(klass)
       if !reply.resource.nil? && (reply.resource.total > 0 || display_zero)
-        counts["#{klass.name.demodulize}"] = reply.resource.total
+        counts[klass.name.demodulize.to_s] = reply.resource.total
       end
     end
     printf "  %-30s %5s\n", 'Resource', 'Count'
     printf "  %-30s %5s\n", '--------', '-----'
-    counts.each do |key,value|
+    counts.each do |key, value|
       # puts "#{key}  #{value}"
       printf "  %-30s %5s\n", key, value
     end
   end
 
   desc 'delete all resources for a given server'
-  task :clean, [:url] do |t, args|
+  task :clean, [:url] do |_t, args|
     client = FHIR::Client.new(args.url)
-    fhir_resources.each do | klass |
+    fhir_resources.each do |klass|
       puts "Reading #{klass.name.demodulize}..."
       skipped = []
       reply = client.read_feed(klass)
@@ -65,24 +67,23 @@ namespace :fhir do
         puts "  Cleaning #{reply.resource.entry.length} #{klass.name.demodulize} resources..."
         reply.resource.entry.each do |entry|
           unless entry.resource.nil?
-            del_reply = client.destroy(klass,entry.resource.id) 
-            skipped << "#{klass.name.demodulize}/#{entry.resource.id}" if [405,409].include?(del_reply.code)
+            del_reply = client.destroy(klass, entry.resource.id)
+            skipped << "#{klass.name.demodulize}/#{entry.resource.id}" if [405, 409].include?(del_reply.code)
           end
         end
         if skipped.empty?
-          reply = client.read_feed(klass) 
+          reply = client.read_feed(klass)
         else
           puts "  *** Unable to delete some #{klass.name.demodulize}s ***"
           reply = nil
         end
       end
     end
-    puts "Done cleaning."
+    puts 'Done cleaning.'
     Rake::Task['fhir:count'].invoke(args.url)
   end
 
   def fhir_resources
-    FHIR::RESOURCES.map {|r| Object::const_get("FHIR::#{r}")}
+    FHIR::RESOURCES.map { |r| Object.const_get("FHIR::#{r}") }
   end
-
 end

data/lib/fhir_client/version.rb

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

metadata

@@ -1,214 +1,258 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.7
 platform: ruby
 authors:
 - Andre Quina
 - Jason Walonoski
 - Janoo Fernandes
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fhir_models
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: fhir_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.6.6
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.13'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Gem for handling FHIR client requests in ruby
-email: aquina@mitre.org
+email:
+- aquina@mitre.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .simplecov
-- .travis.yml
+- ".codeclimate.yml"
+- ".csslintrc"
+- ".eslintignore"
+- ".eslintrc"
+- ".gitignore"
+- ".rubocop.yml"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - fhir_client.gemspec
-- lib/client_exception.rb
-- lib/client_interface.rb
-- lib/ext/bundle.rb
-- lib/ext/model.rb
-- lib/ext/reference.rb
-- lib/fhir_api_validation.json
 - lib/fhir_client.rb
-- lib/model/client_reply.rb
-- lib/model/tag.rb
-- lib/patch_format.rb
-- lib/resource_address.rb
-- lib/resource_format.rb
-- lib/sections/crud.rb
-- lib/sections/feed.rb
-- lib/sections/history.rb
-- lib/sections/operations.rb
-- lib/sections/search.rb
-- lib/sections/tags.rb
-- lib/sections/transactions.rb
-- lib/sections/validate.rb
-- lib/tasks/tasks.rake
-- test/fixtures/bundle-example.xml
-- test/fixtures/parameters-example.json
-- test/fixtures/parameters-example.xml
-- test/test_helper.rb
-- test/unit/basic_test.rb
-- test/unit/bundle_test.rb
-- test/unit/parameters_test.rb
-homepage: https://github.com/hl7-fhir/fhir-svn
+- lib/fhir_client/client.rb
+- lib/fhir_client/client_exception.rb
+- lib/fhir_client/ext/bundle.rb
+- lib/fhir_client/ext/model.rb
+- lib/fhir_client/ext/reference.rb
+- lib/fhir_client/fhir_api_validation.json
+- lib/fhir_client/model/client_reply.rb
+- lib/fhir_client/model/tag.rb
+- lib/fhir_client/patch_format.rb
+- lib/fhir_client/resource_address.rb
+- lib/fhir_client/resource_format.rb
+- lib/fhir_client/sections/crud.rb
+- lib/fhir_client/sections/feed.rb
+- lib/fhir_client/sections/history.rb
+- lib/fhir_client/sections/operations.rb
+- 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
 licenses: []
 metadata: {}
 post_install_message: 
@@ -217,17 +261,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby