aircana 5.2.3 → 5.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.rspec_status +19 -18
  3. data/CHANGELOG.md +8 -0
  4. data/lib/aircana/contexts/confluence_content.rb +1 -1
  5. data/lib/aircana/version.rb +1 -1
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0adb1fb471548787b02f777d635e59dd3a641877047c482933d29b86303ab464
4
- data.tar.gz: fb18a8883ad19fc7634aa85916a5ac9c6a276f64b60ce0f65e893c40ddeb3499
3
+ metadata.gz: 73a735eddc9f1fcd6d749bfb8899256c43bd9cb800c009f6e30b811c57c8602c
4
+ data.tar.gz: 3346a4b44f5b327c533e4e13d1635daedcbabee24fce6002bdee8156b7a1036e
5
5
  SHA512:
6
- metadata.gz: ef03ef5ba7d3ef1321c2f61a12547737d1fdc3a0d7825e0f445fc5aac927493f50fd3a962a4905aec231002c8f0b2e665622fd189c35dde08e0b253c52e992ff
7
- data.tar.gz: 27a74fa2195b062e32336dacfa6593d625bd0c6d34accdf2d7ad48149301e1620bff10dc5c2a52abc03e1a063c10261c4d5ff2e9c5384855517d0240d4fd51c9
6
+ metadata.gz: 7a86ae36cbc69918f0dd74d16d8e367c2040631d857c17c68ab9492021b5f39e831853918691e34e7d548eb625d59e3d2338628b5dd7085ddf707c724e3acddb
7
+ data.tar.gz: 648e239ba3cc9cab99e45055cf1cfd668f5807a1c4c7035558cee7a9c4e69a2e5d20cff75f86520fed60f3b270128d8db03f93715512d2eda7ae6b139629d806
data/.rspec_status CHANGED
@@ -55,26 +55,27 @@ example_id | status | run_t
55
55
  ./spec/aircana/configuration_spec.rb[1:8:2:1] | passed | 0.0002 seconds |
56
56
  ./spec/aircana/configuration_spec.rb[1:8:3:1] | passed | 0.0002 seconds |
57
57
  ./spec/aircana/configuration_spec.rb[1:8:4:1] | passed | 0.0001 seconds |
58
- ./spec/aircana/contexts/confluence_spec.rb[1:1:1:1] | passed | 0.00719 seconds |
59
- ./spec/aircana/contexts/confluence_spec.rb[1:1:1:2] | passed | 0.00053 seconds |
60
- ./spec/aircana/contexts/confluence_spec.rb[1:1:1:3] | passed | 0.0011 seconds |
61
- ./spec/aircana/contexts/confluence_spec.rb[1:1:2:1] | passed | 0.00077 seconds |
62
- ./spec/aircana/contexts/confluence_spec.rb[1:1:2:2] | passed | 0.0002 seconds |
63
- ./spec/aircana/contexts/confluence_spec.rb[1:1:2:3] | passed | 0.00018 seconds |
64
- ./spec/aircana/contexts/confluence_spec.rb[1:1:3:1] | passed | 0.00037 seconds |
65
- ./spec/aircana/contexts/confluence_spec.rb[1:1:3:2] | passed | 0.00054 seconds |
66
- ./spec/aircana/contexts/confluence_spec.rb[1:2:1] | passed | 0.00337 seconds |
67
- ./spec/aircana/contexts/confluence_spec.rb[1:2:2] | passed | 0.00024 seconds |
58
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:1:1] | passed | 0.01148 seconds |
59
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:1:2] | passed | 0.00055 seconds |
60
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:1:3] | passed | 0.00114 seconds |
61
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:2:1] | passed | 0.00097 seconds |
62
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:2:2] | passed | 0.00023 seconds |
63
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:2:3] | passed | 0.00021 seconds |
64
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:3:1] | passed | 0.00035 seconds |
65
+ ./spec/aircana/contexts/confluence_spec.rb[1:1:3:2] | passed | 0.00226 seconds |
66
+ ./spec/aircana/contexts/confluence_spec.rb[1:2:1] | passed | 0.00167 seconds |
67
+ ./spec/aircana/contexts/confluence_spec.rb[1:2:2] | passed | 0.00022 seconds |
68
68
  ./spec/aircana/contexts/confluence_spec.rb[1:2:3] | passed | 0.0002 seconds |
69
- ./spec/aircana/contexts/confluence_spec.rb[1:2:4] | passed | 0.00018 seconds |
70
- ./spec/aircana/contexts/confluence_spec.rb[1:2:5] | passed | 0.00041 seconds |
71
- ./spec/aircana/contexts/confluence_spec.rb[1:2:6] | passed | 0.00024 seconds |
72
- ./spec/aircana/contexts/confluence_spec.rb[1:3:1:1] | passed | 0.00072 seconds |
73
- ./spec/aircana/contexts/confluence_spec.rb[1:3:1:2] | passed | 0.00044 seconds |
74
- ./spec/aircana/contexts/confluence_spec.rb[1:3:1:3] | passed | 0.0003 seconds |
69
+ ./spec/aircana/contexts/confluence_spec.rb[1:2:4] | passed | 0.00038 seconds |
70
+ ./spec/aircana/contexts/confluence_spec.rb[1:2:5] | passed | 0.00018 seconds |
71
+ ./spec/aircana/contexts/confluence_spec.rb[1:2:6] | passed | 0.00018 seconds |
72
+ ./spec/aircana/contexts/confluence_spec.rb[1:2:7] | passed | 0.00018 seconds |
73
+ ./spec/aircana/contexts/confluence_spec.rb[1:3:1:1] | passed | 0.00084 seconds |
74
+ ./spec/aircana/contexts/confluence_spec.rb[1:3:1:2] | passed | 0.00031 seconds |
75
+ ./spec/aircana/contexts/confluence_spec.rb[1:3:1:3] | passed | 0.00031 seconds |
75
76
  ./spec/aircana/contexts/confluence_spec.rb[1:3:1:4] | passed | 0.0003 seconds |
76
- ./spec/aircana/contexts/confluence_spec.rb[1:3:2:1] | passed | 0.00027 seconds |
77
- ./spec/aircana/contexts/confluence_spec.rb[1:3:2:2] | passed | 0.00025 seconds |
77
+ ./spec/aircana/contexts/confluence_spec.rb[1:3:2:1] | passed | 0.00031 seconds |
78
+ ./spec/aircana/contexts/confluence_spec.rb[1:3:2:2] | passed | 0.00026 seconds |
78
79
  ./spec/aircana/contexts/local_spec.rb[1:1:1] | passed | 0.00065 seconds |
79
80
  ./spec/aircana/contexts/local_spec.rb[1:1:2] | passed | 0.00038 seconds |
80
81
  ./spec/aircana/contexts/local_spec.rb[1:1:3] | passed | 0.00041 seconds |
data/CHANGELOG.md CHANGED
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
5
5
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6
6
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
 
8
+ ## [5.2.4]
9
+
10
+ ### Fixed
11
+ - Fixed Confluence code blocks with whitespace around CDATA not being parsed
12
+ - Confluence API often returns newlines/spaces between `<ac:plain-text-body>` and `<![CDATA[`
13
+ - Added `\s*` to regex to allow optional whitespace around CDATA sections
14
+ - Previously, unmatched code blocks were stripped by generic `ac:` tag removal, truncating content
15
+
8
16
  ## [5.2.2]
9
17
 
10
18
  ### Fixed
data/lib/aircana/contexts/confluence_content.rb CHANGED
@@ -26,7 +26,7 @@ module Aircana
26
26
 
27
27
  # Convert code blocks with CDATA content to <pre><code> tags
28
28
  cleaned.gsub!(
29
- %r{<ac:structured-macro[^>]*ac:name="code"[^>]*>(?:.*?<ac:parameter[^>]*ac:name="language"[^>]*>([^<]*)</ac:parameter>)?.*?<ac:plain-text-body><!\[CDATA\[(.*?)\]\]></ac:plain-text-body>.*?</ac:structured-macro>}m
29
+ %r{<ac:structured-macro[^>]*ac:name="code"[^>]*>(?:.*?<ac:parameter[^>]*ac:name="language"[^>]*>([^<]*)</ac:parameter>)?.*?<ac:plain-text-body>\s*<!\[CDATA\[(.*?)\]\]>\s*</ac:plain-text-body>.*?</ac:structured-macro>}m
30
30
  ) do
31
31
  language = Regexp.last_match(1)&.strip || ""
32
32
  code = Regexp.last_match(2) || ""
data/lib/aircana/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Aircana
4
- VERSION = "5.2.3"
4
+ VERSION = "5.2.4"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aircana
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.3
4
+ version: 5.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Weston Dransfield