ipxact-ruby 0.13.1 → 0.13.2

data/VERSION

@@ -1 +1 @@
-0.13.1
+0.13.2

data/lib/ipxact/parser/component_data_parser.rb

@@ -114,7 +114,8 @@ module IPXACT::Parser::ComponentData
   def self.select_component(component_id, component_docs)
     if component_id.kind_of?(Array) && component_id.size == 2
       # A version must have been specified
-      raise ArgumentError, 'Component could not be found!' unless component_docs.has_key? component_id 
+      raise ArgumentError, "Component '#{component_id}' could not be found!" \
+        unless component_docs.has_key? component_id 
       component_name, component_version = component_id
     else
       component_name = component_id
@@ -167,11 +168,21 @@ module IPXACT::Parser::ComponentData
         component_reference = entry[1][:reference]
         local_variables =  entry[1][:variables]
         
-        constraint = constraints.select{|constraint| constraint[0] == component_reference.name}.first
-        if constraint.nil?
-          acc[local_instance_name] = parse_component([component_reference.name, component_reference.version], local_instance_name, local_variables, component_docs, design_docs, constraints)
+        if constraint = constraints.find{|constraint| constraint[0] == component_reference.name}
+          acc[local_instance_name] = parse_component(constraint,
+                                                     local_instance_name,
+                                                     local_variables,
+                                                     component_docs,
+                                                     design_docs, constraints)
         else
-          acc[local_instance_name] = parse_component(constraint, local_instance_name, local_variables, component_docs, design_docs, constraints)
+          acc[local_instance_name] = parse_component([
+                                                      component_reference.name,
+                                                      component_reference.version
+                                                     ],
+                                                     local_instance_name,
+                                                     local_variables,
+                                                     component_docs,
+                                                     design_docs, constraints)
         end
         acc
       end
@@ -205,17 +216,21 @@ module IPXACT::Parser::ComponentData
   #     :port_name          - The subcomponent's port name.
   #     :port_type          - The subcomponent's port type.
   #     :component_instance - The subcomponent instance.
+  # @raise an exception if any port connection cannot be found.
   #
   def self.parse_interconnections(design_doc, component_instances)
     design_doc.xpath("//spirit:interconnection").inject({}) do |acc, inter|
       unordered_connection = inter.xpath("./spirit:activeInterface").collect do |active_interface|
         component_instance = component_instances[active_interface['componentRef']]
-        port = component_instance.ports.select{|port| port[:name] == active_interface['busRef']}.first
-        {
-          :port_name => port[:name],
-          :port_type => port[:type],
-          :component_instance => active_interface['componentRef']
-        }
+        if port = component_instance.ports.find{|port| port[:name] == active_interface['busRef']}
+          {
+            :port_name => port[:name],
+            :port_type => port[:type],
+            :component_instance => active_interface['componentRef']
+          }
+        else
+          raise "Could not find port named \"#{active_interface['busRef']}\" for component \"#{component_instance.instance_name}\""
+        end
       end
 
       ordered_connection = reorder_connection(unordered_connection)
@@ -243,17 +258,21 @@ module IPXACT::Parser::ComponentData
   #     :port_name          - The corresponding subcomponent's port name.
   #     :port_type          - The corresponding subcomponent's port type.
   #     :component_instance - The subcomponent's instance.
+  # @raise an exception if any port connection could not be found.
   #
   def self.parse_hierconnections(design_doc, component_instances)
     design_doc.xpath("//spirit:hierConnection").inject({}) do |acc, hier|
       interface = hier.xpath("./spirit:interface").first
-      port = component_instances[interface['componentRef']].ports.select{|port| port[:name] == interface['busRef']}.first
-      acc[hier['interfaceRef']] = {
-        :port_name => interface['busRef'],
-        :port_type => port[:type],
-        :component_instance => interface['componentRef']
-      }
-      acc
+      if port = component_instances[interface['componentRef']].ports.find{|port| port[:name] == interface['busRef']}
+        acc[hier['interfaceRef']] = {
+          :port_name => interface['busRef'],
+          :port_type => port[:type],
+          :component_instance => interface['componentRef']
+        }
+        acc
+      else
+        raise "Could not find port with name \"#{interface['busRef']}\" in component list."
+      end
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 13
-  - 1
-  version: 0.13.1
+  - 2
+  version: 0.13.2
 platform: ruby
 authors: 
 - Guillaume Godet-Bar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency