t2-server 0.2.0 → 0.2.1

data/README.rdoc

@@ -1,7 +1,7 @@
 = Taverna[http://www.taverna.org.uk/] 2 Server Interaction Gem
 
 Authors::     Robert Haines
-Gem Version:: 0.2.0
+Gem Version:: 0.2.1
 API Version:: 2.2a1
 Contact::     mailto:rhaines@manchester.ac.uk
 URL::         http://taverna.sourceforge.net/

data/lib/t2server.rb

@@ -43,7 +43,7 @@ require 't2server/run'
 #   Taverna 2 Server instance.
 module T2Server
   # The version of this library
-  GEM_VERSION = "0.0.4"
+  GEM_VERSION = "0.2.1"
   # The version of the Taverna 2 Server API that this library can interface with
   API_VERSION = "2.2a1"
 end

data/lib/t2server/run.rb

@@ -31,7 +31,6 @@
 # Author: Robert Haines
 
 require 'rexml/document'
-include REXML
 
 module T2Server
 
@@ -361,14 +360,14 @@ module T2Server
     def ls(dir="")
       dir.strip_path!
       dir_list = @server.get_run_attribute(@uuid, "#{@links[:wdir]}/#{dir}")
-      doc = Document.new(dir_list)
+      doc = REXML::Document.new(dir_list)
 
       # compile a list of directory entries stripping the
       # directory name from the front of each filename
       dirs = []
       files = []
-      XPath.each(doc, "//nss:dir", Namespaces::MAP) {|e| dirs << e.text.split('/')[-1]}
-      XPath.each(doc, "//nss:file", Namespaces::MAP) {|e| files << e.text.split('/')[-1]}
+      REXML::XPath.each(doc, "//nss:dir", Namespaces::MAP) {|e| dirs << e.text.split('/')[-1]}
+      REXML::XPath.each(doc, "//nss:file", Namespaces::MAP) {|e| files << e.text.split('/')[-1]}
       [dirs, files]
     end
 
@@ -427,9 +426,9 @@ module T2Server
       
       # get inputs
       inputs = @server.get_run_attribute(@uuid, links[:inputs])
-      doc = Document.new(inputs)
+      doc = REXML::Document.new(inputs)
       nsmap = Namespaces::MAP
-      links[:baclava] = "#{links[:inputs]}/" + XPath.first(doc, "//nsr:baclava", nsmap).attributes["href"].split('/')[-1]
+      links[:baclava] = "#{links[:inputs]}/" + REXML::XPath.first(doc, "//nsr:baclava", nsmap).attributes["href"].split('/')[-1]
 
       # set io properties
       links[:io]       = "#{links[:listeners]}/io"
@@ -441,20 +440,20 @@ module T2Server
     end
 
     def parse_description(desc)
-      doc = Document.new(desc)
+      doc = REXML::Document.new(desc)
       nsmap = Namespaces::MAP
       {
-        :expiry     => XPath.first(doc, "//nsr:expiry", nsmap).attributes["href"].split('/')[-1],
-        :workflow   => XPath.first(doc, "//nsr:creationWorkflow", nsmap).attributes["href"].split('/')[-1],
-        :status     => XPath.first(doc, "//nsr:status", nsmap).attributes["href"].split('/')[-1],
-        :createtime => XPath.first(doc, "//nsr:createTime", nsmap).attributes["href"].split('/')[-1],
-        :starttime  => XPath.first(doc, "//nsr:startTime", nsmap).attributes["href"].split('/')[-1],
-        :finishtime => XPath.first(doc, "//nsr:finishTime", nsmap).attributes["href"].split('/')[-1],
-        :wdir       => XPath.first(doc, "//nsr:workingDirectory", nsmap).attributes["href"].split('/')[-1],
-        :inputs     => XPath.first(doc, "//nsr:inputs", nsmap).attributes["href"].split('/')[-1],
-        :output     => XPath.first(doc, "//nsr:output", nsmap).attributes["href"].split('/')[-1],
-        :securectx  => XPath.first(doc, "//nsr:securityContext", nsmap).attributes["href"].split('/')[-1],
-        :listeners  => XPath.first(doc, "//nsr:listeners", nsmap).attributes["href"].split('/')[-1]
+        :expiry     => REXML::XPath.first(doc, "//nsr:expiry", nsmap).attributes["href"].split('/')[-1],
+        :workflow   => REXML::XPath.first(doc, "//nsr:creationWorkflow", nsmap).attributes["href"].split('/')[-1],
+        :status     => REXML::XPath.first(doc, "//nsr:status", nsmap).attributes["href"].split('/')[-1],
+        :createtime => REXML::XPath.first(doc, "//nsr:createTime", nsmap).attributes["href"].split('/')[-1],
+        :starttime  => REXML::XPath.first(doc, "//nsr:startTime", nsmap).attributes["href"].split('/')[-1],
+        :finishtime => REXML::XPath.first(doc, "//nsr:finishTime", nsmap).attributes["href"].split('/')[-1],
+        :wdir       => REXML::XPath.first(doc, "//nsr:workingDirectory", nsmap).attributes["href"].split('/')[-1],
+        :inputs     => REXML::XPath.first(doc, "//nsr:inputs", nsmap).attributes["href"].split('/')[-1],
+        :output     => REXML::XPath.first(doc, "//nsr:output", nsmap).attributes["href"].split('/')[-1],
+        :securectx  => REXML::XPath.first(doc, "//nsr:securityContext", nsmap).attributes["href"].split('/')[-1],
+        :listeners  => REXML::XPath.first(doc, "//nsr:listeners", nsmap).attributes["href"].split('/')[-1]
       }
     end
   end

data/lib/t2server/server.rb

@@ -34,7 +34,6 @@ require 'base64'
 require 'uri'
 require 'net/https'
 require 'rexml/document'
-include REXML
 
 module T2Server
 
@@ -394,24 +393,24 @@ module T2Server
     end
 
     def parse_description(desc)
-      doc = Document.new(desc)
+      doc = REXML::Document.new(desc)
       nsmap = Namespaces::MAP
       {
-        :runs          => URI.parse(XPath.first(doc, "//nsr:runs", nsmap).attributes["href"]).path,
-        :runlimit      => URI.parse(XPath.first(doc, "//nsr:runLimit", nsmap).attributes["href"]).path,
-        :permworkflows => URI.parse(XPath.first(doc, "//nsr:permittedWorkflows", nsmap).attributes["href"]).path,
-        :permlisteners => URI.parse(XPath.first(doc, "//nsr:permittedListeners", nsmap).attributes["href"]).path
+        :runs          => URI.parse(REXML::XPath.first(doc, "//nsr:runs", nsmap).attributes["href"]).path,
+        :runlimit      => URI.parse(REXML::XPath.first(doc, "//nsr:runLimit", nsmap).attributes["href"]).path,
+        :permworkflows => URI.parse(REXML::XPath.first(doc, "//nsr:permittedWorkflows", nsmap).attributes["href"]).path,
+        :permlisteners => URI.parse(REXML::XPath.first(doc, "//nsr:permittedListeners", nsmap).attributes["href"]).path
       }
     end
 
     def get_runs
       run_list = get_attribute("#{@links[:runs]}")
 
-      doc = Document.new(run_list)
+      doc = REXML::Document.new(run_list)
 
       # get list of run uuids
       uuids = []
-      XPath.each(doc, "//nsr:run", Namespaces::MAP) do |run|
+      REXML::XPath.each(doc, "//nsr:run", Namespaces::MAP) do |run|
         uuids << run.attributes["href"].split('/')[-1]
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: t2-server
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Robert Haines
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +01:00
+date: 2010-09-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency