Merge lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

[Ghislain Fourny]

Allowing fn:serialize to also serialize JSON/JSONiq.

Allowing fn:serialize to also serialize JSON/JSONiq.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fn-serialize-json-2012-08-21T13-52-54.553Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fn-serialize-json-2012-08-21T13-52-54.553Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fn-serialize-json-2012-08-21T15-24-00.276Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fn-serialize-json-2012-08-21T15-24-00.276Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

[Matthias Brantner (matthias-brantner)]

I would like to finish the discussion about serialization before we merge this fix.

[Matthias Brantner (matthias-brantner)]

I think this branch has become obsolete with the latest discussion about serialization.

@Ghislain: do you agree? If so, could you please mark the merge proposal as "rejected"?

Unmerged revisions

10996. By Ghislain Fourny on 2012-08-21

Adding test and modified schema.

10995. By Ghislain Fourny on 2012-08-21

Adding tests as well as JSONiq serialization parameters.

10994. By Ghislain Fourny on 2012-08-21

Added json and jsoniq to allowed methods in fn:serialize.

=== modified file 'schemas/xslt-xquery-serialization.xsd'
--- schemas/xslt-xquery-serialization.xsd	2012-08-16 18:31:02 +0000
+++ schemas/xslt-xquery-serialization.xsd	2012-08-21 14:08:21 +0000
@@ -61,6 +61,8 @@
           <xs:enumeration value="text"/>
           <xs:enumeration value="xml"/>
           <xs:enumeration value="xhtml"/>
+          <xs:enumeration value="json"/>
+          <xs:enumeration value="jsoniq"/>
         </xs:restriction>
       </xs:simpleType>
       <xs:simpleType>
@@ -324,6 +326,48 @@
         type="output:string-param-type"
         substitutionGroup="output:serialization-parameter-element"/>
 
+  <!-- <JSONiq> -->
+
+  <!--
+   - Serialization parameter element for jsoniq-extensions parameter
+  -->
+  <xs:element id="jsoniq-extensions" name="jsoniq-extensions" type="output:yes-no-param-type"
+          substitutionGroup="output:serialization-parameter-element"/>
+  
+  <!--
+     - Serialization parameter element for jsoniq-xdm-node-output-method
+     - parameter
+    -->
+  <xs:element id="jsoniq-xdm-node-output-method" name="jsoniq-xdm-node-output-method" type="output:method-param-type"
+        substitutionGroup="output:serialization-parameter-element"/>
+
+  <!--
+     - Serialization parameter type for jsoniq-multiple-items
+     - serialization parameters
+    -->
+  <xs:complexType name="jsoniq-multiple-items-param-type">
+    <xs:complexContent>
+      <xs:extension base="output:base-param-type">
+        <xs:attribute name="value" use="required">
+          <xs:simpleType>
+            <xs:restriction base="xs:token">
+              <xs:enumeration value="no"/>
+              <xs:enumeration value="array"/>
+              <xs:enumeration value="appended"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!--
+     - Serialization parameter element for jsoniq-multiple-items parameter
+  -->
+  <xs:element id="jsoniq-multiple-items" name="jsoniq-multiple-items" type="output:jsoniq-multiple-items-param-type"
+        substitutionGroup="output:serialization-parameter-element"/>
+
+  <!-- </JSONiq> -->
   <xs:element name="serialization-parameters">
     <xs:complexType>
       <xs:sequence>

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize-2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize-2.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize-2.xml.res	2012-08-21 14:08:21 +0000
@@ -0,0 +1,1 @@
+<json>{ "foo" : "bar" }{ "bar" : "blub" }</json>

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize-3.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize-3.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize-3.xml.res	2012-08-21 14:08:21 +0000
@@ -0,0 +1,1 @@
+{ "a1" : { "JSONiq XDM node" : "&lt;a1&gt;1&lt;/a1&gt;" } }{ "a2" : { "JSONiq XDM node" : "&lt;a2&gt;2&lt;/a2&gt;" } }{ "a3" : { "JSONiq XDM node" : "&lt;a3&gt;3&lt;/a3&gt;" } }

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/fn-serialize.xml.res	2012-08-21 14:08:21 +0000
@@ -0,0 +1,1 @@
+<json>{ "foo" : "bar" }</json>

=== added file 'test/rbkt/Queries/zorba/jsoniq/fn-serialize-2.xq'
--- test/rbkt/Queries/zorba/jsoniq/fn-serialize-2.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/fn-serialize-2.xq	2012-08-21 14:08:21 +0000
@@ -0,0 +1,7 @@
+<json>{
+  fn:serialize(({ "foo" : "bar"}, { "bar" : "blub" }),
+               <output:serialization-parameters xmlns:output="http://www.w3.org/2010/xslt-xquery-serialization">
+                 <output:method value="json"/>
+                 <output:jsoniq-multiple-items value="appended"/>
+               </output:serialization-parameters>)
+}</json>
\ No newline at end of file

=== added file 'test/rbkt/Queries/zorba/jsoniq/fn-serialize-3.xq'
--- test/rbkt/Queries/zorba/jsoniq/fn-serialize-3.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/fn-serialize-3.xq	2012-08-21 14:08:21 +0000
@@ -0,0 +1,19 @@
+import schema namespace out = "http://www.w3.org/2010/xslt-xquery-serialization";
+
+let $params :=
+  <out:serialization-parameters>
+    <out:indent value="no" />
+
+    <out:jsoniq-extensions value="yes" />
+    <out:jsoniq-xdm-node-output-method value="xml" />
+    <out:jsoniq-multiple-items value="appended" />
+  </out:serialization-parameters>
+return
+  serialize(
+    for $i in 1 to 3
+    let $name :=  "a" || $i,
+        $value := element { $name } { $i }
+    return
+      { $name : $value },
+    $params
+  )

=== added file 'test/rbkt/Queries/zorba/jsoniq/fn-serialize.xq'
--- test/rbkt/Queries/zorba/jsoniq/fn-serialize.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/fn-serialize.xq	2012-08-21 14:08:21 +0000
@@ -0,0 +1,6 @@
+<json>{
+  fn:serialize({ "foo" : "bar"},
+               <output:serialization-parameters xmlns:output="http://www.w3.org/2010/xslt-xquery-serialization">
+                 <output:method value="json"/>
+               </output:serialization-parameters>)
+}</json>
\ No newline at end of file