marlens-jira-api 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782848ce0d3f51aed25b94ade7e4cabda09106be46fd3803307450f42a9d249c
-  data.tar.gz: ce6672958668fcf08a45a3dbdceb66ba7a99daf5b2d95e5085b07efc8741581b
+  metadata.gz: 4d03091de06691a2493443796b27c4c7205067ba92eb3503cdf0ccb2771b86a6
+  data.tar.gz: 0f1c94a08e018b97a171a25a888baabebb301a9427f9f6eccc915e8b222fad7a
 SHA512:
-  metadata.gz: b31245df26fe026493a556d6e3b1ab1d9e45be5281705672b631d65b86f85ac91c8ce392064068b913c1c5e0c2096332c4f13533aeffdd59f382f6fd76cf4472
-  data.tar.gz: 5591a8de6a89de181ef02d0d5e4d7427bb20a6fc36c7d8c888c164f9966f029d30277516bf69b17dcc2bea8444dbbcc4bdb9e7d011fe79d422a2827f90cf9521
+  metadata.gz: a47ff4083694ad1406d0248b4ac86afead42c425464c2cfeb0fb61f9d344aed3c8a78172fae723095d02f09ea0cdc9343cfac0d9394388cfa490a646449900bc
+  data.tar.gz: 51e132f5fa0b5f3e59fb6ebb35c37d8fd9ec468bab881dbca2fb7bc191cd210a9adc1055ac9173fc1200ab27b05ec49824c1468a9786414a7db6e64b2f8e8c2d

data/lib/marlens/jira_api/client.rb

@@ -2,7 +2,7 @@
 
 require "base64"
 require "json"
-require "multipart/post"
+require "net/http/post/multipart"
 require "net/http"
 require "uri"
 

data/lib/marlens/jira_api/markdown_to_adf.rb

@@ -31,6 +31,25 @@ module Marlens
         }
       end
 
+      def self.external_media_single(url:, alt:, width:, height:)
+        {
+          "type" => "mediaSingle",
+          "attrs" => { "layout" => "center" },
+          "content" => [
+            {
+              "type" => "media",
+              "attrs" => {
+                "type" => "external",
+                "url" => url,
+                "alt" => alt,
+                "width" => width,
+                "height" => height,
+              },
+            },
+          ],
+        }
+      end
+
       def self.paragraph(text)
         new("").send(:paragraph_from_text, text)
       end
@@ -79,7 +98,7 @@ module Marlens
         when :heading
           heading(node)
         when :paragraph
-          paragraph(node)
+          paragraph_blocks(node)
         when :code_block
           code_block(node)
         when :list
@@ -105,19 +124,23 @@ module Marlens
         }
       end
 
-      def paragraph(node)
-        return image_block_for(children(node).first) if single_image_node?(node)
+      def paragraph_blocks(node)
+        return [image_block_for(children(node).first)] if single_image_node?(node)
+
+        split_paragraph_around_html_images(node) || [paragraph_from_inline_content(inline_content(node))]
+      end
 
+      def paragraph_from_text(text)
         {
           "type" => "paragraph",
-          "content" => inline_content(node),
+          "content" => [text_node(text)],
         }
       end
 
-      def paragraph_from_text(text)
+      def paragraph_from_inline_content(content)
         {
           "type" => "paragraph",
-          "content" => [text_node(text)],
+          "content" => content,
         }
       end
 
@@ -210,6 +233,43 @@ module Marlens
         )
       end
 
+      def split_paragraph_around_html_images(node)
+        blocks = []
+        pending_content = []
+
+        children(node).each do |child|
+          image_block = inline_html_image_block(child)
+
+          if image_block.nil?
+            append_inline_content(pending_content, render_inline(child, []))
+          else
+            append_paragraph_block(blocks, pending_content)
+            pending_content = []
+            blocks << image_block
+          end
+        end
+        return nil if blocks.empty?
+
+        append_paragraph_block(blocks, pending_content)
+        blocks
+      end
+
+      def inline_html_image_block(node)
+        return nil unless node.type == :html_inline
+
+        html_image_block(node)
+      end
+
+      def append_paragraph_block(blocks, content)
+        blocks << paragraph_from_inline_content(content) unless content.empty?
+      end
+
+      def append_inline_content(content, inline)
+        return if inline.nil?
+
+        inline.is_a?(Array) ? content.concat(inline.compact) : content << inline
+      end
+
       def resolved_image_block(url:, alt: nil, width: nil, height: nil)
         return nil if url.nil? || url.strip.empty?
         return fallback_image_paragraph(url, alt) if @image_resolver.nil?

data/lib/marlens/jira_api/remote_image_attachment_uploader.rb

@@ -20,8 +20,8 @@ module Marlens
         attachment = upload_image_attachment(image.fetch(:url))
         dimensions = attachment.fetch("dimensions")
 
-        MarkdownToAdf.media_single(
-          id: attachment.fetch("id"),
+        MarkdownToAdf.external_media_single(
+          url: attachment.fetch("content"),
           alt: image[:alt].to_s.strip.empty? ? attachment.fetch("filename") : image[:alt],
           width: image_dimension_value(image[:width], dimensions.fetch("width")),
           height: image_dimension_value(image[:height], dimensions.fetch("height"))
@@ -55,7 +55,7 @@ module Marlens
           )
 
           return {
-            "id" => attachment.fetch("id").to_s,
+            "content" => attachment.fetch("content").to_s,
             "filename" => attachment.fetch("filename", filename),
             "dimensions" => dimensions,
           }

data/lib/marlens/jira_api/version.rb

@@ -2,6 +2,6 @@
 
 module Marlens
   module JiraApi
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marlens-jira-api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Marlen Brunner