opentox-ruby-api-wrapper 1.6.2 → 1.6.3

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

data/lib/algorithm.rb

@@ -1,7 +1,25 @@
-LOGGER.progname = File.expand_path(__FILE__)
 
 module OpenTox
   module Algorithm 
+    
+    
+    class Generic
+      
+      attr_accessor :uri, :title, :date
+      
+      def self.find(uri)
+        owl = OpenTox::Owl.from_uri(uri, "Algorithm")
+        return self.new(owl)
+      end
+      
+      protected
+      def initialize(owl)
+        @title = owl.get("title")
+        @date = owl.get("date")
+        @uri = owl.uri 
+      end
+      
+    end
 
     class Fminer 
 

data/lib/dataset.rb

@@ -1,5 +1,3 @@
-LOGGER.progname = File.expand_path(__FILE__)
-
 module OpenTox
   
   class Dataset 

data/lib/model.rb

@@ -21,9 +21,8 @@ module OpenTox
       
       protected
       def initialize(owl)
-        [:date, :creator, :title, :format, :algorithm, :dependentVariables, 
-         :independentVariables, :predictedVariables, :trainingDataset].each do |a|
-            self.send("#{a.to_s}=".to_sym, owl.get(a.to_s))
+        MODEL_ATTRIBS.each do |a|
+            self.send("#{a.to_s}=".to_sym, owl.get(a.to_s)) unless a==:uri
         end
         @uri = owl.uri 
         if ENV['RACK_ENV'] =~ /test|debug/

data/lib/ot-logger.rb

@@ -14,7 +14,7 @@ class MyLogger < Logger
     n = 2
     line = lines[n]
     
-    while (line =~ /spork.rb/ or line =~ /as_task/ or line =~ /environment.rb/)
+    while (line =~ /spork.rb/ or line =~ /as_task/ or line =~ /ot-logger.rb/)
       n += 1
       line = lines[n]
     end

data/lib/owl.rb

@@ -240,7 +240,7 @@ module OpenTox
         unless owl.root_node
           types = []
           owl.model.find(nil, RDF_TYPE, nil){ |s,p,o| types << o.to_s }
-          raise "root node for class '"+ot_class+"' not found (available type nodes: "+types.inspect+")"
+          raise "root node for class '"+owl.node(ot_class).to_s+"' not found (available type nodes: "+types.inspect+")"
         end
         raise "no uri in rdf: '"+owl.uri+"'" unless owl.uri and Utils.is_uri?(owl.uri) 
         owl.ot_class = ot_class
@@ -251,7 +251,7 @@ module OpenTox
     end
   
 	  def self.from_uri(uri, ot_class)
-     return from_data(RestClientWrapper.get(uri,:accept => "application/rdf+xml").to_s, uri, ot_class) 
+      return from_data(RestClientWrapper.get(uri,:accept => "application/rdf+xml").to_s, uri, ot_class) 
 		end
 
 		def rdf

data/lib/task.rb

@@ -1,5 +1,3 @@
-LOGGER.progname = File.expand_path(__FILE__)
-
 $self_task=nil
 
 module OpenTox

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: opentox-ruby-api-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 6
-  - 2
-  version: 1.6.2
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Christoph Helma, Martin Guetlein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +02:00
+date: 2010-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency