taverna-t2flow 0.1.3 → 0.1.4

data/ChangeLog.rdoc

@@ -1,8 +1,6 @@
-= Version 0.1.1
-Released:: Wednesday, September 16, 2009
+= Version 0.1.4
+Released:: Monday, July 26, 2010
 
 == Added Functionality
-- Retrieval of Taverna local workers.
-
-=== New instance method in T2Flow::Model
-      local_workers
+- Bug fixes in the parser.
+- Added Dataflow#name

data/README.rdoc

@@ -1,7 +1,7 @@
 = Taverna[http://taverna.sourceforge.net] 2 Interaction Gem
 
 Authors::       Mannie Tagarira, David Withers
-Version::       0.1.2
+Version::       0.1.4
 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

@@ -189,6 +189,10 @@ module T2Flow # :nodoc:
       @coordinations = []
     end
     
+    def name
+      @annotations.name
+    end
+    
     # Retrieve beanshell processors specific to this dataflow.
     def beanshells
       @processors.select { |x| x.type == "beanshell" }

data/lib/t2flow/parser.rb

@@ -41,6 +41,8 @@ module T2Flow
       end
     
       element.each do |dataflow|
+        next if dataflow["id"].nil? || dataflow["id"].chomp.strip.empty?
+
         dataflow_obj = Dataflow.new
         dataflow_obj.dataflow_id = dataflow["id"]
         
@@ -76,14 +78,16 @@ module T2Flow
     end
     
     def add_source(dataflow, port) # :nodoc:
+      return if port.nil? || port.content.chomp.strip.empty?
+
       source = Source.new
-      
+
       port.each do |elt|
         case elt.name
           when "name": source.name = elt.content
           when "annotations"
             elt.each do |ann|
-              next if ann.nil? || ann.empty?
+              next if ann.nil? || ann.content.chomp.strip.empty?
               
               node = LibXML::XML::Parser.string("#{ann}").parse
               content_node = node.find_first("//annotationBean")
@@ -105,6 +109,8 @@ module T2Flow
     end
     
     def add_sink(dataflow, port) # :nodoc:
+      return if port.nil? || port.content.chomp.strip.empty?
+      
       sink = Sink.new
       
       port.each do |elt|
@@ -112,7 +118,7 @@ module T2Flow
           when "name": sink.name = elt.content
           when "annotations"
             elt.each do |ann|
-              next if ann.nil? || ann.empty?
+              next if ann.nil? || ann.content.chomp.strip.empty?
               
               node = LibXML::XML::Parser.string("#{ann}").parse
               content_node = node.find_first("//annotationBean")
@@ -134,6 +140,8 @@ module T2Flow
     end
     
     def add_processor(dataflow, element) # :nodoc:
+      return if element.nil? || element.content.chomp.strip.empty?
+
       processor = Processor.new
       
       temp_inputs = []
@@ -208,6 +216,8 @@ module T2Flow
     end
     
     def add_link(dataflow, link) # :nodoc:
+      return if link.nil? || link.content.chomp.strip.empty?
+
       datalink = Datalink.new
       
       link.each do |sink_source|
@@ -225,6 +235,8 @@ module T2Flow
     end
     
     def add_coordination(dataflow, condition) # :nodoc:
+      return if coordination.nil? || coordination.content.chomp.strip.empty?
+
       coordination = Coordination.new
       
       coordination.control = condition["control"]

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: taverna-t2flow
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Mannie Tagarira
@@ -14,14 +20,20 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 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: mannie@mygrid.org.uk
 executables: []
@@ -33,7 +45,6 @@ extra_rdoc_files:
 - LICENCE
 - ChangeLog.rdoc
 files: 
-- lib/t2flow
 - lib/t2flow/dot.rb
 - lib/t2flow/model.rb
 - lib/t2flow/parser.rb
@@ -42,6 +53,8 @@ files:
 - ChangeLog.rdoc
 has_rdoc: true
 homepage: http://www.mygrid.org.uk/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - -N
@@ -51,21 +64,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 21
+      segments: 
+      - 1
+      - 0
+      - 1
       version: 1.0.1
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 1
 summary: Support for interacting with the Taverna 2 workflow system (T2Flow).