roundtrip_xml 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5864c0b1462c2486342dbf085f4a303e7dcf7e
-  data.tar.gz: 6d7bf2ccc2dd2bcb028165ead0159e88b53327d2
+  metadata.gz: 850975cc32a5c9ced95414160cfad097ce92e9e8
+  data.tar.gz: 671db4137da1eb5905eba7cdc2cf9c25c8070fef
 SHA512:
-  metadata.gz: 48c9b419de4a6c1ea4370758a067bd4d6bb858961463126b27f2466ea415769c3c39faa47299ff7ceb5edce2fc3d48e42f2c23ad5485f9c5070449627f51e155
-  data.tar.gz: 94191253c7ea0fdb495edbca7c1d1062aa8099d69f980a4f5c996a256ebeb0bf8f59aaf8ed11010776e00ef0a55ac34deabead6f0f7e5270d34765ac9adb1224
+  metadata.gz: bff3c1deb59c3b10fc8d28f85dab0af750505fa1087644b70974ed1603e2149738c335bf741a3e65fa5bb399fd4ec9832a7d78e32dc4ca5e3303e7b0cf88884f
+  data.tar.gz: 179aee0f43f83b93bef5cd047ff78b5f50b863a0470768cb03b787be956cfe7f783b30e8c6432decea7d7e352ac6f74dfdce0a653236f1317508d2ca7648b95a

data/lib/roundtrip_xml.rb

@@ -4,4 +4,3 @@ require './lib/roundtrip_xml/base_cleanroom'
 require './lib/roundtrip_xml/root_cleanroom'
 require './lib/roundtrip_xml/roxml_builder'
 require './lib/roundtrip_xml/plain_accessors'
-puts DslRuntime.new

data/lib/roundtrip_xml/dsl_builder.rb

@@ -13,16 +13,21 @@ class DslBuilder
 
   def write_attrs(clazz, xml, inset='')
     clazz.roxml_attrs.inject('') do |out, attr|
+      # if no xml was found for the given selector, the attribute was optional
+      return '' unless xml
       accessor = attr.accessor
       selector = attr.name
 
       if attr.sought_type == :text
         out += inset + "#{accessor} '#{xml.xpath(selector)[0].content}'\n"
       elsif attr.sought_type == :attr
-        out += inset + "#{accessor} '#{xml.xpath("@#{selector}")[0].content}'\n"
+        child_attribute = xml.attributes[selector]
+        out += inset + "#{accessor} '#{child_attribute.content}'\n" if child_attribute
       elsif !attr.array?
-        out += inset + "#{accessor} do\n#{write_attrs attr.sought_type, xml.xpath(selector)[0], inset + '  '}#{inset}end\n"
-
+        child_element = xml.children.find {|c| c.name == selector}
+        if child_element
+          out += inset + "#{accessor} do\n#{write_attrs attr.sought_type, child_element, inset + '  '}#{inset}end\n"
+        end
       else
         xml.xpath(selector).each do |node|
           out += inset + "#{accessor} do\n#{write_attrs attr.sought_type, node, inset + '  '}#{inset}end\n"

data/lib/roundtrip_xml/dsl_runtime.rb

@@ -1,8 +1,8 @@
 require 'roxml'
 require 'nokogiri'
-require './lib/roundtrip_xml/roxml_builder'
-require './lib/roundtrip_xml/root_cleanroom'
-require './lib/roundtrip_xml/base_cleanroom'
+require 'roundtrip_xml/roxml_builder'
+require 'roundtrip_xml/root_cleanroom'
+require 'roundtrip_xml/base_cleanroom'
 # Class which evaluates DSL and read XML files to populate the namespace with classes
 class DslRuntime
   def initialize()

data/lib/roundtrip_xml/root_cleanroom.rb

@@ -1,4 +1,4 @@
-require './lib/roundtrip_xml/base_cleanroom'
+require 'roundtrip_xml/base_cleanroom'
 # addes the `define` and `use_file` method to a cleanroom. Only used when evaluating a root file
 class RootCleanroom < BaseCleanroom
 

data/lib/roundtrip_xml/roxml_builder.rb

@@ -1,6 +1,6 @@
 # require 'roxml'
 require 'nokogiri'
-require './lib/roundtrip_xml/plain_accessors'
+require 'roundtrip_xml/plain_accessors'
 # Builds dynamic classes based on an XML file.
 # Classes that already exist in the DslRuntime instance are modified if necessary, not overridden.
 class RoxmlBuilder
@@ -22,16 +22,18 @@ class RoxmlBuilder
     end
 
     @generated_classes[ name_to_sym(@root.name)] = @root_class
+    @nodes = {}
   end
   def build_classes
     # @root_class.xml_name (@root.name)
-    @root.xpath("//#{@root.name}/*|//#{@root.name}/@*").each do |child|
+    @root.attributes.values.to_a.concat(@root.children.to_a).each do |child|
       default_opts = {from:child.name}
       if is_leaf_element?(child)
         add_accessor name_to_sym(child.name, true), default_opts, @root
       elsif child.type == Nokogiri::XML::Node::ATTRIBUTE_NODE
         add_accessor name_to_sym(child.name, true), {from: "@#{child.name}"}, @root
-      else
+      elsif child.type == Nokogiri::XML::Node::ELEMENT_NODE
+        # making sure that child is an element here ensures text nodes don't get processed here
         builder = RoxmlBuilder.new child, @generated_classes
         new_classes = builder.build_classes
         child_name = name_to_sym(child.name, true)
@@ -52,30 +54,23 @@ class RoxmlBuilder
   end
 
 
-  def add_accessor(name, opts = {}, node = nil)
+  def add_accessor(name, opts = {}, node)
     attrs = @root_class.roxml_attrs
     attr = attrs.find do |a|
       a.accessor.to_sym == name
     end
     # if class already has xml attribute, delete the old version and add the new version
 
-    if attr && node
-      if node.xpath("./#{attr.name}").size > 1
+    if attr
+      if node_has_child?(node, attr.accessor.to_sym)
         @root_class.instance_variable_set(:@roxml_attrs, attrs.select {|i| i != attr })
         new_attr_type = opts[:as]
         # add a new attribute with the array type.
         @root_class.xml_accessor name, opts.merge({as: [new_attr_type]})
       end
-      # attr_type = attr.sought_type
-      # new_attr_type = opts[:as]
-      # if new_attr_type && attr_type != :text && new_attr_type.tag_name == attr_type.tag_name
-      #   # remove `attr` from the class's attributes
-      #   @root_class.instance_variable_set(:@roxml_attrs, attrs.select {|i| i != attr })
-      #   # add a new attribute with the array type.
-      #   @root_class.xml_accessor name, opts.merge({as: [new_attr_type]})
-      # end
     else
       @root_class.xml_accessor name, opts
+      add_child_to_node(node, name)
     end
   end
 
@@ -85,4 +80,13 @@ class RoxmlBuilder
       element.attributes.size == 0 &&
       element.children.select {|c| c.type == Nokogiri::XML::Node::ELEMENT_NODE}.empty?
   end
+
+  def node_has_child?(node, child)
+    @nodes[node.path] && @nodes[node.path][child]
+  end
+
+  def add_child_to_node(node, child)
+    @nodes[node.path] ||= {}
+    @nodes[node.path][child] = true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundtrip_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Usick