ipxact-ruby 0.12.1 → 0.13.0

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.13.0

data/lib/ipxact.rb

@@ -77,7 +77,8 @@ module IPXACT
     design_schema.validate(design_doc).size == 0
   end
 
-  # Returns the component's identifier (i.e., name, library, vendor, version).
+  # Returns the component's identifier (i.e., name, library, vendor,
+  # version) from a design or component file.
   #
   # @param [String] path The path to the component's XML file
   #
@@ -89,12 +90,7 @@ module IPXACT
       ipxact_doc = Nokogiri::XML(ipxact_file)
       ipxact_file.close
 
-      {
-        :name     => ipxact_doc.xpath("./*/spirit:name").first.text,
-        :vendor   => ipxact_doc.xpath("./*/spirit:vendor").first.text,
-        :library  => ipxact_doc.xpath("./*/spirit:library").first.text,
-        :version  => ipxact_doc.xpath("./*/spirit:version").first.text
-      }
+      IPXACT::Parser::IdentifierData.parse_identifier(ipxact_doc.xpath('./*'))
     else
       nil
     end
@@ -189,76 +185,11 @@ module IPXACT
     design_docs
 
   end
-
-  # Decides whether version_a is strictly more recent than version_b. Accepts
-  # any relaxed version of semantic versioning markup (i.e., +X(\.Y(\.Z)?)?+).
-  #
-  # @param [String] version_a a version number
-  # @param [String] version_b a version number
-  #
-  # @return [Boolean] a Boolean that states if +version_a > version_b+
-  #
-  def self.is_most_recent_version?(version_a, version_b)
-    split_a = version_a.split('.')
-    split_b = version_b.split('.')
-
-    split_a.each_with_index do |el,i|
-      return true if split_b.size <= i && el.to_i != 0
-      return true if el.to_i > split_b[i].to_i
-    end
-
-    false
-  end
-
-  # Decides whether version_a and version_b are the same version. Accepts any
-  # relaxed version of the semantic versioning markup (i.e., +X(\.Y(\.Z)?)?+).
-  # When comparing versions with different lengths, the method will 'pad' the
-  # shortest version string with 0s.
-  #
-  # @example
-  #   IPXACT::is_same_version('1.0', '1.1')
-  #   # => false
-  #
-  #   IPXACT::is_same_version('1.0', '1.0')
-  #   # => true
-  #
-  #   IPXACT::is_same_version('1.0.0', '1.0')
-  #   # => true
-  #
-  #   IPXACT::is_same_version('1.0.1', '1.0')
-  #   # => false
-  #
-  # @return [Boolean] a Boolean that states if +version_a == version_b+
-  #   (relaxed equivalence)
-  #
-  def self.is_same_version?(version_a, version_b)
-    return !(self.is_most_recent_version?(version_a, version_b) || self.is_most_recent_version?(version_b, version_a))
-  end
-
-  # Parses an IPXACT reference element (i.e., any +spirit:hierarchyRef+ or
-  # +spirit:componentRef+).
-  #
-  # @param [Nokogiri::Node] reference The IPXACT reference, as an XML
-  #                                   (Nokogiri) fragment
-  #
-  # @return [Hash] a Hash with the following keys:
-  #   +:library+ the referenced element's library;
-  #   +:name+ the referenced element's name;
-  #   +:vendor+ the referenced element's vendor;
-  #   +:version+ the referenced element's version.
-  #
-  def self.parse_reference(reference)
-    {
-      :library => reference['library'],
-      :name => reference['name'],
-      :vendor => reference['vendor'],
-      :version => reference['version']
-    }
-  end
 end
 
 require File.join File.dirname(__FILE__), 'ipxact/parser'
 require File.join File.dirname(__FILE__), 'ipxact/platform'
 require File.join File.dirname(__FILE__), 'ipxact/register'
+require File.join File.dirname(__FILE__), 'ipxact/identifier'
 require File.join File.dirname(__FILE__), 'ipxact/pathfinder/graph_pathfinder'
 

data/lib/ipxact/component.rb

@@ -14,18 +14,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# {IPXACT::Component} is what an {IPXACT::Platform} is essentially made of.
-# This class behaves like a Hash for general attributes (such as
-# +:instance_name+, +:vendor+, +:name+ and +:version+). This class also defines
-# 4 fixed attributes, that is: {#subcomponents}, {#interconnections},
-# {#hierconnections} and {#ports}. While interconnections, hierconnections and
-# ports are mostly used by the {IPXACT::GraphPathFinder} class, the
-# subcomponents are what most users will be querying. Subcomponents may be
-# terminal or non-terminal, i.e. composed of other subcomponents.
+# {IPXACT::Component} is what an {IPXACT::Platform} is essentially made
+# of.  This class defines 6 attributes: (#instance_name}, {#cpus},
+# {#subcomponents}, {#interconnections}, {#hierconnections} and
+# {#ports}. While interconnections, hierconnections and ports are mostly
+# used by the {IPXACT::GraphPathFinder} class, the subcomponents are
+# what most users will be querying. Subcomponents may be terminal or
+# non-terminal, i.e. composed of other subcomponents.  Finally, {#cpus}
+# simply corresponds to the list of cpus the component is doted with.
 #
 # @author Guillaume Godet-Bar
 #
-class IPXACT::Component < Hash
+class IPXACT::Component
   
   # @return [Array<Component>] the list of subcomponents
   attr_accessor :subcomponents 
@@ -41,25 +41,27 @@ class IPXACT::Component < Hash
 
   # @return [Array<Hash>] the list of cpus
   attr_accessor :cpus
+
+  # @return [IPXACT::Identifier] the component's IPXACT identifier
+  attr_reader :ipxact_id
+
+  # @return [String] The component's instance name
+  attr_reader :instance_name
   
   # Creates a new {IPXACT::Component} instance
   #
   # @param [String] instance_name The name that will be used for identifying
   #                 this specific component instance component.
-  # @param [String] name The name of the component type.
-  # @param [String] vendor The name of the component's vendor.
-  # @param [String] version The version of the component, following the typical
-  #                 relaxed semantic versioning convention +X(.Y(.Z)?)?+
+  # @param          id_args The component's identifier. Can be either a
+  #                 {Hash} or an {IPXACT::Identifier}
   #
-  def initialize(instance_name, name, vendor, version)
+  def initialize(instance_name, id_args)
     @subcomponents = {}
     @interconnections = {}
     @hierconnections = {}
     @ports = []
-    self.merge!({:instance_name => instance_name,
-                 :version => version,
-                 :vendor => vendor,
-                 :name => name})
+    @ipxact_id = id_args.is_a?(Hash) ? IPXACT::Identifier.new(id_args) : id_args
+    @instance_name = instance_name
   end
 
   # Returns true if the component has one or more cpus
@@ -227,7 +229,7 @@ class IPXACT::Component < Hash
   #
   def rec_prepare_pathfinder_connections(current_nodes, current_interconnections)
     if subcomponents.empty?
-      [current_nodes << self[:instance_name], current_interconnections]
+      [current_nodes << self.instance_name, current_interconnections]
     else
       subcomponents.each do |sub_name, subcomponent|
         formatted_interconnections = interconnections.values.collect do |interconnect|

data/lib/ipxact/identifier.rb

@@ -0,0 +1,92 @@
+# Copyright (C) 2010 TIMA Laboratory
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+class IPXACT::Identifier
+  ATTRIBUTES = [
+    :name, :library, :vendor, :version
+  ].freeze
+
+  ATTRIBUTES.each do |attr|
+    attr_accessor attr
+  end
+
+  def initialize(args)
+    ATTRIBUTES.each do |attr|
+      instance_variable_set("@#{attr}", args[attr] || "")
+    end
+  end
+
+  # Decides whether version_a is strictly more recent than version_b. Accepts
+  # any relaxed version of semantic versioning markup (i.e., +X(\.Y(\.Z)?)?+).
+  #
+  # @param [String] version_a a version number
+  # @param [String] version_b a version number
+  #
+  # @return [Boolean] a Boolean that states if +version_a > version_b+
+  #
+  def self.is_most_recent_version?(version_a, version_b)
+    split_a = version_a.split('.')
+    split_b = version_b.split('.')
+
+    split_a.each_with_index do |el,i|
+      return true if split_b.size <= i && el.to_i != 0
+      return true if el.to_i > split_b[i].to_i
+    end
+
+    false
+  end
+
+  # Decides whether version_a and version_b are the same version. Accepts any
+  # relaxed version of the semantic versioning markup (i.e., +X(\.Y(\.Z)?)?+).
+  # When comparing versions with different lengths, the method will 'pad' the
+  # shortest version string with 0s.
+  #
+  # @example
+  #   IPXACT::is_same_version('1.0', '1.1')
+  #   # => false
+  #
+  #   IPXACT::is_same_version('1.0', '1.0')
+  #   # => true
+  #
+  #   IPXACT::is_same_version('1.0.0', '1.0')
+  #   # => true
+  #
+  #   IPXACT::is_same_version('1.0.1', '1.0')
+  #   # => false
+  #
+  # @return [Boolean] a Boolean that states if +version_a == version_b+
+  #   (relaxed equivalence)
+  #
+  def self.is_same_version?(version_a, version_b)
+    return !(self.is_most_recent_version?(version_a, version_b) || self.is_most_recent_version?(version_b, version_a))
+  end
+
+  # Overrides the default equality. Two {Identifier} are defined as
+  # equal when they share the same 1) name; 2) library; 3) vendor and 4)
+  # version (based on the result of the +is_same_version?+ method).
+  #
+  # @param [Identifier] other The other {Identifier} on which to test
+  #                           the equality.
+  #
+  # @return [Boolean]
+  #
+  def ==(other)
+    name == other.name &&
+    library == other.library &&
+    vendor == other.vendor &&
+    IPXACT::Identifier.is_same_version?(version, other.version)
+  end
+end

data/lib/ipxact/parser.rb

@@ -24,4 +24,5 @@ end
 require File.join File.dirname(__FILE__), 'parser/bus_data_parser'
 require File.join File.dirname(__FILE__), 'parser/component_data_parser'
 require File.join File.dirname(__FILE__), 'parser/platform_data_parser'
+require File.join File.dirname(__FILE__), 'parser/identifier_parser'
 

data/lib/ipxact/parser/bus_data_parser.rb

@@ -33,7 +33,7 @@ module IPXACT::Parser::BusData
   #     :name       - The name of the port.
   #     :type       - The port type (i.e., :master, :mirrored_master, :slave or
   #                   :mirrored_slave)
-  #     :bus_type   - The bus interface type (i.e., its generic name).
+  #     :bus_id     - The bus ipxact identifier
   #     :library    - The library in which the bus interface is defined.
   #     :port_data  - Specific port data, depending on the port type.
   #
@@ -43,8 +43,7 @@ module IPXACT::Parser::BusData
       {
         :name => bus_doc.xpath("./spirit:name").first.text,
         :type => port_type,
-        :bus_type => bus_doc.xpath("./spirit:busType").first['name'],
-        :library => bus_doc.xpath("./spirit:busType").first['library'],
+        :bus_id => IPXACT::Parser::IdentifierData.parse_reference(bus_doc.xpath("./spirit:busType").first),
         :port_data => port_data
       }
   end

data/lib/ipxact/parser/component_data_parser.rb

@@ -73,7 +73,7 @@ module IPXACT::Parser::ComponentData
     component_name, component_version = select_component(component_id, component_docs)
 
     root_component = component_docs[[component_name, component_version]]
-    component_vendor = root_component.xpath("./spirit:component/spirit:vendor").text
+    component_id = IPXACT::Parser::IdentifierData.parse_identifier(root_component.xpath("./spirit:component"))
     views = root_component.xpath("//spirit:model/spirit:views/spirit:view")
 
     instances, interconnections, hierconnections = parse_design_views(views, component_docs, design_docs, constraints)
@@ -86,7 +86,7 @@ module IPXACT::Parser::ComponentData
       { :name => a_cpu.xpath("./spirit:name").first.text }
     end
 
-    component = IPXACT::Component.new(instance_name, component_name, component_vendor, component_version)
+    component = IPXACT::Component.new(instance_name, component_id)
     component.interconnections = interconnections
     component.hierconnections = hierconnections
     component.subcomponents = instances
@@ -121,8 +121,8 @@ module IPXACT::Parser::ComponentData
       component_version = component_docs.keys.select{|name, version| name == component_name} \
                                              .collect{|name, version| version} \
                                              .sort{|a, b| 
-                                                1 if IPXACT::is_most_recent_version?(a,b)
-                                                0 if IPXACT::is_same_version?(a,b)
+                                                1 if IPXACT::Identifier::is_most_recent_version?(a,b)
+                                                0 if IPXACT::Identifier::is_same_version?(a,b)
                                                 -1
                                              }.last
     end
@@ -157,9 +157,9 @@ module IPXACT::Parser::ComponentData
   def self.parse_design_views(views, component_docs, design_docs, constraints)
     design_view = views.select{|view| view.xpath("./spirit:name").text == 'spirit-design' && view.xpath("./spirit:envIdentifier").text == '::Hierarchy'}
     if design_view.size == 1
-      design_ref = IPXACT::parse_reference(design_view.first.xpath("./spirit:hierarchyRef").first)
+      design_ref = IPXACT::Parser::IdentifierData.parse_reference(design_view.first.xpath("./spirit:hierarchyRef").first)
 
-      design_doc = design_docs[[design_ref[:name], design_ref[:version]]]
+      design_doc = design_docs[[design_ref.name, design_ref.version]]
 
       instances_map = parse_component_instances(design_doc)
       instances = instances_map.inject({}) do |acc, entry|
@@ -167,9 +167,9 @@ module IPXACT::Parser::ComponentData
         component_reference = entry[1][:reference]
         local_variables =  entry[1][:variables]
         
-        constraint = constraints.select{|constraint| constraint[0] == component_reference[:name]}.first
+        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)
+          acc[local_instance_name] = parse_component([component_reference.name, component_reference.version], 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)
         end
@@ -200,7 +200,7 @@ module IPXACT::Parser::ComponentData
   #                       instances (i.e. parsed components) that correspond to
   #                       the +design_doc+'s root component's subcomponents.
   # @return [Hash] a Hash that associates the interconnection's name with an
-  #   ordered Array (see {ComponentData#reorder_connection}) of
+  #   ordered Array (see {ComponentData.reorder_connection}) of
   #   Hashes, composed as follows:
   #     :port_name          - The subcomponent's port name.
   #     :port_type          - The subcomponent's port type.
@@ -277,7 +277,7 @@ module IPXACT::Parser::ComponentData
       end
       acc[instance.xpath("./spirit:instanceName").text] = 
         {
-          :reference => IPXACT::parse_reference(instance.xpath("./spirit:componentRef").first),
+          :reference => IPXACT::Parser::IdentifierData::parse_reference(instance.xpath("./spirit:componentRef").first),
           :variables => variables
         }
       acc

data/lib/ipxact/parser/identifier_parser.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2010 TIMA Laboratory
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Module for parsing IPXACT identifiers into a ruby {IPXACT::Identifier}
+#
+# @author Guillaume Godet-Bar
+#
+module IPXACT::Parser::IdentifierData
+
+  # Parses the XML node (assuming it has the required children) into an
+  # {IPXACT::Identifier}
+  #
+  # @param [Nokogiri::Node] ipxact_root The XML node that should be
+  #                         parsed.
+  #
+  # @return [IPXACT::Identifier] the parsed data
+  #
+  def self.parse_identifier(ipxact_root)
+    args = {
+      :name => ipxact_root.xpath('./spirit:name').first.text,
+      :vendor => ipxact_root.xpath('./spirit:vendor').first.text,
+      :library => ipxact_root.xpath('./spirit:library').first.text,
+      :version => ipxact_root.xpath('./spirit:version').first.text
+    }
+    IPXACT::Identifier.new(args)
+  end
+
+  # Parses the XML node (assuming it has the required attributes) into an
+  # {IPXACT::Identifier}
+  #
+  # @param [Nokogiri::Node] ipxact_root The XML node that should be
+  #                         parsed.
+  #
+  # @return [IPXACT::Identifier] the parsed data
+  #
+  def self.parse_reference(ipxact_root)
+    args = {
+      :name => ipxact_root['name'],
+      :vendor => ipxact_root['vendor'],
+      :library => ipxact_root['library'],
+      :version => ipxact_root['version']
+    }
+    IPXACT::Identifier.new(args)
+  end
+end

data/lib/ipxact/platform.rb

@@ -35,9 +35,10 @@ class IPXACT::Platform < IPXACT::Component
   #                    into a Platform.
   #
   def initialize(root_component)
-    self.merge!(root_component)
-    self.components = root_component.subcomponents
-    self.ports = root_component.ports
-    self.interconnections = root_component.interconnections
+    @ipxact_id = root_component.ipxact_id
+    @subcomponents = root_component.subcomponents
+    @ports = root_component.ports
+    @interconnections = root_component.interconnections
+    @cpus = root_component.cpus
   end
 end

data/spec/integration/general_spec.rb

@@ -52,21 +52,21 @@ describe "IPXACT: the tools for building transformation data" do
 
   context "extracting a component's identifier" do
     it "should be able to extract a design's identifier" do
-      IPXACT::identifier(File.join(PLATFORM_PATH,DESIGN_PATH)).should == {
+      IPXACT::identifier(File.join(PLATFORM_PATH,DESIGN_PATH)).should == IPXACT::Identifier.new({
         :name     => 'design_Leon2Platform',
         :vendor   => 'spiritconsortium.org',
         :library  => 'Leon2TLM',
         :version  => '1.1'
-      }
+      })
     end
 
     it "should be able to extract a component's identifier" do
-      IPXACT::identifier(File.join(PLATFORM_PATH,'SystemTLM1/Leon2Platform/Leon2Platform.xml')).should == {
+      IPXACT::identifier(File.join(PLATFORM_PATH,'SystemTLM1/Leon2Platform/Leon2Platform.xml')).should == IPXACT::Identifier.new({
         :name     => 'Leon2Platform',
         :vendor   => 'spiritconsortium.org',
         :library  => 'Leon2TLM',
         :version  => '1.1'
-      }
+      })
     end
   end
 
@@ -106,7 +106,7 @@ describe "IPXACT: the tools for building transformation data" do
       platform.components['i_ahb'].should have(0).interconnections
       platform.components['i_sub'].should have(4).subcomponents
       platform.components['i_sub'].should have(5).interconnections
-      platform.components['i_sub'][:version].should == "1.1"
+      platform.components['i_sub'].ipxact_id.version.should == "1.1"
       platform.should have(0).ports
     end
 

data/spec/unit/component_spec.rb

@@ -19,14 +19,17 @@ require File.join File.dirname(__FILE__), '../../lib/ipxact'
 describe IPXACT::Component do
  
   it "should create new components without subcomponents, interconnections or ports" do
-    component = IPXACT::Component.new("instance_name",  "component_name", "component_vendor", "0.0")
+    component = IPXACT::Component.new("instance_name",  {:name => "component_name", :vendor => "component_vendor", :version => "0.0", :library => "component_library"})
     component.should have(0).subcomponents
     component.should have(0).interconnections
     component.should have(0).ports
-    component[:name].should == "component_name"
-    component[:vendor].should == "component_vendor"
-    component[:version].should == "0.0"
-    component[:instance_name].should == "instance_name"
+
+    ipxact_id = component.ipxact_id
+    ipxact_id.name.should == "component_name"
+    ipxact_id.vendor.should == "component_vendor"
+    ipxact_id.library.should == "component_library"
+    ipxact_id.version.should == "0.0"
+    component.instance_name.should == "instance_name"
   end
 
   it "should be able to get the register map of a given dma device" do
@@ -146,7 +149,7 @@ describe IPXACT::Component do
     platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
 
     dma = platform.components['i_dma']
-    (dma[:name] + '/' + dma[:vendor] + '/x/y').should == 'dma/spiritconsortium.org/x/y'
+    (dma.ipxact_id.name + '/' + dma.ipxact_id.vendor + '/x/y').should == 'dma/spiritconsortium.org/x/y'
     
   end
 

data/spec/unit/identifier_spec.rb

@@ -0,0 +1,66 @@
+# Copyright (C) 2010 TIMA Laboratory
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require File.join File.dirname(__FILE__), '../../lib/ipxact'
+
+describe IPXACT::Identifier do
+  context "version comparator" do
+ 
+    it "should return true when comparing '1' and '0'" do
+      IPXACT::Identifier::is_most_recent_version?('1', '0').should be_true
+    end
+
+    it "should return false when comparing '0' and '1'" do
+      IPXACT::Identifier::is_most_recent_version?('0', '1').should be_false
+    end
+
+    it "should return false when comparing '1' and '1'" do
+      IPXACT::Identifier::is_most_recent_version?('1', '1').should be_false
+    end
+    
+    it "should return false when comparing '1.0' and '1.0'" do
+      IPXACT::Identifier::is_most_recent_version?('1.0', '1.0').should be_false
+    end
+
+    it "should return true when comparing '1.1' and '1.0'" do
+      IPXACT::Identifier::is_most_recent_version?('1.1', '1.0').should be_true
+    end
+
+    it "should return false when comparing '1.0' and '1.1'" do
+      IPXACT::Identifier::is_most_recent_version?('1.0', '1.1').should be_false
+    end
+
+    it "should return false when comparing '1.0.0' and '1.0'" do
+      IPXACT::Identifier::is_most_recent_version?('1.0.0', '1.0').should be_false
+    end
+
+    it "should return false when comparing '1.0' and '1.0.0'" do
+      IPXACT::Identifier::is_most_recent_version?('1.0', '1.0.0').should be_false
+    end
+
+    it "should return false when comparing '1.0' and '1.0.1'" do
+      IPXACT::Identifier::is_most_recent_version?('1.0', '1.0.1').should be_false
+    end
+
+    it "should return true when comparing '1.0.1' and '1.0'" do
+      IPXACT::Identifier::is_most_recent_version?('1.0.1', '1.0').should be_true
+    end
+
+    it "should return true when comparing '1.4.1' and '1.0'" do
+      IPXACT::Identifier::is_most_recent_version?('1.4.1', '1.0').should be_true
+    end
+  end
+end

data/spec/unit/ipxact_spec.rb

@@ -18,52 +18,4 @@ require File.join File.dirname(__FILE__), '../../lib/ipxact'
 
 describe IPXACT do
 
-  context "version comparator" do
- 
-    it "should return true when comparing '1' and '0'" do
-      IPXACT::is_most_recent_version?('1', '0').should be_true
-    end
-
-    it "should return false when comparing '0' and '1'" do
-      IPXACT::is_most_recent_version?('0', '1').should be_false
-    end
-
-    it "should return false when comparing '1' and '1'" do
-      IPXACT::is_most_recent_version?('1', '1').should be_false
-    end
-    
-    it "should return false when comparing '1.0' and '1.0'" do
-      IPXACT::is_most_recent_version?('1.0', '1.0').should be_false
-    end
-
-    it "should return true when comparing '1.1' and '1.0'" do
-      IPXACT::is_most_recent_version?('1.1', '1.0').should be_true
-    end
-
-    it "should return false when comparing '1.0' and '1.1'" do
-      IPXACT::is_most_recent_version?('1.0', '1.1').should be_false
-    end
-
-    it "should return false when comparing '1.0.0' and '1.0'" do
-      IPXACT::is_most_recent_version?('1.0.0', '1.0').should be_false
-    end
-
-    it "should return false when comparing '1.0' and '1.0.0'" do
-      IPXACT::is_most_recent_version?('1.0', '1.0.0').should be_false
-    end
-
-    it "should return false when comparing '1.0' and '1.0.1'" do
-      IPXACT::is_most_recent_version?('1.0', '1.0.1').should be_false
-    end
-
-    it "should return true when comparing '1.0.1' and '1.0'" do
-      IPXACT::is_most_recent_version?('1.0.1', '1.0').should be_true
-    end
-
-    it "should return true when comparing '1.4.1' and '1.0'" do
-      IPXACT::is_most_recent_version?('1.4.1', '1.0').should be_true
-    end
-  end
-
-
 end

data/spec/unit/platform_spec.rb

@@ -22,13 +22,13 @@ describe IPXACT::Platform do
     design_docs = IPXACT::load_designs(PLATFORM_PATH)
     component_docs = IPXACT::load_components(PLATFORM_PATH)
     platform = IPXACT::Parser::PlatformData.parse_platform("Leon2Platform", component_docs, design_docs)
-    platform[:version].should == "1.3"
+    platform.ipxact_id.version.should == "1.3"
   end
 
   it "should get the version of the platform that is specified in the arguments" do
     design_docs = IPXACT::load_designs(PLATFORM_PATH)
     component_docs = IPXACT::load_components(PLATFORM_PATH)
     platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], component_docs, design_docs)
-    platform[:version].should == "1.1"
+    platform.ipxact_id.version.should == "1.1"
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 12
-  - 1
-  version: 0.12.1
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Guillaume Godet-Bar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,11 @@ files:
 - autotest/discover.rb
 - lib/ipxact.rb
 - lib/ipxact/component.rb
+- lib/ipxact/identifier.rb
 - lib/ipxact/parser.rb
 - lib/ipxact/parser/bus_data_parser.rb
 - lib/ipxact/parser/component_data_parser.rb
+- lib/ipxact/parser/identifier_parser.rb
 - lib/ipxact/parser/platform_data_parser.rb
 - lib/ipxact/pathfinder/graph_pathfinder.rb
 - lib/ipxact/platform.rb
@@ -177,6 +179,7 @@ files:
 - spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/uart_tac.xml
 - spec/unit/component_spec.rb
 - spec/unit/graph_pathfinder_spec.rb
+- spec/unit/identifier_spec.rb
 - spec/unit/interconnect_spec.rb
 - spec/unit/ipxact_spec.rb
 - spec/unit/platform_spec.rb
@@ -221,6 +224,7 @@ test_files:
 - spec/integration/general_spec.rb
 - spec/unit/component_spec.rb
 - spec/unit/graph_pathfinder_spec.rb
+- spec/unit/identifier_spec.rb
 - spec/unit/interconnect_spec.rb
 - spec/unit/ipxact_spec.rb
 - spec/unit/platform_spec.rb