xmimodel 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6eedac5a14ed62e48491ffb7ebacffcfd42cdaa4
+  data.tar.gz: 4bc59859d307c43b49fb2a3d6cffd0b4960d9622
+SHA512:
+  metadata.gz: 35fc123beab06f777a05cc4961734588f961e35665243c87bd26e162b719962bd6b94c13ec4ad450e03f89023ea061ffd008460f3593479ed12c16f449ff7a96
+  data.tar.gz: 632da159972894e7d5a66b726752537d33d7d9e3ed6c6d6b909fcad9eeaf5597da925c87d20481fadf803e4de3b76ad8c505bcfdb97a1d755b4e347eb37e3342

data/lib/xmimodel.rb

@@ -26,12 +26,16 @@ class XmiModel
 	# @return [Array<Association>] All model associations.
 	attr_reader :associations
 
+	attr_reader :model_file_name
+
 	##
 	# Constructor. 
 	# 
 	# @param [String, #read] Path of model.
 	def initialize(model_file_name)
 
+		@model_file_name = model_file_name
+
 		# Obtem a tag 'XMI.content' que contém todos os objetos que serão tratados
 		f = File.open(model_file_name)		
 		doc = Nokogiri::XML(f)
@@ -51,7 +55,7 @@ class XmiModel
 				uml_package.attribute('name').to_s.empty? || 
 				uml_package.attribute('name').to_s.strip == "Component View" ||
 				uml_package.attribute('name').to_s.strip == "Data types")
-				p = Package.new(uml_package, nil)
+				p = Package.new(uml_package, self)
 				@packages << p
 			end
 		end
@@ -70,12 +74,29 @@ class XmiModel
 
 		@associations = Array.new
 		XmiHelper.all_associations(xmi_content).each do |xml|
-			@associations << Association.new(xml, self)
+
+			association = Association.new(xml, self)
+			
+			association.end_a.participant.associations << association.end_b	
+			association.end_b.participant.associations << association.end_a
+
+			@associations << association			
 		end
 
 		true
 	end
 
+	##
+	# Get the object of type 'Association' by id.
+	#
+	# @param [String, #read] Id of the state in model file.
+	# @return [Association]
+	def association_by_id(id)
+		raise ArgumentError.new("Parameter 'id' cannot be empty.") if id.nil? or id.empty?
+		objs = @associations.select{|obj| obj.id == id}	
+		(!objs.nil? && objs.size > 0) ? objs[0] : nil
+	end	
+
 	##
 	# Get the object of type 'Clazz' by full name of class.
 	#
@@ -188,10 +209,26 @@ class XmiModel
 		@states		
 	end
 
+
+	def id_exists?(id)
+		tag = XmiHelper.tag_by_id(@document, '*', id)
+		return !tag.nil?
+	end	
+
 	def to_s
 		"'XmiModel #{exporter} #{exporter_version} [Packages: #{packages.size}, Classes: #{classes.size}]'"
 	end
 
+	def to_xml
+		@document.to_xml
+	end
+
+	def save(model_file_name=@model_file_name)
+		f = File.open(model_file_name, 'w')
+		f.write(@document.to_xml)
+		f.close		
+	end
+
 	private
 	
 	def add_package(packages)
@@ -200,6 +237,6 @@ class XmiModel
 			@all_packages << p			
 			add_package(p.packages) unless p.packages.nil?
 		end
-	end		
+	end
 
 end

data/lib/xmimodel/action_state.rb

@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'xmimodel/state'
+require 'xmimodel/tag'
 
 class ActionState < State
 

data/lib/xmimodel/activity_graph.rb

@@ -1,6 +1,9 @@
+# encoding: utf-8
+
 require 'xmimodel/action_state'
 require 'xmimodel/final_state'
 require 'xmimodel/pseudo_state'
+require 'xmimodel/tag'
 require 'xmimodel/transition'
 
 ##
@@ -8,11 +11,8 @@ require 'xmimodel/transition'
 # It's represented by tag diagram inside of XMI.extension.
 #
 #
-class ActivityGraph
+class ActivityGraph < Tag
 
-	attr_reader :xml
-	
-	attr_reader :id
 	attr_reader :name
 
 	attr_reader :pseudo_states
@@ -20,9 +20,10 @@ class ActivityGraph
 	attr_reader :final_states
 	attr_reader :transitions
 
-	def initialize(xml, parent)
-		@xml = xml
-		@use_case = parent.parent
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
+
+		@use_case = parent_tag.parent_tag
 		
 		@id = xml.attribute("xmi.id").to_s
 		@name = xml.attribute("name").to_s

data/lib/xmimodel/association.rb

@@ -1,24 +1,35 @@
+# encoding: utf-8
 
-class Association
+require 'xmimodel/association_end'
+require 'xmimodel/tag'
 
-	attr_reader :xml
-	attr_reader :parent
+class Association < Tag
 
-	attr_reader :id
 	attr_reader :name
+
+	attr_reader :end_a
+	attr_reader :end_b	
 	
-	# TODO Build AssociationEnd class
 	def initialize(xml, parent)
-		@xml = xml
-		@parent = parent
+		super(xml, parent)
 
-		@id = xml.attribute("xmi.id").to_s
 		@name = xml.attribute("name").to_s.strip
 
-		#association_end_a
-		#association_end_b
+		association_end = xml.xpath('./UML:Association.connection/UML:AssociationEnd')
+
+		@end_a = AssociationEnd.new(association_end, 0, self)
+		@end_b = AssociationEnd.new(association_end, 1, self)
 	end
 
+	# @return [String]
+	def full_name
+		if @name.nil? or @name.empty?
+			"#{@end_a.name}[#{@end_a.participant.full_name}] - #{@end_b.name}[#{@end_b.participant.full_name}]"
+		else
+			"#{@name}(#{@end_a.name}[#{@end_a.participant.full_name}] - #{@end_b.name}[#{@end_b.participant.full_name}])"
+		end
+	end	
+
 	def to_s
 		"Association[#{@name}]"
 	end	

data/lib/xmimodel/association_end.rb

@@ -0,0 +1,131 @@
+# encoding: utf-8
+
+require 'xmimodel/tag'
+
+class AssociationEnd < Tag
+	
+	# @return [String]
+	attr_reader :name
+
+	# @return [String]
+	attr_reader :visibility
+
+	# @return [String]
+	attr_reader :is_navigable
+
+	# @return [String]
+	attr_reader :is_specification
+
+	# @return [String]
+	attr_reader :multiplicity_range
+
+	# @return [String]
+	attr_reader :ordering
+
+	# @return [String]
+	attr_reader :aggregation
+
+	# @return [String]
+	attr_reader :target_scope
+
+	# @return [String]
+	attr_reader :changeability
+
+	# @return [Array<Stereotype>] Association end stereotypes.
+	attr_reader :stereotypes
+
+	# @return [Array<TaggedValue>] Association end tagged values.
+	attr_reader :tagged_values	
+	
+	def initialize(xmls, index, parent_tag)		
+		super(xmls[index], parent_tag)
+
+		@xml_a = xmls[0]
+		@xml_b = xmls[1]
+
+		@xmi_model = parent_tag.parent_tag
+	
+		@participant_id = @xml.attribute("participant").to_s
+
+		# argoUML
+		if @participant_id.nil? or @participant_id.empty?
+			c = @xml.at_xpath("./UML:AssociationEnd.participant/UML:Class")			
+			@participant_id = c.attribute("xmi.idref").to_s unless c.nil?
+		end
+
+		@name = @xml.attribute("name").to_s
+
+		if @name.empty?
+			@name = index == 0 ? "EndA" : "EndB"
+		end
+
+		@visibility = @xml.attribute("visibility").to_s
+		@is_navigable = @xml.attribute("isNavigable").to_s
+		@is_specification = @xml.attribute("isSpecification").to_s
+		@ordering = @xml.attribute("ordering").to_s
+		@aggregation = @xml.attribute("aggregation").to_s
+		@target_scope = @xml.attribute("targetScope").to_s
+		@changeability = @xml.attribute("changeability").to_s
+
+		@multiplicity_range = XmiHelper.multiplicity_range(@xml)
+
+		@stereotypes = Array.new
+		stereotype_id = @xml.attribute("stereotype").to_s
+		if !stereotype_id.empty?
+			stereotype = XmiHelper.stereotype_by_id(@xml, stereotype_id)
+			stereotype = Stereotype.new(stereotype, self)
+			@stereotypes << stereotype			
+		end
+		XmiHelper.stereotypes(@xml).each do |uml_stereotype|
+			stereotype = Stereotype.new(uml_stereotype, self)
+			@stereotypes << stereotype
+		end	
+
+		@tagged_values = Array.new
+		XmiHelper.tagged_values(@xml).each do |uml_tagged_value|
+			tagged_value = TaggedValue.new(uml_tagged_value, self)
+			@tagged_values << tagged_value
+		end		
+	end
+
+	# @return [Clazz]
+	def participant
+		return nil if @participant_id.nil? or @participant_id.empty?
+		participant = @xmi_model.class_by_id(@participant_id)
+	end
+
+	def ==(obj)
+		return false if obj.nil?
+		if String == obj.class
+			@name == obj
+		elsif AssociationEnd == obj.class
+    		@name == obj.name && participant.full_name == obj.participant.full_name
+    	else
+    		return false
+    	end
+	end	
+
+	# @return [Stereotype]
+	def stereotype_by_name(name)
+		stereotype = @stereotypes.select{|obj| obj == name}
+		return stereotype[0] if !stereotype.nil? && stereotype.size > 0
+		nil		
+	end
+
+	# @return [TaggedValue]
+	def tagged_value_by_name(tagged_value_name)
+		tagged_value = @tagged_values.select{|obj| obj.name == tagged_value_name}
+		return tagged_value[0] if !tagged_value.nil? && tagged_value.size > 0
+		nil
+	end
+
+	# @return [String]
+	def full_name
+		"#{@parent_tag.full_name}::#{@name}"
+	end
+
+	# @return [String]
+	def to_s
+		"AssociationEnd[#{name} (#{participant.full_name}])"
+	end		
+end

data/lib/xmimodel/attribute.rb

@@ -1,11 +1,11 @@
+# encoding: utf-8
+
 require 'xmimodel/stereotype'
+require 'xmimodel/tag'
 require 'xmimodel/tagged_value'
 
-class Attribute
-
-	attr_reader :xml
+class Attribute < Tag
 
-	attr_reader :id
 	attr_reader :name
 	attr_reader :type
 	attr_reader :visibility
@@ -17,16 +17,17 @@ class Attribute
 	attr_reader :stereotypes
 	attr_reader :tagged_values
 
-	def initialize(xml, clazz)
-		@xml = xml
-		@clazz = clazz
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
+		
+		@clazz = parent_tag
 
-		@id = xml.attribute("xmi:id").to_s
 		@name = xml.attribute("name").to_s.strip
 		@visibility = xml.attribute("visibility").to_s
 		@visibility = "private" if @visibility == ""
 
-		@type = XmiHelper.attribute_type_name(xml)
+		@obj_type = XmiHelper.attribute_type(xml)
+		@type = XmiHelper.attribute_type_name(xml)		
 
 		@initial_value = XmiHelper.attribute_initial_value(xml)
 		@multiplicity_range = XmiHelper.multiplicity_range(xml)
@@ -44,6 +45,44 @@ class Attribute
 		end		
 	end
 
+	def add_xml_tagged_value(xml)
+		model_element_tagged_value().inner_html = model_element_tagged_value().inner_html + xml
+	end
+
+=begin
+	def add_tagged_value(name, value)		
+		if tagged_values.include? name
+			tag = tagged_value_by_name name
+		else
+			tagged_value = Nokogiri::XML::Node.new('TaggedValue', self.xml.document)
+			tagged_value['xmi.id'] = 
+			tagged_value['name'] = name
+			model_element_tagged_value() << tagged_value			
+		end
+		tag.value = value
+	end
+=end
+
+	def is_enum?
+		return false if @obj_type.nil?
+		if @obj_type.class == Nokogiri::XML::Element
+			return true if @obj_type.name == "Enumeration"
+
+			if @obj_type.name == "Class"
+				id = @obj_type.attribute('xmi.id').to_s
+				@enum_obj = xml_root.class_by_id(id)
+				return @enum_obj.stereotypes.include?("org.andromda.profile::Enumeration")
+			end
+		end		
+		false		
+	end
+
+	def enum_obj
+		return @enum_obj unless @enum_obj.nil?
+		is_enum?
+		@enum_obj
+	end
+
 	def full_name
 		"#{@clazz.full_name}::#{@name}"
 	end
@@ -73,4 +112,16 @@ class Attribute
 		"Attribute[#{full_name}]"
 	end	
 
+	private
+
+	def model_element_tagged_value
+		return @model_element_tagged_value unless @model_element_tagged_value.nil?
+		@model_element_tagged_value = self.xml.at_xpath('./UML:ModelElement.taggedValue')
+		if @model_element_tagged_value.nil?
+			@model_element_tagged_value = Nokogiri::XML::Node.new('ModelElement.taggedValue', self.xml.document)
+			self.xml << model_element_tagged_value
+		end
+		@model_element_tagged_value
+	end
+
 end

data/lib/xmimodel/clazz.rb

@@ -1,15 +1,13 @@
 # encoding: utf-8
 
 require 'xmimodel/attribute'
-require 'xmimodel/stereotype'
-require 'xmimodel/tagged_value'
 require 'xmimodel/operation'
+require 'xmimodel/tag'
+require 'xmimodel/tagged_value'
+require 'xmimodel/stereotype'
 
-class Clazz
-	
-	attr_reader :xml
+class Clazz < Tag
 	
-	attr_reader :id
 	attr_reader :name
 
 	# @return [String] Full Package name of class.
@@ -18,26 +16,31 @@ class Clazz
 	# @return [Array<Attribute>] Class attributes.
 	attr_reader :attributes
 
-	# @return [Array<String>] Class associations.
+	# @return [Array<Stereotype>] Class stereotypes.
 	attr_reader :stereotypes
 
+	# @return [Array<TaggedValue>] Class tagged values.
 	attr_reader :tagged_values
+	
 	attr_reader :operations
 
 	attr_accessor :children
 	attr_accessor :parent
 
-	def initialize(xml, parent)
-		@xml = xml
-		@package = parent.parent
-		
-		@id = xml.attribute("xmi.id").to_s
+	# @return [Array<AssociationEnd>] Class associations end.
+	attr_reader :associations
+
+	def initialize(xml, parent_tag)		
+		super(xml, parent_tag)
+
+		@package = parent_tag.parent_tag
+				
 		@name = xml.attribute("name").to_s.strip
 		
 		@attributes = Array.new
 		XmiHelper.attributes(xml).each do |uml_attribute|
 			attribute = Attribute.new(uml_attribute, self)
-			@attributes << attribute
+			@attributes << attribute			
 		end
 
 		@stereotypes = Array.new
@@ -67,8 +70,53 @@ class Clazz
 		# Será povoado quando tratar dos objetos do tipo Genezalization
 		@children = Array.new
 
+		@associations = Array.new
+
 	end
 
+	def add_xml_attribute(xml_attribute)
+		parent = self.xml.at_xpath('./UML:Classifier.feature')
+		if parent.nil?
+			parent = Nokogiri::XML::Node.new('Classifier.feature', self.xml.document)
+			self.xml << parent
+		end		
+		parent.inner_html = parent.inner_html + xml_attribute
+
+		@attributes << Attribute.new(uml_attribute, self)		
+	end
+
+	##
+	# @param xml [Nokogiri::XML::Element, #read]
+	def add_xml_stereotype(xml)		
+		parent = self.xml.at_xpath('./UML:ModelElement.stereotype')
+		if parent.nil?
+			parent = Nokogiri::XML::Node.new('ModelElement.stereotype', self.xml.document)
+			self.xml << parent
+		end		
+		parent.inner_html = parent.inner_html + xml.to_xml
+
+		stereotype = Stereotype.new(xml, self)
+		@stereotypes << stereotype
+		return stereotype
+	end
+
+	##
+	# @param [String, #read] associations_end_name 
+	# @param [Clazz, #read] participant
+	# @return [AssociationEnd]	
+	def association_end_by_name_and_participant(associations_end_name, participant)
+		obj = @associations.select{|obj| obj.name == associations_end_name && obj.participant == participant}
+		return obj[0] if !obj.nil? && obj.size > 0
+		nil
+	end	
+
+	##
+	# @param [Clazz, #read] participant
+	# @return [Array<AssociationEnd>]
+	def associations_end_by_participant(participant)
+		obj = @associations.select{|obj| obj.participant == participant}
+	end	
+
 	def attribute_by_id(attribute_id)
 		attribute = @attributes.select{|obj| obj.id == attribute_id}
 		return attribute[0] if !attribute.nil? && attribute.size > 0

data/lib/xmimodel/data_type.rb

@@ -1,17 +1,14 @@
+# encoding: utf-8
 
-class DataType
+require 'xmimodel/tag'
 
-	attr_reader :xml
-	attr_reader :parent
+class DataType < Tag
 
-	attr_reader :id
 	attr_reader :name	
 	
-	def initialize(xml, parent)
-		@xml = xml
-		@parent = parent
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
-		@id = xml.attribute("xmi.id").to_s
 		@name = xml.attribute("name").to_s.strip		
 	end
 

data/lib/xmimodel/final_state.rb

@@ -1,9 +1,11 @@
+# encoding: utf-8
+
 require 'xmimodel/state'
 
 class FinalState < State
 
-	def initialize(xml, activity_graph)
-		super(xml, activity_graph)
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 	end
 
 	def to_s

data/lib/xmimodel/generalization.rb

@@ -1,32 +1,29 @@
 # encoding: utf-8
 
+require 'xmimodel/tag'
+
 ##
 # UML:Generalization
-class Generalization
+class Generalization < Tag
 
-	attr_reader :xml
-	
-	attr_reader :id
 	attr_reader :child
 	attr_reader :parent
 
-	def initialize(xml, xmi_model)
-		@xml = xml
-		@xmi_model = xmi_model
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
-		@id = xml.attribute("xmi.id").to_s
 		@child = XmiHelper.generalization_child(xml)
 		@parent = XmiHelper.generalization_parent(xml)
 	end
 
 	def child_obj
 		return nil if @child.nil? or @child.empty?
-		@child_obj = @xmi_model.class_by_id(@child)
+		@child_obj = xml_root.class_by_id(@child)
 	end
 
 	def parent_obj
 		return nil if @parent.nil? or @parent.empty?
-		@parent_obj = @xmi_model.class_by_id(@parent)
+		@parent_obj = xml_root.class_by_id(@parent)
 	end
 
 	def to_s

data/lib/xmimodel/namespace.rb

@@ -1,15 +1,15 @@
+# encoding: utf-8
+
 require 'xmimodel/association'
 require 'xmimodel/attribute'
 require 'xmimodel/clazz'
 require 'xmimodel/data_type'
 require 'xmimodel/use_case'
 require 'xmimodel/package'
+require 'xmimodel/tag'
 
 # UML:Namespace.ownedElement
-class Namespace
-
-	attr_reader :xml
-	attr_reader :parent
+class Namespace < Tag
 
 	attr_reader :activity_graphs
 
@@ -323,9 +323,8 @@ class Namespace
 	attr_reader :Partition
 =end
 
-	def initialize(xml, parent)
-		@xml = xml
-		@parent = parent
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
 		@activity_graphs = Array.new
 		XmiHelper.activity_graphs(xml).each do |obj|
@@ -369,5 +368,8 @@ class Namespace
 			@packages << obj
 		end			
 	end
- 
+
+	def to_s
+		"Namespace"
+	end 
  end

data/lib/xmimodel/operation.rb

@@ -1,20 +1,20 @@
-require 'xmimodel/parameter'
+# encoding: utf-8
 
-class Operation
+require 'xmimodel/parameter'
+require 'xmimodel/tag'
 
-	attr_reader :xml
+class Operation < Tag
 
-	attr_reader :id
 	attr_reader :name
 	attr_reader :visibility
 
 	attr_reader :parameters
 
-	def initialize(xml, clazz)
-		@xml = xml
-		@clazz = clazz
+	def initialize(xml, parent)
+		super(xml, parent)
+
+		@clazz = parent
 
-		@id = xml.attribute("xmi:id").to_s
 		@name = xml.attribute("name").to_s
 		@visibility = xml.attribute("visibility").to_s
 		@visibility = "private" if @visibility == ""

data/lib/xmimodel/package.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
 
 require 'xmimodel/clazz'
-require 'xmimodel/use_case'
 require 'xmimodel/namespace'
+require 'xmimodel/tag'
+require 'xmimodel/use_case'
 
-class Package
-
-	attr_reader :xml
+class Package < Tag
 
 	attr_reader :name
 	attr_reader :full_name
@@ -14,10 +13,10 @@ class Package
 
 	attr_reader :namespace
 
-	def initialize(xml, parent)
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
-		@xml = xml
-		@parent_package = parent.parent unless parent.nil?
+		@parent_package = parent_tag.parent_tag unless parent_tag.nil? or parent_tag.class == XmiModel
 
 		@name = xml.attribute("name").to_s
 		@full_name = XmiHelper.full_package_name(xml)
@@ -30,6 +29,11 @@ class Package
 		self		
 	end
 
+	def add_xml_class(xml)
+		add_namespace() if !XmiHelper.has_namespace?(self.xml)
+		@namespace.xml.inner_html = @namespace.xml.inner_html + xml
+	end
+
 	def activity_graphs
 		return Array.new if @namespace.nil?
 		@namespace.activity_graphs
@@ -79,6 +83,13 @@ class Package
 
 	def to_s
 		"Package[#{@full_name}]"
-	end	
+	end
+
+	private 
+
+	def add_namespace
+		xml_namespace = XmiHelper.add_namespace(self.xml)
+		@namespace = Namespace.new(xml_namespace, self)		
+	end
 	
 end

data/lib/xmimodel/parameter.rb

@@ -1,19 +1,17 @@
+# encoding: utf-8
 
-class Parameter
-	
-	attr_reader :xml
-	attr_reader :owner
+require 'xmimodel/tag'
 
-	attr_reader :id
+class Parameter < Tag
+	
 	attr_reader :name
 	attr_reader :kind
 
 	attr_reader :stereotypes
 	attr_reader :tagged_values
 
-	def initialize(xml, owner)
-		@xml = xml
-		@owner = owner
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
 		@id = xml.attribute("xmi:id").to_s
 		@name = xml.attribute("name").to_s
@@ -45,8 +43,8 @@ class Parameter
 	end	
 
 	def full_name
-		return "#{@owner.full_name}::#{@kind}" if (@name.nil? || @name.empty?)
-		return "#{@owner.full_name}::#{@name}" 		
+		return "#{@parent_tag.full_name}::#{@kind}" if (@name.nil? || @name.empty?)
+		return "#{@parent_tag.full_name}::#{@name}" 		
 	end
 
 	def to_s

data/lib/xmimodel/pseudo_state.rb

@@ -1,11 +1,14 @@
+# encoding: utf-8
+
 require 'xmimodel/state'
+require 'xmimodel/tag'
 
 class PseudoState < State
 
 	attr_reader :kind
 
-	def initialize(xml, activity_graph)
-		super(xml, activity_graph)
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
 		@kind = xml.attribute("kind").to_s				
 	end

data/lib/xmimodel/signal_event.rb

@@ -1,21 +1,20 @@
-require 'xmimodel/parameter'
+# encoding: utf-8
 
-class SignalEvent
+require 'xmimodel/parameter'
+require 'xmimodel/tag'
 
-	attr_reader :xml
+class SignalEvent < Tag
 
-	attr_reader :id
 	attr_reader :name
 
 	attr_reader :parameters
 
 	attr_reader :use_case
 
-	def initialize(xml, use_case)
-		@xml = xml
-		@use_case = use_case.parent
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
+		@use_case = parent_tag.parent_tag
 
-		@id = xml.attribute("xmi:id").to_s
 		@name = xml.attribute("name").to_s
 
 		@parameters = Array.new

data/lib/xmimodel/state.rb

@@ -1,20 +1,21 @@
+# encoding: utf-8
 
-class State
+require 'xmimodel/tag'
+
+class State < Tag
 
-	attr_reader :xml
 	attr_reader :activity_graph	
 
-	attr_reader :id
 	attr_reader :name
 
 	attr_reader :stereotypes
 	attr_reader :tagged_values	
 
-	def initialize(xml, activity_graph)
-		@xml = xml
-		@activity_graph = activity_graph
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
+
+		@activity_graph = parent_tag
 		
-		@id = xml.attribute("xmi.id").to_s
 		@name = xml.attribute("name").to_s
 
 		if @name.nil? || @name.empty?

data/lib/xmimodel/stereotype.rb

@@ -1,23 +1,32 @@
+# encoding: utf-8
 
-class Stereotype
+require 'xmimodel/tag'
+
+class Stereotype < Tag
 
-	attr_reader :xml	
 	attr_reader :href
 
-	def initialize(xml, owner)
-		@xml = xml
-		@owner = owner
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
-		@id = xml.attribute("xmi.id").to_s
 		@name = xml.attribute("name").to_s
 		@href = xml.attribute("href").to_s
 		@idref = xml.attribute("xmi.idref").to_s
 	end
 
 	def <=>(obj)
-    	href <=> obj.href
+    	name <=> obj.name
 	end
 
+	def ==(obj)
+		return false if obj.nil?
+		if String == obj.class
+			name == obj
+		else
+    		name == obj.name
+    	end
+	end	
+
 	def name
 		return @name unless (@name.nil? or @name.empty?)
 

data/lib/xmimodel/tag.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+class Tag
+	
+	# @return [Nokogiri::XML::Element]
+	attr_reader :xml
+
+	# @return [Tag]
+	attr_reader :parent_tag
+
+	# @return [String]
+	attr_reader :id
+
+	##
+	# Constructor. 
+	# 
+	# @param xml [Nokogiri::XML::Element]
+	# @param parent_tag [Tag]
+	def initialize(xml, parent_tag)
+
+		raise "Diferente de Tag. #{parent_tag.class}" if !parent_tag.kind_of?(Tag) && parent_tag.class != XmiModel
+
+		@xml = xml
+		@parent_tag = parent_tag
+
+		@id = xml.attribute("xmi.id").to_s
+	end
+
+	def xml_root
+		parent_tag = @parent_tag
+		until parent_tag.class == XmiModel
+			parent_tag = parent_tag.parent_tag
+		end
+		parent_tag
+	end
+end

data/lib/xmimodel/tagged_value.rb

@@ -1,17 +1,15 @@
+# encoding: utf-8
 
-class TaggedValue
+require 'xmimodel/tag'
 
-	attr_reader :xml	
+class TaggedValue < Tag
 
-	attr_reader :id
 	attr_reader :name
 	attr_reader :value
 
-	def initialize(xml, owner)
-		@xml = xml
-		@owner = owner
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
 
-		@id = xml.attribute("xmi.id").to_s
 		@name = xml.attribute("name").to_s
 
 		if @name.nil? or @name.empty?
@@ -26,12 +24,19 @@ class TaggedValue
 
 	end
 
+	def value=(new_value)
+		# testar para outros tipos que não sejam o Magic Draw
+		tag = @xml.at_xpath("./UML:TaggedValue.dataValue")
+		tag.inner_html = new_value
+		@value = new_value
+	end
+
 	def ==(obj)
 		return false if obj.nil?
 		if String == obj.class
-			return "#{@name}=#{@value}".eql?(obj)
+			return "#{@name}".eql?(obj)
 		else
-			return @name.eql?(obj.name) && @value.eql?(obj.value)
+			return @name.eql?(obj.name)
 		end
 	end	
 

data/lib/xmimodel/transition.rb

@@ -1,10 +1,10 @@
+# encoding: utf-8
+
 require 'xmimodel/stereotype'
+require 'xmimodel/tag'
 require 'xmimodel/tagged_value'
 
-class Transition
-
-	attr_reader :xml
-	attr_reader :id
+class Transition < Tag
 
 	attr_reader :activity_graph
 
@@ -17,11 +17,11 @@ class Transition
 
 	attr_reader :guard_condition
 
-	def initialize(xml, activity_graph)
-		@xml = xml
-		@activity_graph = activity_graph
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
+
+		@activity_graph = parent_tag
 		
-		@id = xml.attribute("xmi.id").to_s
 		@trigger = xml.attribute("trigger").to_s
 		@source = xml.attribute("source").to_s
 		@target = xml.attribute("target").to_s

data/lib/xmimodel/use_case.rb

@@ -1,14 +1,15 @@
+# encoding: utf-8
+
 require 'xmimodel/activity_graph'
 require 'xmimodel/stereotype'
 require 'xmimodel/signal_event'
+require 'xmimodel/tag'
 require 'xmimodel/tagged_value'
 
-class UseCase
+class UseCase < Tag
 
-	attr_reader :xml
 	attr_reader :package
 
-	attr_reader :id
 	attr_reader :name
 
 	attr_reader :stereotypes
@@ -16,11 +17,11 @@ class UseCase
 
 	#UML:CallEvent
 
-	def initialize(xml, parent)
-		@xml = xml
-		@package = parent.parent
+	def initialize(xml, parent_tag)
+		super(xml, parent_tag)
+
+		@package = parent_tag.parent_tag
 
-		@id = xml.attribute("xmi:id").to_s
 		@name = xml.attribute("name").to_s
 
 		if XmiHelper.has_namespace?(xml)

data/lib/xmimodel/xmihelper.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'nokogiri'
 
 ##
@@ -48,7 +49,16 @@ class XmiHelper
 	# Returns a object Nokogiri::XML::Element of type 'UML:ActivityGraph'.
 	def self.activity_graphs(tag)
 		namespace(tag).xpath('./UML:ActivityGraph')
-	end	
+	end
+
+	##
+	# Add a tag UML:Namespace.ownedElement to the parameter xml
+	#
+	def self.add_namespace(xml)
+		xml_namespace = Nokogiri::XML::Node.new('Namespace.ownedElement', xml.document)
+		xml << xml_namespace
+		return xml_namespace
+	end
 
 	##
 	# Get all the Associations in the model.

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmimodel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcus Siqueira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies: []
 description: A helper gem for working with XMI files
 email: marvinsiq@gmail.com
@@ -30,37 +29,38 @@ files:
 - lib/xmimodel/transition.rb
 - lib/xmimodel/stereotype.rb
 - lib/xmimodel/data_type.rb
+- lib/xmimodel/association_end.rb
 - lib/xmimodel/parameter.rb
 - lib/xmimodel/xmihelper.rb
 - lib/xmimodel/association.rb
 - lib/xmimodel/action_state.rb
+- lib/xmimodel/tag.rb
 - lib/xmimodel/pseudo_state.rb
 - lib/xmimodel/tagged_value.rb
 - lib/xmimodel/clazz.rb
 - lib/xmimodel/state.rb
 homepage: https://github.com/marvinsiq/xmimodel
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Xmi Model!
 test_files: []
 has_rdoc: