tilia-xml 1.2.0.2 → 1.3.0

data/test/xml/reader_test.rb

@@ -9,7 +9,7 @@ module Tilia
         @reader = Reader.new
       end
 
-      def test_should_load_clark
+      def test_get_clark
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns" />
@@ -19,7 +19,7 @@ BLA
         assert_equal('{http://sabredav.org/ns}root', @reader.clark)
       end
 
-      def test_should_get_clark_without_ns
+      def test_get_clark_no_ns
         input = <<BLA
 <?xml version="1.0"?>
 <root />
@@ -29,7 +29,7 @@ BLA
         assert_equal('{}root', @reader.clark)
       end
 
-      def test_should_load_clark_on_an_element
+      def test_get_clark_not_on_an_element
         input = <<BLA
 <?xml version="1.0"?>
 <root />
@@ -38,7 +38,7 @@ BLA
         assert_nil(@reader.clark)
       end
 
-      def test_should_parse_a_simple_xml_file
+      def test_simple
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -79,7 +79,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_work_with_cdata
+      def test_cdata
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -104,7 +104,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_read_simple_namespaced_attributes
+      def test_simple_namespaced_attribute
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns" xmlns:foo="urn:foo">
@@ -131,7 +131,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_read_mapped_elements
+      def test_mapped_element
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -159,7 +159,26 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_activate_mapped_element_callbacks
+      def test_mapped_element_bad_class
+        input = <<BLA
+<?xml version="1.0"?>
+<root xmlns="http://sabredav.org/ns">
+  <elem1 />
+</root>
+BLA
+
+        reader = Reader.new
+        reader.element_map = {
+          '{http://sabredav.org/ns}elem1' => Class.new
+        }
+        reader.xml(input)
+
+        assert_raises(RuntimeError) do
+          reader.parse
+        end
+      end
+
+      def test_mapped_element_call_back
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -190,7 +209,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_read_text
+      def test_read_text
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -221,7 +240,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_raise_exceptions
+      def test_parse_problem
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -234,7 +253,7 @@ BLA
         assert_raises(LibXmlException) { @reader.parse }
       end
 
-      def test_should_handle_broken_parser
+      def test_broken_parser_class
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -248,7 +267,7 @@ BLA
         assert_raises(ParseException) { @reader.parse }
       end
 
-      def test_should_handle_invalid_xml
+      def test_broken_xml
         input = <<BLA
 <test>
 <hello>
@@ -259,7 +278,7 @@ BLA
         assert_raises(LibXmlException) { @reader.parse }
       end
 
-      def test_should_handle_invalid_xml_2
+      def test_broken_xml2
         input = <<BLA
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions>
@@ -277,7 +296,7 @@ BLA
         assert_raises(LibXmlException) { @reader.parse }
       end
 
-      def test_should_parse_an_inner_tree
+      def test_parse_inner_tree
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -321,7 +340,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_use_parse_get_elements
+      def test_parse_get_elements
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
@@ -365,7 +384,7 @@ BLA
         assert_equal(expected, output)
       end
 
-      def test_should_work_with_no_elements
+      def test_parse_get_elements_no_elements
         input = <<BLA
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">

data/test/xml/serializer/enum_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+module Tilia
+  module Xml
+    module Serializer
+      class EnumTest < Minitest::Test
+        def test_serialize
+          service = Service.new
+          service.namespace_map['urn:test'] = nil
+
+          xml = service.write(
+            '{urn:test}root',
+            lambda do |writer|
+              Serializer.enum(
+                writer,
+                [
+                  '{urn:test}foo1',
+                  '{urn:test}foo2'
+                ]
+              )
+            end
+          )
+
+          expected = <<XML
+<?xml version="1.0"?>
+<root xmlns="urn:test">
+   <foo1/>
+   <foo2/>
+</root>
+XML
+          assert_xml_equal(expected, xml)
+        end
+      end
+    end
+  end
+end

data/test/xml/serializer/repeating_elements_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+module Tilia
+  module Xml
+    module Serializer
+      class RepeatingElementsTest < Minitest::Test
+        def test_serialize
+          service = Service.new
+          service.namespace_map['urn:test'] = nil
+          xml = service.write(
+            '{urn:test}collection',
+            lambda do |writer|
+              Serializer.repeating_elements(
+                writer,
+                [
+                  'foo',
+                  'bar'
+                ],
+                '{urn:test}item'
+              )
+            end
+          )
+
+          expected = <<XML
+<?xml version="1.0"?>
+<collection xmlns="urn:test">
+   <item>foo</item>
+   <item>bar</item>
+</collection>
+XML
+
+          assert_xml_equal(expected, xml)
+        end
+      end
+    end
+  end
+end

data/test/xml/service_test.rb

@@ -142,6 +142,48 @@ XML
         assert_equal(expected, result)
       end
 
+      def test_map_value_object
+        input = <<XML
+<?xml version="1.0"?>
+<order xmlns="http://sabredav.org/ns">
+ <id>1234</id>
+ <amount>99.99</amount>
+ <description>black friday deal</description>
+ <status>
+  <id>5</id>
+  <label>processed</label>
+ </status>
+</order>
+XML
+
+        ns = 'http://sabredav.org/ns'
+        order_service = Service.new
+        order_service.map_value_object("{#{ns}}order", Xml::Order)
+        order_service.map_value_object("{#{ns}}status", Xml::OrderStatus)
+        order_service.namespace_map[ns] = nil
+
+        order = order_service.parse(input)
+        expected = Order.new
+        expected.id = '1234'
+        expected.amount = '99.99'
+        expected.description = 'black friday deal'
+        expected.status = OrderStatus.new
+        expected.status.id = '5'
+        expected.status.label = 'processed'
+
+        assert_instance_equal(expected, order)
+
+        written_xml = order_service.write_value_object(order)
+        assert_equal(input, written_xml)
+      end
+
+      def test_write_vo_not_found
+        service = Service.new
+        assert_raises(ArgumentError) do
+          service.write_value_object(Class.new)
+        end
+      end
+
       def test_parse_clark_notation
         expected = ['http://sabredav.org/ns', 'elem']
         result = Service.parse_clark_notation('{http://sabredav.org/ns}elem')
@@ -152,5 +194,31 @@ XML
         assert_raises(ArgumentError) { Service.parse_clark_notation('http://sabredav.org/ns}elem') }
       end
     end
+
+    # asset for test_map_value_object
+    class Order
+      attr_accessor :id
+      attr_accessor :amount
+      attr_accessor :description
+      attr_accessor :status
+
+      def initialize
+        @id = nil
+        @amount = nil
+        @description = nil
+        @status = nil
+      end
+    end
+
+    # asset for test_map_value_object
+    class OrderStatus
+      attr_accessor :id
+      attr_accessor :label
+
+      def initialize
+        @id = nil
+        @label = nil
+      end
+    end
   end
 end

data/test/xml/writer_test.rb

@@ -17,9 +17,6 @@ module Tilia
         assert_equal(output, @writer.output_memory)
       end
 
-      # rubocop:disable Style/ClosingParenthesisIndentation
-      # Rubocop has a problem with the closing parenthesis of the long compare()
-      # statements, but IMO that's the best way.
       def test_simple
         compare(
           { '{http://sabredav.org/ns}root' => 'text' },
@@ -31,7 +28,9 @@ HI
       end
 
       def test_simple_quotes
-        compare({ '{http://sabredav.org/ns}root' => '"text"' }, <<HI
+        compare(
+          { '{http://sabredav.org/ns}root' => '"text"' },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">&quot;text&quot;</s:root>
 HI
@@ -47,7 +46,8 @@ HI
                 'attr1' => 'attribute value'
               }
             }
-          }, <<HI
+          },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns" attr1="attribute value">text</s:root>
 HI
@@ -83,7 +83,8 @@ HI
                 }
               }
             }
-          }, <<HI
+          },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">
  <single>value</single>
@@ -95,15 +96,17 @@ HI
  <verbose foo="bar">syntax</verbose>
 </s:root>
 HI
-          )
+        )
       end
 
       def test_null
-        compare({ '{http://sabredav.org/ns}root' => nil }, <<HI
+        compare(
+          { '{http://sabredav.org/ns}root' => nil },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns"/>
 HI
-          )
+        )
       end
 
       def test_array_format2
@@ -118,7 +121,8 @@ HI
                 }
               }
             ]
-          }, <<HI
+          },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">
  <s:elem1 attr1="attribute value">text</s:elem1>
@@ -127,13 +131,35 @@ HI
         )
       end
 
+      def test_array_format2_no_value
+        compare(
+          {
+            '{http://sabredav.org/ns}root' => [
+              {
+                'name'       => '{http://sabredav.org/ns}elem1',
+                'attributes' => {
+                  'attr1' => 'attribute value'
+                }
+              }
+            ]
+          },
+          <<HI
+<?xml version="1.0"?>
+<s:root xmlns:s="http://sabredav.org/ns">
+ <s:elem1 attr1="attribute value"/>
+</s:root>
+HI
+        )
+      end
+
       def test_custom_namespace
         compare(
           {
             '{http://sabredav.org/ns}root' => {
               '{urn:foo}elem1' => 'bar'
             }
-          }, <<HI
+          },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">
  <x1:elem1 xmlns:x1="urn:foo">bar</x1:elem1>
@@ -144,7 +170,9 @@ HI
 
       def test_empty_namespace
         # Empty namespaces are allowed, so we should support this.
-        compare({ '{http://sabredav.org/ns}root' => { '{}elem1' => 'bar' } }, <<HI
+        compare(
+          { '{http://sabredav.org/ns}root' => { '{}elem1' => 'bar' } },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">
  <elem1 xmlns="">bar</elem1>
@@ -167,7 +195,8 @@ HI
                 }
               }
             ]
-          }, <<HI
+          },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">
  <s:elem1 attr1="val1" s:attr2="val2" x1:attr3="val3" xmlns:x1="urn:foo">text</s:elem1>
@@ -190,7 +219,9 @@ HI
       end
 
       def test_base_element
-        compare({ '{http://sabredav.org/ns}root' => Tilia::Xml::Element::Base.new('hello') }, <<HI
+        compare(
+          { '{http://sabredav.org/ns}root' => Tilia::Xml::Element::Base.new('hello') },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">hello</s:root>
 HI
@@ -198,7 +229,9 @@ HI
       end
 
       def test_element_obj
-        compare({ '{http://sabredav.org/ns}root' => Tilia::Xml::Element::Mock.new }, <<HI
+        compare(
+          { '{http://sabredav.org/ns}root' => Tilia::Xml::Element::Mock.new },
+          <<HI
 <?xml version="1.0"?>
 <s:root xmlns:s="http://sabredav.org/ns">
  <s:elem1>hiiii!</s:elem1>
@@ -209,7 +242,22 @@ HI
 
       def test_empty_namespace_prefix
         @writer.namespace_map['http://sabredav.org/ns'] = nil
-        compare({ '{http://sabredav.org/ns}root' => Tilia::Xml::Element::Mock.new }, <<HI
+        compare(
+          { '{http://sabredav.org/ns}root' => Tilia::Xml::Element::Mock.new },
+          <<HI
+<?xml version="1.0"?>
+<root xmlns="http://sabredav.org/ns">
+ <elem1>hiiii!</elem1>
+</root>
+HI
+        )
+      end
+
+      def test_empty_namespace_prefix_empty_string
+        @writer.namespace_map['http://sabredav.org/ns'] = ''
+        compare(
+          { '{http://sabredav.org/ns}root' => Element::Mock.new },
+          <<HI
 <?xml version="1.0"?>
 <root xmlns="http://sabredav.org/ns">
  <elem1>hiiii!</elem1>
@@ -254,7 +302,62 @@ HI
 HI
         assert_equal(output, @writer.output_memory)
       end
-      # rubocop:enable Style/ClosingParenthesisIndentation
+
+      def test_callback
+        compare(
+          {
+            '{http://sabredav.org/ns}root' => lambda do |writer|
+              writer.write_string('deferred writer')
+            end
+          },
+          <<HI
+<?xml version="1.0"?>
+<s:root xmlns:s="http://sabredav.org/ns">deferred writer</s:root>
+HI
+        )
+      end
+
+      def test_resource
+        assert_raises(ArgumentError) do
+          compare(
+            { '{http://sabredav.org/ns}root' => StringIO.new },
+            <<HI
+<?xml version="1.0"?>
+<s:root xmlns:s="http://sabredav.org/ns">deferred writer</s:root>
+HI
+          )
+        end
+      end
+
+      def test_class_map
+        obj = TestClass.new('value1', 'value2')
+
+        @writer.class_map[TestClass] = lambda do |writer, value|
+          [:@key1, :@key2].each do |key|
+            val = value.instance_variable_get(key)
+            key = key.to_s[1..-1]
+            writer.write_element("{http://sabredav.org/ns}#{key}", val)
+          end
+        end
+
+        compare(
+          { '{http://sabredav.org/ns}root' => obj },
+          <<HI
+<?xml version="1.0"?>
+<s:root xmlns:s="http://sabredav.org/ns">
+ <s:key1>value1</s:key1>
+ <s:key2>value2</s:key2>
+</s:root>
+HI
+        )
+      end
+    end
+
+    class TestClass
+      def initialize(a, b)
+        @key1 = a
+        @key2 = b
+      end
     end
   end
 end