Merge pull request #54 from readium/develop

1.0.8

Author: aferditamuriqi

opds/Cartfile

@@ -1,2 +1,2 @@
-github "readium/r2-shared-swift" == 1.2.8
-github "cezheng/Fuzi" == 2.2.1
+github "readium/r2-shared-swift" == 1.2.11
+github "edrlab/Fuzi" == 2.2.2

opds/Cartfile.resolved

@@ -1,2 +1,2 @@
-github "cezheng/Fuzi" "2.2.1"
-github "readium/r2-shared-swift" "1.2.8"
+github "edrlab/Fuzi" "2.2.2"
+github "readium/r2-shared-swift" "1.2.11"

opds/README.md

@@ -64,7 +64,7 @@ ReadiumOPDS with CocoaPods:
     use_frameworks!
 
     target 'YourAppTargetName' do
-        pod 'ReadiumOPDS', :git => 'https://github.com/readium/r2-opds-swift.git', '~> 1.0.4'
+        pod 'ReadiumOPDS', :git => 'https://github.com/readium/r2-opds-swift.git'
     end
     ```
 
@@ -87,7 +87,7 @@ import ReadiumOPDS
 #### Dependencies in this module
 
   - [R2Shared](https://github.com/readium/r2-shared-swift) : Custom types shared by several readium-2 Swift modules.
-  - [Fuzi](https://github.com/cezheng/Fuzi) : A fast & lightweight XML & HTML parser in Swift with XPath & CSS support.
+  - [Fuzi](https://github.com/edrlab/Fuzi) : A fast & lightweight XML & HTML parser in Swift with XPath & CSS support.
 
 Modifications needed in Xcode:
 

opds/readium-opds.xcodeproj/project.pbxproj

@@ -165,6 +165,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = F34B7E431FA35B7900534FD3;
 			productRefGroup = F34B7E4E1FA35B7900534FD3 /* Products */;

opds/readium-opds.xcodeproj/xcshareddata/IDETemplateMacros.plist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FILEHEADER</key>
+	<string>
+//  ___FILENAME___
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//
+//  Copyright ___YEAR___ Readium Foundation. All rights reserved.
+//  Use of this source code is governed by a BSD-style license which is detailed
+//  in the LICENSE file present in the project repository where this source code is maintained.
+//</string>
+</dict>
+</plist>

opds/readium-opds.xcodeproj/xcshareddata/xcschemes/readium-opds.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

opds/readium-opds/OPDS1Parser.swift

@@ -106,9 +106,9 @@ public class OPDS1Parser: Loggable {
     /// - parameter document: The XMLDocument data
     /// - Returns: The resulting Feed
     public static func parse(document: XMLDocument) throws -> Feed {
-        document.definePrefix("thr", defaultNamespace: "http://purl.org/syndication/thread/1.0")
-        document.definePrefix("dcterms", defaultNamespace: "http://purl.org/dc/terms/")
-        document.definePrefix("opds", defaultNamespace: "http://opds-spec.org/2010/catalog")
+        document.definePrefix("thr", forNamespace: "http://purl.org/syndication/thread/1.0")
+        document.definePrefix("dcterms", forNamespace: "http://purl.org/dc/terms/")
+        document.definePrefix("opds", forNamespace: "http://opds-spec.org/2010/catalog")
 
         guard let root = document.root else {
             throw OPDS1ParserError.rootNotFound

opds/readium-opdsTests/readium_opds1_1_test.swift

@@ -8,7 +8,6 @@
 
 import XCTest
 
-import AEXML
 import R2Shared
 
 @testable import ReadiumOPDS