summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-29 13:24:27 +0200
committerrautenberg <rautenberg@in-silico.ch>2012-03-29 13:24:27 +0200
commitef6b74aa8167c1cd2685e8c7ab97f6905d5a03b9 (patch)
treefb87b90eebbde1acca339ee643211d2b75d06586
parent0d457e40c005ba4209ec7e3093aa06d73d65a442 (diff)
let subjectid in header if aa is defined and request go to opensso
-rw-r--r--lib/rest-client-wrapper.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/rest-client-wrapper.rb b/lib/rest-client-wrapper.rb
index 30292de..a5adc80 100644
--- a/lib/rest-client-wrapper.rb
+++ b/lib/rest-client-wrapper.rb
@@ -16,13 +16,16 @@ module OpenTox
define_singleton_method method do |uri,payload={},headers={}|
# check input
- @subjectid = headers[:subjectid] ? headers[:subjectid] : nil
+ @subjectid = headers[:subjectid] ? headers[:subjectid] : nil
bad_request_error "Invalid URI: '#{uri}'" unless URI.valid? uri
not_found_error "URI '#{uri}' not found." unless URI.accessible?(uri, @subjectid) unless URI.ssl?(uri)
bad_request_error "Headers are not a hash: #{headers.inspect}" unless headers==nil or headers.is_a?(Hash)
# make sure that no header parameters are set in the payload
[:accept,:content_type,:subjectid].each do |header|
- bad_request_error "#{header} should be submitted in the headers" if payload and payload.is_a?(Hash) and payload[header] unless URI(uri).host == URI($aa[:uri]).host
+ if defined? $aa || URI(uri).host == URI($aa[:uri]).host
+ else
+ bad_request_error "#{header} should be submitted in the headers" if payload and payload.is_a?(Hash) and payload[header]
+ end
end
# create request