rgen-xsd 0.1.0 → 0.2.0

data/CHANGELOG

@@ -2,3 +2,9 @@
 
 * First public release
 
+=0.2.0
+
+* Made XSI instantiator support XML patterns (wrapper, reference, attribute)
+* Made XSI instantiator a lot faster
+* XSI instantiator options to output problems and unresolved refs and set fragment refs
+

data/Rakefile

@@ -6,7 +6,7 @@ DocFiles = [
 
 RTextGemSpec = Gem::Specification.new do |s|
   s.name = %q{rgen-xsd}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = %q{RGen XML schema support}
   s.email = %q{martin dot thiede at gmx de}

data/lib/rgen/xsd/xsi_instantiator.rb

@@ -17,8 +17,16 @@ class XSIInstantiator
     @namespaces = []
   end
 
+  # options:
+  #  :unresolved_refs: an array to which unresolved references will be appended
+  #  :problems: an array to which problems during instantiation will be appended
+  #  :fragment_ref: a fragment ref object which will be set on every model element created
   def instantiate(file, options={})
-    @unresolved_refs = []
+    @unresolved_refs = options[:unresolved_refs] || []
+    @fragment_ref = options[:fragment_ref]
+    @problems = options[:problems]
+    @target_identifier_provider = options[:target_identifier_provider] ||
+      lambda do |node| node["id"] end
     root = nil
     root_class = options[:root_class].andand.ecore || root_class(doc.root.name)
     File.open(file) do |f|
@@ -42,7 +50,7 @@ class XSIInstantiator
       if prefix == "xml"
         href = "http://www.w3.org/XML/1998/namespace" 
       elsif prefix
-        puts "WARN: Can not resolve namespace prefix #{prefix}"
+        report_problem "WARN: Can not resolve namespace prefix #{prefix}"
       end
     end
     [href, name]
@@ -54,41 +62,59 @@ class XSIInstantiator
     node.attribute_nodes.find{|n| is_xsi_type?(n)}.andand.text
   end
 
-  def instantiate_node(node, eclass)
-    element = eclass.instanceClass.new
-    @env << element
-    set_attribute_values(element, node)
+  def instantiate_node(node, eclass, element=nil, wrapper_features=nil)
+    if !element
+      element = eclass.instanceClass.new
+      element.fragment_ref = @fragment_ref if @fragment_ref
+      @env << element
+    end
+    set_attribute_values(element, node, wrapper_features)
     simple_content = ""
-    can_take_any = eclass.eAllAttributes.any?{|a| a.name == "anyObject"}
     node.children.each do |c|
       if c.text?
         simple_content << c.text
       elsif c.element?
-        feats = features_by_xml_name(c.name).select{|f| 
-          f.eContainingClass == element.class.ecore ||
-          f.eContainingClass.eAllSubTypes.include?(element.class.ecore)
-        }
+        if wrapper_features
+          feats = wrapper_features.select{|f| xml_name(f) == c.name}
+        else
+          feats = features_by_xml_name(element.class, c.name) || []
+        end
         if feats.size == 1
           begin
             if feats.first.is_a?(RGen::ECore::EReference)
-              element.setOrAddGeneric(feats.first.name,
-                instantiate_node(c, reference_target_type(feats.first, xsi_type_value(c))))
+              if feats.first.containment
+                element.setOrAddGeneric(feats.first.name,
+                  instantiate_node(c, reference_target_type(feats.first, xsi_type_value(c))))
+              else
+                proxy = RGen::MetamodelBuilder::MMProxy.new(@target_identifier_provider.call(c))
+                @unresolved_refs <<
+                  RGen::Instantiator::ReferenceResolver::UnresolvedReference.new(element, feats.first.name, proxy)
+                element.setOrAddGeneric(feats.first.name, proxy)
+              end
             else
               element.setOrAddGeneric(feats.first.name, value_from_string(element, feats.first, c.text))
             end
           rescue Exception => e
-            puts "Line: #{node.line}: #{e}"
+            report_problem "#{e}\n#{e.backtrace.join("\n")}", node
           end
         else
-          if can_take_any
+          if wrapper_features
+            # already inside a wrapper
+            wrapper_feats = []
+          else
+            wrapper_feats = features_by_xml_wrapper_name(element.class, c.name) || []
+          end
+          if wrapper_feats.size > 0
+            instantiate_node(c, eclass, element, wrapper_feats)
+          elsif can_take_any(eclass)
             begin
-              # currently the XML node is added to the model
-              element.setOrAddGeneric("anyObject", c)
+              # TODO: currently the XML node is added to the model
+              # element.setOrAddGeneric("anyObject", c)
             rescue Exception => e
-              puts "Line: #{node.line}: #{e}"
+              report_problem "#{e}\n#{e.backtrace.join("\n")}", node
             end
           else
-            problem "could not determine reference for tag #{c.name}, #{feats.size} options", node
+            report_problem "could not determine reference for tag #{c.name}, #{feats.size} options", node
           end
         end
       end
@@ -112,13 +138,15 @@ class XSIInstantiator
     attr_node.namespace.andand.href == "http://www.w3.org/2001/XMLSchema-instance" && attr_node.node_name == "type"
   end
 
-  def set_attribute_values(element, node)
+  def set_attribute_values(element, node, wrapper_features)
     node.attribute_nodes.each do |attrnode|
       next if is_xsi_type?(attrnode)
       name = attrnode.node_name
-      feats = (features_by_xml_name(name) || []).select{|f| 
-        f.eContainingClass == element.class.ecore ||
-        f.eContainingClass.eAllSubTypes.include?(element.class.ecore)}
+      if wrapper_features
+        feats = wrapper_features.select{|f| xml_name(f) == name}
+      else
+        feats = features_by_xml_name(element.class, name) || []
+      end
       if feats.size == 1
         f = feats.first
         str = node.attr(name)
@@ -135,25 +163,27 @@ class XSIInstantiator
       elsif name == "schemaLocation" || name == "noNamespaceSchemaLocation"
         # ignore, this may occure with any XML element
       else
-        problem "could not determine feature for attribute #{name}, #{feats.size} options", node
+        report_problem "could not determine feature for attribute #{name}, #{feats.size} options", node
       end
     end
   end
 
   def value_from_string(element, f, str)
     if f.is_a?(RGen::ECore::EAttribute)
-      case f.eType
-      when RGen::ECore::EInt
-        str.to_i
-      when RGen::ECore::EFloat
-        str.to_f
-      when RGen::ECore::EEnum
+      if f.eType.is_a?(RGen::ECore::EEnum)
         str.to_sym
-      when RGen::ECore::EBoolean
-        (str == "true")
       else
-        str
-      end 
+        case f.eType.instanceClassName
+        when "Integer"
+          str.to_i
+        when "Float"
+          str.to_f
+        when "Boolean"
+          (str == "true")
+        else
+          str
+        end 
+      end
     else
       proxy = RGen::MetamodelBuilder::MMProxy.new(str)
       @unresolved_refs <<
@@ -188,8 +218,12 @@ class XSIInstantiator
     end
   end
 
-  def problem(desc, node)
-    raise desc + " at [#{node.name}]"
+  def report_problem(desc, node=nil)
+    if node
+      @problems << "#{desc} at line #{node.line}"
+    else
+      @problems << desc
+    end
   end
 
   def classes_by_xml_name(name)
@@ -203,21 +237,45 @@ class XSIInstantiator
     @classes_by_xml_name[name]
   end
 
-  def features_by_xml_name(name)
-    return @features_by_xml_name[name] || [] if @features_by_xml_name
-    @features_by_xml_name = {}
-    @mm.ecore.eAllClasses.eStructuralFeatures.each do |f|
+  def features_by_xml_name(clazz, name)
+    @features_by_xml_name ||= {}
+    return @features_by_xml_name[clazz][name] || [] if @features_by_xml_name[clazz]
+    @features_by_xml_name[clazz] = {}
+    clazz.ecore.eAllStructuralFeatures.each do |f|
       n = xml_name(f)
-      @features_by_xml_name[n] ||= []
-      @features_by_xml_name[n] << f
+      @features_by_xml_name[clazz][n] ||= []
+      @features_by_xml_name[clazz][n] << f
+    end
+    @features_by_xml_name[clazz][name]
+  end
+
+  def features_by_xml_wrapper_name(clazz, name)
+    @features_by_xml_wrapper_name ||= {}
+    return @features_by_xml_wrapper_name[clazz][name] || [] if @features_by_xml_wrapper_name[clazz]
+    @features_by_xml_wrapper_name[clazz] = {}
+    clazz.ecore.eAllStructuralFeatures.each do |f|
+      n = xml_wrapper_name(f)
+      if n
+        @features_by_xml_wrapper_name[clazz][n] ||= []
+        @features_by_xml_wrapper_name[clazz][n] << f
+      end
     end
-    @features_by_xml_name[name]
+    @features_by_xml_wrapper_name[clazz][name]
+  end
+
+  def can_take_any(eclass)
+    @can_take_any ||= {}
+    @can_take_any[eclass] ||= eclass.eAllAttributes.any?{|a| a.name == "anyObject"}
   end
 
   def xml_name(o)
     annotation_value(o, "xmlName") || o.name
   end
 
+  def xml_wrapper_name(o)
+    annotation_value(o, "xmlWrapperName")
+  end
+
   def annotation_value(o, key)
     anno = o.eAnnotations.find{|a| a.source == "xsd"}
     anno.andand.details.andand.find{|d| d.key == key}.andand.value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgen-xsd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000Z
+date: 2012-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
-  requirement: &23972604 !ruby/object:Gem::Requirement
+  requirement: &24218064 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *23972604
+  version_requirements: *24218064
 description: Derive RGen/ECore metamodels from XML schema and load/store XML documents
   conforming to the schema as RGen models
 email: martin dot thiede at gmx de