dcm_dict 0.27.0 → 0.32.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +32 -0
  3. data/LICENSE +1 -1
  4. data/README.md +78 -60
  5. data/bin/dcm_dict_converter.rb +3 -3
  6. data/lib/dcm_dict.rb +1 -1
  7. data/lib/dcm_dict/dictionary/base_dictionary.rb +1 -1
  8. data/lib/dcm_dict/dictionary/base_record.rb +1 -1
  9. data/lib/dcm_dict/dictionary/data_element_dictionary.rb +1 -1
  10. data/lib/dcm_dict/dictionary/data_element_record.rb +1 -1
  11. data/lib/dcm_dict/dictionary/uid_dictionary.rb +2 -4
  12. data/lib/dcm_dict/dictionary/uid_record.rb +6 -1
  13. data/lib/dcm_dict/encoder/data_to_code.rb +2 -2
  14. data/lib/dcm_dict/error/dictionary_error.rb +1 -1
  15. data/lib/dcm_dict/ext/object_extension.rb +1 -1
  16. data/lib/dcm_dict/refine/array_refine.rb +1 -1
  17. data/lib/dcm_dict/refine/data_element_refine.rb +1 -1
  18. data/lib/dcm_dict/refine/internal/array_refine_internal.rb +1 -1
  19. data/lib/dcm_dict/refine/internal/hash_refine_internal.rb +14 -1
  20. data/lib/dcm_dict/refine/internal/string_refine_internal.rb +1 -1
  21. data/lib/dcm_dict/refine/string_refine.rb +1 -1
  22. data/lib/dcm_dict/refine/symbol_refine.rb +2 -1
  23. data/lib/dcm_dict/refine/uid_refine.rb +1 -1
  24. data/lib/dcm_dict/rubies/rb_ext.rb +1 -1
  25. data/lib/dcm_dict/source_data/data_elements_data.rb +96 -7
  26. data/lib/dcm_dict/source_data/detached_data.rb +1 -1
  27. data/lib/dcm_dict/source_data/uid_values_data.rb +447 -427
  28. data/lib/dcm_dict/version.rb +3 -3
  29. data/lib/dcm_dict/xml/constant.rb +3 -2
  30. data/lib/dcm_dict/xml/field_data.rb +1 -1
  31. data/lib/dcm_dict/xml/nokogiri_tool.rb +1 -1
  32. data/lib/dcm_dict/xml/rexml_tool.rb +1 -1
  33. data/lib/dcm_dict/xml/tag_field_data.rb +1 -1
  34. data/lib/dcm_dict/xml/uid_field_data.rb +14 -4
  35. data/lib/dcm_dict/xml/xml_tool.rb +1 -1
  36. data/spec/data_element_sample_spec_helper.rb +12 -2
  37. data/spec/data_element_shared_example_spec_helper.rb +1 -1
  38. data/spec/dcm_dict/dictionary/data_element_dictionary_spec.rb +1 -1
  39. data/spec/dcm_dict/dictionary/data_element_record_spec.rb +1 -1
  40. data/spec/dcm_dict/dictionary/uid_dictionary_spec.rb +62 -17
  41. data/spec/dcm_dict/dictionary/uid_record_spec.rb +8 -4
  42. data/spec/dcm_dict/encoder/data_to_code_spec.rb +2 -2
  43. data/spec/dcm_dict/ext/object_extension_spec.rb +1 -1
  44. data/spec/dcm_dict/refine/array_refine_spec.rb +1 -1
  45. data/spec/dcm_dict/refine/internal/array_refine_internal_spec.rb +1 -1
  46. data/spec/dcm_dict/refine/internal/hash_refine_internal_spec.rb +19 -1
  47. data/spec/dcm_dict/refine/internal/string_refine_internal_spec.rb +1 -1
  48. data/spec/dcm_dict/refine/string_refine_spec.rb +4 -4
  49. data/spec/dcm_dict/refine/symbol_refine_spec.rb +26 -1
  50. data/spec/dcm_dict/rubies/rb_ext_spec.rb +1 -1
  51. data/spec/dcm_dict/source_data/data_elements_data_spec.rb +1 -1
  52. data/spec/dcm_dict/source_data/detached_data_spec.rb +1 -1
  53. data/spec/dcm_dict/source_data/uid_values_data_spec.rb +1 -1
  54. data/spec/dcm_dict/version_spec.rb +1 -1
  55. data/spec/dcm_dict/xml/tag_field_data_spec.rb +1 -1
  56. data/spec/dcm_dict/xml/uid_field_data_spec.rb +1 -1
  57. data/spec/dictionary_shared_example_spec_helper.rb +1 -1
  58. data/spec/refine_shared_example_spec_helper.rb +1 -1
  59. data/spec/spec_helper.rb +1 -1
  60. data/spec/xml_sample_spec_helper.rb +80 -32
  61. metadata +24 -24
data/spec/dcm_dict/rubies/rb_ext_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dcm_dict/source_data/data_elements_data_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dcm_dict/source_data/detached_data_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dcm_dict/source_data/uid_values_data_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dcm_dict/version_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dcm_dict/xml/tag_field_data_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dcm_dict/xml/uid_field_data_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/dictionary_shared_example_spec_helper.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/refine_shared_example_spec_helper.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/spec_helper.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright (C) 2014-2020 Enrico Rivarola
2
+ # Copyright (C) 2014-2021 Enrico Rivarola
3
3
  #
4
4
  # This file is part of DcmDict gem (dcm_dict).
5
5
  #
data/spec/xml_sample_spec_helper.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # coding: utf-8
2
2
  #
3
- # Copyright (C) 2014-2020 Enrico Rivarola
3
+ # Copyright (C) 2014-2021 Enrico Rivarola
4
4
  #
5
5
  # This file is part of DcmDict gem (dcm_dict).
6
6
  #
@@ -502,26 +502,33 @@ END
502
502
  end
503
503
 
504
504
  def self.uid_single_standard
505
- xml_string=<<END
505
+ xml_string=<<END
506
506
  <book xmlns="http://docbook.org/ns/docbook">
507
- <tr valign="top">
508
- <td align="left" colspan="1" rowspan="1">
509
- <para>1.2.840.10008.1.​2</para>
510
- </td>
511
- <td align="left" colspan="1" rowspan="1">
512
- <para>Implicit VR Little Endian: Default Transfer Syntax for DICOM</para>
513
- </td>
514
- <td align="left" colspan="1" rowspan="1">
515
- <para>Transfer Syntax</para>
516
- </td>
517
- <td align="center" colspan="1" rowspan="1">
518
- <para><olink targetdoc="PS3.5" targetptr="PS3.5" xrefstyle="select: labelnumber"/></para>
519
- </td>
520
- </tr>
507
+ <tr valign="top">
508
+ <td align="left" colspan="1" rowspan="1">
509
+ <para xml:id="para_893becfb-16cd-4300-923d-e422781af211">1.2.840.10008.1.​2</para>
510
+ </td>
511
+ <td align="left" colspan="1" rowspan="1">
512
+ <para xml:id="para_ccbbb435-5d2e-4d4d-b2c2-a27a5a762f75">Implicit VR Little Endian: Default Transfer Syntax for DICOM</para>
513
+ </td>
514
+ <td align="left" colspan="1" rowspan="1">
515
+ <para xml:id="para_6871172d-db56-4b45-b5d5-446f82a22c89">Implicit​VR​Little​Endian</para>
516
+ </td>
517
+ <td align="left" colspan="1" rowspan="1">
518
+ <para xml:id="para_6e075f3d-2392-4c57-908c-889b50ebcbcd">Transfer Syntax</para>
519
+ </td>
520
+ <td align="center" colspan="1" rowspan="1">
521
+ <para xml:id="para_c2a11bee-08cc-422f-a64c-01dcb4baf73b">
522
+ <olink targetdoc="PS3.5" targetptr="PS3.5" xrefstyle="select: labelnumber"/>
523
+ </para>
524
+ </td>
525
+ </tr>
521
526
  </book>
522
527
  END
523
528
  data = {uid_value: "1.2.840.10008.1.2",
524
529
  uid_name: "Implicit VR Little Endian: Default Transfer Syntax for DICOM",
530
+ uid_key: 'ImplicitVRLittleEndian',
531
+ uid_sym: :implicit_vr_little_endian,
525
532
  uid_type: :transfer_syntax}
526
533
  {xml_string => data}
527
534
  end
@@ -529,39 +536,80 @@ END
529
536
  def self.uid_sample_retired_noname
530
537
  xml_string=<<END
531
538
  <book xmlns="http://docbook.org/ns/docbook">
532
- <tr valign="top">
533
- <td align="left" colspan="1" rowspan="1">
534
- <para xml:id="para_0b48f6f3-b2fe-49cf-a870-c6d3635f4266">
535
- <emphasis role="italic">1.2.840.10008.​5.​1.​4.​1.​1.​12.​77</emphasis>
539
+ <tr valign="top">
540
+ <td align="left" colspan="1" rowspan="1">
541
+ <para xml:id="para_0b48f6f3-b2fe-49cf-a870-c6d3635f4266">
542
+ <emphasis role="italic">1.2.840.10008.​5.​1.​4.​1.​1.​12.​77</emphasis>
543
+ </para>
544
+ </td>
545
+ <td align="left" colspan="1" rowspan="1">
546
+ <para xml:id="para_6ca19788-eac9-4d90-b754-aaa06bebe9e9">
547
+ <emphasis role="italic">(Retired)</emphasis>
548
+ </para>
549
+ </td>
550
+ <td align="left" colspan="1" rowspan="1">
551
+ <para xml:id="para_336821ef-5d70-4332-9b88-f4704825ac91">
552
+ <emphasis role="italic"/>
536
553
  </para>
554
+ </td>
555
+ <td align="left" colspan="1" rowspan="1">
556
+ <para xml:id="para_ca5d2e50-63ea-4008-80ae-896296e83fdd">
557
+ <emphasis role="italic">SOP Class</emphasis>
558
+ </para>
559
+ </td>
560
+ <td align="center" colspan="1" rowspan="1">
561
+ <para xml:id="para_178cccfe-86a2-41a1-b905-70e5fbc5eebf">
562
+ <emphasis role="italic">(2015c)</emphasis>
563
+ </para>
564
+ </td>
565
+ </tr>
566
+ </book>
567
+ END
568
+ data = {uid_value: "1.2.840.10008.5.1.4.1.1.12.77",
569
+ uid_name: "1.2.840.10008.5.1.4.1.1.12.77 (Retired)",
570
+ uid_key: 'UID_1_2_840_10008_5_1_4_1_1_12_77',
571
+ uid_sym: :uid_1_2_840_10008_5_1_4_1_1_12_77,
572
+ uid_type: :sop_class}
573
+ {xml_string => data}
574
+ end
575
+
576
+ def self.uid_standard_sop
577
+ xml_string=<<END
578
+ <book xmlns="http://docbook.org/ns/docbook">
579
+ <tr valign="top">
580
+ <td align="left" colspan="1" rowspan="1">
581
+ <para xml:id="para_de68fe97-b7cf-497e-af8f-a653669ac4e4">1.2.840.10008.1.​1</para>
537
582
  </td>
538
583
  <td align="left" colspan="1" rowspan="1">
539
- <para xml:id="para_6ca19788-eac9-4d90-b754-aaa06bebe9e9">
540
- <emphasis role="italic">(Retired)</emphasis>
541
- </para>
584
+ <para xml:id="para_935df29c-2e6c-4d50-aa93-83225337b0ba">Verification SOP Class</para>
542
585
  </td>
543
586
  <td align="left" colspan="1" rowspan="1">
544
- <para xml:id="para_ca5d2e50-63ea-4008-80ae-896296e83fdd">
545
- <emphasis role="italic">SOP Class</emphasis>
546
- </para>
587
+ <para xml:id="para_5b280f39-109f-416f-bbc7-fb65409d9574">Verification</para>
588
+ </td>
589
+ <td align="left" colspan="1" rowspan="1">
590
+ <para xml:id="para_5e8dcea9-7c49-4751-b561-ca8a41698555">SOP Class</para>
547
591
  </td>
548
592
  <td align="center" colspan="1" rowspan="1">
549
- <para xml:id="para_178cccfe-86a2-41a1-b905-70e5fbc5eebf">
550
- <emphasis role="italic"/>
551
- </para>
593
+ <para xml:id="para_d37461b4-5537-4bf6-98b1-ded888b9b028">
594
+ <olink targetdoc="PS3.4" targetptr="PS3.4" xrefstyle="select: labelnumber"/>
595
+ </para>
552
596
  </td>
553
597
  </tr>
598
+
554
599
  </book>
555
600
  END
556
- data = {uid_value: "1.2.840.10008.5.1.4.1.1.12.77",
557
- uid_name: "1.2.840.10008.5.1.4.1.1.12.77 (Retired)",
601
+ data = {uid_value: "1.2.840.10008.1.1",
602
+ uid_name: "Verification SOP Class",
603
+ uid_key: 'Verification',
604
+ uid_sym: :verification,
558
605
  uid_type: :sop_class}
559
606
  {xml_string => data}
560
607
  end
561
608
 
562
609
  def self.xml_uid_set
563
610
  {}.merge(uid_single_standard).
564
- merge(uid_sample_retired_noname)
611
+ merge(uid_sample_retired_noname).
612
+ merge(uid_standard_sop)
565
613
  end
566
614
 
567
615
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dcm_dict
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.27.0
4
+ version: 0.32.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Enrico Rivarola
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-02-05 00:00:00.000000000 Z
11
+ date: 2021-02-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri
@@ -76,20 +76,20 @@ dependencies:
76
76
  requirements:
77
77
  - - "~>"
78
78
  - !ruby/object:Gem::Version
79
- version: '10.3'
79
+ version: 12.3.3
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: 10.3.0
82
+ version: 12.3.3
83
83
  type: :development
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '10.3'
89
+ version: 12.3.3
90
90
  - - ">="
91
91
  - !ruby/object:Gem::Version
92
- version: 10.3.0
92
+ version: 12.3.3
93
93
  description: DcmDict is a Ruby gem (dcm_dict) to handle in a simple way the Data Dictionary
94
94
  defined within the DICOM Standard
95
95
  email: henrythebuilder@yahoo.it
@@ -165,7 +165,7 @@ licenses:
165
165
  metadata:
166
166
  bug_tracker_uri: https://github.com/henrythebuilder/dcm_dict/issues
167
167
  changelog_uri: https://github.com/henrythebuilder/dcm_dict/blob/master/CHANGELOG.md
168
- documentation_uri: http://www.rubydoc.info/gems/dcm_dict/0.27.0
168
+ documentation_uri: http://www.rubydoc.info/gems/dcm_dict/0.32.0
169
169
  homepage_uri: http://rubygems.org/gems/dcm_dict
170
170
  source_code_uri: https://github.com/henrythebuilder/dcm_dict
171
171
  post_install_message:
@@ -183,34 +183,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
183
183
  - !ruby/object:Gem::Version
184
184
  version: '0'
185
185
  requirements: []
186
- rubygems_version: 3.1.2
186
+ rubygems_version: 3.2.3
187
187
  signing_key:
188
188
  specification_version: 4
189
189
  summary: A simple way to handle DICOM Data Dictionary
190
190
  test_files:
191
- - spec/spec_helper.rb
192
- - spec/refine_shared_example_spec_helper.rb
193
- - spec/dictionary_shared_example_spec_helper.rb
191
+ - spec/data_element_sample_spec_helper.rb
194
192
  - spec/data_element_shared_example_spec_helper.rb
195
- - spec/xml_sample_spec_helper.rb
193
+ - spec/dcm_dict/dictionary/data_element_dictionary_spec.rb
194
+ - spec/dcm_dict/dictionary/data_element_record_spec.rb
195
+ - spec/dcm_dict/dictionary/uid_dictionary_spec.rb
196
+ - spec/dcm_dict/dictionary/uid_record_spec.rb
197
+ - spec/dcm_dict/encoder/data_to_code_spec.rb
196
198
  - spec/dcm_dict/ext/object_extension_spec.rb
197
- - spec/dcm_dict/version_spec.rb
198
- - spec/dcm_dict/refine/string_refine_spec.rb
199
- - spec/dcm_dict/refine/symbol_refine_spec.rb
199
+ - spec/dcm_dict/refine/array_refine_spec.rb
200
+ - spec/dcm_dict/refine/internal/array_refine_internal_spec.rb
200
201
  - spec/dcm_dict/refine/internal/hash_refine_internal_spec.rb
201
202
  - spec/dcm_dict/refine/internal/string_refine_internal_spec.rb
202
- - spec/dcm_dict/refine/internal/array_refine_internal_spec.rb
203
- - spec/dcm_dict/refine/array_refine_spec.rb
203
+ - spec/dcm_dict/refine/string_refine_spec.rb
204
+ - spec/dcm_dict/refine/symbol_refine_spec.rb
204
205
  - spec/dcm_dict/rubies/rb_ext_spec.rb
205
- - spec/dcm_dict/source_data/uid_values_data_spec.rb
206
206
  - spec/dcm_dict/source_data/data_elements_data_spec.rb
207
207
  - spec/dcm_dict/source_data/detached_data_spec.rb
208
- - spec/dcm_dict/encoder/data_to_code_spec.rb
209
- - spec/dcm_dict/dictionary/data_element_record_spec.rb
210
- - spec/dcm_dict/dictionary/uid_dictionary_spec.rb
211
- - spec/dcm_dict/dictionary/data_element_dictionary_spec.rb
212
- - spec/dcm_dict/dictionary/uid_record_spec.rb
208
+ - spec/dcm_dict/source_data/uid_values_data_spec.rb
209
+ - spec/dcm_dict/version_spec.rb
213
210
  - spec/dcm_dict/xml/tag_field_data_spec.rb
214
211
  - spec/dcm_dict/xml/uid_field_data_spec.rb
215
- - spec/data_element_sample_spec_helper.rb
212
+ - spec/dictionary_shared_example_spec_helper.rb
213
+ - spec/refine_shared_example_spec_helper.rb
214
+ - spec/spec_helper.rb
215
+ - spec/xml_sample_spec_helper.rb
216
216
  - Rakefile