taverna-t2flow 0.4.3 → 0.4.4

data/CHANGES.rdoc

@@ -1,5 +1,9 @@
 = Changes log for the T2Flow Ruby Gem
 
+== Version 0.4.4
+
+* Fixed issue with flow control in nested workflows with no input ports.
+
 == Version 0.4.3
 
 * Fixed issue with nested workflow names and control links not being connected.

data/Rakefile

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

data/lib/t2flow/dot.rb

@@ -136,24 +136,22 @@ module T2Flow
     end
     
     def write_source_cluster(stream, sources, prefix) # :nodoc:
-      if sources.length > 0
-        stream.puts " subgraph cluster_#{prefix}sources {"
-        stream.puts '  style="dotted"'
-        stream.puts '  label="Workflow Inputs"'
-        stream.puts '  fontname="Helvetica"'
-        stream.puts '  fontsize="10"'
-        stream.puts '  fontcolor="black"'
-        stream.puts '  rank="same"'
-        stream.puts " \"#{prefix}WORKFLOWINTERNALSOURCECONTROL\" ["
-        stream.puts '  shape="triangle",'
-        stream.puts '  width="0.2",'
-        stream.puts '  height="0.2",'
-        stream.puts '  fillcolor="brown1"'
-        stream.puts '  label=""'
-        stream.puts ' ]'
-        sources.each {|source| write_source(stream, source, prefix)}
-        stream.puts ' }'
-      end
+      stream.puts " subgraph cluster_#{prefix}sources {"
+      stream.puts '  style="dotted"'
+      stream.puts '  label="Workflow Inputs"'
+      stream.puts '  fontname="Helvetica"'
+      stream.puts '  fontsize="10"'
+      stream.puts '  fontcolor="black"'
+      stream.puts '  rank="same"'
+      stream.puts " \"#{prefix}WORKFLOWINTERNALSOURCECONTROL\" ["
+      stream.puts '  shape="triangle",'
+      stream.puts '  width="0.2",'
+      stream.puts '  height="0.2",'
+      stream.puts '  fillcolor="brown1"'
+      stream.puts '  label=""'
+      stream.puts ' ]'
+      sources.each {|source| write_source(stream, source, prefix)}
+      stream.puts ' }'
     end
     
     def write_source(stream, source, prefix) # :nodoc:
@@ -167,24 +165,22 @@ module T2Flow
     end
     
     def write_sink_cluster(stream, sinks, prefix) # :nodoc:
-      if sinks.length > 0
-        stream.puts " subgraph cluster_#{prefix}sinks {"
-        stream.puts '  style="dotted"'
-        stream.puts '  label="Workflow Outputs"'
-        stream.puts '  fontname="Helvetica"'
-        stream.puts '  fontsize="10"'
-        stream.puts '  fontcolor="black"'
-        stream.puts '  rank="same"'
-        stream.puts " \"#{prefix}WORKFLOWINTERNALSINKCONTROL\" ["
-        stream.puts '  shape="invtriangle",'
-        stream.puts '  width="0.2",'
-        stream.puts '  height="0.2",'
-        stream.puts '  fillcolor="chartreuse3"'
-        stream.puts '  label=""'
-        stream.puts ' ]'
-        sinks.each {|sink| write_sink(stream, sink, prefix)}
-        stream.puts ' }'
-      end
+      stream.puts " subgraph cluster_#{prefix}sinks {"
+      stream.puts '  style="dotted"'
+      stream.puts '  label="Workflow Outputs"'
+      stream.puts '  fontname="Helvetica"'
+      stream.puts '  fontsize="10"'
+      stream.puts '  fontcolor="black"'
+      stream.puts '  rank="same"'
+      stream.puts " \"#{prefix}WORKFLOWINTERNALSINKCONTROL\" ["
+      stream.puts '  shape="invtriangle",'
+      stream.puts '  width="0.2",'
+      stream.puts '  height="0.2",'
+      stream.puts '  fillcolor="chartreuse3"'
+      stream.puts '  label=""'
+      stream.puts ' ]'
+      sinks.each {|sink| write_sink(stream, sink, prefix)}
+      stream.puts ' }'
     end
     
     def write_sink(stream, sink, prefix) # :nodoc:

data/lib/t2flow/parser.rb

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

data/taverna-t2flow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "taverna-t2flow"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   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 = "2013-01-29"
+  s.date = "2013-02-06"
   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: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Finn Bacall
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-29 00:00:00 Z
+date: 2013-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false