Merge pull request #39 from readium/develop

1.0.3

Author: aferditamuriqi

opds/Cartfile.resolved

@@ -1,4 +1,4 @@
 github "Hearst-DD/ObjectMapper" "2.2.0"
-github "Readium/r2-shared-swift" "24cf14563553754e696a273646b1dfaaaef234b4"
+github "Readium/r2-shared-swift" "07f5fe26381e0980925f7a16e8c05a1c7455ea45"
 github "cezheng/Fuzi" "2.0.2"
 github "mxcl/PromiseKit" "4.5.2"

opds/readium-opds.xcodeproj/project.pbxproj

@@ -154,7 +154,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Readium;
 				TargetAttributes = {
 					F34B7E4C1FA35B7900534FD3 = {
@@ -221,13 +221,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -281,13 +283,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

opds/readium-opds/OPDS1Parser.swift

@@ -212,6 +212,12 @@ public class OPDS1Parser {
                     let facetElementCount = Int(facetElementCountStr) {
                     newLink.properties.numberOfItems = facetElementCount
                 }
+                
+                // Active Facet Check
+                if link.attributes["activeFacet"] == "true" {
+                    newLink.rel.append("self")
+                }
+                
                 addFacet(feed: feed, to: newLink, named: facetGroupName)
             } else {
                 feed.links.append(newLink)
@@ -365,7 +371,7 @@ public class OPDS1Parser {
         }
         // Publication date.
         if let tmpDate = entry.firstChild(tag: "published")?.stringValue {
-            metadata.publicationDate = tmpDate
+            metadata.published = tmpDate
         }
 
         // Rights.
@@ -396,10 +402,7 @@ public class OPDS1Parser {
             let contributor = Contributor()
 
             if let uri = author.firstChild(tag: "uri")?.stringValue {
-                let link = Link()
-                link.href = uri
-                link.absoluteHref = URLHelper.getAbsolute(href: uri, base: feedURL)
-                contributor.links.append(link)
+                contributor.identifier = uri
             }
 
             contributor.multilangName.singleString = author.firstChild(tag: "name")?.stringValue