Skip to content

Commit b36d4c7

Browse files
ra1028ra1028
authored
Merge pull request #8 from ra1028/v0.4.1
v0.4.1
2 parents e9c1e9a + 4fd99b9 commit b36d4c7

17 files changed

+59
-22
lines changed

‎DifferenceKit.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'DifferenceKit'
3-
spec.version = '0.4.0'
3+
spec.version = '0.4.1'
44
spec.author = { 'ra1028' => '[email protected]' }
55
spec.homepage = 'https://github.com/ra1028/DifferenceKit'
66
spec.documentation_url = 'https://ra1028.github.io/DifferenceKit'

‎README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ The algorithm is optimized based on the Paul Heckel's algorithm.
55
</H4>
66

77
<p align="center">
8-
<a href="https://developer.apple.com/swift"><img alt="Swift4" src="https://img.shields.io/badge/language-swift4-orange.svg?style=flat"/></a>
8+
<a href="https://developer.apple.com/swift"><img alt="Swift4" src="https://img.shields.io/badge/language-Swift4-orange.svg"/></a>
9+
<a href="https://github.com/ra1028/DifferenceKit/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/ra1028/DifferenceKit.svg"/></a>
910
<a href="https://cocoapods.org/pods/DifferenceKit"><img alt="CocoaPods" src="https://img.shields.io/cocoapods/v/DifferenceKit.svg"/></a>
10-
<a href="https://github.com/Carthage/Carthage"><img alt="Carthage" src="https://img.shields.io/badge/Carthage-compatible-yellow.svg?style=flat"/></a>
11+
<a href="https://github.com/Carthage/Carthage"><img alt="Carthage" src="https://img.shields.io/badge/Carthage-compatible-yellow.svg"/></a>
1112
</br>
1213
<a href="https://travis-ci.org/ra1028/DifferenceKit"><img alt="Build Status" src="https://travis-ci.org/ra1028/DifferenceKit.svg?branch=master"/></a>
13-
<a href="https://developer.apple.com/swift/"><img alt="Platform" src="https://img.shields.io/badge/platform-iOS%20%7C%20OSX%20%7C%20tvOS%20%7C%20watchOS-green.svg"/></a>
14-
<a href="https://github.com/ra1028/DifferenceKit/blob/master/LICENSE"><img alt="Lincense" src="http://img.shields.io/badge/license-MIT-000000.svg?style=flat"/></a>
14+
<a href="https://developer.apple.com/"><img alt="Platform" src="https://img.shields.io/badge/platform-iOS%20%7C%20OSX%20%7C%20tvOS%20%7C%20watchOS-green.svg"/></a>
15+
<a href="https://github.com/ra1028/DifferenceKit/blob/master/LICENSE"><img alt="Lincense" src="http://img.shields.io/badge/license-MIT-000000.svg"/></a>
1516
</p>
1617

1718
---

‎Sources/Algorithm.swift

+12
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
9595
)
9696
}
9797

98+
// Set the target to `data` of the last stage.
99+
if !changesets.isEmpty {
100+
let index = changesets.index(before: changesets.endIndex)
101+
changesets[index].data = target
102+
}
103+
98104
self.init(changesets)
99105
}
100106
}
@@ -363,6 +369,12 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
363369
)
364370
}
365371

372+
// Set the target to `data` of the last stage.
373+
if !changesets.isEmpty {
374+
let index = changesets.index(before: changesets.endIndex)
375+
changesets[index].data = target
376+
}
377+
366378
self.init(changesets)
367379
}
368380
}

‎Tests/AlgorithmTest.swift

+23
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ final class AlgorithmTestCase: XCTestCase {}
55

66
/// Test algorithm for linear collection.
77
extension AlgorithmTestCase {
8+
func testEmptyChangesets() {
9+
let source = [Int]()
10+
let target = [Int]()
11+
12+
XCTAssertExactDifferences(
13+
source: source,
14+
target: target,
15+
section: 0,
16+
expected: []
17+
)
18+
}
19+
820
func testDeleted() {
921
let section = 1
1022

@@ -227,6 +239,17 @@ extension AlgorithmTestCase {
227239

228240
/// Test algorithm for sectioned collection.
229241
extension AlgorithmTestCase {
242+
func testSectionedEmptyChangesets() {
243+
let source = [Section<Int, Int>]()
244+
let target = [Section<Int, Int>]()
245+
246+
XCTAssertExactDifferences(
247+
source: source,
248+
target: target,
249+
expected: []
250+
)
251+
}
252+
230253
func testSectionInserted() {
231254
let source1 = [
232255
Section(model: D.a, elements: [0])

‎docs/Extensions.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ <h4>Declaration</h4>
141141
</section>
142142
</section>
143143
<section id="footer">
144-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
144+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
145145
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
146146
</section>
147147
</article>

‎docs/Extensions/UICollectionView.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ <h4>Parameters</h4>
175175
</section>
176176
</section>
177177
<section id="footer">
178-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
178+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
179179
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
180180
</section>
181181
</article>

‎docs/Extensions/UITableView.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ <h4>Parameters</h4>
349349
</section>
350350
</section>
351351
<section id="footer">
352-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
352+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
353353
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
354354
</section>
355355
</article>

‎docs/Protocols.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ <h4>Declaration</h4>
147147
</section>
148148
</section>
149149
<section id="footer">
150-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
150+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
151151
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
152152
</section>
153153
</article>

‎docs/Protocols/Differentiable.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ <h4>Return Value</h4>
216216
</section>
217217
</section>
218218
<section id="footer">
219-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
219+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
220220
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
221221
</section>
222222
</article>

‎docs/Protocols/DifferentiableSection.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ <h4>Parameters</h4>
259259
</section>
260260
</section>
261261
<section id="footer">
262-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
262+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
263263
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
264264
</section>
265265
</article>

‎docs/Structs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ <h4>Declaration</h4>
309309
</section>
310310
</section>
311311
<section id="footer">
312-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
312+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
313313
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
314314
</section>
315315
</article>

‎docs/Structs/AnyDifferentiable.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ <h4>Declaration</h4>
297297
</section>
298298
</section>
299299
<section id="footer">
300-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
300+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
301301
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
302302
</section>
303303
</article>

‎docs/Structs/Changeset.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ <h4>Declaration</h4>
607607
</section>
608608
</section>
609609
<section id="footer">
610-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
610+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
611611
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
612612
</section>
613613
</article>

‎docs/Structs/ElementPath.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ <h4>Declaration</h4>
240240
</section>
241241
</section>
242242
<section id="footer">
243-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
243+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
244244
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
245245
</section>
246246
</article>

‎docs/Structs/Section.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ <h4>Declaration</h4>
268268
</section>
269269
</section>
270270
<section id="footer">
271-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
271+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
272272
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
273273
</section>
274274
</article>

‎docs/Structs/StagedChangeset.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ <h4>Declaration</h4>
673673
</section>
674674
</section>
675675
<section id="footer">
676-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
676+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
677677
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
678678
</section>
679679
</article>

‎docs/index.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,14 @@ <H4 align="center">
8383
</H4>
8484

8585
<p align="center">
86-
<a href="https://developer.apple.com/swift"><img alt="Swift4" src="https://img.shields.io/badge/language-swift4-orange.svg?style=flat"/></a>
86+
<a href="https://developer.apple.com/swift"><img alt="Swift4" src="https://img.shields.io/badge/language-Swift4-orange.svg"/></a>
87+
<a href="https://github.com/ra1028/DifferenceKit/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/ra1028/DifferenceKit.svg"/></a>
8788
<a href="https://cocoapods.org/pods/DifferenceKit"><img alt="CocoaPods" src="https://img.shields.io/cocoapods/v/DifferenceKit.svg"/></a>
88-
<a href="https://github.com/Carthage/Carthage"><img alt="Carthage" src="https://img.shields.io/badge/Carthage-compatible-yellow.svg?style=flat"/></a>
89+
<a href="https://github.com/Carthage/Carthage"><img alt="Carthage" src="https://img.shields.io/badge/Carthage-compatible-yellow.svg"/></a>
8990
</br>
9091
<a href="https://travis-ci.org/ra1028/DifferenceKit"><img alt="Build Status" src="https://travis-ci.org/ra1028/DifferenceKit.svg?branch=master"/></a>
91-
<a href="https://developer.apple.com/swift/"><img alt="Platform" src="https://img.shields.io/badge/platform-iOS%20%7C%20OSX%20%7C%20tvOS%20%7C%20watchOS-green.svg"/></a>
92-
<a href="https://github.com/ra1028/DifferenceKit/blob/master/LICENSE"><img alt="Lincense" src="http://img.shields.io/badge/license-MIT-000000.svg?style=flat"/></a>
92+
<a href="https://developer.apple.com/"><img alt="Platform" src="https://img.shields.io/badge/platform-iOS%20%7C%20OSX%20%7C%20tvOS%20%7C%20watchOS-green.svg"/></a>
93+
<a href="https://github.com/ra1028/DifferenceKit/blob/master/LICENSE"><img alt="Lincense" src="http://img.shields.io/badge/license-MIT-000000.svg"/></a>
9394
</p>
9495

9596
<hr>
@@ -632,7 +633,7 @@ <h2 id='license' class='heading'>License</h2>
632633
</section>
633634
</section>
634635
<section id="footer">
635-
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-13)</p>
636+
<p>&copy; 2018 <a class="link" href="https://github.com/ra1028" target="_blank" rel="external">Ryo Aoyama</a>. All rights reserved. (Last updated: 2018-08-21)</p>
636637
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
637638
</section>
638639
</article>

0 commit comments

Comments
 (0)