mochigome 0.1.8 → 0.1.9

data/lib/data_node.rb

@@ -82,8 +82,12 @@ module Mochigome
       end
       node.add_child(Nokogiri::XML::Comment.new(doc, @comment)) if @comment
       each do |key, value|
-        sub_node = Nokogiri::XML::Node.new("datum", doc)
-        sub_node["name"] = key.to_s.titleize
+        if key.to_s.start_with?("_")
+          sub_node = Nokogiri::XML::Node.new(key.to_s.sub("_", ""), doc)
+        else
+          sub_node = Nokogiri::XML::Node.new("datum", doc)
+          sub_node["name"] = key.to_s.titleize
+        end
         sub_node.content = value
         node.add_child(sub_node)
       end
@@ -95,7 +99,9 @@ module Mochigome
 
     # TODO: Should handle trickier situations involving datanodes not having various columns
     def flat_column_names
-      colnames = (["name"] + keys).map {|key| "#{@type_name}::#{key}"}
+      colnames = (["name"] + keys).
+        reject{|key| key.to_s.start_with?("_")}.
+        map{|key| "#{@type_name}::#{key}"}
       choices = @children.map(&:flat_column_names)
       colnames += choices.max_by(&:size) || []
       colnames
@@ -103,7 +109,8 @@ module Mochigome
 
     # TODO: Should handle trickier situations involving datanodes not having various columns
     def append_rows_to(table, pad, stack = [])
-      stack.push([@name] + values)
+      row_vals = keys.reject{|k| k.to_s.start_with?("_")}.map{|k| self[k]}
+      stack.push([@name] + row_vals)
       if @children.size > 0
         @children.each {|child| child.send(:append_rows_to, table, pad, stack)}
       else

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/test/unit/data_node_test.rb

@@ -101,7 +101,7 @@ describe Mochigome::DataNode do
       @datanode.comment = "Foo"
       @datanode.merge! [{:id => 400}, {:apples => 1}, {:box_cutters => 2}, {:can_openers => 3}]
       emp1 = @datanode << Mochigome::DataNode.new(:employee, :alice)
-      emp1.merge! [{:id => 500}, {:x => 9}, {:y => 8}, {:z => 7}, {:internal_type => "Cyborg"}]
+      emp1.merge! [{:id => 500}, {:x => 9}, {:y => 8}, {:z => 7}, {:internal_type => "Cyborg"}, {:_foo => "bar"}]
       emp2 = @datanode << Mochigome::DataNode.new(:employee, :bob)
       emp2.merge! [{:id => 600}, {:x => 5}, {:y => 4}, {:z => 8734}, {:internal_type => "Human"}]
       emp2 << Mochigome::DataNode.new(:pet, :lassie)
@@ -122,8 +122,8 @@ describe Mochigome::DataNode do
       ]
     end
 
-    it "can convert to an XML document with ids, names, types, and internal_types as attributes" do
-      # Why stringify and reparse it? So that we could switch to another XML generator.
+    it "can convert to an XML document with correct attributes and elements" do
+      # Why stringify and reparse? So that we could use another XML generator
       doc = Nokogiri::XML(@datanode.to_xml.to_s)
 
       comment = doc.xpath('/node[@type="Corporation"]/comment()').first
@@ -139,8 +139,14 @@ describe Mochigome::DataNode do
       assert_equal "alice", emp_nodes.first['name']
       assert_equal "bob", emp_nodes.last['name']
       assert_equal "Cyborg", emp_nodes.first['internal_type']
-      assert_equal "4", emp_nodes.last.xpath('./datum[@name="Y"]').first.content
+      assert_equal "4", emp_nodes.last.xpath('datum[@name="Y"]').first.content
       assert_equal "lassie", emp_nodes.last.xpath('node').first['name']
+
+      # Keys that start with an underscore are to be turned into so-named elems
+      assert_empty emp_nodes.first.xpath('datum').select{|datum|
+        datum['name'] =~ /foo/i
+      }
+      assert_equal "bar", emp_nodes.first.xpath('foo').first.content
     end
 
     it "can convert to a flattened Ruport table" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-07 00:00:00 Z
+date: 2012-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement