attrs rendering added to more block types

tests/data/html/audio.html

@@ -1,4 +1,4 @@
-<figure class="audio-player-container"><div><audio src=https://getfoobar/audio/sohtdbcmxu-1581683086.mp3></audio><div class="audio-player audio-player-initialising">
+<figure class="audio-player-container" id="b-NzgT2MAhuSTnpFyo-E3"><div><audio src=https://getfoobar/audio/sohtdbcmxu-1581683086.mp3></audio><div class="audio-player audio-player-initialising">
     <div class="player-button">
         <i class="icon audio-play-icon"></i>
     </div>

tests/data/html/code_block.html

@@ -1,4 +1,4 @@
-<div><pre><code data-lang="python"># Python Program to find the L.C.M. of two input number
+<div id="b-NzgT2MAhuSTnpFyo-E4"><pre><code data-lang="python"># Python Program to find the L.C.M. of two input number
 
 def compute_lcm(x, y):
 

tests/data/html/data_attributes.html

@@ -1 +1 @@
-<div data-show-gap="true" data-type="imageStrip"><figure><picture><source srcset="https://placekitten.com/200/301" type="image"/><source srcset="https://placekitten.com/200/301" type="image"/><img src="https://placekitten.com/200/301" alt="Sleepy Kitten" width="300" height="400"/></picture><figcaption>Cute Kitty</figcaption></figure><figure><picture><source srcset="https://placekitten.com/200/301" type="image"/><source srcset="https://placekitten.com/200/301" type="image"/><img src="https://placekitten.com/200/301" alt="Happy Kitten" width="300" height="400"/></picture><figcaption>New Kitty</figcaption></figure></div>
+<div data-show-gap="true" data-type="imageStrip"><figure id="b-NzgT2MAhuSTnpFyo-E5"><picture><source srcset="https://placekitten.com/200/301" type="image"/><source srcset="https://placekitten.com/200/301" type="image"/><img src="https://placekitten.com/200/301" alt="Sleepy Kitten" width="300" height="400"/></picture><figcaption>Cute Kitty</figcaption></figure><figure><picture><source srcset="https://placekitten.com/200/301" type="image"/><source srcset="https://placekitten.com/200/301" type="image"/><img src="https://placekitten.com/200/301" alt="Happy Kitten" width="300" height="400"/></picture><figcaption>New Kitty</figcaption></figure></div>

tests/data/html/document-pdf.html

@@ -1,4 +1,4 @@
-<figure class="file-attachment"><div class="file-attachment-panel">
+<figure class="file-attachment" id="b-NzgT2MAhuSTnpFyo-E6"><div class="file-attachment-panel">
    <div class="file-attachment-container">
       <div class="file-type-container">
          <span class="file-type"> pdf </span>

tests/data/html/embed.html

@@ -1 +1 @@
-<div class="embed-wrapper youtube-wrapper"><figure><iframe width="480" height="270" src="https://www.youtube.com/embed/GJQsT-h0FTU?feature=oembed" frameborder="0"  allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe><figcaption>Extraction</figcaption></figure></div>
+<div class="embed-wrapper youtube-wrapper" id="b-NzgT2MAhuSTnpFyo-E7"><figure><iframe width="480" height="270" src="https://www.youtube.com/embed/GJQsT-h0FTU?feature=oembed" frameborder="0"  allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe><figcaption>Extraction</figcaption></figure></div>

tests/data/html/heading.html

@@ -1 +1 @@
-<h2><strong>This</strong> is a <br><em>word</em></h2>
+<h2 id="b-NzgT2MAhuSTnpFyo-E8"><strong>This</strong> is a <br><em>word</em></h2>

tests/data/html/horizontal_rule.html

@@ -1 +1 @@
-<hr>
+<hr id="b-NzgT2MAhuSTnpFyo-E8"><hr>

tests/data/html/image.html

@@ -1 +1 @@
-<figure><picture><source srcset="https://placekitten.com/200/301?text=&quot;escape me&quot;" type="image"/><source srcset="https://placekitten.com/198/654" type="image"/><img src="https://placekitten.com/198/654" alt="Sleepy Kitten"/></picture><figcaption>&lt;script&gt;alert(23)&lt;/script&gt;Cute Kitty</figcaption></figure>
+<figure id="b-NzgT2MAhuSTnpFyo-E9"><picture><source srcset="https://placekitten.com/200/301?text=&quot;escape me&quot;" type="image"/><source srcset="https://placekitten.com/198/654" type="image"/><img src="https://placekitten.com/198/654" alt="Sleepy Kitten"/></picture><figcaption>&lt;script&gt;alert(23)&lt;/script&gt;Cute Kitty</figcaption></figure>

tests/data/html/paragraph.html

@@ -1 +1 @@
-<p><sup>Quick brown fox jumps over the lazy dog. </sup></p><p id="ayZCtf1xgGPZnCVimIUO">In Penny Lane, there is a barber showing photographs..</p>
+<p><sup>Quick brown fox jumps over the lazy dog. </sup></p><p id="b-NzgT3GpkPSdZL_VyV2f">In Penny Lane, there is a barber showing photographs..</p>

tests/data/json/audio.json

@@ -5,6 +5,7 @@
     {
       "type": "audio",
       "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E3",
         "src": "https://getfoobar/audio/sohtdbcmxu-1581683086.mp3",
         "caption": "YetAnotherPodcaster"
       }

tests/data/json/code_block.json

@@ -4,7 +4,8 @@
     {
       "type": "code_block",
       "attrs": {
-          "language": "python"
+          "language": "python",
+          "id": "b-NzgT2MAhuSTnpFyo-E4"
       },
       "content": [
           {

tests/data/json/data_attributes.json

@@ -5,6 +5,7 @@
     {
       "type": "image",
       "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E5",
         "src": { "image": "https://placekitten.com/200/301", "fallback": "https://placekitten.com/200/301" },
         "alt": "Sleepy Kitten",
         "caption": "Cute Kitty",

tests/data/json/document-pdf.json

@@ -5,6 +5,7 @@
     {
       "type": "document",
       "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E6",
         "src": "http://www.africau.edu/images/default/sample.pdf",
         "caption": "This is pdf caption.",
         "name": "RE_40566006.pdf",

tests/data/json/embed.json

@@ -4,6 +4,7 @@
     {
       "type": "embed",
       "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E7",
         "title": "Extraction | Chris Hemsworth | Official Trailer | Netflix India",
         "description": "A hardened mercenary's mission becomes a soul-searching race to survive when he's sent into Bangladesh to rescue a drug lord's kidnapped son.",
         "type": "video",

tests/data/json/heading.json

@@ -4,6 +4,7 @@
     {
       "type": "heading",
       "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E8",
         "level": 2
       },
       "content": [

tests/data/json/horizontal_rule.json

@@ -1,6 +1,12 @@
 {
   "type": "doc",
   "content": [
+    {
+      "type": "horizontal_rule",
+      "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E8"
+      }
+    },
     {
       "type": "horizontal_rule"
     }

tests/data/json/image.json

@@ -4,6 +4,7 @@
     {
       "type": "image",
       "attrs": {
+        "id": "b-NzgT2MAhuSTnpFyo-E9",
         "src": {
           "image": "https://placekitten.com/200/301?text=\"escape me\"",
           "fallback": "https://placekitten.com/198/654"

tests/data/json/paragraph.json

@@ -18,7 +18,7 @@
     {
       "type": "paragraph",
       "attrs": {
-        "id": "ayZCtf1xgGPZnCVimIUO"
+        "id": "b-NzgT3GpkPSdZL_VyV2f"
       },
       "content": [
         {

tests/test_transform.py

@@ -6,45 +6,45 @@
 import tiptapy
 
 tags_to_test = (
-    # "simple",
-    # "blockquote",
-    # "bulletlist",
-    # "mark_tags",
+    "simple",
+    "blockquote",
+    "bulletlist",
+    "mark_tags",
     "ordered_list",
     "paragraph",
     "paragraph-is_renderable",
     "paragraph-codemark",
     "paragraph-escape",
-    # "image",
-    # "image-is_renderable",
-    # "image-missing_caption",
-    # "image-no_caption",
-    # "image-mime_type",
-    # "image-height_width",
-    # "featuredimage",
-    # "featuredimage-is_renderable",
-    # "featuredimage-missing_caption",
-    # "featuredimage-no_caption",
-    # "featuredimage-mime_type",
-    # "featuredimage-height_width",
-    # "horizontal_rule",
-    # "embed",
-    # "embed-missing_caption",
-    # "embed-no_caption",
-    # "embed-null_caption",
-    # "heading",
-    # "is_renderable",
-    # "code_block",
-    # "code_block-is_renderable",
-    # "audio",
-    # "audio-no_caption",
-    # "audio-is_renderable",
-    # "document-pdf",
-    # "document-is_renderable",
-    # "document-sketch",
-    # "camel-case",
-    # "data_attributes",
-    # "xss",
+    "image",
+    "image-is_renderable",
+    "image-missing_caption",
+    "image-no_caption",
+    "image-mime_type",
+    "image-height_width",
+    "featuredimage",
+    "featuredimage-is_renderable",
+    "featuredimage-missing_caption",
+    "featuredimage-no_caption",
+    "featuredimage-mime_type",
+    "featuredimage-height_width",
+    "horizontal_rule",
+    "embed",
+    "embed-missing_caption",
+    "embed-no_caption",
+    "embed-null_caption",
+    "heading",
+    "is_renderable",
+    "code_block",
+    "code_block-is_renderable",
+    "audio",
+    "audio-no_caption",
+    "audio-is_renderable",
+    "document-pdf",
+    "document-is_renderable",
+    "document-sketch",
+    "camel-case",
+    "data_attributes",
+    "xss",
 )
 
 

tiptapy/templates/codeBlock.html

@@ -2,7 +2,7 @@
 {%- if node.content -%}
   {%- set text = node.content[0].text -%}
   {%- if text -%}
-    <div><pre>
+    <div{{ extract_parent_tag_attrs(node) }}><pre>
       {%- if language -%}
         <code data-lang="{{language}}">{{text}}</code>
       {%- else -%}

tiptapy/templates/code_block.html

@@ -2,7 +2,7 @@
 {%- if node.content -%}
   {%- set text = node.content[0].text -%}
   {%- if text -%}
-    <div><pre>
+    <div{{ extract_parent_tag_attrs(node) }}><pre>
       {%- if language -%}
         <code data-lang="{{language}}">{{text}}</code>
       {%- else -%}

tiptapy/templates/embed.html

@@ -1,7 +1,7 @@
 {%- set html = node.attrs.html -%}
 
 {%- set provider_name = node.attrs.provider|default('link')|lower -%}
-<div class="embed-wrapper {{provider_name}}-wrapper">
+<div class="embed-wrapper {{provider_name}}-wrapper"{{ extract_parent_tag_attrs(node) }}>
 {%- for item in node.content -%}
   {%- with template=item.type + '.html', node=item -%}
       {%- include template -%}

tiptapy/templates/extras/audio.html

@@ -3,7 +3,7 @@
   {%- set audio_player_block = get_audio_player_block() -%}
   {%- set src = node.attrs.src|trim -%}
 
-  <figure class="audio-player-container">
+  <figure class="audio-player-container"{{ extract_parent_tag_attrs(node) }}>
     {%- if caption -%}
       <div><audio src={{src}}></audio>{{audio_player_block}}</div><figcaption>{{caption}}</figcaption>
     {%- else -%}

tiptapy/templates/extras/document.html

@@ -5,7 +5,7 @@
 {%- set ext = node.attrs.format|trim -%}
 {%- if src and size and fname and ext -%}
   {%- set doc_block = get_doc_block(ext, fname, size, src) -%}
-  <figure class="file-attachment">
+  <figure class="file-attachment"{{ extract_parent_tag_attrs(node) }}>
   {%- if caption -%}
     {{doc_block}}<figcaption>{{caption}}</figcaption>
   {%- else -%}

tiptapy/templates/heading.html

@@ -1,4 +1,4 @@
-<h{{node.attrs.level|default(1)}}>
+<h{{node.attrs.level|default(1)}}{{ extract_parent_tag_attrs(node) }}>
 {%- for item in node.content -%}
   {%- with template=item.type + '.html', node=item -%} 
       {%- include template -%}

tiptapy/templates/horizontalRule.html

@@ -1 +1 @@
-<hr>
+<hr{{ extract_parent_tag_attrs(node) }}>

tiptapy/templates/horizontal_rule.html

@@ -1 +1 @@
-<hr>
+<hr{{ extract_parent_tag_attrs(node) }}>

tiptapy/templates/image.html

@@ -9,7 +9,7 @@
   {%- set fallback_type = url2mime(fallback_url) -%}
 
   {%- if image_url or fallback_url -%}
-    <figure><picture><source srcset="{{ image_url }}" type="{{ image_type }}"/><source srcset="{{ fallback_url }}" type="{{ fallback_type }}"/><{{ make_img_src(node.attrs) }}/></picture>
+    <figure{{ extract_parent_tag_attrs(node) }}><picture><source srcset="{{ image_url }}" type="{{ image_type }}"/><source srcset="{{ fallback_url }}" type="{{ fallback_type }}"/><{{ make_img_src(node.attrs) }}/></picture>
       {%- if caption -%}
         <figcaption>{{ caption }}</figcaption>
       {%- endif -%}