taverna-t2flow 0.4.2 → 0.4.3

data/CHANGES.rdoc

@@ -1,5 +1,9 @@
 = Changes log for the T2Flow Ruby Gem
 
+== Version 0.4.3
+
+* Fixed issue with nested workflow names and control links not being connected.
+
 == Version 0.4.2
 
 * Altered colours of various activities to align with the latest version of Taverna.

data/Rakefile

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

data/lib/t2flow/dot.rb

@@ -122,7 +122,7 @@ module T2Flow
       # nested workflows
       if "#{processor.type}" == "workflow"
         dataflow = @t2flow_model.dataflow(processor.dataflow_id)
-        write_dataflow(stream, dataflow, prefix + dataflow.annotations.name, dataflow.annotations.name, depth.next)
+        write_dataflow(stream, dataflow, prefix + processor.name, processor.name, depth.next)
       else
         stream.puts " \"#{prefix}#{processor.name}\" ["
         stream.puts "  fillcolor=\"#{get_colour processor.type}\","
@@ -204,7 +204,7 @@ module T2Flow
         processor = dataflow.processors.select{|p| p.name == link.source.split(':')[0]}[0]
         if "#{processor.type}" == "workflow"
           df = @t2flow_model.dataflow(processor.dataflow_id)
-          stream.write " \"#{prefix}#{df.annotations.name}WORKFLOWINTERNALSINK_#{link.source.split(':')[1]}\""
+          stream.write " \"#{prefix}#{processor.name}WORKFLOWINTERNALSINK_#{link.source.split(':')[1]}\""
         else
           stream.write " \"#{prefix}#{processor.name}\""
         end
@@ -216,7 +216,7 @@ module T2Flow
         processor = dataflow.processors.select{|p| p.name == link.sink.split(':')[0]}[0]
         if "#{processor.type}" == "workflow"
           df = @t2flow_model.dataflow(processor.dataflow_id)
-          stream.write "\"#{prefix}#{df.annotations.name}WORKFLOWINTERNALSOURCE_#{link.sink.split(':')[1]}\""
+          stream.write "\"#{prefix}#{processor.name}WORKFLOWINTERNALSOURCE_#{link.sink.split(':')[1]}\""
         else
           stream.write "\"#{prefix}#{processor.name}\""
         end

data/taverna-t2flow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "taverna-t2flow"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   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-28"
+  s.date = "2013-01-29"
   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,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: taverna-t2flow
-version: !ruby/object:Gem::Version
-  version: 0.4.2
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
-authors:
+authors: 
 - Finn Bacall
 - Robert Haines
 - David Withers
@@ -12,85 +17,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2013-01-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
+  name: rake
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 3
+        - 9
+        - 4
         version: 3.9.4
   type: :development
+  name: rdoc
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.9.4
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
   type: :development
+  name: jeweler
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: libxml-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
         version: 1.1.4
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-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.
-email:
+  name: libxml-ruby
+  version_requirements: *id004
+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.
+email: 
 - finn.bacall@cs.man.ac.uk
 - rhaines@manchester.ac.uk
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGES.rdoc
 - LICENCE
 - README.rdoc
-files:
+files: 
 - .rvmrc
 - CHANGES.rdoc
 - LICENCE
@@ -122,30 +128,38 @@ files:
 - test/test_starter_pack_workflows.rb
 homepage: http://www.taverna.org.uk/
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - -N
 - --tab-width=2
 - --main=README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Support for interacting with Taverna 2 workflows.
-test_files:
+test_files: 
 - test/run_tests.rb