activeldap 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGES +10 -0
- data/README +3 -2
- data/data/locale/en/LC_MESSAGES/active-ldap.mo +0 -0
- data/data/locale/ja/LC_MESSAGES/active-ldap.mo +0 -0
- data/examples/al-admin/po/en/al-admin.po +1 -1
- data/examples/al-admin/po/ja/al-admin.po +1 -1
- data/examples/al-admin/po/nl/al-admin.po +1 -1
- data/examples/al-admin/vendor/plugins/exception_notification/lib/exception_notifier.rb +7 -8
- data/examples/al-admin/vendor/plugins/exception_notification/lib/exception_notifier_helper.rb +2 -1
- data/examples/al-admin/vendor/plugins/exception_notification/views/exception_notifier/_environment.rhtml +1 -1
- data/examples/al-admin/vendor/plugins/exception_notification/views/exception_notifier/_request.rhtml +2 -1
- data/lib/active_ldap.rb +9 -3
- data/lib/active_ldap/action_controller/ldap_benchmarking.rb +36 -0
- data/lib/active_ldap/adapter/jndi.rb +1 -1
- data/lib/active_ldap/adapter/jndi_connection.rb +2 -1
- data/lib/active_ldap/association/belongs_to_many.rb +10 -2
- data/lib/active_ldap/association/collection.rb +10 -0
- data/lib/active_ldap/association/has_many_utils.rb +13 -9
- data/lib/active_ldap/association/has_many_wrap.rb +10 -2
- data/lib/active_ldap/associations.rb +3 -3
- data/lib/active_ldap/base.rb +95 -32
- data/lib/active_ldap/connection.rb +1 -1
- data/lib/active_ldap/distinguished_name.rb +3 -0
- data/lib/active_ldap/entry_attribute.rb +2 -2
- data/lib/active_ldap/ldif.rb +2 -2
- data/lib/active_ldap/operations.rb +7 -3
- data/lib/active_ldap/user_password.rb +0 -1
- data/lib/active_ldap/validations.rb +2 -0
- data/po/en/active-ldap.po +1 -1
- data/po/ja/active-ldap.po +1 -1
- data/rails/plugin/active_ldap/init.rb +3 -34
- data/test-unit/History.txt +32 -0
- data/test-unit/Manifest.txt +70 -0
- data/test-unit/README.txt +32 -0
- data/test-unit/Rakefile +22 -0
- data/test-unit/bin/testrb +5 -0
- data/test-unit/lib/test/unit.rb +280 -0
- data/test-unit/lib/test/unit/assertionfailederror.rb +14 -0
- data/test-unit/lib/test/unit/assertions.rb +722 -0
- data/test-unit/lib/test/unit/attribute.rb +125 -0
- data/test-unit/lib/test/unit/autorunner.rb +250 -0
- data/test-unit/lib/test/unit/collector.rb +43 -0
- data/test-unit/lib/test/unit/collector/descendant.rb +23 -0
- data/test-unit/lib/test/unit/collector/dir.rb +108 -0
- data/test-unit/lib/test/unit/collector/load.rb +135 -0
- data/test-unit/lib/test/unit/collector/objectspace.rb +34 -0
- data/test-unit/lib/test/unit/color.rb +61 -0
- data/test-unit/lib/test/unit/diff.rb +524 -0
- data/test-unit/lib/test/unit/error.rb +124 -0
- data/test-unit/lib/test/unit/exceptionhandler.rb +39 -0
- data/test-unit/lib/test/unit/failure.rb +110 -0
- data/test-unit/lib/test/unit/fixture.rb +185 -0
- data/test-unit/lib/test/unit/notification.rb +116 -0
- data/test-unit/lib/test/unit/omission.rb +129 -0
- data/test-unit/lib/test/unit/pending.rb +130 -0
- data/test-unit/lib/test/unit/priority.rb +146 -0
- data/test-unit/lib/test/unit/runner/console.rb +46 -0
- data/test-unit/lib/test/unit/runner/emacs.rb +8 -0
- data/test-unit/lib/test/unit/testcase.rb +174 -0
- data/test-unit/lib/test/unit/testresult.rb +89 -0
- data/test-unit/lib/test/unit/testsuite.rb +110 -0
- data/test-unit/lib/test/unit/ui/console/outputlevel.rb +14 -0
- data/test-unit/lib/test/unit/ui/console/testrunner.rb +195 -0
- data/test-unit/lib/test/unit/ui/emacs/testrunner.rb +49 -0
- data/test-unit/lib/test/unit/ui/testrunner.rb +20 -0
- data/test-unit/lib/test/unit/ui/testrunnermediator.rb +77 -0
- data/test-unit/lib/test/unit/ui/testrunnerutilities.rb +41 -0
- data/test-unit/lib/test/unit/util/backtracefilter.rb +41 -0
- data/test-unit/lib/test/unit/util/observable.rb +90 -0
- data/test-unit/lib/test/unit/util/procwrapper.rb +48 -0
- data/test-unit/lib/test/unit/version.rb +7 -0
- data/test-unit/sample/adder.rb +13 -0
- data/test-unit/sample/subtracter.rb +12 -0
- data/test-unit/sample/tc_adder.rb +18 -0
- data/test-unit/sample/tc_subtracter.rb +18 -0
- data/test-unit/sample/ts_examples.rb +7 -0
- data/test-unit/test/collector/test_descendant.rb +135 -0
- data/test-unit/test/collector/test_dir.rb +406 -0
- data/test-unit/test/collector/test_load.rb +333 -0
- data/test-unit/test/collector/test_objectspace.rb +98 -0
- data/test-unit/test/run-test.rb +13 -0
- data/test-unit/test/test_assertions.rb +693 -0
- data/test-unit/test/test_attribute.rb +86 -0
- data/{test-unit-ext → test-unit}/test/test_color.rb +3 -5
- data/{test-unit-ext → test-unit}/test/test_diff.rb +18 -16
- data/test-unit/test/test_emacs_runner.rb +60 -0
- data/test-unit/test/test_error.rb +26 -0
- data/test-unit/test/test_failure.rb +33 -0
- data/test-unit/test/test_fixture.rb +275 -0
- data/{test-unit-ext → test-unit}/test/test_notification.rb +7 -6
- data/test-unit/test/test_omission.rb +81 -0
- data/{test-unit-ext → test-unit}/test/test_pending.rb +15 -15
- data/{test-unit-ext → test-unit}/test/test_priority.rb +4 -3
- data/test-unit/test/test_testcase.rb +411 -0
- data/test-unit/test/test_testresult.rb +113 -0
- data/test-unit/test/test_testsuite.rb +129 -0
- data/test-unit/test/testunit_test_util.rb +12 -0
- data/test-unit/test/ui/test_testrunmediator.rb +20 -0
- data/test-unit/test/util/test_backtracefilter.rb +41 -0
- data/test-unit/test/util/test_observable.rb +102 -0
- data/test-unit/test/util/test_procwrapper.rb +36 -0
- data/test/al-test-utils.rb +4 -4
- data/test/command.rb +1 -1
- data/test/run-test.rb +5 -4
- data/test/test_associations.rb +143 -9
- data/test/test_base.rb +25 -1
- data/test/test_dn.rb +2 -0
- data/test/test_find.rb +8 -1
- data/test/test_ldif.rb +51 -114
- data/test/test_reflection.rb +4 -8
- data/test/test_usermod-lang-add.rb +2 -1
- data/test/test_validation.rb +4 -3
- metadata +76 -31
- data/test-unit-ext/NEWS.en +0 -28
- data/test-unit-ext/NEWS.ja +0 -28
- data/test-unit-ext/README.en +0 -247
- data/test-unit-ext/README.ja +0 -246
- data/test-unit-ext/Rakefile +0 -111
- data/test-unit-ext/lib/test-unit-ext.rb +0 -16
- data/test-unit-ext/lib/test-unit-ext/always-show-result.rb +0 -28
- data/test-unit-ext/lib/test-unit-ext/assertions.rb +0 -40
- data/test-unit-ext/lib/test-unit-ext/attributes.rb +0 -129
- data/test-unit-ext/lib/test-unit-ext/backtrace-filter.rb +0 -17
- data/test-unit-ext/lib/test-unit-ext/color.rb +0 -59
- data/test-unit-ext/lib/test-unit-ext/colorized-runner.rb +0 -111
- data/test-unit-ext/lib/test-unit-ext/diff.rb +0 -516
- data/test-unit-ext/lib/test-unit-ext/long-display-for-emacs.rb +0 -25
- data/test-unit-ext/lib/test-unit-ext/notification.rb +0 -79
- data/test-unit-ext/lib/test-unit-ext/omission.rb +0 -96
- data/test-unit-ext/lib/test-unit-ext/pending.rb +0 -97
- data/test-unit-ext/lib/test-unit-ext/priority.rb +0 -158
- data/test-unit-ext/lib/test-unit-ext/version.rb +0 -3
- data/test-unit-ext/lib/test-unit-ext/xml-report.rb +0 -224
- data/test-unit-ext/test/run-test.rb +0 -14
- data/test-unit-ext/test/test_attributes.rb +0 -139
- data/test-unit-ext/test/test_omission.rb +0 -64
- data/test-unit-ext/test/test_xml_report.rb +0 -161
@@ -0,0 +1,135 @@
|
|
1
|
+
require 'pathname'
|
2
|
+
|
3
|
+
require 'test/unit/testsuite'
|
4
|
+
require 'test/unit/collector'
|
5
|
+
|
6
|
+
module Test
|
7
|
+
module Unit
|
8
|
+
module Collector
|
9
|
+
class Load
|
10
|
+
include Collector
|
11
|
+
|
12
|
+
attr_reader :patterns, :excludes, :base
|
13
|
+
|
14
|
+
def initialize
|
15
|
+
super
|
16
|
+
@system_excludes = [/~\z/, /\A\.\#/]
|
17
|
+
@system_directory_excludes = [/\A(?:CVS|\.svn)\z/]
|
18
|
+
@patterns = [/\Atest_.+\.rb\z/m]
|
19
|
+
@excludes = []
|
20
|
+
@base = nil
|
21
|
+
end
|
22
|
+
|
23
|
+
def base=(base)
|
24
|
+
base = Pathname(base) unless base.nil?
|
25
|
+
@base = base
|
26
|
+
end
|
27
|
+
|
28
|
+
def collect(*froms)
|
29
|
+
add_load_path(@base) do
|
30
|
+
froms = ["."] if froms.empty?
|
31
|
+
test_suites = froms.collect do |from|
|
32
|
+
test_suite = collect_recursive(from, find_test_cases)
|
33
|
+
test_suite = nil if test_suite.tests.empty?
|
34
|
+
test_suite
|
35
|
+
end.compact
|
36
|
+
|
37
|
+
if test_suites.size > 1
|
38
|
+
test_suite = TestSuite.new("[#{froms.join(', ')}]")
|
39
|
+
sort(test_suites).each do |sub_test_suite|
|
40
|
+
test_suite << sub_test_suite
|
41
|
+
end
|
42
|
+
test_suite
|
43
|
+
else
|
44
|
+
test_suites.first
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def find_test_cases(ignore=[])
|
50
|
+
test_cases = []
|
51
|
+
TestCase::DESCENDANTS.each do |test_case|
|
52
|
+
test_cases << test_case unless ignore.include?(test_case)
|
53
|
+
end
|
54
|
+
ignore.concat(test_cases)
|
55
|
+
test_cases
|
56
|
+
end
|
57
|
+
|
58
|
+
private
|
59
|
+
def collect_recursive(name, already_gathered)
|
60
|
+
sub_test_suites = []
|
61
|
+
|
62
|
+
path = resolve_path(name)
|
63
|
+
if path.directory?
|
64
|
+
directories, files = path.children.partition do |child|
|
65
|
+
child.directory?
|
66
|
+
end
|
67
|
+
|
68
|
+
files.each do |child|
|
69
|
+
next if excluded_file?(child.basename.to_s)
|
70
|
+
collect_file(child, sub_test_suites, already_gathered)
|
71
|
+
end
|
72
|
+
|
73
|
+
directories.each do |child|
|
74
|
+
next if excluded_directory?(child.basename.to_s)
|
75
|
+
sub_test_suite = collect_recursive(child, already_gathered)
|
76
|
+
sub_test_suites << sub_test_suite unless sub_test_suite.empty?
|
77
|
+
end
|
78
|
+
else
|
79
|
+
collect_file(path, sub_test_suites, already_gathered)
|
80
|
+
end
|
81
|
+
|
82
|
+
test_suite = TestSuite.new(path.basename.to_s)
|
83
|
+
sort(sub_test_suites).each do |sub_test_suite|
|
84
|
+
test_suite << sub_test_suite
|
85
|
+
end
|
86
|
+
test_suite
|
87
|
+
end
|
88
|
+
|
89
|
+
def collect_file(path, test_suites, already_gathered)
|
90
|
+
add_load_path(path.expand_path.dirname) do
|
91
|
+
require(path.to_s)
|
92
|
+
find_test_cases(already_gathered).each do |test_case|
|
93
|
+
add_suite(test_suites, test_case.suite)
|
94
|
+
end
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
def resolve_path(path)
|
99
|
+
if @base
|
100
|
+
@base + path
|
101
|
+
else
|
102
|
+
Pathname(path)
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
def add_load_path(path)
|
107
|
+
$LOAD_PATH.push(path.to_s) if path
|
108
|
+
yield
|
109
|
+
ensure
|
110
|
+
$LOAD_PATH.delete_at($LOAD_PATH.rindex(path.to_s)) if path
|
111
|
+
end
|
112
|
+
|
113
|
+
def excluded_directory?(base)
|
114
|
+
@system_directory_excludes.any? {|pattern| pattern =~ base}
|
115
|
+
end
|
116
|
+
|
117
|
+
def excluded_file?(base)
|
118
|
+
return true if @system_excludes.any? {|pattern| pattern =~ base}
|
119
|
+
|
120
|
+
patterns = @patterns || []
|
121
|
+
unless patterns.empty?
|
122
|
+
return true unless patterns.any? {|pattern| pattern =~ base}
|
123
|
+
end
|
124
|
+
|
125
|
+
excludes = @excludes || []
|
126
|
+
unless excludes.empty?
|
127
|
+
return true if excludes.any? {|pattern| pattern =~ base}
|
128
|
+
end
|
129
|
+
|
130
|
+
false
|
131
|
+
end
|
132
|
+
end
|
133
|
+
end
|
134
|
+
end
|
135
|
+
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
# Author:: Nathaniel Talbott.
|
2
|
+
# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
|
3
|
+
# License:: Ruby license.
|
4
|
+
|
5
|
+
require 'test/unit/collector'
|
6
|
+
|
7
|
+
module Test
|
8
|
+
module Unit
|
9
|
+
module Collector
|
10
|
+
class ObjectSpace
|
11
|
+
include Collector
|
12
|
+
|
13
|
+
NAME = 'collected from the ObjectSpace'
|
14
|
+
|
15
|
+
def initialize(source=::ObjectSpace)
|
16
|
+
super()
|
17
|
+
@source = source
|
18
|
+
end
|
19
|
+
|
20
|
+
def collect(name=NAME)
|
21
|
+
suite = TestSuite.new(name)
|
22
|
+
sub_suites = []
|
23
|
+
@source.each_object(Class) do |klass|
|
24
|
+
if(Test::Unit::TestCase > klass)
|
25
|
+
add_suite(sub_suites, klass.suite)
|
26
|
+
end
|
27
|
+
end
|
28
|
+
sort(sub_suites).each{|s| suite << s}
|
29
|
+
suite
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,61 @@
|
|
1
|
+
module Test
|
2
|
+
module Unit
|
3
|
+
class Color
|
4
|
+
NAMES = ["black", "red", "green", "yellow",
|
5
|
+
"blue", "magenta", "cyan", "white"]
|
6
|
+
def initialize(name, options={})
|
7
|
+
@name = name
|
8
|
+
@foreground = options[:foreground]
|
9
|
+
@foreground = true if @foreground.nil?
|
10
|
+
@intensity = options[:intensity]
|
11
|
+
@bold = options[:bold]
|
12
|
+
@italic = options[:italic]
|
13
|
+
@underline = options[:underline]
|
14
|
+
end
|
15
|
+
|
16
|
+
def sequence
|
17
|
+
sequence = []
|
18
|
+
if @name == "none"
|
19
|
+
elsif @name == "reset"
|
20
|
+
sequence << "0"
|
21
|
+
else
|
22
|
+
foreground_parameter = @foreground ? 3 : 4
|
23
|
+
foreground_parameter += 6 if @intensity
|
24
|
+
sequence << "#{foreground_parameter}#{NAMES.index(@name)}"
|
25
|
+
end
|
26
|
+
sequence << "1" if @bold
|
27
|
+
sequence << "3" if @italic
|
28
|
+
sequence << "4" if @underline
|
29
|
+
sequence
|
30
|
+
end
|
31
|
+
|
32
|
+
def escape_sequence
|
33
|
+
"\e[#{sequence.join(';')}m"
|
34
|
+
end
|
35
|
+
|
36
|
+
def +(other)
|
37
|
+
MixColor.new([self, other])
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
class MixColor
|
42
|
+
def initialize(colors)
|
43
|
+
@colors = colors
|
44
|
+
end
|
45
|
+
|
46
|
+
def sequence
|
47
|
+
@colors.inject([]) do |result, color|
|
48
|
+
result + color.sequence
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
def escape_sequence
|
53
|
+
"\e[#{sequence.join(';')}m"
|
54
|
+
end
|
55
|
+
|
56
|
+
def +(other)
|
57
|
+
self.class.new([self, other])
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,524 @@
|
|
1
|
+
# port of Python's difflib.
|
2
|
+
|
3
|
+
module Test
|
4
|
+
module Unit
|
5
|
+
module Diff
|
6
|
+
class SequenceMatcher
|
7
|
+
def initialize(from, to, &junk_predicate)
|
8
|
+
@from = from
|
9
|
+
@to = to
|
10
|
+
@junk_predicate = junk_predicate
|
11
|
+
update_to_indexes
|
12
|
+
end
|
13
|
+
|
14
|
+
def longest_match(from_start, from_end, to_start, to_end)
|
15
|
+
best_info = find_best_match_position(from_start, from_end,
|
16
|
+
to_start, to_end)
|
17
|
+
unless @junks.empty?
|
18
|
+
args = [from_start, from_end, to_start, to_end]
|
19
|
+
best_info = adjust_best_info_with_junk_predicate(false, best_info,
|
20
|
+
*args)
|
21
|
+
best_info = adjust_best_info_with_junk_predicate(true, best_info,
|
22
|
+
*args)
|
23
|
+
end
|
24
|
+
|
25
|
+
best_info
|
26
|
+
end
|
27
|
+
|
28
|
+
def blocks
|
29
|
+
@blocks ||= compute_blocks
|
30
|
+
end
|
31
|
+
|
32
|
+
def operations
|
33
|
+
@operations ||= compute_operations
|
34
|
+
end
|
35
|
+
|
36
|
+
def grouped_operations(context_size=nil)
|
37
|
+
context_size ||= 3
|
38
|
+
_operations = operations
|
39
|
+
_operations = [[:equal, 0, 0, 0, 0]] if _operations.empty?
|
40
|
+
expand_edge_equal_operations!(_operations, context_size)
|
41
|
+
|
42
|
+
group_window = context_size * 2
|
43
|
+
groups = []
|
44
|
+
group = []
|
45
|
+
_operations.each do |tag, from_start, from_end, to_start, to_end|
|
46
|
+
if tag == :equal and from_end - from_start > group_window
|
47
|
+
group << [tag,
|
48
|
+
from_start,
|
49
|
+
[from_end, from_start + context_size].min,
|
50
|
+
to_start,
|
51
|
+
[to_end, to_start + context_size].min]
|
52
|
+
groups << group
|
53
|
+
group = []
|
54
|
+
from_start = [from_start, from_end - context_size].max
|
55
|
+
to_start = [to_start, to_end - context_size].max
|
56
|
+
end
|
57
|
+
group << [tag, from_start, from_end, to_start, to_end]
|
58
|
+
end
|
59
|
+
groups << group unless group.empty?
|
60
|
+
groups
|
61
|
+
end
|
62
|
+
|
63
|
+
def ratio
|
64
|
+
@ratio ||= compute_ratio
|
65
|
+
end
|
66
|
+
|
67
|
+
private
|
68
|
+
def update_to_indexes
|
69
|
+
@to_indexes = {}
|
70
|
+
@junks = {}
|
71
|
+
if @to.is_a?(String)
|
72
|
+
each = " "[0].is_a?(Integer) ? :each_byte : :each_char
|
73
|
+
else
|
74
|
+
each = :each
|
75
|
+
end
|
76
|
+
i = 0
|
77
|
+
@to.send(each) do |item|
|
78
|
+
@to_indexes[item] ||= []
|
79
|
+
@to_indexes[item] << i
|
80
|
+
i += 1
|
81
|
+
end
|
82
|
+
|
83
|
+
return if @junk_predicate.nil?
|
84
|
+
@to_indexes = @to_indexes.reject do |key, value|
|
85
|
+
junk = @junk_predicate.call(key)
|
86
|
+
@junks[key] = true if junk
|
87
|
+
junk
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
def find_best_match_position(from_start, from_end, to_start, to_end)
|
92
|
+
best_from, best_to, best_size = from_start, to_start, 0
|
93
|
+
sizes = {}
|
94
|
+
from_start.upto(from_end) do |from_index|
|
95
|
+
_sizes = {}
|
96
|
+
(@to_indexes[@from[from_index]] || []).each do |to_index|
|
97
|
+
next if to_index < to_start
|
98
|
+
break if to_index > to_end
|
99
|
+
size = _sizes[to_index] = (sizes[to_index - 1] || 0) + 1
|
100
|
+
if size > best_size
|
101
|
+
best_from = from_index - size + 1
|
102
|
+
best_to = to_index - size + 1
|
103
|
+
best_size = size
|
104
|
+
end
|
105
|
+
end
|
106
|
+
sizes = _sizes
|
107
|
+
end
|
108
|
+
[best_from, best_to, best_size]
|
109
|
+
end
|
110
|
+
|
111
|
+
def adjust_best_info_with_junk_predicate(should_junk, best_info,
|
112
|
+
from_start, from_end,
|
113
|
+
to_start, to_end)
|
114
|
+
best_from, best_to, best_size = best_info
|
115
|
+
while best_from > from_start and best_to > to_start and
|
116
|
+
(should_junk ?
|
117
|
+
@junks.has_key?(@to[best_to - 1]) :
|
118
|
+
!@junks.has_key?(@to[best_to - 1])) and
|
119
|
+
@from[best_from - 1] == @to[best_to - 1]
|
120
|
+
best_from -= 1
|
121
|
+
best_to -= 1
|
122
|
+
best_size += 1
|
123
|
+
end
|
124
|
+
|
125
|
+
while best_from + best_size < from_end and
|
126
|
+
best_to + best_size < to_end and
|
127
|
+
(should_junk ?
|
128
|
+
@junks.has_key?(@to[best_to + best_size]) :
|
129
|
+
!@junks.has_key?(@to[best_to + best_size])) and
|
130
|
+
@from[best_from + best_size] == @to[best_to + best_size]
|
131
|
+
best_size += 1
|
132
|
+
end
|
133
|
+
|
134
|
+
[best_from, best_to, best_size]
|
135
|
+
end
|
136
|
+
|
137
|
+
def matches
|
138
|
+
@matches ||= compute_matches
|
139
|
+
end
|
140
|
+
|
141
|
+
def compute_matches
|
142
|
+
matches = []
|
143
|
+
queue = [[0, @from.size, 0, @to.size]]
|
144
|
+
until queue.empty?
|
145
|
+
from_start, from_end, to_start, to_end = queue.pop
|
146
|
+
match = longest_match(from_start, from_end - 1, to_start, to_end - 1)
|
147
|
+
match_from_index, match_to_index, size = match
|
148
|
+
unless size.zero?
|
149
|
+
if from_start < match_from_index and
|
150
|
+
to_start < match_to_index
|
151
|
+
queue.push([from_start, match_from_index,
|
152
|
+
to_start, match_to_index])
|
153
|
+
end
|
154
|
+
matches << match
|
155
|
+
if match_from_index + size < from_end and
|
156
|
+
match_to_index + size < to_end
|
157
|
+
queue.push([match_from_index + size, from_end,
|
158
|
+
match_to_index + size, to_end])
|
159
|
+
end
|
160
|
+
end
|
161
|
+
end
|
162
|
+
matches.sort_by do |(from_index, to_index, match_size)|
|
163
|
+
from_index
|
164
|
+
end
|
165
|
+
end
|
166
|
+
|
167
|
+
def compute_blocks
|
168
|
+
blocks = []
|
169
|
+
current_from_index = current_to_index = current_size = 0
|
170
|
+
matches.each do |from_index, to_index, size|
|
171
|
+
if current_from_index + current_size == from_index and
|
172
|
+
current_to_index + current_size == to_index
|
173
|
+
current_size += size
|
174
|
+
else
|
175
|
+
unless current_size.zero?
|
176
|
+
blocks << [current_from_index, current_to_index, current_size]
|
177
|
+
end
|
178
|
+
current_from_index = from_index
|
179
|
+
current_to_index = to_index
|
180
|
+
current_size = size
|
181
|
+
end
|
182
|
+
end
|
183
|
+
unless current_size.zero?
|
184
|
+
blocks << [current_from_index, current_to_index, current_size]
|
185
|
+
end
|
186
|
+
|
187
|
+
blocks << [@from.size, @to.size, 0]
|
188
|
+
blocks
|
189
|
+
end
|
190
|
+
|
191
|
+
def compute_operations
|
192
|
+
from_index = to_index = 0
|
193
|
+
operations = []
|
194
|
+
blocks.each do |match_from_index, match_to_index, size|
|
195
|
+
tag = determine_tag(from_index, to_index,
|
196
|
+
match_from_index, match_to_index)
|
197
|
+
if tag != :equal
|
198
|
+
operations << [tag,
|
199
|
+
from_index, match_from_index,
|
200
|
+
to_index, match_to_index]
|
201
|
+
end
|
202
|
+
|
203
|
+
from_index, to_index = match_from_index + size, match_to_index + size
|
204
|
+
if size > 0
|
205
|
+
operations << [:equal,
|
206
|
+
match_from_index, from_index,
|
207
|
+
match_to_index, to_index]
|
208
|
+
end
|
209
|
+
end
|
210
|
+
operations
|
211
|
+
end
|
212
|
+
|
213
|
+
def compute_ratio
|
214
|
+
matches = blocks.inject(0) {|result, block| result + block[-1]}
|
215
|
+
length = @from.length + @to.length
|
216
|
+
if length.zero?
|
217
|
+
1.0
|
218
|
+
else
|
219
|
+
2.0 * matches / length
|
220
|
+
end
|
221
|
+
end
|
222
|
+
|
223
|
+
def determine_tag(from_index, to_index,
|
224
|
+
match_from_index, match_to_index)
|
225
|
+
if from_index < match_from_index and to_index < match_to_index
|
226
|
+
:replace
|
227
|
+
elsif from_index < match_from_index
|
228
|
+
:delete
|
229
|
+
elsif to_index < match_to_index
|
230
|
+
:insert
|
231
|
+
else
|
232
|
+
:equal
|
233
|
+
end
|
234
|
+
end
|
235
|
+
|
236
|
+
def expand_edge_equal_operations!(_operations, context_size)
|
237
|
+
tag, from_start, from_end, to_start, to_end = _operations[0]
|
238
|
+
if tag == :equal
|
239
|
+
_operations[0] = [tag,
|
240
|
+
[from_start, from_end - context_size].max,
|
241
|
+
from_end,
|
242
|
+
[to_start, to_end - context_size].max,
|
243
|
+
to_end]
|
244
|
+
end
|
245
|
+
|
246
|
+
tag, from_start, from_end, to_start, to_end = _operations[-1]
|
247
|
+
if tag == :equal
|
248
|
+
_operations[-1] = [tag,
|
249
|
+
from_start,
|
250
|
+
[from_end, from_start + context_size].min,
|
251
|
+
to_start,
|
252
|
+
[to_end, to_start + context_size].min]
|
253
|
+
end
|
254
|
+
end
|
255
|
+
end
|
256
|
+
|
257
|
+
class Differ
|
258
|
+
def initialize(from, to)
|
259
|
+
@from = from
|
260
|
+
@to = to
|
261
|
+
end
|
262
|
+
|
263
|
+
private
|
264
|
+
def tag(mark, contents)
|
265
|
+
contents.collect {|content| "#{mark}#{content}"}
|
266
|
+
end
|
267
|
+
end
|
268
|
+
|
269
|
+
class ReadableDiffer < Differ
|
270
|
+
def diff(options={})
|
271
|
+
result = []
|
272
|
+
matcher = SequenceMatcher.new(@from, @to)
|
273
|
+
matcher.operations.each do |args|
|
274
|
+
tag, from_start, from_end, to_start, to_end = args
|
275
|
+
case tag
|
276
|
+
when :replace
|
277
|
+
result.concat(diff_lines(from_start, from_end, to_start, to_end))
|
278
|
+
when :delete
|
279
|
+
result.concat(tag_deleted(@from[from_start...from_end]))
|
280
|
+
when :insert
|
281
|
+
result.concat(tag_inserted(@to[to_start...to_end]))
|
282
|
+
when :equal
|
283
|
+
result.concat(tag_equal(@from[from_start...from_end]))
|
284
|
+
else
|
285
|
+
raise "unknown tag: #{tag}"
|
286
|
+
end
|
287
|
+
end
|
288
|
+
result
|
289
|
+
end
|
290
|
+
|
291
|
+
private
|
292
|
+
def tag_deleted(contents)
|
293
|
+
tag("- ", contents)
|
294
|
+
end
|
295
|
+
|
296
|
+
def tag_inserted(contents)
|
297
|
+
tag("+ ", contents)
|
298
|
+
end
|
299
|
+
|
300
|
+
def tag_equal(contents)
|
301
|
+
tag(" ", contents)
|
302
|
+
end
|
303
|
+
|
304
|
+
def tag_difference(contents)
|
305
|
+
tag("? ", contents)
|
306
|
+
end
|
307
|
+
|
308
|
+
def find_diff_line_info(from_start, from_end, to_start, to_end)
|
309
|
+
best_ratio = 0.74
|
310
|
+
from_equal_index = to_equal_index = nil
|
311
|
+
from_best_index = to_best_index = nil
|
312
|
+
|
313
|
+
to_start.upto(to_end - 1) do |to_index|
|
314
|
+
from_start.upto(from_end - 1) do |from_index|
|
315
|
+
if @from[from_index] == @to[to_index]
|
316
|
+
from_equal_index ||= from_index
|
317
|
+
to_equal_index ||= to_index
|
318
|
+
next
|
319
|
+
end
|
320
|
+
|
321
|
+
matcher = SequenceMatcher.new(@from[from_index], @to[to_index],
|
322
|
+
&method(:space_character?))
|
323
|
+
if matcher.ratio > best_ratio
|
324
|
+
best_ratio = matcher.ratio
|
325
|
+
from_best_index = from_index
|
326
|
+
to_best_index = to_index
|
327
|
+
end
|
328
|
+
end
|
329
|
+
end
|
330
|
+
|
331
|
+
[best_ratio,
|
332
|
+
from_equal_index, to_equal_index,
|
333
|
+
from_best_index, to_best_index]
|
334
|
+
end
|
335
|
+
|
336
|
+
def diff_lines(from_start, from_end, to_start, to_end)
|
337
|
+
cut_off = 0.75
|
338
|
+
|
339
|
+
info = find_diff_line_info(from_start, from_end, to_start, to_end)
|
340
|
+
best_ratio, from_equal_index, to_equal_index, *info = info
|
341
|
+
from_best_index, to_best_index = info
|
342
|
+
|
343
|
+
if best_ratio < cut_off
|
344
|
+
if from_equal_index.nil?
|
345
|
+
tagged_from = tag_deleted(@from[from_start...from_end])
|
346
|
+
tagged_to = tag_inserted(@to[to_start...to_end])
|
347
|
+
if to_end - to_start < from_end - from_start
|
348
|
+
return tagged_to + tagged_from
|
349
|
+
else
|
350
|
+
return tagged_from + tagged_to
|
351
|
+
end
|
352
|
+
end
|
353
|
+
from_best_index = from_equal_index
|
354
|
+
to_best_index = to_equal_index
|
355
|
+
best_ratio = 1.0
|
356
|
+
end
|
357
|
+
|
358
|
+
_diff_lines(from_start, from_best_index, to_start, to_best_index) +
|
359
|
+
diff_line(@from[from_best_index], @to[to_best_index]) +
|
360
|
+
_diff_lines(from_best_index + 1, from_end, to_best_index + 1, to_end)
|
361
|
+
end
|
362
|
+
|
363
|
+
def _diff_lines(from_start, from_end, to_start, to_end)
|
364
|
+
if from_start < from_end
|
365
|
+
if to_start < to_end
|
366
|
+
diff_lines(from_start, from_end, to_start, to_end)
|
367
|
+
else
|
368
|
+
tag_deleted(@from[from_start...from_end])
|
369
|
+
end
|
370
|
+
else
|
371
|
+
tag_inserted(@to[to_start...to_end])
|
372
|
+
end
|
373
|
+
end
|
374
|
+
|
375
|
+
def diff_line(from_line, to_line)
|
376
|
+
from_tags = ""
|
377
|
+
to_tags = ""
|
378
|
+
matcher = SequenceMatcher.new(from_line, to_line,
|
379
|
+
&method(:space_character?))
|
380
|
+
operations = matcher.operations
|
381
|
+
operations.each do |tag, from_start, from_end, to_start, to_end|
|
382
|
+
from_length = from_end - from_start
|
383
|
+
to_length = to_end - to_start
|
384
|
+
case tag
|
385
|
+
when :replace
|
386
|
+
from_tags << "^" * from_length
|
387
|
+
to_tags << "^" * to_length
|
388
|
+
when :delete
|
389
|
+
from_tags << "-" * from_length
|
390
|
+
when :insert
|
391
|
+
to_tags << "+" * to_length
|
392
|
+
when :equal
|
393
|
+
from_tags << " " * from_length
|
394
|
+
to_tags << " " * to_length
|
395
|
+
else
|
396
|
+
raise "unknown tag: #{tag}"
|
397
|
+
end
|
398
|
+
end
|
399
|
+
format_diff_point(from_line, to_line, from_tags, to_tags)
|
400
|
+
end
|
401
|
+
|
402
|
+
def format_diff_point(from_line, to_line, from_tags, to_tags)
|
403
|
+
common = [n_leading_characters(from_line, ?\t),
|
404
|
+
n_leading_characters(to_line, ?\t)].min
|
405
|
+
common = [common,
|
406
|
+
n_leading_characters(from_tags[0, common], " "[0])].min
|
407
|
+
from_tags = from_tags[common..-1].rstrip
|
408
|
+
to_tags = to_tags[common..-1].rstrip
|
409
|
+
|
410
|
+
result = tag_deleted([from_line])
|
411
|
+
unless from_tags.empty?
|
412
|
+
result.concat(tag_difference(["#{"\t" * common}#{from_tags}"]))
|
413
|
+
end
|
414
|
+
result.concat(tag_inserted([to_line]))
|
415
|
+
unless to_tags.empty?
|
416
|
+
result.concat(tag_difference(["#{"\t" * common}#{to_tags}"]))
|
417
|
+
end
|
418
|
+
result
|
419
|
+
end
|
420
|
+
|
421
|
+
def n_leading_characters(string, character)
|
422
|
+
n = 0
|
423
|
+
while string[n] == character
|
424
|
+
n += 1
|
425
|
+
end
|
426
|
+
n
|
427
|
+
end
|
428
|
+
|
429
|
+
def space_character?(character)
|
430
|
+
[" "[0], "\t"[0]].include?(character)
|
431
|
+
end
|
432
|
+
end
|
433
|
+
|
434
|
+
class UnifiedDiffer < Differ
|
435
|
+
def diff(options={})
|
436
|
+
groups = SequenceMatcher.new(@from, @to).grouped_operations
|
437
|
+
return [] if groups.empty?
|
438
|
+
return [] if same_content?(groups)
|
439
|
+
|
440
|
+
show_context = options[:show_context]
|
441
|
+
show_context = true if show_context.nil?
|
442
|
+
result = ["--- #{options[:from_label]}".rstrip,
|
443
|
+
"+++ #{options[:to_label]}".rstrip]
|
444
|
+
groups.each do |operations|
|
445
|
+
result << format_summary(operations, show_context)
|
446
|
+
operations.each do |args|
|
447
|
+
operation_tag, from_start, from_end, to_start, to_end = args
|
448
|
+
case operation_tag
|
449
|
+
when :replace
|
450
|
+
result.concat(tag("-", @from[from_start...from_end]))
|
451
|
+
result.concat(tag("+", @to[to_start...to_end]))
|
452
|
+
when :delete
|
453
|
+
result.concat(tag("-", @from[from_start...from_end]))
|
454
|
+
when :insert
|
455
|
+
result.concat(tag("+", @to[to_start...to_end]))
|
456
|
+
when :equal
|
457
|
+
result.concat(tag(" ", @from[from_start...from_end]))
|
458
|
+
end
|
459
|
+
end
|
460
|
+
end
|
461
|
+
result
|
462
|
+
end
|
463
|
+
|
464
|
+
private
|
465
|
+
def same_content?(groups)
|
466
|
+
return false if groups.size != 1
|
467
|
+
group = groups[0]
|
468
|
+
return false if group.size != 1
|
469
|
+
tag, from_start, from_end, to_start, to_end = group[0]
|
470
|
+
|
471
|
+
tag == :equal and [from_start, from_end] == [to_start, to_end]
|
472
|
+
end
|
473
|
+
|
474
|
+
def format_summary(operations, show_context)
|
475
|
+
_, first_from_start, _, first_to_start, _ = operations[0]
|
476
|
+
_, _, last_from_end, _, last_to_end = operations[-1]
|
477
|
+
summary = "@@ -%d,%d +%d,%d @@" % [first_from_start + 1,
|
478
|
+
last_from_end - first_from_start,
|
479
|
+
first_to_start + 1,
|
480
|
+
last_to_end - first_to_start,]
|
481
|
+
if show_context
|
482
|
+
interesting_line = find_interesting_line(first_from_start,
|
483
|
+
first_to_start,
|
484
|
+
:define_line?)
|
485
|
+
summary << " #{interesting_line}" if interesting_line
|
486
|
+
end
|
487
|
+
summary
|
488
|
+
end
|
489
|
+
|
490
|
+
def find_interesting_line(from_start, to_start, predicate)
|
491
|
+
from_index = from_start
|
492
|
+
to_index = to_start
|
493
|
+
while from_index >= 0 or to_index >= 0
|
494
|
+
[@from[from_index], @to[to_index]].each do |line|
|
495
|
+
return line if line and send(predicate, line)
|
496
|
+
end
|
497
|
+
|
498
|
+
from_index -= 1
|
499
|
+
to_index -= 1
|
500
|
+
end
|
501
|
+
nil
|
502
|
+
end
|
503
|
+
|
504
|
+
def define_line?(line)
|
505
|
+
/\A(?:[_a-zA-Z$]|\s*(?:class|module|def)\b)/ =~ line
|
506
|
+
end
|
507
|
+
end
|
508
|
+
|
509
|
+
module_function
|
510
|
+
def readable(from, to, options={})
|
511
|
+
diff(ReadableDiffer, from, to, options)
|
512
|
+
end
|
513
|
+
|
514
|
+
def unified(from, to, options={})
|
515
|
+
diff(UnifiedDiffer, from, to, options)
|
516
|
+
end
|
517
|
+
|
518
|
+
def diff(differ_class, from, to, options={})
|
519
|
+
differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
|
520
|
+
differ.diff(options).join("\n")
|
521
|
+
end
|
522
|
+
end
|
523
|
+
end
|
524
|
+
end
|