Merge pull request fhir-crucible#130 from fhir-crucible/version_searc…

…h_options

updated search function to allow user to specify request headers

lib/fhir_client/sections/search.rb

@@ -6,28 +6,31 @@ module Search
  #
  # @param klass The type of resource to be searched.
  # @param options A hash of options used to construct the search query.
+ # @param headers A hash of headers used in the http request itself. 
  # @return FHIR::ClientReply
  #
- def search(klass, options = {}, format = @default_format)
+ def search(klass, options = {}, format = @default_format, headers = {})
  options[:resource] = klass
  options[:format] = format
 
  reply = if options[:search] && options[:search][:flag]
- post resource_url(options), nil, fhir_headers({content_type: 'application/x-www-form-urlencoded'})
+ headers[:content_type] = 'application/x-www-form-urlencoded'
+ post resource_url(options), nil, fhir_headers(headers)
  else
- get resource_url(options), fhir_headers
+ get resource_url(options), fhir_headers(headers)
  end
  # reply = get resource_url(options), fhir_headers(options)
  reply.resource = parse_reply(klass, format, reply)
  reply.resource_class = klass
  reply
  end
 
- def search_existing(klass, id, options = {}, format = @default_format)
+ def search_existing(klass, id, options = {}, format = @default_format, headers = {})
  options.merge!(resource: klass, id: id, format: format)
  # if options[:search][:flag]
  reply = if options[:search] && options[:search][:flag]
- post resource_url(options), nil, fhir_headers({content_type: 'application/x-www-form-urlencoded'})
+ headers[:content_type] = 'application/x-www-form-urlencoded'
+ post resource_url(options), nil, fhir_headers(headers)
  else
  get resource_url(options), fhir_headers
  end
@@ -36,10 +39,11 @@ def search_existing(klass, id, options = {}, format = @default_format)
  reply
  end
 
- def search_all(options = {}, format = @default_format)
+ def search_all(options = {}, format = @default_format, headers = {})
  options[:format] = format
  reply = if options[:search] && options[:search][:flag]
- post resource_url(options), nil, fhir_headers({content_type: 'application/x-www-form-urlencoded'})
+ headers[:content_type] = 'application/x-www-form-urlencoded'
+ post resource_url(options), nil, fhir_headers(headers)
  else
  get resource_url(options), fhir_headers
  end