Merge branch 'develop'

.gitattributes

@@ -0,0 +1,3 @@
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.deflate filter=lfs diff=lfs merge=lfs -text
+*.answer filter=lfs diff=lfs merge=lfs -text

.travis.yml

@@ -8,6 +8,10 @@ env:
 before_install:
 - brew update
 - brew outdated carthage || brew upgrade carthage
+- brew install git-lfs
+- git lfs install
+before_script:
+- git lfs pull
 before_deploy:
 - carthage build --no-skip-current
 - carthage archive $FRAMEWORK_NAME

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+v1.1.2
+----------------
+- Fixed memory problem in Deflate.
+- Improved overall performance.
+
 v1.1.1
 ----------------
 - Fixed problems when building with Swift Package Manager.

README.md

@@ -65,7 +65,7 @@ import PackageDescription
 let package = Package(
     name: "PackageName",
     dependencies: [
-        .Package(url: "https://github.com/tsolomko/SWCompression.git")
+        .Package(url: "https://github.com/tsolomko/SWCompression.git", majorVersion: 1)
     ]
 )
 ```

SWCompression.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SWCompression"
-  s.version      = "1.1.1"
+  s.version      = "1.1.2"
   s.summary      = "Framework with implementations in Swift of different (de)compression algorithms"
 
   s.description  = <<-DESC

Sources/DataWithPointer.swift

@@ -85,9 +85,19 @@ class DataWithPointer {
         return self.bits(count: 1).first!
     }
 
+    /// Skips until next byte and returns next `count` bytes.
+    func alignedBytes(count: Int) -> [UInt8] {
+        self.skipUntilNextByte()
+        var array: [UInt8] = Array(repeating: 0, count: count)
+        CFBitVectorGetBits(self.bitVector, CFRangeMake(self.index * 8, count * 8), &array)
+        self.index += count
+        return array
+    }
+
     // MARK: Manipulations with index and bitShift
 
     func skipUntilNextByte() {
+        guard self.bitShift != 0 else { return }
         self.index += 1
         self.bitShift = 0
     }

Sources/Deflate.swift

@@ -56,7 +56,6 @@ public class Deflate: DecompressionAlgorithm {
 
             if blockType == [0, 0] { // Uncompressed block.
                 pointerData.skipUntilNextByte()
-
                 /// Length of the uncompressed data.
                 let length = pointerData.intFromBits(count: 16)
                 /// 1-complement of the length.
@@ -65,9 +64,9 @@ public class Deflate: DecompressionAlgorithm {
                 // TODO: Rename WrongBlockLengths to WrongUncompressedBlockLengths (or something else)
                 guard length & nlength == 0 else { throw DeflateError.WrongBlockLengths }
                 // Process uncompressed data into the output
+                // TODO: Replace precondition with guard and error throwing.
                 precondition(pointerData.bitShift == 0, "Misaligned byte.")
-                out.append(contentsOf: data.bytes(from: pointerData.index..<pointerData.index + length))
-                pointerData.index += length
+                out.append(contentsOf: pointerData.alignedBytes(count: length))
             } else if blockType == [1, 0] || blockType == [0, 1] {
                 // Block with Huffman coding (either static or dynamic)
 

Sources/GzipArchive.swift

@@ -36,11 +36,12 @@ public class GzipArchive: Archive {
         static let fcomment: UInt8 = 0x10
     }
 
-    struct ServiceInfo {
+    struct ServiceInfo: Equatable {
+
         let magic: [UInt8]
         let method: UInt8
         let flags: UInt8
-        let mtime: UInt64
+        let mtime: [UInt8]
         let extraFlags: UInt8
         let osType: UInt8
         // Starting point of compressed data. Depends on presence of optional fields.
@@ -49,6 +50,13 @@ public class GzipArchive: Archive {
         var fileName: String
         var comment: String
         var crc: UInt16
+
+        public static func ==(lhs: ServiceInfo, rhs: ServiceInfo) -> Bool {
+            return lhs.magic == rhs.magic && lhs.method == rhs.method &&
+                lhs.flags == rhs.flags && lhs.mtime == rhs.mtime && lhs.extraFlags == rhs.extraFlags &&
+                lhs.osType == rhs.osType && lhs.startPoint == rhs.startPoint &&
+                lhs.fileName == rhs.fileName && lhs.comment == rhs.comment && lhs.crc == rhs.crc
+        }
     }
 
     static func serviceInfo(archiveData data: Data) throws -> ServiceInfo {
@@ -64,7 +72,7 @@ public class GzipArchive: Archive {
         var serviceInfo = ServiceInfo(magic: magic,
                                       method: method,
                                       flags: data[3],
-                                      mtime: Data(data[4...7]).to(type: UInt64.self),
+                                      mtime: data.bytes(from: 4..<8),
                                       extraFlags: data[8],
                                       osType: data[9],
                                       startPoint: 10,

Sources/Service/Info-iOS.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/Service/Info-tvOS.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/Service/Info-watchOS.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/Service/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

Sources/ZlibArchive.swift

@@ -38,11 +38,20 @@ public class ZlibArchive: Archive {
         case slowAlgorithm = 3
     }
 
-    struct ServiceInfo {
+    struct ServiceInfo: Equatable {
+
         let compressionMethod: UInt8
         let windowSize: Int
         let compressionLevel: CompressionLevel
         var startPoint: Int
+
+        public static func ==(lhs: ServiceInfo, rhs: ServiceInfo) -> Bool {
+            return lhs.compressionMethod == rhs.compressionMethod &&
+                lhs.windowSize == rhs.windowSize &&
+                lhs.compressionLevel == rhs.compressionLevel &&
+                lhs.startPoint == rhs.startPoint
+        }
+
     }
 
     static func serviceInfo(archiveData data: Data) throws -> ServiceInfo {

Tests/DeflateTests.swift

@@ -0,0 +1,160 @@
+//
+//  DeflateTests.swift
+//  SWCompression
+//
+//  Created by Timofey Solomko on 21.11.16.
+//  Copyright © 2016 Timofey Solomko. All rights reserved.
+//
+
+import XCTest
+import SWCompression
+
+class DeflateTests: XCTestCase {
+
+    static let testType: String = "deflate"
+
+    func testDeflate1() {
+        let testName = "test1"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+    func testDeflate2() {
+        let testName = "test2"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+    func testDeflate3() {
+        let testName = "test3"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+
+    func testDeflate4() {
+        let testName = "test4"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+
+    func testDeflate5() {
+        let testName = "test5"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+
+    func testDeflate6() {
+        let testName = "test6"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+
+    func testDeflate7() {
+        let testName = "test7"
+        guard let testData = try? Data(contentsOf: Constants.url(forTest: testName, withType: DeflateTests.testType)) else {
+            XCTFail("Failed to load test archive")
+            return
+        }
+
+        guard let decompressedData = try? Deflate.decompress(compressedData: testData) else {
+            XCTFail("Failed to decompress")
+            return
+        }
+
+        guard let answerData = try? Data(contentsOf: Constants.url(forAnswer: testName)) else {
+            XCTFail("Failed to get the answer")
+            return
+        }
+
+        XCTAssertEqual(decompressedData, answerData, "Decompression was incorrect")
+    }
+
+}