diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/opentox.rb | 9 | ||||
-rw-r--r-- | lib/task.rb | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/lib/opentox.rb b/lib/opentox.rb index 9493362..4338302 100644 --- a/lib/opentox.rb +++ b/lib/opentox.rb @@ -27,8 +27,9 @@ module OpenTox # Get object metadata # @return [Hash] Metadata + # TODO: rename to_hash? or store in object variables def metadata - pull if @rdf.empty? + pull # force update metadata = {} @rdf.query([RDF::URI.new(@uri),nil,nil]).collect do |statement| metadata[statement.predicate] ||= [] @@ -41,9 +42,11 @@ module OpenTox # @param [RDF] Key from RDF Vocabularies # @return [Array] Values for supplied key def [](key) - pull if @rdf.empty? + pull # force update result = @rdf.query([RDF::URI.new(@uri),key,nil]).collect{|statement| statement.object} - result.size == 1 ? result.first : result + return nil if result.empty? + return result.first.to_s if result.size == 1 + return result.collect{|r| r.to_s} end # Save object at service diff --git a/lib/task.rb b/lib/task.rb index 2f79cf1..7452012 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -97,12 +97,12 @@ module OpenTox code >= 400 and code != 503 end - def method_missing(method,*args) - method = method.to_s - response = self.[](RDF::OT[method]) - response = self.[](RDF::OT1[method]) if response.empty? # API 1.1 compatibility - internal_server_error "Unknown #{self.class} method #{method} for #{@uri}" if response.is_a? Array and response.empty? - return response.to_s + [:hasStatus, :resultURI].each do |method| + define_method method do + response = self.[](RDF::OT[method]) + response = self.[](RDF::OT1[method]) unless response # API 1.1 compatibility + response + end end #TODO: subtasks |