prreview 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e70c1efe8d054fde07f26a2a4830ec6d267bfcf1c1476c1acefbfda3f1a98a5
-  data.tar.gz: 9e18b68ab00cfb79c464b03e6ccaa0e7381420d5e74cd332b6e6c35cd597d30c
+  metadata.gz: 9b7c0932a902f7945386447266e75f47c548440c6dba6f4df12120a7e1f798d8
+  data.tar.gz: 3ce6c0071493576b4a40763193797668206471b87d28a5d08ca74c37a720c0d9
 SHA512:
-  metadata.gz: c0afeacc8f117863e7b92623d98c81e84bb765957b59f0bcffd2558dd8a978a594e4857e5ecae1172223f06554af1f8ed795bcbdfb96b2b8ec348eac1fbb24e6
-  data.tar.gz: bc8bbafaca87a04880f2eb4fda82c5493d3eda67d61cc22840c2ad1f7dc43688a993ae6327c9b94425f1f1fadd1c5876f1a1899c710065e0f2f0d40c1a135f51
+  metadata.gz: b549fb10017f52ee23154662ce1f28271f385e8771e607b9c736e2e5295327ff5389792bcdd4f6e55e9d490cc9e7ec2de04781bd4de4dc249865090e4d96d0d9
+  data.tar.gz: 8393b54c91c0c81dc8da1c9a7d7f39d864d455dd63b46ff4a7614783da90ff83554fc2a5daeca5aaee24b62ec54ecafb0d7c997ff5611a51db2355574f7596f0

data/lib/prreview/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prreview
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/prreview.rb

@@ -128,7 +128,9 @@ module Prreview
 
       content = @client.contents(@full_repo, path:, ref: @pr.head.sha)
       decoded = Base64.decode64(content.content)
-      binary?(decoded) ? '(binary file)' : decoded
+      return if binary?(decoded)
+
+      decoded
     rescue Octokit::NotFound
       '(file content not found)'
     end
@@ -207,7 +209,7 @@ module Prreview
           x.current_date DateTime.now
 
           x.pull_request do
-            build_issue(x, @pr)
+            build_issue!(x, @pr)
 
             x.commits do
               @pr_commits.each do |c|
@@ -222,7 +224,7 @@ module Prreview
             x.comments do
               @pr_comments.each do |c|
                 x.comment_ do
-                  build_comment(x, c)
+                  build_comment!(x, c)
                 end
               end
             end
@@ -230,7 +232,7 @@ module Prreview
             x.code_comments do
               @pr_code_comments.each do |c|
                 x.code_comment do
-                  build_comment(x, c)
+                  build_comment!(x, c)
                   x.path c.path
                   x.line c.line
                 end
@@ -240,12 +242,12 @@ module Prreview
             x.pull_request_files do
               @pr_files.each do |f|
                 content = fetch_file_content(f.filename) if @include_content && !skip_file?(f.filename)
-                patch = extract_patch(f) || '(no patch data)'
+                patch = extract_patch(f)
 
                 x.file do
                   x.filename f.filename
-                  x.content(content) if content
-                  x.patch patch
+                  x.content { cdata!(x, content) } if content
+                  x.patch { cdata!(x, patch) } if patch
                 end
               end
             end
@@ -257,12 +259,12 @@ module Prreview
               comments = linked_issue[:comments]
 
               x.linked_issue do
-                build_issue(x, issue)
+                build_issue!(x, issue)
 
                 x.comments do
                   comments.each do |c|
                     x.comment_ do
-                      build_comment(x, c)
+                      build_comment!(x, c)
                     end
                   end
                 end
@@ -275,7 +277,7 @@ module Prreview
               @optional_file_contents.each do |file|
                 x.file do
                   x.filename file[:filename]
-                  x.content file[:content]
+                  x.content { cdata!(x, file[:content]) }
                 end
               end
             end
@@ -289,7 +291,7 @@ module Prreview
       @xml = builder.doc.root.to_xml
     end
 
-    def build_issue(xml, issue)
+    def build_issue!(xml, issue)
       xml.url issue.html_url
       xml.user issue.user.login
       xml.title issue.title
@@ -297,7 +299,7 @@ module Prreview
       xml.created_at issue.created_at
     end
 
-    def build_comment(xml, comment)
+    def build_comment!(xml, comment)
       xml.user comment.user.login
       xml.body comment.body
       xml.created_at comment.created_at
@@ -317,6 +319,17 @@ module Prreview
       string.include?("\x00")
     end
 
+    def cdata!(x, str)
+      return unless str
+
+      parts = str.to_s.split(']]>')
+      x.cdata(parts.first || '')
+      parts.drop(1).each do |rest|
+        x.text(']]>')
+        x.cdata rest
+      end
+    end
+
     def copy_result_to_clipboard
       Clipboard.copy(@xml)
       puts 'XML prompt generated and copied to your clipboard.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prreview
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Evgenii Morozov