taverna-t2flow 0.1.6 → 0.2.0

data/ChangeLog.rdoc

@@ -1,5 +1,7 @@
-= Version 0.1.6
+= Version 0.2.0
 Released:: Tuesday, July 27, 2010
 
-== Added Functionality
-- Bug fixes in the parser.
+== Changes
+- Updated the unit tests which can now be run by entering "ruby tests/run_tests.rb"
+- Misc. bug fixes.
+- Added the following methods to the T2Flow::Model class: coordinates, all_coordinates, name

data/README.rdoc

@@ -1,7 +1,7 @@
 = Taverna[http://taverna.sourceforge.net] 2 Interaction Gem
 
 Authors::       Mannie Tagarira, David Withers
-Version::       0.1.6
+Version::       0.2.0
 Contact::       mailto:mannie@mygrid.org.uk
 URL::           http://taverna.sourceforge.net/
 Licence::       LGPL 3 (See LICENCE or http://www.gnu.org/licenses/lgpl.html)

data/lib/t2flow/model.rb

@@ -13,6 +13,12 @@ module T2Flow # :nodoc:
     # Creates an empty model for a Taverna 2 workflow.
     def initialize
       @dataflows = []
+      @dependencies = []
+    end
+    
+    # Retrieve the top level dataflow's name
+    def name
+      main.name
     end
     
     # Retrieve the top level dataflow ie the MAIN (containing) dataflow
@@ -72,6 +78,19 @@ module T2Flow # :nodoc:
       @dataflows.each { |dataflow| procs << dataflow.processors }
       return procs.flatten
     end
+
+    # Retrieve coordinations from the top level of a nested workflow.
+    # If the workflow is not nested, retrieve all coordinations.
+    def coordinations
+      self.main.coordinations
+    end
+    
+    # Retrieve ALL the coordinations found in a nested workflow
+    def all_coordinations
+      coordinations =[]
+      @dataflows.each { |dataflow| coordinations << dataflow.coordinations }
+      return coordinations.flatten
+    end
     
     # Retrieve the sources(inputs) to the workflow
     def sources
@@ -282,6 +301,10 @@ module T2Flow # :nodoc:
     
     # A list of authors of the dataflow
     attr_accessor :authors
+    
+    def initialize
+      @authors, @descriptions, @titles = [], [], []
+    end
   end
   
   

data/lib/t2flow/parser.rb

@@ -235,7 +235,7 @@ module T2Flow
     end
     
     def add_coordination(dataflow, condition) # :nodoc:
-      return if condition.nil? || condition.content.chomp.strip.empty?
+      return if condition.nil?
 
       coordination = Coordination.new
       
@@ -254,13 +254,10 @@ module T2Flow
 
       case content_node["class"]
         when /freetextdescription/i
-          dataflow.annotations.descriptions ||= []
           dataflow.annotations.descriptions << content
         when /descriptivetitle/i
-          dataflow.annotations.titles ||= []
           dataflow.annotations.titles << content
         when /author/i
-          dataflow.annotations.authors ||= []
           dataflow.annotations.authors << content
         end # case
     end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mannie Tagarira