taverna-t2flow 0.4.0 → 0.4.1

data/CHANGES.rdoc

@@ -1,5 +1,9 @@
 = Changes log for the T2Flow Ruby Gem
 
+== Version 0.4.1
+
+* Fixed how "merge" datalinks are extracted.
+
 == Version 0.4.0
 
 * Made parser more robust.

data/README.rdoc

@@ -1,6 +1,6 @@
 = Taverna[http://taverna.sourceforge.net] 2 Interaction Gem
 
-Authors::       Robert Haines, Mannie Tagarira, David Withers
+Authors::       Finn Bacall, Robert Haines, Mannie Tagarira, David Withers
 Contact::       mailto:support@mygrid.org.uk
 URL::           http://www.taverna.org.uk/
 Licence::       LGPL 3 (See LICENCE or http://www.gnu.org/licenses/lgpl.html)

data/Rakefile

@@ -14,7 +14,7 @@ require 'jeweler'
 
 task :default => [:test]
 
-T2FLOW_GEM_VERSION = "0.4.0"
+T2FLOW_GEM_VERSION = "0.4.1"
 
 Jeweler::Tasks.new do |s|
   s.name             = "taverna-t2flow"

data/lib/t2flow/parser.rb

@@ -175,13 +175,21 @@ module T2Flow
       datalink = Datalink.new
       
       if sink = link.find_first('./t2:sink')
-        datalink.sink = (sink["type"] == "processor" ? "#{sink.find_first('./t2:processor').content}:" : "") +
-                        "#{sink.find_first('./t2:port').content}"
+        if sink["type"] == "processor" || sink["type"] == "merge"
+          datalink.sink = "#{sink.find_first('./t2:processor').content}:"
+        else
+          datalink.sink = ""
+        end
+        datalink.sink += "#{sink.find_first('./t2:port').content}"
       end
 
       if source = link.find_first('./t2:source')
-        datalink.source = (source["type"] == "processor" ? "#{source.find_first('./t2:processor').content}:" : "") +
-                          "#{source.find_first('./t2:port').content}"
+        if source["type"] == "processor" || source["type"] == "merge"
+          datalink.source = "#{source.find_first('./t2:processor').content}:"
+        else
+          datalink.source = ""
+        end
+        datalink.source += "#{source.find_first('./t2:port').content}"
       end
 
       dataflow.datalinks << datalink

data/taverna-t2flow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "taverna-t2flow"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Finn Bacall", "Robert Haines", "David Withers", "Mannie Tagarira"]
-  s.date = "2012-12-03"
+  s.date = "2013-01-07"
   s.description = "This a gem developed by myGrid for the purpose of interacting with Taverna 2 workflows. An example use would be the image genaration for the model representing Taverna 2 workflows as used in myExperiment."
   s.email = ["finn.bacall@cs.man.ac.uk", "rhaines@manchester.ac.uk"]
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: taverna-t2flow
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Finn Bacall
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-03 00:00:00 Z
+date: 2013-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false