Handled custom attributes when converting XmlText to RichText #92

SerheyDolgushev · 2019-04-09T04:08:16Z

Related to ezsystems/ezplatform-richtext#35

Following eZ XML:

<?xml version="1.0" encoding="utf-8"?>
<section xmlns:image="http://ez.no/namespaces/ezpublish3/image/" xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
         xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
    <section>
        <header class="header_class_1" custom:ezca_header_1="header">Header</header>
        <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
            <table class="table_class_1" border="0" width="100%" custom:summary="summary" custom:caption=""
                   custom:ezca_table_1="table">
                <tr class="tr_class_1" custom:ezca_tr_1="tr1">
                    <td class="td_class_1" xhtml:width="0" custom:valign="top" custom:ezca_td_1="td11">
                        <paragraph>c11</paragraph>
                    </td>
                    <td>
                        <paragraph>c12</paragraph>
                    </td>
                </tr>
                <tr custom:ezca_tr_1="tr2">
                    <td>
                        <paragraph>c21</paragraph>
                    </td>
                    <td>
                        <paragraph>c22</paragraph>
                    </td>
                </tr>
            </table>
        </paragraph>
        <paragraph>
            <strong class="strong_class_1" custom:ezca_strong_1="strong">Strong text</strong>
        </paragraph>
        <paragraph>
            <emphasize class="em_class_1" custom:ezca_em_1="em">Italic text</emphasize>
        </paragraph>
        <paragraph class="para_class_1" custom:ezca_para_1="para_1" custom:ezca_para_2="para_2">Paragraph</paragraph>
        <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
            <ol class="ol_class_1" custom:ezca_ol_1="ol">
                <li class="li_class_1" custom:ezca_li_1="li">
                    <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">Ordered item 1</paragraph>
                </li>
                <li>
                    <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">Ordered item 2</paragraph>
                </li>
            </ol>
            <ul class="ul_class_1" custom:ezca_ul_1="ul">
                <li>
                    <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">Unordered item 1</paragraph>
                </li>
                <li>
                    <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">Unordered item 2</paragraph>
                </li>
            </ul>
        </paragraph>
        <paragraph>
            <link class="link_class_1" url_id="67" custom:ezca_link_1="link">Link</link>
        </paragraph>
    </section>
</section>

Is converted to:

<?xml version="1.0" encoding="UTF-8"?>\n
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
         xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
         xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
    <title ezxhtml:level="2" ezxhtml:class="header_class_1">
        <ez-custom-attributes>
            <ezvalue key="ezca_header_1">header</ezvalue>
        </ez-custom-attributes>
        Header
    </title>
    <informaltable class="table_class_1" width="100%" title="summary">
        <ez-custom-attributes>
            <ezvalue key="summary">summary</ezvalue>
            <ezvalue key="caption"/>
            <ezvalue key="ezca_table_1">table</ezvalue>
        </ez-custom-attributes>
        <tbody>
            <tr class="tr_class_1">
                <ez-custom-attributes>
                    <ezvalue key="ezca_tr_1">tr1</ezvalue>
                </ez-custom-attributes>
                <td class="td_class_1" ezxhtml:width="0" valign="top">
                    <ez-custom-attributes>
                        <ezvalue key="valign">top</ezvalue>
                        <ezvalue key="ezca_td_1">td11</ezvalue>
                    </ez-custom-attributes>
                    <para>c11</para>
                </td>
                <td>
                    <para>c12</para>
                </td>
            </tr>
            <tr>
                <ez-custom-attributes>
                    <ezvalue key="ezca_tr_1">tr2</ezvalue>
                </ez-custom-attributes>
                <td>
                    <para>c21</para>
                </td>
                <td>
                    <para>c22</para>
                </td>
            </tr>
        </tbody>
    </informaltable>
    <para>
        <emphasis role="strong" ezxhtml:class="strong_class_1">
            <ez-custom-attributes>
                <ezvalue key="ezca_strong_1">strong</ezvalue>
            </ez-custom-attributes>
            Strong text
        </emphasis>
    </para>
    <para>
        <emphasis ezxhtml:class="em_class_1">
            <ez-custom-attributes>
                <ezvalue key="ezca_em_1">em</ezvalue>
            </ez-custom-attributes>
            Italic text
        </emphasis>
    </para>
    <para ezxhtml:class="para_class_1">
        <ez-custom-attributes>
            <ezvalue key="ezca_para_1">para_1</ezvalue>
            <ezvalue key="ezca_para_2">para_2</ezvalue>
        </ez-custom-attributes>
        Paragraph
    </para>
    <orderedlist ezxhtml:class="ol_class_1">
        <ez-custom-attributes>
            <ezvalue key="ezca_ol_1">ol</ezvalue>
        </ez-custom-attributes>
        <listitem ezxhtml:class="li_class_1">
            <ez-custom-attributes>
                <ezvalue key="ezca_li_1">li</ezvalue>
            </ez-custom-attributes>
            <para>Ordered item 1</para>
        </listitem>
        <listitem>
            <para>Ordered item 2</para>
        </listitem>
    </orderedlist>
    <itemizedlist ezxhtml:class="ul_class_1">
        <ez-custom-attributes>
            <ezvalue key="ezca_ul_1">ul</ezvalue>
        </ez-custom-attributes>
        <listitem>
            <para>Unordered item 1</para>
        </listitem>
        <listitem>
            <para>Unordered item 2</para>
        </listitem>
    </itemizedlist>
    <para>
        <link xlink:href="ezurl://67" xlink:show="none" ezxhtml:class="link_class_1">
            <ez-custom-attributes>
                <ezvalue key="ezca_link_1">link</ezvalue>
            </ez-custom-attributes>
            Link
        </link>
    </para>
</section>

alongosz · 2019-04-17T15:54:12Z

lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl

@@ -149,6 +149,18 @@
  <xsl:template match="line">
  </xsl:template>

+  <xsl:template name="custom-attributes">
+    <xsl:if test="@*[namespace-uri() = 'http://ez.no/namespaces/ezpublish3/custom/' and not( local-name() = 'class' ) and not( local-name() = 'align' )]">
+      <xsl:element name="ez-custom-attributes" namespace="http://docbook.org/ns/docbook">


This needs to be aligned with requested naming changes in ezsystems/ezplatform-richtext#35 (review)

lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl

SerheyDolgushev · 2019-04-17T19:17:12Z

@alongosz it is done. Some of the tests are failing because old ezpublish.rng schema is used, which does not allow to have ezattribute element. So it is related to #91.

Thinking about merging #91 into this PR.

SerheyDolgushev · 2019-04-18T12:54:23Z

I think the next logical steps here would be:

Wait until EZP-29301: Added support for custom attributes on elements ezplatform-richtext#35 will be merged.
Merge here Injected RichText Validator from DIC into RichText Converter #91.
Add richtext dependency in this PR.
In this PR switch tests to use EzSystems\EzPlatformRichText\eZ\RichText\Validator\Validator.
Release it as a new major version.

@andrerom @vidarl @alongosz what do you think about it?

alongosz · 2019-04-18T13:02:43Z

I think the next logical steps here would be:

Wait until ezsystems/ezplatform-richtext#35 will be merged.

Merge here Injected RichText Validator from DIC into RichText Converter #91.

Add richtext dependency in this PR.

In this PR switch tests to use EzSystems\EzPlatformRichText\eZ\RichText\Validator\Validator.

Release it as a new major version.

From my side this is good plan, but points 3-5 indeed need to be validated by @andrerom and/or @vidarl :)

vidarl · 2019-04-24T13:32:21Z

#91 is fine and should be merged to master and then this one can be rebased I think..

It would be nice have all travis stuff working again before merging this one. @alongosz : Any luck with #94 ?

SerheyDolgushev · 2019-04-24T22:50:50Z

Waiting for merge #91 to continue the work here.

lserwatka · 2019-04-25T05:15:06Z

#91 was merged

…ests

SerheyDolgushev · 2019-04-26T12:47:33Z

@vidarl Please check the latest changes.

composer.json

vidarl

I find the PR fine, but would like to have all green on travis before we merge this, ref. #94

SerheyDolgushev · 2019-04-30T08:43:20Z

Sorry, but all failed tests does not depend on #94 I believe. They are failing because of ezsystems/ezplatform-richtext v1.1.1 requires php ^7.1 .
So I don't think #94 will have any impact on this PR.
@vidarl

vidarl · 2019-04-30T08:56:51Z

Right, so since this PR introduces dependency to ezsystems/ezplatform-richtext v1.1.1, the travis config should be changed accordingly

SerheyDolgushev · 2019-04-30T09:03:08Z

@vidarl thanks for explanations. Don't have a lot of experience in travis, but b04817a seems pretty straightforward.

andrerom · 2019-04-30T10:52:35Z

Failure is due to CS checker and PHP 7.3, I'll update that in master 👍

Handle custom attributes

2327e9c

alongosz requested changes Apr 17, 2019

View reviewed changes

SerheyDolgushev added 3 commits April 17, 2019 13:27

Custom attributes: use new naming convensions

a981d4e

Custom attributes: handle literal, quote, underline, strike, sub, sup

1fcc97c

Custom attributes: tests

d810f1e

alongosz approved these changes Apr 18, 2019

View reviewed changes

alongosz changed the title ~~Handle custom attributes~~ Handled custom attributes when converting XmlText to RichText Apr 18, 2019

alongosz added the Feature label Apr 18, 2019

vidarl added the Work in progress label Apr 24, 2019

vidarl changed the title ~~Handled custom attributes when converting XmlText to RichText~~ [WIP]Handled custom attributes when converting XmlText to RichText Apr 24, 2019

SerheyDolgushev added 2 commits April 25, 2019 16:12

Merge branch 'master' into custom_attributes

8396ad0

Custom attributes: require richtext, use richtext Validator, update t…

d57ec15

…ests

andrerom reviewed Apr 29, 2019

View reviewed changes

composer.json Show resolved Hide resolved

andrerom mentioned this pull request Apr 29, 2019

Disable warnings for inline custom tags #93

Merged

andrerom approved these changes Apr 30, 2019

View reviewed changes

vidarl requested changes Apr 30, 2019

View reviewed changes

Custom attributes: removing travis configs for PHP <7.1

b04817a

andrerom added 2 commits April 30, 2019 12:45

[Travis] Add full PHP 7.x testing

6a2607f

Update .travis.yml

21f0ad9

andrerom changed the title ~~[WIP]Handled custom attributes when converting XmlText to RichText~~ Handled custom attributes when converting XmlText to RichText Apr 30, 2019

andrerom merged commit 8d2f1d8 into ezsystems:master Apr 30, 2019

SerheyDolgushev mentioned this pull request Apr 30, 2019

Allow to extend RichText converter #90

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handled custom attributes when converting XmlText to RichText #92

Handled custom attributes when converting XmlText to RichText #92

SerheyDolgushev commented Apr 9, 2019

alongosz Apr 17, 2019

SerheyDolgushev Apr 17, 2019

SerheyDolgushev commented Apr 17, 2019

SerheyDolgushev commented Apr 18, 2019

alongosz commented Apr 18, 2019

vidarl commented Apr 24, 2019 •

edited

Loading

SerheyDolgushev commented Apr 24, 2019

lserwatka commented Apr 25, 2019

SerheyDolgushev commented Apr 26, 2019

vidarl left a comment

SerheyDolgushev commented Apr 30, 2019

vidarl commented Apr 30, 2019

SerheyDolgushev commented Apr 30, 2019

andrerom commented Apr 30, 2019 •

edited

Loading

Handled custom attributes when converting XmlText to RichText #92

Handled custom attributes when converting XmlText to RichText #92

Conversation

SerheyDolgushev commented Apr 9, 2019

alongosz Apr 17, 2019

Choose a reason for hiding this comment

SerheyDolgushev Apr 17, 2019

Choose a reason for hiding this comment

SerheyDolgushev commented Apr 17, 2019

SerheyDolgushev commented Apr 18, 2019

alongosz commented Apr 18, 2019

vidarl commented Apr 24, 2019 • edited Loading

SerheyDolgushev commented Apr 24, 2019

lserwatka commented Apr 25, 2019

SerheyDolgushev commented Apr 26, 2019

vidarl left a comment

Choose a reason for hiding this comment

SerheyDolgushev commented Apr 30, 2019

vidarl commented Apr 30, 2019

SerheyDolgushev commented Apr 30, 2019

andrerom commented Apr 30, 2019 • edited Loading

vidarl commented Apr 24, 2019 •

edited

Loading

andrerom commented Apr 30, 2019 •

edited

Loading