diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e1943d9..9412cfd 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +1.4, Feb 23, 2017 +- added a new property named "soapActionRequest" to set a different SOAPAction value in the header of the request for the support of the last versions of WCF services. + 1.31, Nov 15, 2016 - added a new delegate to retrieve original NSData before of the parsing. - deprecated didBeforeParsingResponseString leading by didBeforeParsingResponseData. diff --git a/SOAPEngine.podspec b/SOAPEngine.podspec index 826bc4e..5654280 100644 --- a/SOAPEngine.podspec +++ b/SOAPEngine.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'SOAPEngine' - s.version = '1.31' - s.summary = 'This generic SOAP client allows you to access web services using a your iOS and Mac OS X app.' + s.version = '1.4' + s.summary = 'This generic SOAP client allows you to access web services using a your iOS app, Mac OS X app and AppleTV app.' s.license = { :type => 'Shareware', :file => 'LICENSE.txt' } s.authors = { 'Danilo Priore' => 'support@prioregroup.com' } s.homepage = 'https://github.com/priore/SOAPEngine' @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.xcconfig = { 'HEADER_SEARCH_PATHS' => "${PODS_ROOT}/#{s.name}/**" } s.frameworks = 'Security' - s.ios.deployment_target = '7.1' + s.ios.deployment_target = '8.0' s.ios.preserve_paths = 'SOAPEngine64.framework' s.ios.public_header_files = 'SOAPEngine64.framework/Headers/*.h' s.ios.source_files = 'SOAPEngine64.framework/Headers/*.h' diff --git a/SOAPEngine64.framework/Headers/SOAPEngine.h b/SOAPEngine64.framework/Headers/SOAPEngine.h index c205ed4..a900edc 100644 --- a/SOAPEngine64.framework/Headers/SOAPEngine.h +++ b/SOAPEngine64.framework/Headers/SOAPEngine.h @@ -10,11 +10,11 @@ // // email support: support@prioregroup.com // -// Version : 1.31 +// Version : 1.4 // Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt // Updates : https://github.com/priore/SOAPEngine // -#define SOAPEngineFrameworkVersion @"1.31" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString") +#define SOAPEngineFrameworkVersion @"1.4" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString") #import @@ -50,8 +50,10 @@ FOUNDATION_EXPORT const NSString *SOAPEngineErrorKey; // errors FOUNDATION_EXPORT const NSString *SOAPEngineDataSizeKey; // send/receive data size FOUNDATION_EXPORT const NSString *SOAPEngineTotalDataSizeKey; // send/receive total data size -typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary"); typedef void(^SOAPEngineCompleteBlockWithDictionary)(NSInteger statusCode, NSDictionary *dict); +typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) + DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary"); + typedef void(^SOAPEngineFailBlock)(NSError *error); typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, long long total); typedef void(^SOAPEngineSendDataSizeBlock)(NSUInteger current, NSUInteger total); @@ -96,12 +98,16 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) @interface SOAPEngine : NSObject // return the current request URL -@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL"); @property (nonatomic, strong, readonly) NSURL *currentRequestURL; +@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL + DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL"); // return the current SOAP Action @property (nonatomic, strong, readonly) NSString *soapAction; +// sets or returns SOAPAction value in the header of the request. +@property (nonatomic, strong) NSString *soapActionRequest; + // return the current method name @property (nonatomic, strong, readonly) NSString *methodName; @@ -245,8 +251,10 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) - (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName attributes:(NSDictionary*)attrbitues; #if TARGET_OS_SIMULATOR || TARGET_OS_IOS || TARGET_OS_TV + - (void)setImage:(UIImage*)image forKey:(NSString*)key __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_4_3); - (void)setImage:(UIImage*)image forKey:(NSString*)key attributes:(NSDictionary*)attributes __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_4_3); + #endif // return a formatted dictionary for a sub-child with attributes @@ -271,20 +279,23 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction value:(id)value complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction value:(id)value forKey:(NSString*)key complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction @@ -292,7 +303,8 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) forKey:(NSString*)key complete:(SOAPEngineCompleteBlock)complete failWithError:(SOAPEngineFailBlock)fail - receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:"); + receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction @@ -301,7 +313,8 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) complete:(SOAPEngineCompleteBlock)complete failWithError:(SOAPEngineFailBlock)fail receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive - sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:"); + sendedDataSize:(SOAPEngineSendDataSizeBlock)sended + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:"); // webservice request with block and dictionary - (void)requestURL:(id)asmxURL @@ -401,15 +414,27 @@ authorization:(SOAPAuthorization)authorization; @optional -- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoading:dictionary:"); -- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict; +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoadingWithDictionary:data:"); + +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoadingWithDictionary:data:"); + +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoadingWithDictionary:(NSDictionary*)dict data:(NSData*)data; + - (void)soapEngine:(SOAPEngine*)soapEngine didFailWithError:(NSError*)error; + - (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(long long)total; + - (void)soapEngine:(SOAPEngine*)soapEngine didSendDataSize:(NSUInteger)current total:(NSUInteger)total; + - (BOOL)soapEngine:(SOAPEngine*)soapEngine didReceiveResponseCode:(NSInteger)statusCode; + - (NSMutableURLRequest*)soapEngine:(SOAPEngine*)soapEngine didBeforeSendingURLRequest:(NSMutableURLRequest*)request; -- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didBeforeParsingResponseString: as deprecated please use soapEngine:didBeforeParsingResponseData:"); + - (NSData*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseData:(NSData*)data; +- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didBeforeParsingResponseString: as deprecated please use soapEngine:didBeforeParsingResponseData:"); @end diff --git a/SOAPEngine64.framework/Info.plist b/SOAPEngine64.framework/Info.plist index 6e9dea5..55fbd1e 100644 Binary files a/SOAPEngine64.framework/Info.plist and b/SOAPEngine64.framework/Info.plist differ diff --git a/SOAPEngine64.framework/SOAPEngine64 b/SOAPEngine64.framework/SOAPEngine64 index 1a1669d..375d7e1 100644 Binary files a/SOAPEngine64.framework/SOAPEngine64 and b/SOAPEngine64.framework/SOAPEngine64 differ diff --git a/SOAPEngineOSX.framework/Versions/A/Headers/SOAPEngine.h b/SOAPEngineOSX.framework/Versions/A/Headers/SOAPEngine.h index c205ed4..a900edc 100644 --- a/SOAPEngineOSX.framework/Versions/A/Headers/SOAPEngine.h +++ b/SOAPEngineOSX.framework/Versions/A/Headers/SOAPEngine.h @@ -10,11 +10,11 @@ // // email support: support@prioregroup.com // -// Version : 1.31 +// Version : 1.4 // Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt // Updates : https://github.com/priore/SOAPEngine // -#define SOAPEngineFrameworkVersion @"1.31" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString") +#define SOAPEngineFrameworkVersion @"1.4" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString") #import @@ -50,8 +50,10 @@ FOUNDATION_EXPORT const NSString *SOAPEngineErrorKey; // errors FOUNDATION_EXPORT const NSString *SOAPEngineDataSizeKey; // send/receive data size FOUNDATION_EXPORT const NSString *SOAPEngineTotalDataSizeKey; // send/receive total data size -typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary"); typedef void(^SOAPEngineCompleteBlockWithDictionary)(NSInteger statusCode, NSDictionary *dict); +typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) + DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary"); + typedef void(^SOAPEngineFailBlock)(NSError *error); typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, long long total); typedef void(^SOAPEngineSendDataSizeBlock)(NSUInteger current, NSUInteger total); @@ -96,12 +98,16 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) @interface SOAPEngine : NSObject // return the current request URL -@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL"); @property (nonatomic, strong, readonly) NSURL *currentRequestURL; +@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL + DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL"); // return the current SOAP Action @property (nonatomic, strong, readonly) NSString *soapAction; +// sets or returns SOAPAction value in the header of the request. +@property (nonatomic, strong) NSString *soapActionRequest; + // return the current method name @property (nonatomic, strong, readonly) NSString *methodName; @@ -245,8 +251,10 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) - (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName attributes:(NSDictionary*)attrbitues; #if TARGET_OS_SIMULATOR || TARGET_OS_IOS || TARGET_OS_TV + - (void)setImage:(UIImage*)image forKey:(NSString*)key __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_4_3); - (void)setImage:(UIImage*)image forKey:(NSString*)key attributes:(NSDictionary*)attributes __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_4_3); + #endif // return a formatted dictionary for a sub-child with attributes @@ -271,20 +279,23 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction value:(id)value complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction value:(id)value forKey:(NSString*)key complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction @@ -292,7 +303,8 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) forKey:(NSString*)key complete:(SOAPEngineCompleteBlock)complete failWithError:(SOAPEngineFailBlock)fail - receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:"); + receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction @@ -301,7 +313,8 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) complete:(SOAPEngineCompleteBlock)complete failWithError:(SOAPEngineFailBlock)fail receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive - sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:"); + sendedDataSize:(SOAPEngineSendDataSizeBlock)sended + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:"); // webservice request with block and dictionary - (void)requestURL:(id)asmxURL @@ -401,15 +414,27 @@ authorization:(SOAPAuthorization)authorization; @optional -- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoading:dictionary:"); -- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict; +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoadingWithDictionary:data:"); + +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoadingWithDictionary:data:"); + +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoadingWithDictionary:(NSDictionary*)dict data:(NSData*)data; + - (void)soapEngine:(SOAPEngine*)soapEngine didFailWithError:(NSError*)error; + - (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(long long)total; + - (void)soapEngine:(SOAPEngine*)soapEngine didSendDataSize:(NSUInteger)current total:(NSUInteger)total; + - (BOOL)soapEngine:(SOAPEngine*)soapEngine didReceiveResponseCode:(NSInteger)statusCode; + - (NSMutableURLRequest*)soapEngine:(SOAPEngine*)soapEngine didBeforeSendingURLRequest:(NSMutableURLRequest*)request; -- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didBeforeParsingResponseString: as deprecated please use soapEngine:didBeforeParsingResponseData:"); + - (NSData*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseData:(NSData*)data; +- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didBeforeParsingResponseString: as deprecated please use soapEngine:didBeforeParsingResponseData:"); @end diff --git a/SOAPEngineOSX.framework/Versions/A/Resources/Info.plist b/SOAPEngineOSX.framework/Versions/A/Resources/Info.plist index a835cf0..2dcb5b6 100644 --- a/SOAPEngineOSX.framework/Versions/A/Resources/Info.plist +++ b/SOAPEngineOSX.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 16B2555 + 16D32 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.31 + 1.4 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -25,21 +25,21 @@ MacOSX CFBundleVersion - 1.31 + 1.4 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 8B62 + 8C1002 DTPlatformVersion GM DTSDKBuild - 16B2649 + 16C58 DTSDKName macosx10.12 DTXcode - 0810 + 0821 DTXcodeBuild - 8B62 + 8C1002 NSHumanReadableCopyright Copyright © 2016 Danilo Priore. All rights reserved. UIDeviceFamily diff --git a/SOAPEngineOSX.framework/Versions/A/SOAPEngineOSX b/SOAPEngineOSX.framework/Versions/A/SOAPEngineOSX index 7005ebc..d468989 100644 Binary files a/SOAPEngineOSX.framework/Versions/A/SOAPEngineOSX and b/SOAPEngineOSX.framework/Versions/A/SOAPEngineOSX differ diff --git a/SOAPEngineTV.framework/Headers/SOAPEngine.h b/SOAPEngineTV.framework/Headers/SOAPEngine.h index c205ed4..a900edc 100644 --- a/SOAPEngineTV.framework/Headers/SOAPEngine.h +++ b/SOAPEngineTV.framework/Headers/SOAPEngine.h @@ -10,11 +10,11 @@ // // email support: support@prioregroup.com // -// Version : 1.31 +// Version : 1.4 // Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt // Updates : https://github.com/priore/SOAPEngine // -#define SOAPEngineFrameworkVersion @"1.31" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString") +#define SOAPEngineFrameworkVersion @"1.4" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString") #import @@ -50,8 +50,10 @@ FOUNDATION_EXPORT const NSString *SOAPEngineErrorKey; // errors FOUNDATION_EXPORT const NSString *SOAPEngineDataSizeKey; // send/receive data size FOUNDATION_EXPORT const NSString *SOAPEngineTotalDataSizeKey; // send/receive total data size -typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary"); typedef void(^SOAPEngineCompleteBlockWithDictionary)(NSInteger statusCode, NSDictionary *dict); +typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) + DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary"); + typedef void(^SOAPEngineFailBlock)(NSError *error); typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, long long total); typedef void(^SOAPEngineSendDataSizeBlock)(NSUInteger current, NSUInteger total); @@ -96,12 +98,16 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) @interface SOAPEngine : NSObject // return the current request URL -@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL"); @property (nonatomic, strong, readonly) NSURL *currentRequestURL; +@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL + DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL"); // return the current SOAP Action @property (nonatomic, strong, readonly) NSString *soapAction; +// sets or returns SOAPAction value in the header of the request. +@property (nonatomic, strong) NSString *soapActionRequest; + // return the current method name @property (nonatomic, strong, readonly) NSString *methodName; @@ -245,8 +251,10 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) - (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName attributes:(NSDictionary*)attrbitues; #if TARGET_OS_SIMULATOR || TARGET_OS_IOS || TARGET_OS_TV + - (void)setImage:(UIImage*)image forKey:(NSString*)key __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_4_3); - (void)setImage:(UIImage*)image forKey:(NSString*)key attributes:(NSDictionary*)attributes __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_4_3); + #endif // return a formatted dictionary for a sub-child with attributes @@ -271,20 +279,23 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction value:(id)value complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction value:(id)value forKey:(NSString*)key complete:(SOAPEngineCompleteBlock)complete - failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:"); + failWithError:(SOAPEngineFailBlock)fail + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction @@ -292,7 +303,8 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) forKey:(NSString*)key complete:(SOAPEngineCompleteBlock)complete failWithError:(SOAPEngineFailBlock)fail - receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:"); + receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:"); - (void)requestURL:(id)asmxURL soapAction:(NSString *)soapAction @@ -301,7 +313,8 @@ typedef NS_ENUM(NSInteger, SOAPCertificate) complete:(SOAPEngineCompleteBlock)complete failWithError:(SOAPEngineFailBlock)fail receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive - sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:"); + sendedDataSize:(SOAPEngineSendDataSizeBlock)sended + DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:"); // webservice request with block and dictionary - (void)requestURL:(id)asmxURL @@ -401,15 +414,27 @@ authorization:(SOAPAuthorization)authorization; @optional -- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoading:dictionary:"); -- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict; +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoadingWithDictionary:data:"); + +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoadingWithDictionary:data:"); + +- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoadingWithDictionary:(NSDictionary*)dict data:(NSData*)data; + - (void)soapEngine:(SOAPEngine*)soapEngine didFailWithError:(NSError*)error; + - (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(long long)total; + - (void)soapEngine:(SOAPEngine*)soapEngine didSendDataSize:(NSUInteger)current total:(NSUInteger)total; + - (BOOL)soapEngine:(SOAPEngine*)soapEngine didReceiveResponseCode:(NSInteger)statusCode; + - (NSMutableURLRequest*)soapEngine:(SOAPEngine*)soapEngine didBeforeSendingURLRequest:(NSMutableURLRequest*)request; -- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didBeforeParsingResponseString: as deprecated please use soapEngine:didBeforeParsingResponseData:"); + - (NSData*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseData:(NSData*)data; +- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML + DEPRECATED_MSG_ATTRIBUTE("soapEngine:didBeforeParsingResponseString: as deprecated please use soapEngine:didBeforeParsingResponseData:"); @end diff --git a/SOAPEngineTV.framework/Info.plist b/SOAPEngineTV.framework/Info.plist index 250c4eb..e5ee7ce 100644 Binary files a/SOAPEngineTV.framework/Info.plist and b/SOAPEngineTV.framework/Info.plist differ diff --git a/SOAPEngineTV.framework/SOAPEngineTV b/SOAPEngineTV.framework/SOAPEngineTV index 7c274bc..3eddd1e 100644 Binary files a/SOAPEngineTV.framework/SOAPEngineTV and b/SOAPEngineTV.framework/SOAPEngineTV differ