ironcalc 0.9.0.0 → 0.9.1.0

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3d19047f19258a32527431ddd547aa0014a7b94cb400620807cebf7bd889618c
4
- data.tar.gz: 8cb8e57a7f3fe3ddfc79a3147e9dcc55eead3820de0e0337ca53a2ec31fb6a4d
3
+ metadata.gz: 1e609992a014e903a48028efa83a063c10e23ca907a04eeb8e40779b1c5a1db2
4
+ data.tar.gz: a4aec775ff1216db62486e01addaf603531a55a14264e1378cd80debfc31226b
5
5
  SHA512:
6
- metadata.gz: 3ad2745c1ed85f7c83b833116b997fcea846f59612423ccdddd2846d4647a79fe0d4a59e1dbf462edffe4b0f8e4569c9ae78ff60b73beba18943e8459d22723d
7
- data.tar.gz: 8c1b25cc6709ebf4db2ea780bb56dffcf491d21970ac0b2ab26a54cea7c750605cbc9fb5df5ad9fd5a489e512285d7e91a7c3d5b7da9b253f97de154417292c7
6
+ metadata.gz: 798a3fe643ce2f1cbeb44f9c291766ce3627d29a5699a4bcee6abb00fffca05ccab7e682b7d2970e89b25478dc973fa40dfd30d00e9eac52324911104679c0cd
7
+ data.tar.gz: fc6ee83b138f57b63c52db357a0662e9f2bcda9ad04fd817578806cfdb897f72e47e43bdfdbe4c1b6a73c4e7b6e4af498db35e548e1daacfbfca9620d89e765b
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ ## 0.9.1.0
2
+
3
+ - update the IronCalc engine to 0.9.1
4
+ - merged cells on `Model` and `UserModel`: `merge_cells`, `merge_cells_across`,
5
+ `merge_cells_center`, `merge_cells_down`, `unmerge_cells` and
6
+ `get_merged_cells`, plus `get_merge_structure` on `Model`, which returns a
7
+ Hash tagged by `:type` (`{type: "Anchor", width:, height:}`)
8
+
1
9
  ## 0.9.0.0
2
10
 
3
11
  - update the IronCalc engine to 0.9.0
data/Cargo.lock CHANGED
@@ -62,7 +62,7 @@ dependencies = [
62
62
  "regex",
63
63
  "rustc-hash",
64
64
  "shlex 1.3.0",
65
- "syn",
65
+ "syn 2.0.117",
66
66
  ]
67
67
 
68
68
  [[package]]
@@ -86,7 +86,7 @@ checksum = "238b90427dfad9da4a9abd60f3ec1cdee6b80454bde49ed37f1781dd8e9dc7f9"
86
86
  dependencies = [
87
87
  "proc-macro2",
88
88
  "quote",
89
- "syn",
89
+ "syn 2.0.117",
90
90
  ]
91
91
 
92
92
  [[package]]
@@ -107,12 +107,6 @@ version = "1.25.0"
107
107
  source = "registry+https://github.com/rust-lang/crates.io-index"
108
108
  checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
109
109
 
110
- [[package]]
111
- name = "byteorder"
112
- version = "1.5.0"
113
- source = "registry+https://github.com/rust-lang/crates.io-index"
114
- checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
115
-
116
110
  [[package]]
117
111
  name = "cc"
118
112
  version = "1.2.64"
@@ -138,6 +132,23 @@ version = "1.0.4"
138
132
  source = "registry+https://github.com/rust-lang/crates.io-index"
139
133
  checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
140
134
 
135
+ [[package]]
136
+ name = "cfg_aliases"
137
+ version = "0.2.2"
138
+ source = "registry+https://github.com/rust-lang/crates.io-index"
139
+ checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
140
+
141
+ [[package]]
142
+ name = "chacha20"
143
+ version = "0.10.2"
144
+ source = "registry+https://github.com/rust-lang/crates.io-index"
145
+ checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
146
+ dependencies = [
147
+ "cfg-if",
148
+ "cpufeatures",
149
+ "rand_core",
150
+ ]
151
+
141
152
  [[package]]
142
153
  name = "chrono"
143
154
  version = "0.4.45"
@@ -179,19 +190,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
179
190
  checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
180
191
 
181
192
  [[package]]
182
- name = "crc32fast"
183
- version = "1.5.0"
193
+ name = "cpufeatures"
194
+ version = "0.3.1"
184
195
  source = "registry+https://github.com/rust-lang/crates.io-index"
185
- checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
196
+ checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
186
197
  dependencies = [
187
- "cfg-if",
198
+ "libc",
188
199
  ]
189
200
 
190
201
  [[package]]
191
- name = "crossbeam-utils"
192
- version = "0.8.21"
202
+ name = "crc32fast"
203
+ version = "1.5.3"
193
204
  source = "registry+https://github.com/rust-lang/crates.io-index"
194
- checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
205
+ checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
206
+ dependencies = [
207
+ "cfg-if",
208
+ ]
195
209
 
196
210
  [[package]]
197
211
  name = "csv"
@@ -220,6 +234,12 @@ version = "1.16.0"
220
234
  source = "registry+https://github.com/rust-lang/crates.io-index"
221
235
  checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
222
236
 
237
+ [[package]]
238
+ name = "equivalent"
239
+ version = "1.0.3"
240
+ source = "registry+https://github.com/rust-lang/crates.io-index"
241
+ checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
242
+
223
243
  [[package]]
224
244
  name = "find-msvc-tools"
225
245
  version = "0.1.9"
@@ -232,8 +252,8 @@ version = "1.1.9"
232
252
  source = "registry+https://github.com/rust-lang/crates.io-index"
233
253
  checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
234
254
  dependencies = [
235
- "crc32fast",
236
255
  "miniz_oxide",
256
+ "zlib-rs",
237
257
  ]
238
258
 
239
259
  [[package]]
@@ -262,13 +282,16 @@ dependencies = [
262
282
 
263
283
  [[package]]
264
284
  name = "getrandom"
265
- version = "0.2.17"
285
+ version = "0.4.3"
266
286
  source = "registry+https://github.com/rust-lang/crates.io-index"
267
- checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
287
+ checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
268
288
  dependencies = [
269
289
  "cfg-if",
290
+ "js-sys",
270
291
  "libc",
271
- "wasi",
292
+ "r-efi",
293
+ "rand_core",
294
+ "wasm-bindgen",
272
295
  ]
273
296
 
274
297
  [[package]]
@@ -283,6 +306,12 @@ version = "0.3.3"
283
306
  source = "registry+https://github.com/rust-lang/crates.io-index"
284
307
  checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
285
308
 
309
+ [[package]]
310
+ name = "hashbrown"
311
+ version = "0.17.1"
312
+ source = "registry+https://github.com/rust-lang/crates.io-index"
313
+ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
314
+
286
315
  [[package]]
287
316
  name = "iana-time-zone"
288
317
  version = "0.1.65"
@@ -307,16 +336,26 @@ dependencies = [
307
336
  "cc",
308
337
  ]
309
338
 
339
+ [[package]]
340
+ name = "indexmap"
341
+ version = "2.14.2"
342
+ source = "registry+https://github.com/rust-lang/crates.io-index"
343
+ checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855"
344
+ dependencies = [
345
+ "equivalent",
346
+ "hashbrown",
347
+ ]
348
+
310
349
  [[package]]
311
350
  name = "ironcalc"
312
- version = "0.9.0"
351
+ version = "0.9.1"
313
352
  source = "registry+https://github.com/rust-lang/crates.io-index"
314
- checksum = "c2dcead338bdbba6f024850fad275727841475ca9f5965c2ed39044da785b629"
353
+ checksum = "aabf0987c9f8e941476a7bfd2564496ca9f97bbf25a7165f7d499895b35fff0c"
315
354
  dependencies = [
316
355
  "bitcode",
317
356
  "chrono",
318
357
  "ironcalc_base",
319
- "itertools 0.12.1",
358
+ "itertools 0.15.0",
320
359
  "quick-xml",
321
360
  "serde",
322
361
  "serde_json",
@@ -326,9 +365,9 @@ dependencies = [
326
365
 
327
366
  [[package]]
328
367
  name = "ironcalc_base"
329
- version = "0.9.0"
368
+ version = "0.9.1"
330
369
  source = "registry+https://github.com/rust-lang/crates.io-index"
331
- checksum = "156daca9eaf6ef662842fd72f06f6cbfc61234d3b0159d7582c4e840d9f135cf"
370
+ checksum = "ecf55ea346dcda5e0f0034d8300dc2d40ffbcb64e7c4db23bfa1d8a0cf11c738"
332
371
  dependencies = [
333
372
  "bitcode",
334
373
  "chrono",
@@ -357,18 +396,18 @@ dependencies = [
357
396
 
358
397
  [[package]]
359
398
  name = "itertools"
360
- version = "0.12.1"
399
+ version = "0.13.0"
361
400
  source = "registry+https://github.com/rust-lang/crates.io-index"
362
- checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
401
+ checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
363
402
  dependencies = [
364
403
  "either",
365
404
  ]
366
405
 
367
406
  [[package]]
368
407
  name = "itertools"
369
- version = "0.13.0"
408
+ version = "0.15.0"
370
409
  source = "registry+https://github.com/rust-lang/crates.io-index"
371
- checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
410
+ checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
372
411
  dependencies = [
373
412
  "either",
374
413
  ]
@@ -412,11 +451,17 @@ dependencies = [
412
451
  "windows-link",
413
452
  ]
414
453
 
454
+ [[package]]
455
+ name = "libm"
456
+ version = "0.2.16"
457
+ source = "registry+https://github.com/rust-lang/crates.io-index"
458
+ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
459
+
415
460
  [[package]]
416
461
  name = "log"
417
- version = "0.4.32"
462
+ version = "0.4.34"
418
463
  source = "registry+https://github.com/rust-lang/crates.io-index"
419
- checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
464
+ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
420
465
 
421
466
  [[package]]
422
467
  name = "magnus"
@@ -438,7 +483,7 @@ checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
438
483
  dependencies = [
439
484
  "proc-macro2",
440
485
  "quote",
441
- "syn",
486
+ "syn 2.0.117",
442
487
  ]
443
488
 
444
489
  [[package]]
@@ -463,6 +508,18 @@ dependencies = [
463
508
  "simd-adler32",
464
509
  ]
465
510
 
511
+ [[package]]
512
+ name = "nix"
513
+ version = "0.31.3"
514
+ source = "registry+https://github.com/rust-lang/crates.io-index"
515
+ checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
516
+ dependencies = [
517
+ "bitflags",
518
+ "cfg-if",
519
+ "cfg_aliases",
520
+ "libc",
521
+ ]
522
+
466
523
  [[package]]
467
524
  name = "nom"
468
525
  version = "7.1.3"
@@ -480,6 +537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
480
537
  checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
481
538
  dependencies = [
482
539
  "autocfg",
540
+ "libm",
483
541
  ]
484
542
 
485
543
  [[package]]
@@ -512,15 +570,6 @@ version = "0.2.17"
512
570
  source = "registry+https://github.com/rust-lang/crates.io-index"
513
571
  checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
514
572
 
515
- [[package]]
516
- name = "ppv-lite86"
517
- version = "0.2.21"
518
- source = "registry+https://github.com/rust-lang/crates.io-index"
519
- checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
520
- dependencies = [
521
- "zerocopy",
522
- ]
523
-
524
573
  [[package]]
525
574
  name = "proc-macro2"
526
575
  version = "1.0.106"
@@ -549,34 +598,27 @@ dependencies = [
549
598
  ]
550
599
 
551
600
  [[package]]
552
- name = "rand"
553
- version = "0.8.6"
601
+ name = "r-efi"
602
+ version = "6.0.0"
554
603
  source = "registry+https://github.com/rust-lang/crates.io-index"
555
- checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
556
- dependencies = [
557
- "libc",
558
- "rand_chacha",
559
- "rand_core",
560
- ]
604
+ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
561
605
 
562
606
  [[package]]
563
- name = "rand_chacha"
564
- version = "0.3.1"
607
+ name = "rand"
608
+ version = "0.10.3"
565
609
  source = "registry+https://github.com/rust-lang/crates.io-index"
566
- checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
610
+ checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
567
611
  dependencies = [
568
- "ppv-lite86",
612
+ "chacha20",
613
+ "getrandom",
569
614
  "rand_core",
570
615
  ]
571
616
 
572
617
  [[package]]
573
618
  name = "rand_core"
574
- version = "0.6.4"
619
+ version = "0.10.1"
575
620
  source = "registry+https://github.com/rust-lang/crates.io-index"
576
- checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
577
- dependencies = [
578
- "getrandom",
579
- ]
621
+ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
580
622
 
581
623
  [[package]]
582
624
  name = "rb-sys"
@@ -599,7 +641,7 @@ dependencies = [
599
641
  "quote",
600
642
  "regex",
601
643
  "shell-words",
602
- "syn",
644
+ "syn 2.0.117",
603
645
  ]
604
646
 
605
647
  [[package]]
@@ -694,7 +736,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
694
736
  dependencies = [
695
737
  "proc-macro2",
696
738
  "quote",
697
- "syn",
739
+ "syn 2.0.117",
698
740
  ]
699
741
 
700
742
  [[package]]
@@ -741,9 +783,9 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
741
783
 
742
784
  [[package]]
743
785
  name = "simd-adler32"
744
- version = "0.3.9"
786
+ version = "0.3.10"
745
787
  source = "registry+https://github.com/rust-lang/crates.io-index"
746
- checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
788
+ checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
747
789
 
748
790
  [[package]]
749
791
  name = "siphasher"
@@ -759,12 +801,13 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
759
801
 
760
802
  [[package]]
761
803
  name = "statrs"
762
- version = "0.18.0"
804
+ version = "0.19.1"
763
805
  source = "registry+https://github.com/rust-lang/crates.io-index"
764
- checksum = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e"
806
+ checksum = "c1837f9a1bd13dabbdbb04489c39451482d3cdd35a6e1a0d0f3570dea2b8c8be"
765
807
  dependencies = [
766
808
  "approx",
767
809
  "num-traits",
810
+ "thiserror",
768
811
  ]
769
812
 
770
813
  [[package]]
@@ -778,6 +821,17 @@ dependencies = [
778
821
  "unicode-ident",
779
822
  ]
780
823
 
824
+ [[package]]
825
+ name = "syn"
826
+ version = "3.0.9"
827
+ source = "registry+https://github.com/rust-lang/crates.io-index"
828
+ checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
829
+ dependencies = [
830
+ "proc-macro2",
831
+ "quote",
832
+ "unicode-ident",
833
+ ]
834
+
781
835
  [[package]]
782
836
  name = "tap"
783
837
  version = "1.0.1"
@@ -786,35 +840,35 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
786
840
 
787
841
  [[package]]
788
842
  name = "thiserror"
789
- version = "1.0.69"
843
+ version = "2.0.21"
790
844
  source = "registry+https://github.com/rust-lang/crates.io-index"
791
- checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
845
+ checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e"
792
846
  dependencies = [
793
847
  "thiserror-impl",
794
848
  ]
795
849
 
796
850
  [[package]]
797
851
  name = "thiserror-impl"
798
- version = "1.0.69"
852
+ version = "2.0.21"
799
853
  source = "registry+https://github.com/rust-lang/crates.io-index"
800
- checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
854
+ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
801
855
  dependencies = [
802
856
  "proc-macro2",
803
857
  "quote",
804
- "syn",
858
+ "syn 3.0.9",
805
859
  ]
806
860
 
807
861
  [[package]]
808
- name = "unicode-ident"
809
- version = "1.0.24"
862
+ name = "typed-path"
863
+ version = "0.13.0"
810
864
  source = "registry+https://github.com/rust-lang/crates.io-index"
811
- checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
865
+ checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e"
812
866
 
813
867
  [[package]]
814
- name = "wasi"
815
- version = "0.11.1+wasi-snapshot-preview1"
868
+ name = "unicode-ident"
869
+ version = "1.0.24"
816
870
  source = "registry+https://github.com/rust-lang/crates.io-index"
817
- checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
871
+ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
818
872
 
819
873
  [[package]]
820
874
  name = "wasm-bindgen"
@@ -848,7 +902,7 @@ dependencies = [
848
902
  "bumpalo",
849
903
  "proc-macro2",
850
904
  "quote",
851
- "syn",
905
+ "syn 2.0.117",
852
906
  "wasm-bindgen-shared",
853
907
  ]
854
908
 
@@ -882,7 +936,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
882
936
  dependencies = [
883
937
  "proc-macro2",
884
938
  "quote",
885
- "syn",
939
+ "syn 2.0.117",
886
940
  ]
887
941
 
888
942
  [[package]]
@@ -893,7 +947,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
893
947
  dependencies = [
894
948
  "proc-macro2",
895
949
  "quote",
896
- "syn",
950
+ "syn 2.0.117",
897
951
  ]
898
952
 
899
953
  [[package]]
@@ -921,39 +975,51 @@ dependencies = [
921
975
  ]
922
976
 
923
977
  [[package]]
924
- name = "zerocopy"
925
- version = "0.8.52"
926
- source = "registry+https://github.com/rust-lang/crates.io-index"
927
- checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
928
- dependencies = [
929
- "zerocopy-derive",
930
- ]
931
-
932
- [[package]]
933
- name = "zerocopy-derive"
934
- version = "0.8.52"
978
+ name = "windows-sys"
979
+ version = "0.61.2"
935
980
  source = "registry+https://github.com/rust-lang/crates.io-index"
936
- checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
981
+ checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
937
982
  dependencies = [
938
- "proc-macro2",
939
- "quote",
940
- "syn",
983
+ "windows-link",
941
984
  ]
942
985
 
943
986
  [[package]]
944
987
  name = "zip"
945
- version = "0.6.6"
988
+ version = "9.1.2"
946
989
  source = "registry+https://github.com/rust-lang/crates.io-index"
947
- checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
990
+ checksum = "ec2e3161de27091f18a831d9494e9c53378a34833af5c1dda35ad85849da18d6"
948
991
  dependencies = [
949
- "byteorder",
950
992
  "crc32fast",
951
- "crossbeam-utils",
952
993
  "flate2",
994
+ "getrandom",
995
+ "indexmap",
996
+ "memchr",
997
+ "nix",
998
+ "typed-path",
999
+ "windows-sys",
1000
+ "zopfli",
953
1001
  ]
954
1002
 
1003
+ [[package]]
1004
+ name = "zlib-rs"
1005
+ version = "0.6.8"
1006
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1007
+ checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112"
1008
+
955
1009
  [[package]]
956
1010
  name = "zmij"
957
1011
  version = "1.0.21"
958
1012
  source = "registry+https://github.com/rust-lang/crates.io-index"
959
1013
  checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
1014
+
1015
+ [[package]]
1016
+ name = "zopfli"
1017
+ version = "0.8.4"
1018
+ source = "registry+https://github.com/rust-lang/crates.io-index"
1019
+ checksum = "aaf7fc5d30c28483d93805c4a5e12b05bbb52407fa67c5f8bd552374cd01fb11"
1020
+ dependencies = [
1021
+ "bumpalo",
1022
+ "crc32fast",
1023
+ "log",
1024
+ "simd-adler32",
1025
+ ]
@@ -14,4 +14,4 @@ serde_magnus = "0.11"
14
14
  bitcode = "0.6.8"
15
15
  # The IronCalc engine, published on crates.io as `ironcalc`. Renamed to `xlsx`
16
16
  # here so the source can refer to `xlsx::base`, `xlsx::import`, `xlsx::export`.
17
- xlsx = { package = "ironcalc", version = "0.9.0" }
17
+ xlsx = { package = "ironcalc", version = "0.9.1" }
@@ -293,6 +293,11 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
293
293
  get_defined_name_list/0, new_defined_name/3, update_defined_name/5,
294
294
  delete_defined_name/2, is_valid_defined_name/3,
295
295
  ]);
296
+ // Merged cells
297
+ define_methods!(model_class, Model, [
298
+ merge_cells/1, merge_cells_across/1, merge_cells_center/1, merge_cells_down/1,
299
+ unmerge_cells/1, get_merged_cells/1, get_merge_structure/3,
300
+ ]);
296
301
  // User API: IronCalc::UserModel
297
302
  let user_model_class = module.define_class("UserModel", ruby.class_object())?;
298
303
  // Persistence and collaboration (diff queue)
@@ -336,6 +341,11 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
336
341
  get_defined_name_list/0, new_defined_name/3, update_defined_name/5,
337
342
  delete_defined_name/2, is_valid_defined_name/3,
338
343
  ]);
344
+ // Merged cells
345
+ define_methods!(user_model_class, UserModel, [
346
+ merge_cells/1, merge_cells_across/1, merge_cells_center/1, merge_cells_down/1,
347
+ unmerge_cells/1, get_merged_cells/1,
348
+ ]);
339
349
 
340
350
  Ok(())
341
351
  }
@@ -4,7 +4,8 @@ use std::io::Cursor;
4
4
  use magnus::value::StaticSymbol;
5
5
  use magnus::error::ErrorType;
6
6
  use magnus::value::ReprValue;
7
- use magnus::{IntoValue, RArray, RString, Ruby, TryConvert, Value};
7
+ use magnus::r_hash::ForEach;
8
+ use magnus::{IntoValue, RArray, RHash, RString, Ruby, TryConvert, Value};
8
9
  use serde::de::DeserializeOwned;
9
10
  use serde::Serialize;
10
11
 
@@ -22,6 +23,29 @@ pub(crate) fn to_ruby<T: Serialize>(value: &T) -> Result<Value, magnus::Error> {
22
23
  serde_magnus::serialize(&ruby(), value)
23
24
  }
24
25
 
26
+ /// An enum of unit and struct variants as `{type: "Variant", field: value, ...}`.
27
+ pub(crate) fn to_ruby_tagged<T: Serialize>(value: &T) -> Result<Value, magnus::Error> {
28
+ let ruby = ruby();
29
+ let value = to_ruby(value)?;
30
+ let tagged = ruby.hash_new();
31
+ let type_key = ruby.sym_new("type");
32
+ if let Some(variant) = RString::from_value(value) {
33
+ tagged.aset(type_key, variant)?;
34
+ return Ok(tagged.as_value());
35
+ }
36
+ // serde_magnus writes any other variant as `{"Name" => {field: value, ...}}`.
37
+ let variant = RHash::from_value(value).filter(|hash| hash.len() == 1);
38
+ let Some(variant) = variant else {
39
+ return Err(magnus::Error::new(ruby.exception_type_error(), "expected an enum variant"));
40
+ };
41
+ variant.foreach(|name: RString, fields: RHash| {
42
+ tagged.aset(type_key, name)?;
43
+ tagged.update(fields)?;
44
+ Ok(ForEach::Continue)
45
+ })?;
46
+ Ok(tagged.as_value())
47
+ }
48
+
25
49
  pub(crate) fn from_ruby<T: DeserializeOwned>(value: Value) -> Result<T, magnus::Error> {
26
50
  let ruby = ruby();
27
51
  serde_magnus::deserialize(&ruby, value).map_err(|error| match error.error_type() {
@@ -734,4 +758,66 @@ impl Model {
734
758
  .is_valid_defined_name(&name, scope, &formula)
735
759
  .map_err(workbook_error)
736
760
  }
761
+
762
+ // Merged cells ----------------------------------------------------------
763
+
764
+ pub fn merge_cells(&self, range: Value) -> Result<(), magnus::Error> {
765
+ let range: Area = from_ruby(range)?;
766
+ self.model
767
+ .borrow_mut()
768
+ .merge_cells(&range)
769
+ .map_err(workbook_error)
770
+ }
771
+
772
+ pub fn merge_cells_across(&self, range: Value) -> Result<(), magnus::Error> {
773
+ let range: Area = from_ruby(range)?;
774
+ self.model
775
+ .borrow_mut()
776
+ .merge_cells_across(&range)
777
+ .map_err(workbook_error)
778
+ }
779
+
780
+ pub fn merge_cells_center(&self, range: Value) -> Result<(), magnus::Error> {
781
+ let range: Area = from_ruby(range)?;
782
+ self.model
783
+ .borrow_mut()
784
+ .merge_cells_center(&range)
785
+ .map_err(workbook_error)
786
+ }
787
+
788
+ pub fn merge_cells_down(&self, range: Value) -> Result<(), magnus::Error> {
789
+ let range: Area = from_ruby(range)?;
790
+ self.model
791
+ .borrow_mut()
792
+ .merge_cells_down(&range)
793
+ .map_err(workbook_error)
794
+ }
795
+
796
+ pub fn unmerge_cells(&self, range: Value) -> Result<(), magnus::Error> {
797
+ let range: Area = from_ruby(range)?;
798
+ self.model
799
+ .borrow_mut()
800
+ .unmerge_cells(&range)
801
+ .map_err(workbook_error)
802
+ }
803
+
804
+ pub fn get_merged_cells(&self, sheet: u32) -> Result<Value, magnus::Error> {
805
+ let model = self.model.borrow();
806
+ let merged_cells = model.get_merged_cells(sheet).map_err(workbook_error)?;
807
+ to_ruby(&merged_cells)
808
+ }
809
+
810
+ pub fn get_merge_structure(
811
+ &self,
812
+ sheet: u32,
813
+ row: i32,
814
+ column: i32,
815
+ ) -> Result<Value, magnus::Error> {
816
+ let structure = self
817
+ .model
818
+ .borrow()
819
+ .get_merge_structure(sheet, row, column)
820
+ .map_err(workbook_error)?;
821
+ to_ruby_tagged(&structure)
822
+ }
737
823
  }
@@ -473,4 +473,55 @@ impl UserModel {
473
473
  .is_valid_defined_name(&name, scope, &formula)
474
474
  .map_err(workbook_error)
475
475
  }
476
+
477
+ // Merged cells ----------------------------------------------------------
478
+
479
+ pub fn merge_cells(&self, range: Value) -> Result<(), magnus::Error> {
480
+ let range: Area = from_ruby(range)?;
481
+ self.model
482
+ .borrow_mut()
483
+ .merge_cells(&range)
484
+ .map_err(workbook_error)
485
+ }
486
+
487
+ pub fn merge_cells_across(&self, range: Value) -> Result<(), magnus::Error> {
488
+ let range: Area = from_ruby(range)?;
489
+ self.model
490
+ .borrow_mut()
491
+ .merge_cells_across(&range)
492
+ .map_err(workbook_error)
493
+ }
494
+
495
+ pub fn merge_cells_center(&self, range: Value) -> Result<(), magnus::Error> {
496
+ let range: Area = from_ruby(range)?;
497
+ self.model
498
+ .borrow_mut()
499
+ .merge_cells_center(&range)
500
+ .map_err(workbook_error)
501
+ }
502
+
503
+ pub fn merge_cells_down(&self, range: Value) -> Result<(), magnus::Error> {
504
+ let range: Area = from_ruby(range)?;
505
+ self.model
506
+ .borrow_mut()
507
+ .merge_cells_down(&range)
508
+ .map_err(workbook_error)
509
+ }
510
+
511
+ pub fn unmerge_cells(&self, range: Value) -> Result<(), magnus::Error> {
512
+ let range: Area = from_ruby(range)?;
513
+ self.model
514
+ .borrow_mut()
515
+ .unmerge_cells(&range)
516
+ .map_err(workbook_error)
517
+ }
518
+
519
+ pub fn get_merged_cells(&self, sheet: u32) -> Result<Value, magnus::Error> {
520
+ let merged_cells = self
521
+ .model
522
+ .borrow()
523
+ .get_merged_cells(sheet)
524
+ .map_err(workbook_error)?;
525
+ to_ruby(&merged_cells)
526
+ }
476
527
  }
@@ -629,6 +629,70 @@ module IronCalc
629
629
  # @return [void]
630
630
  # @raise [IronCalc::Error]
631
631
 
632
+ # @!method merge_cells(range)
633
+ # Merges a range into one cell anchored at its top-left cell.
634
+ # @param range [Hash] the engine's +Area+: +{sheet:, row:, column:, width:,
635
+ # height:}+
636
+ # @return [void]
637
+ # @raise [IronCalc::Error] if the range is a single cell, out of bounds,
638
+ # intersects a merged cell or an array formula, or has more than one cell
639
+ # with content; nothing changes
640
+
641
+ # @!method merge_cells_across(range)
642
+ # {#merge_cells} on each row of the range; all rows or none.
643
+ # @param range [Hash] the engine's +Area+
644
+ # @return [void]
645
+ # @raise [IronCalc::Error] as {#merge_cells}, for any row
646
+
647
+ # @!method merge_cells_center(range)
648
+ # {#merge_cells}, then centers the merged cell horizontally.
649
+ # @param range [Hash] the engine's +Area+
650
+ # @return [void]
651
+ # @raise [IronCalc::Error] as {#merge_cells}
652
+
653
+ # @!method merge_cells_down(range)
654
+ # {#merge_cells} on each column of the range; all columns or none.
655
+ # @param range [Hash] the engine's +Area+
656
+ # @return [void]
657
+ # @raise [IronCalc::Error] as {#merge_cells}, for any column
658
+
659
+ # @!method unmerge_cells(range)
660
+ # Removes every merged cell that intersects the range.
661
+ # @param range [Hash] the engine's +Area+
662
+ # @return [void]
663
+ # @raise [IronCalc::Error] if the range is invalid (a +row+, +column+,
664
+ # +width+ or +height+ below 1) or the sheet doesn't exist, not if it
665
+ # holds no merged cells
666
+
667
+ # @!method get_merged_cells(sheet)
668
+ # The sheet's merged cells as +{row:, column:, width:, height:}+ Hashes,
669
+ # +row+ and +column+ being the anchor.
670
+ # @param sheet [Integer]
671
+ # @return [Array<Hash>]
672
+ # @raise [IronCalc::Error]
673
+
674
+ # @!method get_merge_structure(sheet, row, column)
675
+ # Where a cell stands relative to the sheet's merged cells, as a Hash
676
+ # tagged by the engine's +MergeStructure+ variant: +{type: "None"}+,
677
+ # +{type: "Anchor", width:, height:}+ or
678
+ # +{type: "Covered", anchor_row:, anchor_column:}+.
679
+ # @example The +Area+ displayed as one cell at a position
680
+ # def displayed_area(model, sheet, row, column)
681
+ # case model.get_merge_structure(sheet, row, column)
682
+ # in {type: "None"}
683
+ # {sheet: sheet, row: row, column: column, width: 1, height: 1}
684
+ # in {type: "Anchor", width:, height:}
685
+ # {sheet: sheet, row: row, column: column, width: width, height: height}
686
+ # in {type: "Covered", anchor_row:, anchor_column:}
687
+ # displayed_area(model, sheet, anchor_row, anchor_column)
688
+ # end
689
+ # end
690
+ # @param sheet [Integer]
691
+ # @param row [Integer]
692
+ # @param column [Integer]
693
+ # @return [Hash]
694
+ # @raise [IronCalc::Error]
695
+
632
696
  # (yardoc bug lsegal/yard#1207). Doc-only file, never loaded at runtime.
633
697
  # @!visibility private
634
698
  def __yard_anchor__
@@ -973,6 +1037,45 @@ module IronCalc
973
1037
  # +evaluate+ afterwards to bring the workbook up to date.
974
1038
  # @return [void]
975
1039
 
1040
+ # @!method merge_cells(range)
1041
+ # {Model#merge_cells}, as one undo step.
1042
+ # @param range [Hash] the engine's +Area+: +{sheet:, row:, column:, width:,
1043
+ # height:}+
1044
+ # @return [void]
1045
+ # @raise [IronCalc::Error] as {Model#merge_cells}
1046
+
1047
+ # @!method merge_cells_across(range)
1048
+ # {Model#merge_cells_across}, as one undo step.
1049
+ # @param range [Hash] the engine's +Area+
1050
+ # @return [void]
1051
+ # @raise [IronCalc::Error] as {Model#merge_cells}, for any row
1052
+
1053
+ # @!method merge_cells_center(range)
1054
+ # {Model#merge_cells_center}, as one undo step.
1055
+ # @param range [Hash] the engine's +Area+
1056
+ # @return [void]
1057
+ # @raise [IronCalc::Error] as {Model#merge_cells}
1058
+
1059
+ # @!method merge_cells_down(range)
1060
+ # {Model#merge_cells_down}, as one undo step.
1061
+ # @param range [Hash] the engine's +Area+
1062
+ # @return [void]
1063
+ # @raise [IronCalc::Error] as {Model#merge_cells}, for any column
1064
+
1065
+ # @!method unmerge_cells(range)
1066
+ # {Model#unmerge_cells}, as one undo step (none if no merged cell intersects
1067
+ # the range).
1068
+ # @param range [Hash] the engine's +Area+
1069
+ # @return [void]
1070
+ # @raise [IronCalc::Error] as {Model#unmerge_cells}
1071
+
1072
+ # @!method get_merged_cells(sheet)
1073
+ # The sheet's merged cells as +{row:, column:, width:, height:}+ Hashes,
1074
+ # +row+ and +column+ being the anchor.
1075
+ # @param sheet [Integer]
1076
+ # @return [Array<Hash>]
1077
+ # @raise [IronCalc::Error]
1078
+
976
1079
  # Anchors the @!method stubs above — see {Model}.
977
1080
  # @!visibility private
978
1081
  def __yard_anchor__
@@ -1,3 +1,3 @@
1
1
  module IronCalc
2
- VERSION = "0.9.0.0"
2
+ VERSION = "0.9.1.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ironcalc
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0.0
4
+ version: 0.9.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - jvdp
@@ -58,7 +58,7 @@ metadata:
58
58
  source_code_uri: https://github.com/jvdp/IronCalc-Ruby
59
59
  bug_tracker_uri: https://github.com/jvdp/IronCalc-Ruby/issues
60
60
  changelog_uri: https://github.com/jvdp/IronCalc-Ruby/blob/main/CHANGELOG.md
61
- documentation_uri: https://jvdp.github.io/IronCalc-Ruby/0.9.0/
61
+ documentation_uri: https://jvdp.github.io/IronCalc-Ruby/0.9.1/
62
62
  rubygems_mfa_required: 'true'
63
63
  rdoc_options: []
64
64
  require_paths: