slimkeyfy 0.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitignore +34 -0
- data/.rspec +3 -0
- data/Gemfile +6 -0
- data/Gemfile.lock +22 -0
- data/LICENSE +21 -0
- data/README.md +172 -0
- data/bin/slimkeyfy +5 -0
- data/lib/.DS_Store +0 -0
- data/lib/slimkeyfy/console/command_line.rb +90 -0
- data/lib/slimkeyfy/console/io_action.rb +30 -0
- data/lib/slimkeyfy/console/printer.rb +50 -0
- data/lib/slimkeyfy/console/translate.rb +101 -0
- data/lib/slimkeyfy/console.rb +8 -0
- data/lib/slimkeyfy/slimutils/file_utils.rb +61 -0
- data/lib/slimkeyfy/slimutils/hash_merging.rb +84 -0
- data/lib/slimkeyfy/slimutils/key_generator.rb +70 -0
- data/lib/slimkeyfy/slimutils/yaml_processor.rb +56 -0
- data/lib/slimkeyfy/slimutils.rb +8 -0
- data/lib/slimkeyfy/transformer/base_transformer.rb +42 -0
- data/lib/slimkeyfy/transformer/controller_transformer.rb +20 -0
- data/lib/slimkeyfy/transformer/slim_transformer.rb +92 -0
- data/lib/slimkeyfy/transformer/whitespacer.rb +48 -0
- data/lib/slimkeyfy/transformer/word.rb +49 -0
- data/lib/slimkeyfy/transformer.rb +9 -0
- data/lib/slimkeyfy/version.rb +3 -0
- data/lib/slimkeyfy.rb +12 -0
- data/slimkeyfy.gemspec +21 -0
- data/vendor/bundle/bin/htmldiff +25 -0
- data/vendor/bundle/bin/ldiff +25 -0
- data/vendor/bundle/bin/rspec +23 -0
- data/vendor/bundle/build_info/diff-lcs-1.2.5.info +1 -0
- data/vendor/bundle/build_info/rspec-3.0.0.info +1 -0
- data/vendor/bundle/build_info/rspec-core-3.0.2.info +1 -0
- data/vendor/bundle/build_info/rspec-expectations-3.0.2.info +1 -0
- data/vendor/bundle/build_info/rspec-mocks-3.0.2.info +1 -0
- data/vendor/bundle/build_info/rspec-support-3.0.2.info +1 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/.autotest +3 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/.gemtest +0 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/.hoerc +2 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/.rspec +2 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/.travis.yml +22 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/Contributing.rdoc +64 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/Gemfile +20 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/History.rdoc +152 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/License.rdoc +39 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/Manifest.txt +38 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/README.rdoc +85 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/Rakefile +41 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/autotest/discover.rb +1 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/bin/htmldiff +32 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/bin/ldiff +6 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/docs/COPYING.txt +339 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/docs/artistic.txt +127 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/array.rb +7 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/block.rb +37 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/callbacks.rb +322 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/change.rb +177 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/htmldiff.rb +149 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/hunk.rb +276 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/internals.rb +301 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/ldiff.rb +195 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs/string.rb +5 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff/lcs.rb +805 -0
- data/vendor/bundle/gems/diff-lcs-1.2.5/lib/diff-lcs.rb +3 -0
- data/vendor/bundle/gems/rspec-3.0.0/License.txt +24 -0
- data/vendor/bundle/gems/rspec-3.0.0/README.md +47 -0
- data/vendor/bundle/gems/rspec-3.0.0/lib/rspec.rb +3 -0
- data/vendor/bundle/gems/rspec-core-3.0.2/.document +5 -0
- data/vendor/bundle/gems/rspec-core-3.0.2/.yardopts +7 -0
- data/vendor/bundle/gems/rspec-core-3.0.2/Changelog.md +1466 -0
- data/vendor/bundle/gems/rspec-core-3.0.2/License.txt +25 -0
- data/vendor/bundle/gems/rspec-core-3.0.2/README.md +243 -0
- data/vendor/bundle/gems/rspec-core-3.0.2/exe/rspec +4 -0
- data/vendor/bundle/gems/rspec-expectations-3.0.2/.document +5 -0
- data/vendor/bundle/gems/rspec-expectations-3.0.2/.yardopts +6 -0
- data/vendor/bundle/gems/rspec-expectations-3.0.2/Changelog.md +749 -0
- data/vendor/bundle/gems/rspec-expectations-3.0.2/License.txt +24 -0
- data/vendor/bundle/gems/rspec-expectations-3.0.2/README.md +278 -0
- data/vendor/bundle/gems/rspec-mocks-3.0.2/.document +5 -0
- data/vendor/bundle/gems/rspec-mocks-3.0.2/.yardopts +6 -0
- data/vendor/bundle/gems/rspec-mocks-3.0.2/Changelog.md +733 -0
- data/vendor/bundle/gems/rspec-mocks-3.0.2/License.txt +24 -0
- data/vendor/bundle/gems/rspec-mocks-3.0.2/README.md +380 -0
- data/vendor/bundle/gems/rspec-support-3.0.2/Changelog.md +30 -0
- data/vendor/bundle/gems/rspec-support-3.0.2/LICENSE.txt +22 -0
- data/vendor/bundle/gems/rspec-support-3.0.2/README.md +17 -0
- data/vendor/bundle/specifications/diff-lcs-1.2.5.gemspec +68 -0
- data/vendor/bundle/specifications/rspec-3.0.0.gemspec +43 -0
- data/vendor/bundle/specifications/rspec-core-3.0.2.gemspec +66 -0
- data/vendor/bundle/specifications/rspec-expectations-3.0.2.gemspec +51 -0
- data/vendor/bundle/specifications/rspec-mocks-3.0.2.gemspec +48 -0
- data/vendor/bundle/specifications/rspec-support-3.0.2.gemspec +42 -0
- metadata +153 -0
@@ -0,0 +1,322 @@
|
|
1
|
+
# -*- ruby encoding: utf-8 -*-
|
2
|
+
|
3
|
+
require 'diff/lcs/change'
|
4
|
+
|
5
|
+
module Diff::LCS
|
6
|
+
# This callback object implements the default set of callback events,
|
7
|
+
# which only returns the event itself. Note that #finished_a and
|
8
|
+
# #finished_b are not implemented -- I haven't yet figured out where they
|
9
|
+
# would be useful.
|
10
|
+
#
|
11
|
+
# Note that this is intended to be called as is, e.g.,
|
12
|
+
#
|
13
|
+
# Diff::LCS.LCS(seq1, seq2, Diff::LCS::DefaultCallbacks)
|
14
|
+
class DefaultCallbacks
|
15
|
+
class << self
|
16
|
+
# Called when two items match.
|
17
|
+
def match(event)
|
18
|
+
event
|
19
|
+
end
|
20
|
+
# Called when the old value is discarded in favour of the new value.
|
21
|
+
def discard_a(event)
|
22
|
+
event
|
23
|
+
end
|
24
|
+
# Called when the new value is discarded in favour of the old value.
|
25
|
+
def discard_b(event)
|
26
|
+
event
|
27
|
+
end
|
28
|
+
# Called when both the old and new values have changed.
|
29
|
+
def change(event)
|
30
|
+
event
|
31
|
+
end
|
32
|
+
|
33
|
+
private :new
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
# An alias for DefaultCallbacks that is used in
|
38
|
+
# Diff::LCS#traverse_sequences.
|
39
|
+
#
|
40
|
+
# Diff::LCS.LCS(seq1, seq2, Diff::LCS::SequenceCallbacks)
|
41
|
+
SequenceCallbacks = DefaultCallbacks
|
42
|
+
|
43
|
+
# An alias for DefaultCallbacks that is used in
|
44
|
+
# Diff::LCS#traverse_balanced.
|
45
|
+
#
|
46
|
+
# Diff::LCS.LCS(seq1, seq2, Diff::LCS::BalancedCallbacks)
|
47
|
+
BalancedCallbacks = DefaultCallbacks
|
48
|
+
|
49
|
+
def self.callbacks_for(callbacks)
|
50
|
+
callbacks.new rescue callbacks
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
# This will produce a compound array of simple diff change objects. Each
|
55
|
+
# element in the #diffs array is a +hunk+ or +hunk+ array, where each
|
56
|
+
# element in each +hunk+ array is a single Change object representing the
|
57
|
+
# addition or removal of a single element from one of the two tested
|
58
|
+
# sequences. The +hunk+ provides the full context for the changes.
|
59
|
+
#
|
60
|
+
# diffs = Diff::LCS.diff(seq1, seq2)
|
61
|
+
# # This example shows a simplified array format.
|
62
|
+
# # [ [ [ '-', 0, 'a' ] ], # 1
|
63
|
+
# # [ [ '+', 2, 'd' ] ], # 2
|
64
|
+
# # [ [ '-', 4, 'h' ], # 3
|
65
|
+
# # [ '+', 4, 'f' ] ],
|
66
|
+
# # [ [ '+', 6, 'k' ] ], # 4
|
67
|
+
# # [ [ '-', 8, 'n' ], # 5
|
68
|
+
# # [ '-', 9, 'p' ],
|
69
|
+
# # [ '+', 9, 'r' ],
|
70
|
+
# # [ '+', 10, 's' ],
|
71
|
+
# # [ '+', 11, 't' ] ] ]
|
72
|
+
#
|
73
|
+
# There are five hunks here. The first hunk says that the +a+ at position 0
|
74
|
+
# of the first sequence should be deleted (<tt>'-'</tt>). The second hunk
|
75
|
+
# says that the +d+ at position 2 of the second sequence should be inserted
|
76
|
+
# (<tt>'+'</tt>). The third hunk says that the +h+ at position 4 of the
|
77
|
+
# first sequence should be removed and replaced with the +f+ from position 4
|
78
|
+
# of the second sequence. The other two hunks are described similarly.
|
79
|
+
#
|
80
|
+
# === Use
|
81
|
+
#
|
82
|
+
# This callback object must be initialised and is used by the Diff::LCS#diff
|
83
|
+
# method.
|
84
|
+
#
|
85
|
+
# cbo = Diff::LCS::DiffCallbacks.new
|
86
|
+
# Diff::LCS.LCS(seq1, seq2, cbo)
|
87
|
+
# cbo.finish
|
88
|
+
#
|
89
|
+
# Note that the call to #finish is absolutely necessary, or the last set of
|
90
|
+
# changes will not be visible. Alternatively, can be used as:
|
91
|
+
#
|
92
|
+
# cbo = Diff::LCS::DiffCallbacks.new { |tcbo| Diff::LCS.LCS(seq1, seq2, tcbo) }
|
93
|
+
#
|
94
|
+
# The necessary #finish call will be made.
|
95
|
+
#
|
96
|
+
# === Simplified Array Format
|
97
|
+
#
|
98
|
+
# The simplified array format used in the example above can be obtained
|
99
|
+
# with:
|
100
|
+
#
|
101
|
+
# require 'pp'
|
102
|
+
# pp diffs.map { |e| e.map { |f| f.to_a } }
|
103
|
+
class Diff::LCS::DiffCallbacks
|
104
|
+
# Returns the difference set collected during the diff process.
|
105
|
+
attr_reader :diffs
|
106
|
+
|
107
|
+
def initialize # :yields self:
|
108
|
+
@hunk = []
|
109
|
+
@diffs = []
|
110
|
+
|
111
|
+
if block_given?
|
112
|
+
begin
|
113
|
+
yield self
|
114
|
+
ensure
|
115
|
+
self.finish
|
116
|
+
end
|
117
|
+
end
|
118
|
+
end
|
119
|
+
|
120
|
+
# Finalizes the diff process. If an unprocessed hunk still exists, then it
|
121
|
+
# is appended to the diff list.
|
122
|
+
def finish
|
123
|
+
finish_hunk
|
124
|
+
end
|
125
|
+
|
126
|
+
def match(event)
|
127
|
+
finish_hunk
|
128
|
+
end
|
129
|
+
|
130
|
+
def discard_a(event)
|
131
|
+
@hunk << Diff::LCS::Change.new('-', event.old_position, event.old_element)
|
132
|
+
end
|
133
|
+
|
134
|
+
def discard_b(event)
|
135
|
+
@hunk << Diff::LCS::Change.new('+', event.new_position, event.new_element)
|
136
|
+
end
|
137
|
+
|
138
|
+
def finish_hunk
|
139
|
+
@diffs << @hunk unless @hunk.empty?
|
140
|
+
@hunk = []
|
141
|
+
end
|
142
|
+
private :finish_hunk
|
143
|
+
end
|
144
|
+
|
145
|
+
# This will produce a compound array of contextual diff change objects. Each
|
146
|
+
# element in the #diffs array is a "hunk" array, where each element in each
|
147
|
+
# "hunk" array is a single change. Each change is a Diff::LCS::ContextChange
|
148
|
+
# that contains both the old index and new index values for the change. The
|
149
|
+
# "hunk" provides the full context for the changes. Both old and new objects
|
150
|
+
# will be presented for changed objects. +nil+ will be substituted for a
|
151
|
+
# discarded object.
|
152
|
+
#
|
153
|
+
# seq1 = %w(a b c e h j l m n p)
|
154
|
+
# seq2 = %w(b c d e f j k l m r s t)
|
155
|
+
#
|
156
|
+
# diffs = Diff::LCS.diff(seq1, seq2, Diff::LCS::ContextDiffCallbacks)
|
157
|
+
# # This example shows a simplified array format.
|
158
|
+
# # [ [ [ '-', [ 0, 'a' ], [ 0, nil ] ] ], # 1
|
159
|
+
# # [ [ '+', [ 3, nil ], [ 2, 'd' ] ] ], # 2
|
160
|
+
# # [ [ '-', [ 4, 'h' ], [ 4, nil ] ], # 3
|
161
|
+
# # [ '+', [ 5, nil ], [ 4, 'f' ] ] ],
|
162
|
+
# # [ [ '+', [ 6, nil ], [ 6, 'k' ] ] ], # 4
|
163
|
+
# # [ [ '-', [ 8, 'n' ], [ 9, nil ] ], # 5
|
164
|
+
# # [ '+', [ 9, nil ], [ 9, 'r' ] ],
|
165
|
+
# # [ '-', [ 9, 'p' ], [ 10, nil ] ],
|
166
|
+
# # [ '+', [ 10, nil ], [ 10, 's' ] ],
|
167
|
+
# # [ '+', [ 10, nil ], [ 11, 't' ] ] ] ]
|
168
|
+
#
|
169
|
+
# The five hunks shown are comprised of individual changes; if there is a
|
170
|
+
# related set of changes, they are still shown individually.
|
171
|
+
#
|
172
|
+
# This callback can also be used with Diff::LCS#sdiff, which will produce
|
173
|
+
# results like:
|
174
|
+
#
|
175
|
+
# diffs = Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextCallbacks)
|
176
|
+
# # This example shows a simplified array format.
|
177
|
+
# # [ [ [ "-", [ 0, "a" ], [ 0, nil ] ] ], # 1
|
178
|
+
# # [ [ "+", [ 3, nil ], [ 2, "d" ] ] ], # 2
|
179
|
+
# # [ [ "!", [ 4, "h" ], [ 4, "f" ] ] ], # 3
|
180
|
+
# # [ [ "+", [ 6, nil ], [ 6, "k" ] ] ], # 4
|
181
|
+
# # [ [ "!", [ 8, "n" ], [ 9, "r" ] ], # 5
|
182
|
+
# # [ "!", [ 9, "p" ], [ 10, "s" ] ],
|
183
|
+
# # [ "+", [ 10, nil ], [ 11, "t" ] ] ] ]
|
184
|
+
#
|
185
|
+
# The five hunks are still present, but are significantly shorter in total
|
186
|
+
# presentation, because changed items are shown as changes ("!") instead of
|
187
|
+
# potentially "mismatched" pairs of additions and deletions.
|
188
|
+
#
|
189
|
+
# The result of this operation is similar to that of
|
190
|
+
# Diff::LCS::SDiffCallbacks. They may be compared as:
|
191
|
+
#
|
192
|
+
# s = Diff::LCS.sdiff(seq1, seq2).reject { |e| e.action == "=" }
|
193
|
+
# c = Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextDiffCallbacks).flatten
|
194
|
+
#
|
195
|
+
# s == c # -> true
|
196
|
+
#
|
197
|
+
# === Use
|
198
|
+
#
|
199
|
+
# This callback object must be initialised and can be used by the
|
200
|
+
# Diff::LCS#diff or Diff::LCS#sdiff methods.
|
201
|
+
#
|
202
|
+
# cbo = Diff::LCS::ContextDiffCallbacks.new
|
203
|
+
# Diff::LCS.LCS(seq1, seq2, cbo)
|
204
|
+
# cbo.finish
|
205
|
+
#
|
206
|
+
# Note that the call to #finish is absolutely necessary, or the last set of
|
207
|
+
# changes will not be visible. Alternatively, can be used as:
|
208
|
+
#
|
209
|
+
# cbo = Diff::LCS::ContextDiffCallbacks.new { |tcbo| Diff::LCS.LCS(seq1, seq2, tcbo) }
|
210
|
+
#
|
211
|
+
# The necessary #finish call will be made.
|
212
|
+
#
|
213
|
+
# === Simplified Array Format
|
214
|
+
#
|
215
|
+
# The simplified array format used in the example above can be obtained
|
216
|
+
# with:
|
217
|
+
#
|
218
|
+
# require 'pp'
|
219
|
+
# pp diffs.map { |e| e.map { |f| f.to_a } }
|
220
|
+
class Diff::LCS::ContextDiffCallbacks < Diff::LCS::DiffCallbacks
|
221
|
+
def discard_a(event)
|
222
|
+
@hunk << Diff::LCS::ContextChange.simplify(event)
|
223
|
+
end
|
224
|
+
|
225
|
+
def discard_b(event)
|
226
|
+
@hunk << Diff::LCS::ContextChange.simplify(event)
|
227
|
+
end
|
228
|
+
|
229
|
+
def change(event)
|
230
|
+
@hunk << Diff::LCS::ContextChange.simplify(event)
|
231
|
+
end
|
232
|
+
end
|
233
|
+
|
234
|
+
# This will produce a simple array of diff change objects. Each element in
|
235
|
+
# the #diffs array is a single ContextChange. In the set of #diffs provided
|
236
|
+
# by SDiffCallbacks, both old and new objects will be presented for both
|
237
|
+
# changed <strong>and unchanged</strong> objects. +nil+ will be substituted
|
238
|
+
# for a discarded object.
|
239
|
+
#
|
240
|
+
# The diffset produced by this callback, when provided to Diff::LCS#sdiff,
|
241
|
+
# will compute and display the necessary components to show two sequences
|
242
|
+
# and their minimized differences side by side, just like the Unix utility
|
243
|
+
# +sdiff+.
|
244
|
+
#
|
245
|
+
# same same
|
246
|
+
# before | after
|
247
|
+
# old < -
|
248
|
+
# - > new
|
249
|
+
#
|
250
|
+
# seq1 = %w(a b c e h j l m n p)
|
251
|
+
# seq2 = %w(b c d e f j k l m r s t)
|
252
|
+
#
|
253
|
+
# diffs = Diff::LCS.sdiff(seq1, seq2)
|
254
|
+
# # This example shows a simplified array format.
|
255
|
+
# # [ [ "-", [ 0, "a"], [ 0, nil ] ],
|
256
|
+
# # [ "=", [ 1, "b"], [ 0, "b" ] ],
|
257
|
+
# # [ "=", [ 2, "c"], [ 1, "c" ] ],
|
258
|
+
# # [ "+", [ 3, nil], [ 2, "d" ] ],
|
259
|
+
# # [ "=", [ 3, "e"], [ 3, "e" ] ],
|
260
|
+
# # [ "!", [ 4, "h"], [ 4, "f" ] ],
|
261
|
+
# # [ "=", [ 5, "j"], [ 5, "j" ] ],
|
262
|
+
# # [ "+", [ 6, nil], [ 6, "k" ] ],
|
263
|
+
# # [ "=", [ 6, "l"], [ 7, "l" ] ],
|
264
|
+
# # [ "=", [ 7, "m"], [ 8, "m" ] ],
|
265
|
+
# # [ "!", [ 8, "n"], [ 9, "r" ] ],
|
266
|
+
# # [ "!", [ 9, "p"], [ 10, "s" ] ],
|
267
|
+
# # [ "+", [ 10, nil], [ 11, "t" ] ] ]
|
268
|
+
#
|
269
|
+
# The result of this operation is similar to that of
|
270
|
+
# Diff::LCS::ContextDiffCallbacks. They may be compared as:
|
271
|
+
#
|
272
|
+
# s = Diff::LCS.sdiff(seq1, seq2).reject { |e| e.action == "=" }
|
273
|
+
# c = Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextDiffCallbacks).flatten
|
274
|
+
#
|
275
|
+
# s == c # -> true
|
276
|
+
#
|
277
|
+
# === Use
|
278
|
+
#
|
279
|
+
# This callback object must be initialised and is used by the Diff::LCS#sdiff
|
280
|
+
# method.
|
281
|
+
#
|
282
|
+
# cbo = Diff::LCS::SDiffCallbacks.new
|
283
|
+
# Diff::LCS.LCS(seq1, seq2, cbo)
|
284
|
+
#
|
285
|
+
# As with the other initialisable callback objects,
|
286
|
+
# Diff::LCS::SDiffCallbacks can be initialised with a block. As there is no
|
287
|
+
# "fininishing" to be done, this has no effect on the state of the object.
|
288
|
+
#
|
289
|
+
# cbo = Diff::LCS::SDiffCallbacks.new { |tcbo| Diff::LCS.LCS(seq1, seq2, tcbo) }
|
290
|
+
#
|
291
|
+
# === Simplified Array Format
|
292
|
+
#
|
293
|
+
# The simplified array format used in the example above can be obtained
|
294
|
+
# with:
|
295
|
+
#
|
296
|
+
# require 'pp'
|
297
|
+
# pp diffs.map { |e| e.to_a }
|
298
|
+
class Diff::LCS::SDiffCallbacks
|
299
|
+
# Returns the difference set collected during the diff process.
|
300
|
+
attr_reader :diffs
|
301
|
+
|
302
|
+
def initialize #:yields self:
|
303
|
+
@diffs = []
|
304
|
+
yield self if block_given?
|
305
|
+
end
|
306
|
+
|
307
|
+
def match(event)
|
308
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
309
|
+
end
|
310
|
+
|
311
|
+
def discard_a(event)
|
312
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
313
|
+
end
|
314
|
+
|
315
|
+
def discard_b(event)
|
316
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
317
|
+
end
|
318
|
+
|
319
|
+
def change(event)
|
320
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
321
|
+
end
|
322
|
+
end
|
@@ -0,0 +1,177 @@
|
|
1
|
+
# -*- ruby encoding: utf-8 -*-
|
2
|
+
|
3
|
+
# Represents a simplistic (non-contextual) change. Represents the removal or
|
4
|
+
# addition of an element from either the old or the new sequenced
|
5
|
+
# enumerable.
|
6
|
+
class Diff::LCS::Change
|
7
|
+
# The only actions valid for changes are '+' (add), '-' (delete), '='
|
8
|
+
# (no change), '!' (changed), '<' (tail changes from first sequence), or
|
9
|
+
# '>' (tail changes from second sequence). The last two ('<>') are only
|
10
|
+
# found with Diff::LCS::diff and Diff::LCS::sdiff.
|
11
|
+
VALID_ACTIONS = %W(+ - = ! > <)
|
12
|
+
|
13
|
+
def self.valid_action?(action)
|
14
|
+
VALID_ACTIONS.include? action
|
15
|
+
end
|
16
|
+
|
17
|
+
# Returns the action this Change represents.
|
18
|
+
attr_reader :action
|
19
|
+
|
20
|
+
# Returns the position of the Change.
|
21
|
+
attr_reader :position
|
22
|
+
# Returns the sequence element of the Change.
|
23
|
+
attr_reader :element
|
24
|
+
|
25
|
+
def initialize(*args)
|
26
|
+
@action, @position, @element = *args
|
27
|
+
|
28
|
+
unless Diff::LCS::Change.valid_action?(@action)
|
29
|
+
raise "Invalid Change Action '#{@action}'"
|
30
|
+
end
|
31
|
+
raise "Invalid Position Type" unless @position.kind_of? Fixnum
|
32
|
+
end
|
33
|
+
|
34
|
+
def inspect
|
35
|
+
to_a.inspect
|
36
|
+
end
|
37
|
+
|
38
|
+
def to_a
|
39
|
+
[ @action, @position, @element ]
|
40
|
+
end
|
41
|
+
|
42
|
+
def self.from_a(arr)
|
43
|
+
arr = arr.flatten(1)
|
44
|
+
case arr.size
|
45
|
+
when 5
|
46
|
+
Diff::LCS::ContextChange.new(*(arr[0...5]))
|
47
|
+
when 3
|
48
|
+
Diff::LCS::Change.new(*(arr[0...3]))
|
49
|
+
else
|
50
|
+
raise "Invalid change array format provided."
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
include Comparable
|
55
|
+
|
56
|
+
def ==(other)
|
57
|
+
(self.action == other.action) and
|
58
|
+
(self.position == other.position) and
|
59
|
+
(self.element == other.element)
|
60
|
+
end
|
61
|
+
|
62
|
+
def <=>(other)
|
63
|
+
r = self.action <=> other.action
|
64
|
+
r = self.position <=> other.position if r.zero?
|
65
|
+
r = self.element <=> other.element if r.zero?
|
66
|
+
r
|
67
|
+
end
|
68
|
+
|
69
|
+
def adding?
|
70
|
+
@action == '+'
|
71
|
+
end
|
72
|
+
|
73
|
+
def deleting?
|
74
|
+
@action == '-'
|
75
|
+
end
|
76
|
+
|
77
|
+
def unchanged?
|
78
|
+
@action == '='
|
79
|
+
end
|
80
|
+
|
81
|
+
def changed?
|
82
|
+
@action == '!'
|
83
|
+
end
|
84
|
+
|
85
|
+
def finished_a?
|
86
|
+
@action == '>'
|
87
|
+
end
|
88
|
+
|
89
|
+
def finished_b?
|
90
|
+
@action == '<'
|
91
|
+
end
|
92
|
+
end
|
93
|
+
|
94
|
+
# Represents a contextual change. Contains the position and values of the
|
95
|
+
# elements in the old and the new sequenced enumerables as well as the action
|
96
|
+
# taken.
|
97
|
+
class Diff::LCS::ContextChange < Diff::LCS::Change
|
98
|
+
# We don't need these two values.
|
99
|
+
undef :position
|
100
|
+
undef :element
|
101
|
+
|
102
|
+
# Returns the old position being changed.
|
103
|
+
attr_reader :old_position
|
104
|
+
# Returns the new position being changed.
|
105
|
+
attr_reader :new_position
|
106
|
+
# Returns the old element being changed.
|
107
|
+
attr_reader :old_element
|
108
|
+
# Returns the new element being changed.
|
109
|
+
attr_reader :new_element
|
110
|
+
|
111
|
+
def initialize(*args)
|
112
|
+
@action, @old_position, @old_element, @new_position, @new_element = *args
|
113
|
+
|
114
|
+
unless Diff::LCS::Change.valid_action?(@action)
|
115
|
+
raise "Invalid Change Action '#{@action}'"
|
116
|
+
end
|
117
|
+
unless @old_position.nil? or @old_position.kind_of? Fixnum
|
118
|
+
raise "Invalid (Old) Position Type"
|
119
|
+
end
|
120
|
+
unless @new_position.nil? or @new_position.kind_of? Fixnum
|
121
|
+
raise "Invalid (New) Position Type"
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
def to_a
|
126
|
+
[ @action,
|
127
|
+
[ @old_position, @old_element ],
|
128
|
+
[ @new_position, @new_element ]
|
129
|
+
]
|
130
|
+
end
|
131
|
+
|
132
|
+
def inspect(*args)
|
133
|
+
to_a.inspect
|
134
|
+
end
|
135
|
+
|
136
|
+
def self.from_a(arr)
|
137
|
+
Diff::LCS::Change.from_a(arr)
|
138
|
+
end
|
139
|
+
|
140
|
+
# Simplifies a context change for use in some diff callbacks. '<' actions
|
141
|
+
# are converted to '-' and '>' actions are converted to '+'.
|
142
|
+
def self.simplify(event)
|
143
|
+
ea = event.to_a
|
144
|
+
|
145
|
+
case ea[0]
|
146
|
+
when '-'
|
147
|
+
ea[2][1] = nil
|
148
|
+
when '<'
|
149
|
+
ea[0] = '-'
|
150
|
+
ea[2][1] = nil
|
151
|
+
when '+'
|
152
|
+
ea[1][1] = nil
|
153
|
+
when '>'
|
154
|
+
ea[0] = '+'
|
155
|
+
ea[1][1] = nil
|
156
|
+
end
|
157
|
+
|
158
|
+
Diff::LCS::ContextChange.from_a(ea)
|
159
|
+
end
|
160
|
+
|
161
|
+
def ==(other)
|
162
|
+
(@action == other.action) and
|
163
|
+
(@old_position == other.old_position) and
|
164
|
+
(@new_position == other.new_position) and
|
165
|
+
(@old_element == other.old_element) and
|
166
|
+
(@new_element == other.new_element)
|
167
|
+
end
|
168
|
+
|
169
|
+
def <=>(other)
|
170
|
+
r = @action <=> other.action
|
171
|
+
r = @old_position <=> other.old_position if r.zero?
|
172
|
+
r = @new_position <=> other.new_position if r.zero?
|
173
|
+
r = @old_element <=> other.old_element if r.zero?
|
174
|
+
r = @new_element <=> other.new_element if r.zero?
|
175
|
+
r
|
176
|
+
end
|
177
|
+
end
|
@@ -0,0 +1,149 @@
|
|
1
|
+
# -*- ruby encoding: utf-8 -*-
|
2
|
+
|
3
|
+
require 'cgi'
|
4
|
+
|
5
|
+
class Diff::LCS::HTMLDiff
|
6
|
+
class << self
|
7
|
+
attr_accessor :can_expand_tabs #:nodoc:
|
8
|
+
end
|
9
|
+
self.can_expand_tabs = true
|
10
|
+
|
11
|
+
class Callbacks
|
12
|
+
attr_accessor :output
|
13
|
+
attr_accessor :match_class
|
14
|
+
attr_accessor :only_a_class
|
15
|
+
attr_accessor :only_b_class
|
16
|
+
|
17
|
+
def initialize(output, options = {})
|
18
|
+
@output = output
|
19
|
+
options ||= {}
|
20
|
+
|
21
|
+
@match_class = options[:match_class] || "match"
|
22
|
+
@only_a_class = options[:only_a_class] || "only_a"
|
23
|
+
@only_b_class = options[:only_b_class] || "only_b"
|
24
|
+
end
|
25
|
+
|
26
|
+
def htmlize(element, css_class)
|
27
|
+
element = " " if element.empty?
|
28
|
+
%Q|<pre class="#{__send__(css_class)}">#{element}</pre>\n|
|
29
|
+
end
|
30
|
+
private :htmlize
|
31
|
+
|
32
|
+
# This will be called with both lines are the same
|
33
|
+
def match(event)
|
34
|
+
@output << htmlize(event.old_element, :match_class)
|
35
|
+
end
|
36
|
+
|
37
|
+
# This will be called when there is a line in A that isn't in B
|
38
|
+
def discard_a(event)
|
39
|
+
@output << htmlize(event.old_element, :only_a_class)
|
40
|
+
end
|
41
|
+
|
42
|
+
# This will be called when there is a line in B that isn't in A
|
43
|
+
def discard_b(event)
|
44
|
+
@output << htmlize(event.new_element, :only_b_class)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
DEFAULT_OPTIONS = {
|
49
|
+
:expand_tabs => nil,
|
50
|
+
:output => nil,
|
51
|
+
:css => nil,
|
52
|
+
:title => nil,
|
53
|
+
}
|
54
|
+
|
55
|
+
DEFAULT_CSS = <<-CSS
|
56
|
+
body { margin: 0; }
|
57
|
+
.diff
|
58
|
+
{
|
59
|
+
border: 1px solid black;
|
60
|
+
margin: 1em 2em;
|
61
|
+
}
|
62
|
+
p
|
63
|
+
{
|
64
|
+
margin-left: 2em;
|
65
|
+
}
|
66
|
+
pre
|
67
|
+
{
|
68
|
+
padding-left: 1em;
|
69
|
+
margin: 0;
|
70
|
+
font-family: Inconsolata, Consolas, Lucida, Courier, monospaced;
|
71
|
+
white-space: pre;
|
72
|
+
}
|
73
|
+
.match { }
|
74
|
+
.only_a
|
75
|
+
{
|
76
|
+
background-color: #fdd;
|
77
|
+
color: red;
|
78
|
+
text-decoration: line-through;
|
79
|
+
}
|
80
|
+
.only_b
|
81
|
+
{
|
82
|
+
background-color: #ddf;
|
83
|
+
color: blue;
|
84
|
+
border-left: 3px solid blue
|
85
|
+
}
|
86
|
+
h1 { margin-left: 2em; }
|
87
|
+
CSS
|
88
|
+
|
89
|
+
def initialize(left, right, options = nil)
|
90
|
+
@left = left
|
91
|
+
@right = right
|
92
|
+
@options = options
|
93
|
+
|
94
|
+
@options = DEFAULT_OPTIONS.dup if @options.nil?
|
95
|
+
end
|
96
|
+
|
97
|
+
def verify_options
|
98
|
+
@options[:expand_tabs] ||= 4
|
99
|
+
@options[:expand_tabs] = 4 if @options[:expand_tabs] < 0
|
100
|
+
|
101
|
+
@options[:output] ||= $stdout
|
102
|
+
|
103
|
+
@options[:css] ||= DEFAULT_CSS.dup
|
104
|
+
|
105
|
+
@options[:title] ||= "diff"
|
106
|
+
end
|
107
|
+
private :verify_options
|
108
|
+
|
109
|
+
attr_reader :options
|
110
|
+
|
111
|
+
def run
|
112
|
+
verify_options
|
113
|
+
|
114
|
+
if @options[:expand_tabs] > 0 && self.class.can_expand_tabs
|
115
|
+
formatter = Text::Format.new
|
116
|
+
formatter.tabstop = @options[:expand_tabs]
|
117
|
+
|
118
|
+
@left = left.map { |line| formatter.expand(line.chomp) }
|
119
|
+
@right = right.map { |line| formatter.expand(line.chomp) }
|
120
|
+
end
|
121
|
+
|
122
|
+
@left.map! { |line| CGI.escapeHTML(line.chomp) }
|
123
|
+
@right.map! { |line| CGI.escapeHTML(line.chomp) }
|
124
|
+
|
125
|
+
@options[:output] << <<-OUTPUT
|
126
|
+
<html>
|
127
|
+
<head>
|
128
|
+
<title>#{@options[:title]}</title>
|
129
|
+
<style type="text/css">
|
130
|
+
#{@options[:css]}
|
131
|
+
</style>
|
132
|
+
</head>
|
133
|
+
<body>
|
134
|
+
<h1>#{@options[:title]}</h1>
|
135
|
+
<p>Legend: <span class="only_a">Only in Old</span>
|
136
|
+
<span class="only_b">Only in New</span></p>
|
137
|
+
<div class="diff">
|
138
|
+
OUTPUT
|
139
|
+
|
140
|
+
callbacks = Callbacks.new(@options[:output])
|
141
|
+
Diff::LCS.traverse_sequences(@left, @right, callbacks)
|
142
|
+
|
143
|
+
@options[:output] << <<-OUTPUT
|
144
|
+
</div>
|
145
|
+
</body>
|
146
|
+
</html>
|
147
|
+
OUTPUT
|
148
|
+
end
|
149
|
+
end
|