json 2.7.2 → 2.12.2

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 (44) hide show
  1. checksums.yaml +4 -4
  2. data/BSDL +22 -0
  3. data/CHANGES.md +160 -17
  4. data/LEGAL +8 -0
  5. data/README.md +76 -211
  6. data/ext/json/ext/fbuffer/fbuffer.h +178 -95
  7. data/ext/json/ext/generator/extconf.rb +38 -2
  8. data/ext/json/ext/generator/generator.c +1311 -826
  9. data/ext/json/ext/generator/simd.h +112 -0
  10. data/ext/json/ext/parser/extconf.rb +6 -27
  11. data/ext/json/ext/parser/parser.c +1176 -1971
  12. data/ext/json/ext/vendor/fpconv.c +479 -0
  13. data/ext/json/ext/vendor/jeaiii-ltoa.h +267 -0
  14. data/json.gemspec +44 -49
  15. data/lib/json/add/bigdecimal.rb +2 -2
  16. data/lib/json/add/complex.rb +1 -1
  17. data/lib/json/add/core.rb +1 -1
  18. data/lib/json/add/date.rb +1 -1
  19. data/lib/json/add/date_time.rb +1 -1
  20. data/lib/json/add/exception.rb +1 -1
  21. data/lib/json/add/ostruct.rb +1 -1
  22. data/lib/json/add/range.rb +1 -1
  23. data/lib/json/add/rational.rb +1 -1
  24. data/lib/json/add/regexp.rb +1 -1
  25. data/lib/json/add/struct.rb +1 -1
  26. data/lib/json/add/symbol.rb +8 -4
  27. data/lib/json/add/time.rb +3 -10
  28. data/lib/json/common.rb +647 -241
  29. data/lib/json/ext/generator/state.rb +106 -0
  30. data/lib/json/ext.rb +35 -5
  31. data/lib/json/generic_object.rb +1 -1
  32. data/lib/json/{pure → truffle_ruby}/generator.rb +322 -145
  33. data/lib/json/version.rb +3 -7
  34. data/lib/json.rb +16 -21
  35. metadata +18 -22
  36. data/ext/json/ext/generator/depend +0 -1
  37. data/ext/json/ext/generator/generator.h +0 -177
  38. data/ext/json/ext/parser/depend +0 -1
  39. data/ext/json/ext/parser/parser.h +0 -96
  40. data/ext/json/ext/parser/parser.rl +0 -971
  41. data/ext/json/extconf.rb +0 -3
  42. data/lib/json/pure/parser.rb +0 -337
  43. data/lib/json/pure.rb +0 -15
  44. /data/{LICENSE → COPYING} +0 -0
@@ -0,0 +1,267 @@
1
+ /*
2
+
3
+ This file is released under the terms of the MIT License. It is based on the
4
+ work of James Edward Anhalt III, with the original license listed below.
5
+
6
+ MIT License
7
+
8
+ Copyright (c) 2024,2025 Enrico Thierbach - https://github.com/radiospiel
9
+ Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa
10
+
11
+ Permission is hereby granted, free of charge, to any person obtaining a copy
12
+ of this software and associated documentation files (the "Software"), to deal
13
+ in the Software without restriction, including without limitation the rights
14
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15
+ copies of the Software, and to permit persons to whom the Software is
16
+ furnished to do so, subject to the following conditions:
17
+
18
+ The above copyright notice and this permission notice shall be included in all
19
+ copies or substantial portions of the Software.
20
+
21
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
27
+ SOFTWARE.
28
+ */
29
+
30
+ #ifndef JEAIII_TO_TEXT_H_
31
+ #define JEAIII_TO_TEXT_H_
32
+
33
+ #include <stdint.h>
34
+
35
+ typedef uint_fast32_t u32_t;
36
+ typedef uint_fast64_t u64_t;
37
+
38
+ #define u32(x) ((u32_t)(x))
39
+ #define u64(x) ((u64_t)(x))
40
+
41
+ struct digit_pair
42
+ {
43
+ char dd[2];
44
+ };
45
+
46
+ static const struct digit_pair *digits_dd = (struct digit_pair *)(
47
+ "00" "01" "02" "03" "04" "05" "06" "07" "08" "09"
48
+ "10" "11" "12" "13" "14" "15" "16" "17" "18" "19"
49
+ "20" "21" "22" "23" "24" "25" "26" "27" "28" "29"
50
+ "30" "31" "32" "33" "34" "35" "36" "37" "38" "39"
51
+ "40" "41" "42" "43" "44" "45" "46" "47" "48" "49"
52
+ "50" "51" "52" "53" "54" "55" "56" "57" "58" "59"
53
+ "60" "61" "62" "63" "64" "65" "66" "67" "68" "69"
54
+ "70" "71" "72" "73" "74" "75" "76" "77" "78" "79"
55
+ "80" "81" "82" "83" "84" "85" "86" "87" "88" "89"
56
+ "90" "91" "92" "93" "94" "95" "96" "97" "98" "99"
57
+ );
58
+
59
+ static const struct digit_pair *digits_fd = (struct digit_pair *)(
60
+ "0_" "1_" "2_" "3_" "4_" "5_" "6_" "7_" "8_" "9_"
61
+ "10" "11" "12" "13" "14" "15" "16" "17" "18" "19"
62
+ "20" "21" "22" "23" "24" "25" "26" "27" "28" "29"
63
+ "30" "31" "32" "33" "34" "35" "36" "37" "38" "39"
64
+ "40" "41" "42" "43" "44" "45" "46" "47" "48" "49"
65
+ "50" "51" "52" "53" "54" "55" "56" "57" "58" "59"
66
+ "60" "61" "62" "63" "64" "65" "66" "67" "68" "69"
67
+ "70" "71" "72" "73" "74" "75" "76" "77" "78" "79"
68
+ "80" "81" "82" "83" "84" "85" "86" "87" "88" "89"
69
+ "90" "91" "92" "93" "94" "95" "96" "97" "98" "99"
70
+ );
71
+
72
+ static const u64_t mask24 = (u64(1) << 24) - 1;
73
+ static const u64_t mask32 = (u64(1) << 32) - 1;
74
+ static const u64_t mask57 = (u64(1) << 57) - 1;
75
+
76
+ #define COPY(buffer, digits) memcpy(buffer, &(digits), sizeof(struct digit_pair))
77
+
78
+ static char *
79
+ jeaiii_ultoa(char *b, u64_t n)
80
+ {
81
+ if (n < u32(1e2)) {
82
+ COPY(b, digits_fd[n]);
83
+ return n < 10 ? b + 1 : b + 2;
84
+ }
85
+
86
+ if (n < u32(1e6)) {
87
+ if (n < u32(1e4)) {
88
+ u32_t f0 = u32((10 * (1 << 24) / 1e3 + 1) * n);
89
+ COPY(b, digits_fd[f0 >> 24]);
90
+
91
+ b -= n < u32(1e3);
92
+ u32_t f2 = (f0 & mask24) * 100;
93
+ COPY(b + 2, digits_dd[f2 >> 24]);
94
+
95
+ return b + 4;
96
+ }
97
+
98
+ u64_t f0 = u64(10 * (1ull << 32ull)/ 1e5 + 1) * n;
99
+ COPY(b, digits_fd[f0 >> 32]);
100
+
101
+ b -= n < u32(1e5);
102
+ u64_t f2 = (f0 & mask32) * 100;
103
+ COPY(b + 2, digits_dd[f2 >> 32]);
104
+
105
+ u64_t f4 = (f2 & mask32) * 100;
106
+ COPY(b + 4, digits_dd[f4 >> 32]);
107
+ return b + 6;
108
+ }
109
+
110
+ if (n < u64(1ull << 32ull)) {
111
+ if (n < u32(1e8)) {
112
+ u64_t f0 = u64(10 * (1ull << 48ull) / 1e7 + 1) * n >> 16;
113
+ COPY(b, digits_fd[f0 >> 32]);
114
+
115
+ b -= n < u32(1e7);
116
+ u64_t f2 = (f0 & mask32) * 100;
117
+ COPY(b + 2, digits_dd[f2 >> 32]);
118
+
119
+ u64_t f4 = (f2 & mask32) * 100;
120
+ COPY(b + 4, digits_dd[f4 >> 32]);
121
+
122
+ u64_t f6 = (f4 & mask32) * 100;
123
+ COPY(b + 6, digits_dd[f6 >> 32]);
124
+
125
+ return b + 8;
126
+ }
127
+
128
+ u64_t f0 = u64(10 * (1ull << 57ull) / 1e9 + 1) * n;
129
+ COPY(b, digits_fd[f0 >> 57]);
130
+
131
+ b -= n < u32(1e9);
132
+ u64_t f2 = (f0 & mask57) * 100;
133
+ COPY(b + 2, digits_dd[f2 >> 57]);
134
+
135
+ u64_t f4 = (f2 & mask57) * 100;
136
+ COPY(b + 4, digits_dd[f4 >> 57]);
137
+
138
+ u64_t f6 = (f4 & mask57) * 100;
139
+ COPY(b + 6, digits_dd[f6 >> 57]);
140
+
141
+ u64_t f8 = (f6 & mask57) * 100;
142
+ COPY(b + 8, digits_dd[f8 >> 57]);
143
+
144
+ return b + 10;
145
+ }
146
+
147
+ // if we get here U must be u64 but some compilers don't know that, so reassign n to a u64 to avoid warnings
148
+ u32_t z = n % u32(1e8);
149
+ u64_t u = n / u32(1e8);
150
+
151
+ if (u < u32(1e2)) {
152
+ // u can't be 1 digit (if u < 10 it would have been handled above as a 9 digit 32bit number)
153
+ COPY(b, digits_dd[u]);
154
+ b += 2;
155
+ }
156
+ else if (u < u32(1e6)) {
157
+ if (u < u32(1e4)) {
158
+ u32_t f0 = u32((10 * (1 << 24) / 1e3 + 1) * u);
159
+ COPY(b, digits_fd[f0 >> 24]);
160
+
161
+ b -= u < u32(1e3);
162
+ u32_t f2 = (f0 & mask24) * 100;
163
+ COPY(b + 2, digits_dd[f2 >> 24]);
164
+ b += 4;
165
+ }
166
+ else {
167
+ u64_t f0 = u64(10 * (1ull << 32ull) / 1e5 + 1) * u;
168
+ COPY(b, digits_fd[f0 >> 32]);
169
+
170
+ b -= u < u32(1e5);
171
+ u64_t f2 = (f0 & mask32) * 100;
172
+ COPY(b + 2, digits_dd[f2 >> 32]);
173
+
174
+ u64_t f4 = (f2 & mask32) * 100;
175
+ COPY(b + 4, digits_dd[f4 >> 32]);
176
+ b += 6;
177
+ }
178
+ }
179
+ else if (u < u32(1e8)) {
180
+ u64_t f0 = u64(10 * (1ull << 48ull) / 1e7 + 1) * u >> 16;
181
+ COPY(b, digits_fd[f0 >> 32]);
182
+
183
+ b -= u < u32(1e7);
184
+ u64_t f2 = (f0 & mask32) * 100;
185
+ COPY(b + 2, digits_dd[f2 >> 32]);
186
+
187
+ u64_t f4 = (f2 & mask32) * 100;
188
+ COPY(b + 4, digits_dd[f4 >> 32]);
189
+
190
+ u64_t f6 = (f4 & mask32) * 100;
191
+ COPY(b + 6, digits_dd[f6 >> 32]);
192
+
193
+ b += 8;
194
+ }
195
+ else if (u < u64(1ull << 32ull)) {
196
+ u64_t f0 = u64(10 * (1ull << 57ull) / 1e9 + 1) * u;
197
+ COPY(b, digits_fd[f0 >> 57]);
198
+
199
+ b -= u < u32(1e9);
200
+ u64_t f2 = (f0 & mask57) * 100;
201
+ COPY(b + 2, digits_dd[f2 >> 57]);
202
+
203
+ u64_t f4 = (f2 & mask57) * 100;
204
+ COPY(b + 4, digits_dd[f4 >> 57]);
205
+
206
+ u64_t f6 = (f4 & mask57) * 100;
207
+ COPY(b + 6, digits_dd[f6 >> 57]);
208
+
209
+ u64_t f8 = (f6 & mask57) * 100;
210
+ COPY(b + 8, digits_dd[f8 >> 57]);
211
+ b += 10;
212
+ }
213
+ else {
214
+ u32_t y = u % u32(1e8);
215
+ u /= u32(1e8);
216
+
217
+ // u is 2, 3, or 4 digits (if u < 10 it would have been handled above)
218
+ if (u < u32(1e2)) {
219
+ COPY(b, digits_dd[u]);
220
+ b += 2;
221
+ }
222
+ else {
223
+ u32_t f0 = u32((10 * (1 << 24) / 1e3 + 1) * u);
224
+ COPY(b, digits_fd[f0 >> 24]);
225
+
226
+ b -= u < u32(1e3);
227
+ u32_t f2 = (f0 & mask24) * 100;
228
+ COPY(b + 2, digits_dd[f2 >> 24]);
229
+
230
+ b += 4;
231
+ }
232
+ // do 8 digits
233
+ u64_t f0 = (u64((1ull << 48ull) / 1e6 + 1) * y >> 16) + 1;
234
+ COPY(b, digits_dd[f0 >> 32]);
235
+
236
+ u64_t f2 = (f0 & mask32) * 100;
237
+ COPY(b + 2, digits_dd[f2 >> 32]);
238
+
239
+ u64_t f4 = (f2 & mask32) * 100;
240
+ COPY(b + 4, digits_dd[f4 >> 32]);
241
+
242
+ u64_t f6 = (f4 & mask32) * 100;
243
+ COPY(b + 6, digits_dd[f6 >> 32]);
244
+ b += 8;
245
+ }
246
+
247
+ // do 8 digits
248
+ u64_t f0 = (u64((1ull << 48ull) / 1e6 + 1) * z >> 16) + 1;
249
+ COPY(b, digits_dd[f0 >> 32]);
250
+
251
+ u64_t f2 = (f0 & mask32) * 100;
252
+ COPY(b + 2, digits_dd[f2 >> 32]);
253
+
254
+ u64_t f4 = (f2 & mask32) * 100;
255
+ COPY(b + 4, digits_dd[f4 >> 32]);
256
+
257
+ u64_t f6 = (f4 & mask32) * 100;
258
+ COPY(b + 6, digits_dd[f6 >> 32]);
259
+
260
+ return b + 8;
261
+ }
262
+
263
+ #undef u32
264
+ #undef u64
265
+ #undef COPY
266
+
267
+ #endif // JEAIII_TO_TEXT_H_
data/json.gemspec CHANGED
@@ -1,68 +1,63 @@
1
+ # frozen_string_literal: true
2
+
1
3
  version = File.foreach(File.join(__dir__, "lib/json/version.rb")) do |line|
2
4
  /^\s*VERSION\s*=\s*'(.*)'/ =~ line and break $1
3
5
  end rescue nil
4
6
 
5
- Gem::Specification.new do |s|
7
+ spec = Gem::Specification.new do |s|
8
+ java_ext = Gem::Platform === s.platform && s.platform =~ 'java' || RUBY_ENGINE == 'jruby'
9
+
6
10
  s.name = "json"
7
11
  s.version = version
8
12
 
9
13
  s.summary = "JSON Implementation for Ruby"
10
- s.description = "This is a JSON implementation as a Ruby extension in C."
14
+ s.homepage = "https://github.com/ruby/json"
15
+ s.metadata = {
16
+ 'bug_tracker_uri' => 'https://github.com/ruby/json/issues',
17
+ 'changelog_uri' => 'https://github.com/ruby/json/blob/master/CHANGES.md',
18
+ 'documentation_uri' => 'https://docs.ruby-lang.org/en/master/JSON.html',
19
+ 'homepage_uri' => s.homepage,
20
+ 'source_code_uri' => 'https://github.com/ruby/json',
21
+ }
22
+
23
+ s.required_ruby_version = Gem::Requirement.new(">= 2.7")
24
+
25
+ if java_ext
26
+ s.description = "A JSON implementation as a JRuby extension."
27
+ s.author = "Daniel Luz"
28
+ s.email = "dev+ruby@mernen.com"
29
+ else
30
+ s.description = "This is a JSON implementation as a Ruby extension in C."
31
+ s.authors = ["Florian Frank"]
32
+ s.email = "flori@ping.de"
33
+ end
34
+
11
35
  s.licenses = ["Ruby"]
12
- s.authors = ["Florian Frank"]
13
- s.email = "flori@ping.de"
14
36
 
15
- s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb", "ext/json/extconf.rb"]
16
37
  s.extra_rdoc_files = ["README.md"]
17
38
  s.rdoc_options = ["--title", "JSON implementation for Ruby", "--main", "README.md"]
39
+
18
40
  s.files = [
19
41
  "CHANGES.md",
20
- "LICENSE",
42
+ "COPYING",
43
+ "BSDL",
44
+ "LEGAL",
21
45
  "README.md",
22
- "ext/json/ext/fbuffer/fbuffer.h",
23
- "ext/json/ext/generator/depend",
24
- "ext/json/ext/generator/extconf.rb",
25
- "ext/json/ext/generator/generator.c",
26
- "ext/json/ext/generator/generator.h",
27
- "ext/json/ext/parser/depend",
28
- "ext/json/ext/parser/extconf.rb",
29
- "ext/json/ext/parser/parser.c",
30
- "ext/json/ext/parser/parser.h",
31
- "ext/json/ext/parser/parser.rl",
32
- "ext/json/extconf.rb",
33
46
  "json.gemspec",
34
- "lib/json.rb",
35
- "lib/json/add/bigdecimal.rb",
36
- "lib/json/add/complex.rb",
37
- "lib/json/add/core.rb",
38
- "lib/json/add/date.rb",
39
- "lib/json/add/date_time.rb",
40
- "lib/json/add/exception.rb",
41
- "lib/json/add/ostruct.rb",
42
- "lib/json/add/range.rb",
43
- "lib/json/add/rational.rb",
44
- "lib/json/add/regexp.rb",
45
- "lib/json/add/set.rb",
46
- "lib/json/add/struct.rb",
47
- "lib/json/add/symbol.rb",
48
- "lib/json/add/time.rb",
49
- "lib/json/common.rb",
50
- "lib/json/ext.rb",
51
- "lib/json/generic_object.rb",
52
- "lib/json/pure.rb",
53
- "lib/json/pure/generator.rb",
54
- "lib/json/pure/parser.rb",
55
- "lib/json/version.rb",
47
+ *Dir["lib/**/*.rb"],
56
48
  ]
57
- s.homepage = "https://flori.github.io/json"
58
- s.metadata = {
59
- 'bug_tracker_uri' => 'https://github.com/flori/json/issues',
60
- 'changelog_uri' => 'https://github.com/flori/json/blob/master/CHANGES.md',
61
- 'documentation_uri' => 'https://flori.github.io/json/doc/index.html',
62
- 'homepage_uri' => s.homepage,
63
- 'source_code_uri' => 'https://github.com/flori/json',
64
- 'wiki_uri' => 'https://github.com/flori/json/wiki'
65
- }
66
49
 
67
- s.required_ruby_version = Gem::Requirement.new(">= 2.3")
50
+ if java_ext
51
+ s.platform = 'java'
52
+ s.files += Dir["lib/json/ext/**/*.jar"]
53
+ else
54
+ s.extensions = Dir["ext/json/**/extconf.rb"]
55
+ s.files += Dir["ext/json/**/*.{c,h}"]
56
+ end
57
+ end
58
+
59
+ if RUBY_ENGINE == 'jruby' && $0 == __FILE__
60
+ Gem::Builder.new(spec).build
61
+ else
62
+ spec
68
63
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -35,7 +35,7 @@ class BigDecimal
35
35
  def as_json(*)
36
36
  {
37
37
  JSON.create_id => self.class.name,
38
- 'b' => _dump,
38
+ 'b' => _dump.force_encoding(Encoding::UTF_8),
39
39
  }
40
40
  end
41
41
 
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
data/lib/json/add/core.rb CHANGED
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  # This file requires the implementations of ruby core's custom objects for
3
3
  # serialisation/deserialisation.
4
4
 
data/lib/json/add/date.rb CHANGED
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -1,5 +1,4 @@
1
-
2
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
3
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
4
3
  require 'json'
5
4
  end
@@ -37,8 +36,13 @@ class Symbol
37
36
  #
38
37
  # # {"json_class":"Symbol","s":"foo"}
39
38
  #
40
- def to_json(*a)
41
- as_json.to_json(*a)
39
+ def to_json(state = nil, *a)
40
+ state = ::JSON::State.from_state(state)
41
+ if state.strict?
42
+ super
43
+ else
44
+ as_json.to_json(state, *a)
45
+ end
42
46
  end
43
47
 
44
48
  # See #as_json.
data/lib/json/add/time.rb CHANGED
@@ -1,4 +1,4 @@
1
- #frozen_string_literal: false
1
+ # frozen_string_literal: true
2
2
  unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
3
3
  require 'json'
4
4
  end
@@ -10,11 +10,7 @@ class Time
10
10
  if usec = object.delete('u') # used to be tv_usec -> tv_nsec
11
11
  object['n'] = usec * 1000
12
12
  end
13
- if method_defined?(:tv_nsec)
14
- at(object['s'], Rational(object['n'], 1000))
15
- else
16
- at(object['s'], object['n'] / 1000)
17
- end
13
+ at(object['s'], Rational(object['n'], 1000))
18
14
  end
19
15
 
20
16
  # Methods <tt>Time#as_json</tt> and +Time.json_create+ may be used
@@ -34,13 +30,10 @@ class Time
34
30
  # # => 2023-11-25 11:00:56.472846644 -0600
35
31
  #
36
32
  def as_json(*)
37
- nanoseconds = [ tv_usec * 1000 ]
38
- respond_to?(:tv_nsec) and nanoseconds << tv_nsec
39
- nanoseconds = nanoseconds.max
40
33
  {
41
34
  JSON.create_id => self.class.name,
42
35
  's' => tv_sec,
43
- 'n' => nanoseconds,
36
+ 'n' => tv_nsec,
44
37
  }
45
38
  end
46
39