character_set 1.5.0 → 1.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/.gitattributes +1 -1
  3. data/.github/workflows/tests.yml +6 -2
  4. data/BENCHMARK.md +35 -31
  5. data/CHANGELOG.md +30 -1
  6. data/Gemfile +14 -0
  7. data/README.md +9 -6
  8. data/Rakefile +2 -120
  9. data/character_set.gemspec +0 -21
  10. data/ext/character_set/character_set.c +110 -125
  11. data/lib/character_set/core_ext/string_ext.rb +1 -1
  12. data/lib/character_set/parser.rb +8 -4
  13. data/lib/character_set/predefined_sets/assigned.cps +73 -52
  14. data/lib/character_set/predefined_sets/emoji.cps +10 -9
  15. data/lib/character_set/predefined_sets.rb +11 -0
  16. data/lib/character_set/ruby_fallback/character_set_methods.rb +17 -20
  17. data/lib/character_set/ruby_fallback/set_methods.rb +4 -18
  18. data/lib/character_set/ruby_fallback/vendored_set_classes.rb +492 -0
  19. data/lib/character_set/ruby_fallback.rb +2 -6
  20. data/lib/character_set/shared_methods.rb +8 -2
  21. data/lib/character_set/version.rb +1 -1
  22. data/tasks/benchmark.rake +20 -0
  23. data/{benchmarks → tasks/benchmarks}/delete_in.rb +5 -1
  24. data/{benchmarks → tasks/benchmarks}/keep_in.rb +5 -1
  25. data/tasks/benchmarks/shared.rb +28 -0
  26. data/tasks/sync_casefold_data.rake +20 -0
  27. data/tasks/sync_predefined_sets.rake +9 -0
  28. data/tasks/sync_ruby_spec.rake +65 -0
  29. metadata +20 -183
  30. data/benchmarks/shared.rb +0 -30
  31. /data/{benchmarks → tasks/benchmarks}/count_in.rb +0 -0
  32. /data/{benchmarks → tasks/benchmarks}/cover.rb +0 -0
  33. /data/{benchmarks → tasks/benchmarks}/scan.rb +0 -0
  34. /data/{benchmarks → tasks/benchmarks}/used_by.rb +0 -0
  35. /data/{benchmarks → tasks/benchmarks}/z_add.rb +0 -0
  36. /data/{benchmarks → tasks/benchmarks}/z_delete.rb +0 -0
  37. /data/{benchmarks → tasks/benchmarks}/z_merge.rb +0 -0
  38. /data/{benchmarks → tasks/benchmarks}/z_minmax.rb +0 -0
@@ -0,0 +1,65 @@
1
+ desc 'Download relevant ruby/spec tests, adapt to CharacterSet and its variants'
2
+ task :sync_ruby_spec do
3
+ require 'fileutils'
4
+
5
+ variants = {
6
+ 'CharacterSet' => "#{__dir__}/../spec/ruby-spec/library/character_set",
7
+ 'CharacterSet::Pure' => "#{__dir__}/../spec/ruby-spec/library/character_set_pure",
8
+ }
9
+
10
+ # download fresh specs from ruby/spec repository
11
+ variants.each do |_, dir|
12
+ FileUtils.rm_rf(dir)
13
+ `svn export https://github.com/ruby/spec/trunk/library/set/sortedset #{dir}`
14
+ end
15
+
16
+ # make copies for each CharacterSet variant
17
+ base = variants.first[1]
18
+ variants.each_value { |dir| FileUtils.copy_entry(base, dir) unless dir == base }
19
+
20
+ # adapt specs to work with CharacterSet
21
+ variants.each do |class_name, dir|
22
+ Dir["#{dir}/**/*.rb"].each do |spec|
23
+ # ignore some tests that do not apply or are covered otherwise
24
+ if spec =~ %r{/(classify|divide|flatten|initialize|pretty_print)}
25
+ File.delete(spec)
26
+ next
27
+ end
28
+
29
+ adapted_content =
30
+ File.read(spec).
31
+ # adapt class name
32
+ gsub('SortedSet', (spec['/shared/'] ? 'variant' : class_name)).
33
+ gsub(/(it_behaves_like :[^,\n]+), (:[^,\n]+)/, "\\1, #{class_name}, \\2").
34
+ # get shared specs from a single shared dir at the parent level
35
+ gsub(/(require_relative ['"])(shared\/)/, '\1../\2').
36
+ # make 'mspec' syntax rspec-compatible
37
+ gsub(/describe (.*), shared.*$/, 'shared_examples \1 do |variant, method|').
38
+ gsub(/be_(false|true)/, 'be \1').
39
+ gsub('stub!', 'stub').
40
+ gsub('mock', 'double').
41
+ gsub('@method', 'method').
42
+ # remove unneeded requires
43
+ gsub(/require 'set'\n/, '').
44
+ gsub(/require.*spec_helper.*\n/, '').
45
+ gsub(/\A\n+/, '').
46
+ # make examples use Integers/codepoints
47
+ gsub(/1\.0|"cat"|"dog"|"hello"|"test"/, '0').
48
+ gsub('"one"', '1').
49
+ gsub('"two"', '2').
50
+ gsub('"three"', '3').
51
+ gsub('"four"', '4').
52
+ gsub('"five"', '5').
53
+ gsub(/x.(size|length) == 3/, 'x != 3').
54
+ gsub(/x.(size|length) != 3/, 'x == 3').
55
+ gsub(/(add)\(\d\)(\.to_a \}.should raise)/, '\1(:foo)\2')
56
+
57
+ File.open(spec, 'w') { |f| f.puts adapted_content }
58
+ end
59
+ end
60
+
61
+ # keep only one copy of the shared specs, at the parent level
62
+ FileUtils.rm_rf(base + '/../shared')
63
+ FileUtils.mv(base + '/shared', base + '/../')
64
+ variants.each_value { |dir| FileUtils.rm_rf(dir + '/shared') }
65
+ end
metadata CHANGED
@@ -1,183 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: character_set
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Janosch Müller
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-05 00:00:00.000000000 Z
12
- dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: sorted_set
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - "~>"
18
- - !ruby/object:Gem::Version
19
- version: '1.0'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - "~>"
25
- - !ruby/object:Gem::Version
26
- version: '1.0'
27
- - !ruby/object:Gem::Dependency
28
- name: benchmark-ips
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - "~>"
32
- - !ruby/object:Gem::Version
33
- version: '2.7'
34
- type: :development
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - "~>"
39
- - !ruby/object:Gem::Version
40
- version: '2.7'
41
- - !ruby/object:Gem::Dependency
42
- name: get_process_mem
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: 0.2.3
48
- type: :development
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: 0.2.3
55
- - !ruby/object:Gem::Dependency
56
- name: rake
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: '13.0'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: '13.0'
69
- - !ruby/object:Gem::Dependency
70
- name: rake-compiler
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - "~>"
74
- - !ruby/object:Gem::Version
75
- version: '1.1'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "~>"
81
- - !ruby/object:Gem::Version
82
- version: '1.1'
83
- - !ruby/object:Gem::Dependency
84
- name: range_compressor
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - "~>"
88
- - !ruby/object:Gem::Version
89
- version: '1.0'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - "~>"
95
- - !ruby/object:Gem::Version
96
- version: '1.0'
97
- - !ruby/object:Gem::Dependency
98
- name: regexp_parser
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - "~>"
102
- - !ruby/object:Gem::Version
103
- version: '2.1'
104
- type: :development
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - "~>"
109
- - !ruby/object:Gem::Version
110
- version: '2.1'
111
- - !ruby/object:Gem::Dependency
112
- name: regexp_property_values
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - "~>"
116
- - !ruby/object:Gem::Version
117
- version: '1.0'
118
- type: :development
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - "~>"
123
- - !ruby/object:Gem::Version
124
- version: '1.0'
125
- - !ruby/object:Gem::Dependency
126
- name: rspec
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - "~>"
130
- - !ruby/object:Gem::Version
131
- version: '3.8'
132
- type: :development
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - "~>"
137
- - !ruby/object:Gem::Version
138
- version: '3.8'
139
- - !ruby/object:Gem::Dependency
140
- name: codecov
141
- requirement: !ruby/object:Gem::Requirement
142
- requirements:
143
- - - "~>"
144
- - !ruby/object:Gem::Version
145
- version: 0.2.12
146
- type: :development
147
- prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
149
- requirements:
150
- - - "~>"
151
- - !ruby/object:Gem::Version
152
- version: 0.2.12
153
- - !ruby/object:Gem::Dependency
154
- name: gouteur
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - "~>"
158
- - !ruby/object:Gem::Version
159
- version: 1.0.0
160
- type: :development
161
- prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - "~>"
165
- - !ruby/object:Gem::Version
166
- version: 1.0.0
167
- - !ruby/object:Gem::Dependency
168
- name: rubocop
169
- requirement: !ruby/object:Gem::Requirement
170
- requirements:
171
- - - "~>"
172
- - !ruby/object:Gem::Version
173
- version: '1.8'
174
- type: :development
175
- prerelease: false
176
- version_requirements: !ruby/object:Gem::Requirement
177
- requirements:
178
- - - "~>"
179
- - !ruby/object:Gem::Version
180
- version: '1.8'
11
+ date: 2023-05-12 00:00:00.000000000 Z
12
+ dependencies: []
181
13
  description:
182
14
  email:
183
15
  - janosch84@gmail.com
@@ -200,17 +32,6 @@ files:
200
32
  - LICENSE.txt
201
33
  - README.md
202
34
  - Rakefile
203
- - benchmarks/count_in.rb
204
- - benchmarks/cover.rb
205
- - benchmarks/delete_in.rb
206
- - benchmarks/keep_in.rb
207
- - benchmarks/scan.rb
208
- - benchmarks/shared.rb
209
- - benchmarks/used_by.rb
210
- - benchmarks/z_add.rb
211
- - benchmarks/z_delete.rb
212
- - benchmarks/z_merge.rb
213
- - benchmarks/z_minmax.rb
214
35
  - bin/console
215
36
  - bin/setup
216
37
  - character_set.gemspec
@@ -246,10 +67,26 @@ files:
246
67
  - lib/character_set/ruby_fallback.rb
247
68
  - lib/character_set/ruby_fallback/character_set_methods.rb
248
69
  - lib/character_set/ruby_fallback/set_methods.rb
70
+ - lib/character_set/ruby_fallback/vendored_set_classes.rb
249
71
  - lib/character_set/set_method_adapters.rb
250
72
  - lib/character_set/shared_methods.rb
251
73
  - lib/character_set/version.rb
252
74
  - lib/character_set/writer.rb
75
+ - tasks/benchmark.rake
76
+ - tasks/benchmarks/count_in.rb
77
+ - tasks/benchmarks/cover.rb
78
+ - tasks/benchmarks/delete_in.rb
79
+ - tasks/benchmarks/keep_in.rb
80
+ - tasks/benchmarks/scan.rb
81
+ - tasks/benchmarks/shared.rb
82
+ - tasks/benchmarks/used_by.rb
83
+ - tasks/benchmarks/z_add.rb
84
+ - tasks/benchmarks/z_delete.rb
85
+ - tasks/benchmarks/z_merge.rb
86
+ - tasks/benchmarks/z_minmax.rb
87
+ - tasks/sync_casefold_data.rake
88
+ - tasks/sync_predefined_sets.rake
89
+ - tasks/sync_ruby_spec.rake
253
90
  homepage: https://github.com/jaynetics/character_set
254
91
  licenses:
255
92
  - MIT
@@ -269,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
269
106
  - !ruby/object:Gem::Version
270
107
  version: '0'
271
108
  requirements: []
272
- rubygems_version: 3.3.0.dev
109
+ rubygems_version: 3.4.1
273
110
  signing_key:
274
111
  specification_version: 4
275
112
  summary: Build, read, write and compare sets of Unicode codepoints.
data/benchmarks/shared.rb DELETED
@@ -1,30 +0,0 @@
1
- lib = File.expand_path('../lib', __dir__)
2
- $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
-
4
- require 'benchmark/ips'
5
- require 'character_set'
6
- if RUBY_VERSION.to_f >= 3.0 && !RUBY_PLATFORM[/java/i]
7
- require 'sorted_set'
8
- else
9
- require 'set'
10
- end
11
-
12
- def benchmark(caption: nil, cases: {})
13
- puts caption
14
-
15
- report = Benchmark.ips do |x|
16
- cases.each do |label, callable|
17
- x.report(label, &callable)
18
- end
19
- x.compare!
20
- end
21
-
22
- return unless $store_comparison_results
23
-
24
- old_stdout = $stdout.clone
25
- captured_stdout = StringIO.new
26
- $stdout = captured_stdout
27
- report.run_comparison
28
- $store_comparison_results[caption] = captured_stdout.string
29
- $stdout = old_stdout
30
- end
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes