Merge pull request #41 from klefevre/bump-version

Bump version

Author: Kevin Lefèvre

.swift-version

@@ -0,0 +1 @@
+3.0.2

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 3.0.0
+github "antitypical/Result" ~> 3.1.0

Cartfile.resolved

@@ -1 +1 @@
-github "antitypical/Result" "3.0.0"
+github "antitypical/Result" "3.1.0"

Carthage/Checkouts/Result

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Postal'
-  s.version = '0.3.1'
+  s.version = '0.4.0'
   s.summary = 'A swift framework for working with emails.'
   s.description = 'A Swift framework for working with emails. Simple and quick to use. Built on top of libetpan.'
   s.homepage = 'https://github.com/snipsco/Postal'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
 
-  s.source = { :git => 'https://github.com/snipsco/Postal.git', :tag => 'v' + s.version.to_s }
+  s.source = { :git => 'https://github.com/klefevre/Postal.git', :tag => 'v' + s.version.to_s }
 
   s.default_subspec = 'Core'
 
@@ -33,13 +33,17 @@ Pod::Spec.new do |s|
     sp.preserve_paths = 'dependencies'
 
     sp.libraries = 'etpan', 'sasl2', 'z', 'iconv'
-    sp.dependency 'Result', '~> 3.0.0'
+    sp.dependency 'Result', '~> 3.1.0'
   end
 
   s.subspec 'ReactiveCocoa' do |sp|
-    sp.source_files = 'Postal/ReactiveCocoa/*.swift'
-    sp.dependency "Postal/Core"
-    sp.dependency 'ReactiveCocoa', '~> 4.2.1'
+    sp.dependency 'Postal/ReactiveSwift'
+  end
+
+  s.subspec 'ReactiveSwift' do |sp|
+    sp.source_files = 'Postal/ReactiveSwift/*.swift'
+    sp.dependency 'Postal/Core'
+    sp.dependency 'ReactiveSwift', '1.0.0-rc.3'
   end
 
 end

Postal.podspec

@@ -577,7 +577,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = snips;
 				TargetAttributes = {
 					9812C31B1D50959500630D46 = {
@@ -958,6 +958,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = Postal;
 				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/dependencies";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

Postal.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

Postal.xcodeproj/xcshareddata/xcschemes/Postal-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

Postal.xcodeproj/xcshareddata/xcschemes/Postal-macOS.xcscheme

@@ -22,18 +22,18 @@
 //  SOFTWARE.
 //
 
-import ReactiveCocoa
+import ReactiveSwift
 
 public extension Postal {
     func rac_connect() -> SignalProducer<Void, PostalError> {
         return SignalProducer { observer, disposable in
             self.connect(timeout: Postal.defaultTimeout) { result in
                 result.analysis(
                     ifSuccess: {
-                        observer.sendNext(())
+                        observer.send(value: ())
                         observer.sendCompleted()
                     },
-                    ifFailure: observer.sendFailed)
+                    ifFailure: observer.send)
                 }
             }
     }
@@ -43,10 +43,10 @@ public extension Postal {
             self.listFolders { result in
                 result.analysis(
                     ifSuccess: { folders in
-                        observer.sendNext(folders)
+                        observer.send(value: folders)
                         observer.sendCompleted()
                     },
-                    ifFailure: observer.sendFailed)
+                    ifFailure: observer.send)
                 }
             }
     }
@@ -65,31 +65,31 @@ public extension Postal {
             }
     }
 
-    func rac_search(folder: String, filter: SearchKind) -> SignalProducer<NSIndexSet, PostalError> {
-        return rac_search(folder, filter: .base(filter))
+    func rac_search(folder: String, filter: SearchKind) -> SignalProducer<IndexSet, PostalError> {
+        return rac_search(folder: folder, filter: .base(filter))
     }
 
-    func rac_search(folder: String, filter: SearchFilter) -> SignalProducer<NSIndexSet, PostalError> {
+    func rac_search(folder: String, filter: SearchFilter) -> SignalProducer<IndexSet, PostalError> {
         return SignalProducer { observer, disposable in
             self.search(folder, filter: filter) { result in
                 result.analysis(
                     ifSuccess: { uids in
-                        observer.sendNext(uids)
+                        observer.send(value: uids)
                         observer.sendCompleted()
                     },
-                    ifFailure: observer.sendFailed)
+                    ifFailure: observer.send)
                 }
             }
     }
 
-    func rac_fetch(folder: String, uids: NSIndexSet, flags: FetchFlag, extraHeaders: Set<String> = []) -> SignalProducer<FetchResult, PostalError> {
+    func rac_fetch(folder: String, uids: IndexSet, flags: FetchFlag, extraHeaders: Set<String> = []) -> SignalProducer<FetchResult, PostalError> {
         return SignalProducer<FetchResult, PostalError> { observer, disposable in
             self.fetchMessages(folder, uids: uids, flags: flags, extraHeaders: extraHeaders,
                 onMessage: { message in
-                    observer.sendNext(message)
+                    observer.send(value: message)
                 }, onComplete: { error in
                     if let error = error {
-                        observer.sendFailed(error)
+                        observer.send(error: error)
                     } else {
                         observer.sendCompleted()
                     }
@@ -101,38 +101,45 @@ public extension Postal {
         return SignalProducer<MailData, PostalError> { observer, disposable in
             self.fetchAttachments(folder, uid: uid, partId: partId,
                 onAttachment: { data in
-                    observer.sendNext(data)
+                    observer.send(value: data)
                 },
                 onComplete: { error in
                     if let error = error {
-                        observer.sendFailed(error)
+                        observer.send(error: error)
                     } else {
                         observer.sendCompleted()
                     }
                 })
             }
     }
 
-    func rac_fetchTextualMail(folder: String, uids: NSIndexSet) -> SignalProducer<FetchResult, PostalError> {
-        return rac_fetch(folder, uids: uids, flags: [ .structure, .fullHeaders ])
-            .flatMap(.Concat) { (fetchResult: FetchResult) -> SignalProducer<FetchResult, PostalError> in
+    func rac_fetchTextualMail(folder: String, uids: IndexSet) -> SignalProducer<FetchResult, PostalError> {
+        return rac_fetch(folder: folder, uids: uids, flags: [ .structure, .fullHeaders ])
+            .flatMap(.concat) { (fetchResult: FetchResult) -> SignalProducer<FetchResult, PostalError> in
                 let inlineElements = fetchResult.body?.allParts.filter { singlePart in
-                    if case .Some(.attachment) = singlePart.mimeFields.contentDisposition { return false }
+                    if case .some(.attachment) = singlePart.mimeFields.contentDisposition { return false }
                     return [ "text/html", "text/plain" ].contains("\(singlePart.mimeType)")
                     } ?? []
 
-                return SignalProducer<SinglePart, PostalError>(values: inlineElements)
-                    .flatMap(.Merge) { (singlePart: SinglePart) -> SignalProducer<(String, MailData), PostalError> in
-                        return self.rac_fetchAttachment(folder, uid: fetchResult.uid, partId: singlePart.id).map { (singlePart.id, $0) }
+                return SignalProducer<SinglePart, PostalError>(inlineElements)
+                    .flatMap(.merge) { (singlePart: SinglePart) -> SignalProducer<(String, MailData), PostalError> in
+                        return self.rac_fetchAttachment(folder: folder, uid: fetchResult.uid, partId: singlePart.id).map { (singlePart.id, $0) }
                     }
                     .collect()
-                    .map { fetchResult.mergeAttachments(Dictionary(elements: $0)) }
+                    .map { fetchResult.mergeAttachments(attachments: Dictionary<String, MailData>($0)) }
             }
     }
 }
 
 private extension Dictionary {
-    init<S: SequenceType where S.Generator.Element == Element>(elements: S) {
+    init<S: Sequence>(_ seq: S) where S.Iterator.Element == (Key, Value) {
+        self.init()
+        for (k, v) in seq {
+            self[k] = v
+        }
+    }
+    
+    init<S: Sequence>(elements: S) where S.Iterator.Element == Element {
         self.init()
         for (k, v) in elements {
             self[k] = v
@@ -145,7 +152,7 @@ private extension FetchResult {
         return FetchResult(uid: uid,
                            header: header,
                            flags: flags,
-                           body: body?.mergeAttachments(attachments),
+                           body: body?.mergeAttachments(attachments: attachments),
                            rfc822Size: rfc822Size,
                            internalDate: internalDate,
                            gmailThreadId: gmailThreadId,
@@ -163,9 +170,9 @@ private extension MailPart {
             }
             return self
         case .multipart(let id, let mimeType, let parts):
-            return .multipart(id: id, mimeType: mimeType, parts: parts.map { $0.mergeAttachments(attachments) })
+            return .multipart(id: id, mimeType: mimeType, parts: parts.map { $0.mergeAttachments(attachments: attachments) })
         case .message(let id, let header, let message):
-            return .message(id: id, header: header, message: message.mergeAttachments(attachments))
+            return .message(id: id, header: header, message: message.mergeAttachments(attachments: attachments))
         }
     }
 }

Postal/ReactiveCocoa/Postal+RAC.swift renamed to Postal/ReactiveSwift/Postal+RAC.swift

@@ -104,10 +104,10 @@ Postal also can be used by [CocoaPods](https://cocoapods.org/).
     pod "Postal"
     ```
 
-    - For ReactiveCocoa extensions, this project will include them as dependencies. You can do this via CocoaPods subspecs.
+    - For ReactiveSwift extensions, this project will include them as dependencies. You can do this via CocoaPods subspecs.
 
 	```ruby
-	pod 'Postal/ReactiveCocoa'
+	pod 'Postal/ReactiveSwift'
 	```
 
 - Run `pod install`. 

README.md

@@ -6,7 +6,7 @@ popd > /dev/null
 
 # configuration
 url="https://github.com/snipsco/libetpan.git"
-rev=97595a27d22b45fe8c22f112235490d6750edd20
+rev=6a08017f1c742f0c5817d6c1c71143a37da967be
 
 ios_target="libetpan ios"
 macos_target="static libetpan"

dependencies/build-dependencies.sh

@@ -1 +1 @@
-97595a27d22b45fe8c22f112235490d6750edd20
+6a08017f1c742f0c5817d6c1c71143a37da967be

dependencies/build/git-rev

@@ -913,6 +913,27 @@ int mailimap_hack_date_time_parse(const char * str,
                                   size_t progr_rate,
                                   progress_function * progr_fun);
 
+#ifndef LIBETPAN_HAS_MAILIMAP_QIP_WORKAROUND
+#define LIBETPAN_HAS_MAILIMAP_QIP_WORKAROUND	1
+#endif
+
+/*
+    Enable workaround for QIP IMAP server.
+
+    QIP returns invalid (?) response for storeFlags operation:
+      C: A999 UID STORE 123 +FLAGS.SILENT (\Seen)
+      S: * 6 FETCH ()
+      S: A999 OK STORE completed
+
+    Enabling this workaround allows successfully parse such responses.
+*/
+
+LIBETPAN_EXPORT
+int mailimap_is_qip_workaround_enabled(mailimap * session);
+
+LIBETPAN_EXPORT
+void mailimap_set_qip_workaround_enabled(mailimap * session, int enabled);
+
 #ifdef __cplusplus
 }
 #endif

dependencies/build/ios/include/libetpan/mailimap.h

@@ -3393,6 +3393,7 @@ struct mailimap {
 
   int is_163_workaround_enabled;
   int is_rambler_workaround_enabled;
+  int is_qip_workaround_enabled;
 };
 
 
@@ -3576,6 +3577,7 @@ enum {
 
 struct mailimap_parser_context {
   int is_rambler_workaround_enabled;
+  int is_qip_workaround_enabled;
 
   mailimap_msg_body_handler * msg_body_handler;
   void * msg_body_handler_context;
@@ -3596,6 +3598,10 @@ LIBETPAN_EXPORT
 int
 mailimap_parser_context_is_rambler_workaround_enabled(struct mailimap_parser_context * parser_ctx);
 
+LIBETPAN_EXPORT
+int
+mailimap_parser_context_is_qip_workaround_enabled(struct mailimap_parser_context * parser_ctx);
+
 #ifdef __cplusplus
 }
 #endif

dependencies/build/ios/include/libetpan/mailimap_types.h

@@ -34,24 +34,23 @@
  * as extern.  (Technically, we don't even have to do that.) */
 #ifdef WIN32
 # ifdef LIBSASL_EXPORTS
-#  define LIBSASL_API  __declspec(dllexport)
+#  define LIBSASL_API  extern __declspec(dllexport)
 # else /* LIBSASL_EXPORTS */
-#  define LIBSASL_API  __declspec(dllimport)
+#  define LIBSASL_API  extern __declspec(dllimport)
 # endif /* LIBSASL_EXPORTS */
 #else /* WIN32 */
 # define LIBSASL_API extern
 #endif /* WIN32 */
 
-/* Same as above, but used during a variable declaration. Only Unix definition
- * is different, as we can't assign an initial value to an extern variable */ 
+/* Same as above, but used during a variable declaration. */
 #ifdef WIN32
 # ifdef LIBSASL_EXPORTS
-#  define LIBSASL_VAR  __declspec(dllexport)
+#  define LIBSASL_VAR  extern __declspec(dllexport)
 # else /* LIBSASL_EXPORTS */
-#  define LIBSASL_VAR  __declspec(dllimport)
+#  define LIBSASL_VAR  extern __declspec(dllimport)
 # endif /* LIBSASL_EXPORTS */
 #else /* WIN32 */
-# define LIBSASL_VAR
+# define LIBSASL_VAR extern
 #endif /* WIN32 */
 
 /* the resulting structure for property values

dependencies/build/ios/include/sasl/prop.h

@@ -124,7 +124,7 @@
 /* Keep in sync with win32/common.mak */
 #define SASL_VERSION_MAJOR 2
 #define SASL_VERSION_MINOR 1
-#define SASL_VERSION_STEP 25
+#define SASL_VERSION_STEP 26
 
 /* A convenience macro: same as was defined in the OpenLDAP LDAPDB */
 #define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
@@ -225,9 +225,9 @@ extern "C" {
 
 /* memory allocation functions which may optionally be replaced:
  */
-typedef void *sasl_malloc_t(unsigned long);
-typedef void *sasl_calloc_t(unsigned long, unsigned long);
-typedef void *sasl_realloc_t(void *, unsigned long);
+typedef void *sasl_malloc_t(size_t);
+typedef void *sasl_calloc_t(size_t, size_t);
+typedef void *sasl_realloc_t(void *, size_t);
 typedef void sasl_free_t(void *);
 
 LIBSASL_API void sasl_set_alloc(sasl_malloc_t *,
@@ -633,8 +633,10 @@ typedef int sasl_server_userdb_setpass_t(sasl_conn_t *conn,
 /* One of the following two is required */
 #define SASL_CU_AUTHID  0x01
 #define SASL_CU_AUTHZID 0x02
+
 /* Combine the following with SASL_CU_AUTHID, if you don't want
-   to fail if auxprop returned SASL_NOUSER */
+   to fail if auxprop returned SASL_NOUSER/SASL_NOMECH.
+   This flag has no effect on SASL_CU_AUTHZID. */
 #define SASL_CU_EXTERNALLY_VERIFIED 0x04
 
 #define SASL_CU_OVERRIDE	    0x08    /* mapped to SASL_AUXPROP_OVERRIDE */

dependencies/build/ios/include/sasl/sasl.h

@@ -82,6 +82,8 @@ LIBSASL_API char *sasl_strlower (char *val);
 
 LIBSASL_API int sasl_config_init(const char *filename);
 
+LIBSASL_API void sasl_config_done(void);
+
 #ifdef WIN32
 /* Just in case a different DLL defines this as well */
 #if defined(NEED_GETOPT)