moxml 0.5.96 → 0.5.97
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.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/lib/moxml/adapter/ox.rb +17 -6
- data/lib/moxml/version.rb +1 -1
- data/spec/moxml/adapter/ox_spec.rb +30 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ec3d9011525010958b918f5c9665d47f54c202c96d0e3917c65d90ced667233b
|
|
4
|
+
data.tar.gz: 4d7d535d9960f935a6419006c586db0b49981de555cfa362eee641c548c51c1b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8e39fcd9157a62fc686befcae1e4ca077e757c6b9bfc399b590f02377199be55e45f281f9cd50dcac5eaff9d32abd8aa2d40de7fc3250b3d02dd69aadd1dfefe
|
|
7
|
+
data.tar.gz: d947c13ae056a34a65d91d27648b54b89d4bca1c0d7a56712a77c560e7ef89cf798538af3871298ddcf5146379cc57442a7f02d359013228057a707765003f11
|
data/Gemfile
CHANGED
data/lib/moxml/adapter/ox.rb
CHANGED
|
@@ -779,41 +779,52 @@ module Moxml
|
|
|
779
779
|
if node.is_a?(::Ox::Element) && (doc = document(node))
|
|
780
780
|
return true if attachments.get(doc, :has_entity_refs)
|
|
781
781
|
return true if attachments.get(doc, :has_cdata_end_markers)
|
|
782
|
+
return true if attachments.get(doc, :has_patched_text)
|
|
782
783
|
return false if attachments.key?(doc, :has_entity_refs) &&
|
|
783
|
-
attachments.key?(doc, :has_cdata_end_markers)
|
|
784
|
+
attachments.key?(doc, :has_cdata_end_markers) &&
|
|
785
|
+
attachments.key?(doc, :has_patched_text)
|
|
784
786
|
|
|
785
787
|
scan_root = doc
|
|
786
788
|
end
|
|
787
789
|
|
|
788
790
|
# One merged tree scan instead of two; flags cache on the
|
|
789
791
|
# document either way.
|
|
790
|
-
has_er, has_cdata = tree_scan_custom_needs(scan_root)
|
|
792
|
+
has_er, has_cdata, has_patched = tree_scan_custom_needs(scan_root)
|
|
791
793
|
if scan_root.is_a?(::Ox::Document)
|
|
792
794
|
attachments.set(scan_root, :has_entity_refs, has_er)
|
|
793
795
|
attachments.set(scan_root, :has_cdata_end_markers, has_cdata)
|
|
796
|
+
attachments.set(scan_root, :has_patched_text, has_patched)
|
|
794
797
|
end
|
|
795
798
|
|
|
796
|
-
has_er || has_cdata
|
|
799
|
+
has_er || has_cdata || has_patched
|
|
797
800
|
end
|
|
798
801
|
|
|
799
|
-
# Single walk collecting
|
|
802
|
+
# Single walk collecting the custom-serialize triggers.
|
|
800
803
|
def tree_scan_custom_needs(node)
|
|
801
804
|
has_er = false
|
|
802
805
|
has_cdata = false
|
|
806
|
+
# Text enumeration hands out CustomizedOx::Text wrappers
|
|
807
|
+
# (node.rb patches String children so they can carry a
|
|
808
|
+
# parent); dup/append of an enumerated wrapper plants the
|
|
809
|
+
# subclass instance in the raw tree, and ::Ox.dump rejects
|
|
810
|
+
# classes it does not know (moxml#301).
|
|
811
|
+
has_patched = false
|
|
803
812
|
stack = [node]
|
|
804
813
|
until stack.empty?
|
|
805
814
|
current = stack.pop
|
|
806
815
|
case current
|
|
807
816
|
when ::Moxml::Adapter::CustomizedOx::EntityReference
|
|
808
817
|
has_er = true
|
|
818
|
+
when ::Moxml::Adapter::CustomizedOx::Text
|
|
819
|
+
has_patched = true
|
|
809
820
|
when ::Ox::CData
|
|
810
821
|
has_cdata = true if current.value&.include?("]]>")
|
|
811
822
|
when ::Ox::Element, ::Ox::Document
|
|
812
823
|
current.nodes&.each { |child| stack << child }
|
|
813
824
|
end
|
|
814
|
-
return [true, has_cdata] if has_er
|
|
825
|
+
return [true, has_cdata, has_patched] if has_er
|
|
815
826
|
end
|
|
816
|
-
[has_er, has_cdata]
|
|
827
|
+
[has_er, has_cdata, has_patched]
|
|
817
828
|
end
|
|
818
829
|
|
|
819
830
|
def has_declaration?(native_doc, _wrapper)
|
data/lib/moxml/version.rb
CHANGED
|
@@ -110,4 +110,34 @@ RSpec.describe Moxml::Adapter::Ox do
|
|
|
110
110
|
end
|
|
111
111
|
end
|
|
112
112
|
end
|
|
113
|
+
|
|
114
|
+
# moxml#301: text enumeration hands out CustomizedOx::Text
|
|
115
|
+
# (String children are patched so they can carry a parent); dup or
|
|
116
|
+
# append of an enumerated wrapper plants the subclass instance in
|
|
117
|
+
# the raw tree, and ::Ox.dump rejects classes it does not know.
|
|
118
|
+
# The custom-serialize gate must trip on it (has_patched_text).
|
|
119
|
+
describe "duped and appended text nodes serialize" do
|
|
120
|
+
let(:ctx) { Moxml.new(:ox) }
|
|
121
|
+
|
|
122
|
+
it "round-trips a duped text appended to a parsed tree" do
|
|
123
|
+
doc = ctx.parse(%(<r><a>t</a></r>))
|
|
124
|
+
doc.root.add_child(doc.root.children[0].children[0].dup)
|
|
125
|
+
expect(doc.to_xml).to eq(%(<r><a>t</a>t</r>))
|
|
126
|
+
end
|
|
127
|
+
|
|
128
|
+
it "round-trips an enumerated text moved into a built document" do
|
|
129
|
+
src = ctx.parse(%(<r>x</r>))
|
|
130
|
+
built = ctx.create_document
|
|
131
|
+
root = built.create_element("r")
|
|
132
|
+
built.root = root
|
|
133
|
+
root.add_child(src.root.children[0].dup)
|
|
134
|
+
expect(built.to_xml).to eq("<r>x</r>")
|
|
135
|
+
end
|
|
136
|
+
|
|
137
|
+
it "round-trips a cloned text appended deep" do
|
|
138
|
+
doc = ctx.parse(%(<r><a>keep</a></r>))
|
|
139
|
+
doc.root.children[0].add_child(doc.root.children[0].children[0].clone)
|
|
140
|
+
expect(doc.to_xml).to eq(%(<r><a>keepkeep</a></r>))
|
|
141
|
+
end
|
|
142
|
+
end
|
|
113
143
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: moxml
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.97
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-
|
|
11
|
+
date: 2026-10-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: |
|
|
14
14
|
Moxml is a unified XML manipulation library that provides a common API
|