myers_diff 1.1.0 → 1.1.1
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/lib/myers_diff/version.rb +1 -1
- data/lib/myers_diff/word_diff.rb +20 -2
- 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: eafb6443ba3020bb242ceba65c0043dda61b5de37a6549173d0b9ec31d5157e4
|
|
4
|
+
data.tar.gz: 744e6423f793f07fdce00d11d567e840d8bb59df8f3838e3403fabbc4d9c67b8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6d9860589443562ac1c8619f52d560805ced707c789bf1232000e2c05c5f565ede2e532dc2c399c4bf8797e98c9a245ebebc56f1e4ae7e01ad0e81f24c6aa66d
|
|
7
|
+
data.tar.gz: c8aff408c8bdc6941712262016f089fb6b5d50858c7b4afd9c8c66e286c9df6117accbccfdafbf22ef8159d1a9cca2997af226b1a204860dfafa35d82d5ff9ec
|
data/lib/myers_diff/version.rb
CHANGED
data/lib/myers_diff/word_diff.rb
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
module MyersDiff
|
|
2
2
|
class WordDiff
|
|
3
|
+
BOUNDARIES_REGEX = /(\s+|[()\[\]{}'"]|\b)/.freeze
|
|
4
|
+
EXTENDED_WORD_CHARS_REGEX = /^[a-zA-Z\u{C0}-\u{FF}\u{D8}-\u{F6}\u{F8}-\u{2C6}\u{2C8}-\u{2D7}\u{2DE}-\u{2FF}\u{1E00}-\u{1EFF}]+$/u.freeze
|
|
5
|
+
|
|
3
6
|
def diff(s1, s2, **options)
|
|
4
7
|
old_string = cast_input(s1)
|
|
5
8
|
new_string = cast_input(s2)
|
|
@@ -117,11 +120,26 @@ module MyersDiff
|
|
|
117
120
|
end
|
|
118
121
|
|
|
119
122
|
def tokenize(str)
|
|
120
|
-
str.split(
|
|
123
|
+
tokens = str.split(BOUNDARIES_REGEX)
|
|
124
|
+
|
|
125
|
+
i = 0
|
|
126
|
+
while i < tokens.size - 1
|
|
127
|
+
if tokens[i + 1].empty? && !tokens[i + 2].empty? &&
|
|
128
|
+
EXTENDED_WORD_CHARS_REGEX.match?(tokens[i]) &&
|
|
129
|
+
EXTENDED_WORD_CHARS_REGEX.match?(tokens[i + 2])
|
|
130
|
+
tokens[i] += tokens[i + 2]
|
|
131
|
+
tokens.delete_at(i + 1)
|
|
132
|
+
tokens.delete_at(i + 1)
|
|
133
|
+
i -= 1
|
|
134
|
+
end
|
|
135
|
+
i += 1
|
|
136
|
+
end
|
|
137
|
+
|
|
138
|
+
tokens
|
|
121
139
|
end
|
|
122
140
|
|
|
123
141
|
def join(chars)
|
|
124
|
-
chars.join('
|
|
142
|
+
chars.join('')
|
|
125
143
|
end
|
|
126
144
|
|
|
127
145
|
# new_string - tokenized string i.e. array of strings
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: myers_diff
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alex Tsui
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-05-
|
|
11
|
+
date: 2020-05-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: Implementation of Myers 1986 text diff algorithm that started as a port
|
|
14
14
|
of the jsdiff project with plans to branch out to human-friendly diffs
|