summaryrefslogtreecommitdiff
path: root/lib/overwrite.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2013-07-16 17:45:08 +0200
committerChristoph Helma <helma@in-silico.ch>2013-07-16 17:45:08 +0200
commit80c1821e3a55b0d9c1ee51537e109dff3bc79423 (patch)
treeb77873e557b016d265c97cbc212b73f700453712 /lib/overwrite.rb
parent10ffab4d032e3e5584c318a45521e774d49bd3d7 (diff)
subjectid handled by RestClientWrapper
Diffstat (limited to 'lib/overwrite.rb')
-rw-r--r--lib/overwrite.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/overwrite.rb b/lib/overwrite.rb
index c6bf02a..ff43347 100644
--- a/lib/overwrite.rb
+++ b/lib/overwrite.rb
@@ -84,21 +84,21 @@ module URI
uri =~ /task/ and URI.valid? uri
end
- def self.dataset? uri, subjectid=OpenTox::SUBJECTID
- uri =~ /dataset/ and URI.accessible? uri, subjectid
+ def self.dataset? uri
+ uri =~ /dataset/ and URI.accessible? uri
end
- def self.model? uri, subjectid=OpenTox::SUBJECTID
- uri =~ /model/ and URI.accessible? uri, subjectid
+ def self.model? uri
+ uri =~ /model/ and URI.accessible? uri
end
- def self.ssl? uri, subjectid=OpenTox::SUBJECTID
+ def self.ssl? uri
URI.parse(uri).instance_of? URI::HTTPS
end
# @return [Boolean] checks if resource exists by making a HEAD-request
- def self.accessible?(uri, subjectid=OpenTox::SUBJECTID)
- parsed_uri = URI.parse(uri + (subjectid ? "?subjectid=#{CGI.escape subjectid}" : ""))
+ def self.accessible?(uri)
+ parsed_uri = URI.parse(uri + (OpenTox::RestClientWrapper.subjectid ? "?subjectid=#{CGI.escape OpenTox::RestClientWrapper.subjectid}" : ""))
http_code = URI.task?(uri) ? 600 : 400
http = Net::HTTP.new(parsed_uri.host, parsed_uri.port)
unless (URI.ssl? uri) == true