Skip to content

Commit

Permalink
enhancement #46 #47
Browse files Browse the repository at this point in the history
  • Loading branch information
priore committed Jun 3, 2015
1 parent 408d689 commit f765c2e
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 13 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
1.21.0, Jun 2, 2015
- parsing soapAction when contains ‘#’.
- fixes when the xml contains internally JSON.
- extended method setValue with tag attribute definitions.
- support for enterprise licenses, one license for multiple apps.

1.20.2, May 22, 2015
- fixes for basic, digest and NTLM authentication.

Expand All @@ -11,7 +17,7 @@
- added security token in the Authorization header field.
- added recovery token authorization with the current social login settings.
- fixes double slash on namespace of the method.
- now requires the addition also of Account.framework in your projects.
- requires the Account.framework.

1.18.2 May, 10, 2015
- fixes podspec
Expand Down
Binary file modified General License iOS.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ CSIDPS copyright notice in your Developed Software documentation and/or in the "
License to Distribute Developed Software. Subject to the terms and conditions in this EULA, you are granted the license to use and to distribute Developed Software on a royalty- free basis, provided that the Developed Software incorporates the SOFTWARE as an integral part of the Developed Software in native compiled format (customarily an ".app", or ".ipa", or ".xcodearchive" etc.). You may not distribute, bundle, library, framework, wrap or subclass the SOFTWARE as Developed Software which, when used in a "designtime" development environment, exposes the programmatic interface of the SOFTWARE.
Distribution of the Evaluation or Trial Version. You may copy the Evaluation Version of this software and documentation as you wish, and give exact copies of the original Evaluation Version to anyone, and distribute the Evaluation Version of the software and documentation in its unmodified form via electronic means. But you should not charge or request donations for any such copies however made, or from distributing the software and/or documentation with other products without the author's written permission. If you have registered the software, you must not distribute your confidential license key.
4. Specific Product Limitations. Notwithstanding anything in this EULA to the contrary, if the license you have purchased is for any of the following products, then the following additional limitations will apply:
a. SOAPEngine iOS Framework. SOAPEngine iOS Framework includes at least: 1) SOAPEngine.framework packet file, 2) the Source Code of the Sample Application. The SOAPEngine.framework file may be distributed, free of royalties, only in conjunction with the Developed Software in native and compiled format (see paragraph 3 of this EULA) and for one application identified with one bundle-id, only one Serial Number, or License Code, for one bundle-id (see paragraph 6 of this EULA).
a. SOAPEngine Framework. SOAPEngine Framework includes at least: 1) SOAPEngine Framework packet file, 2) the Source Code of the Sample Application. The SOAPEngine Framework file may be distributed, free of royalties, only in conjunction with the Developed Software in native and compiled format (see paragraph 3 of this EULA) and for one application identified with one bundle-id, only one Single License Code for one bundle-id, or in the case of a Enterprise License Code, with multiple applications for single Organization Unit, only one Enterprise License Code for one Organization Unit (see paragraph 6 of this EULA).
b. SnowFalling iOS Framework. SnowFalling iOS Framework includes at least: 1) SnowFalling.framework packet file, 2) the Source Code of the Sample Application. The SnowFalling.framework file may be distributed, free of royalties, only in conjunction with the Developed Software in native and compiled compiled format (see paragraph 3 of this EULA and for one application identified with one bundle-id, only one Serial Number, or License Code, for one bundle-id (see paragraph 6 of this EULA).
Subject to the terms and conditions in this EULA, CSIDPS hereby grants you the right to use the Sample Source Code. You are hereby also granted the right to modify such Sample Source Code and to create derivative works that are based on the licensed Source Code. You may distribute the derivative works that you develop, solely in object code format and exclusively in conjunction with and/or as a part of the Developed Software. You are expressly not granted the right to distribute, disclose or otherwise make available to any third party the licensed Source Code, any modified version, derivative work, or any portion thereof, in source code format.
CSIDPS shall retain all right, title and interest in and to the licensed Source Code, and all CSIDPS updates, modifications or enhancements thereof. Nothing herein shall be deemed to transfer any ownership or title rights in and to the licensed Source Code from CSIDPS to you.

THE SAMPLE SOURCE CODE IS LICENSED TO YOU AS IS. CSIDPS DOES NOT AND SHALL NOT PROVIDE YOU WITH ANY TECHNICAL SUPPORT FOR YOUR SOURCE CODE LICENSE.
5. Updates/Upgrades. Subject to the terms and conditions of this EULA, the Licenses are perpetual. Updates and upgrades to the SOFTWARE may be provided by CSIDPS from time-to- time, and, if so provided by CSIDPS, are provided upon the terms and conditions offered at that time by CSIDPS in its sole discretion. CSIDPS may provide updates and upgrades to the SOFTWARE for free or for any charge, at any time or never, and through its chosen manner of access and distribution, all in CSIDPS 's sole and complete discretion.
6. Serial Number or License Key Code. Within the packaging of the SOFTWARE, a unique serial number (the "Serial Number") or license key code (the “License Code”) is included, which allows for the registration of the SOFTWARE. The Serial Number, or License Code, is subject to the restrictions set forth in this EULA and may not be disclosed or distributed either with your Developed Software or in any other way. The disclosure or distribution of the Serial Number or License Code shall constitute a breach of this EULA, the effect of which shall be the automatic termination and revocation of all the rights granted herein.
6. License Key Code. After purchase the SOFTWARE, a license key code (the “License Code”) is included, this allows for the registration of the SOFTWARE. The License Code, is subject to the restrictions set forth in this EULA and may not be disclosed or distributed either with your Developed Software or in any other way. The disclosure or distribution of the License Code shall constitute a breach of this EULA, the effect of which shall be the automatic termination and revocation of all the rights granted herein.
7. Evaluation or Trial Copy; SHAREWARE. If you are using an "evaluation or trial copy" or similar version, specifically designated as such by CSIDPS on its website or otherwise, then the Licenses are limited as follows: a) you are granted a license to use the SOFTWARE for a period of thirty (30) days counted from the day of installation (the "Evaluation Period"); b) upon completion of the Evaluation Period, you shall either i) delete the SOFTWARE from the computer containing the installation, or you may ii) contact CSIDPS or one of its authorized dealers to purchase a license of the SOFTWARE, which is subject to the terms and limitations contained herein; and c) any Developed Software may not be distributed or used for any commercial purpose.
III. INTELLECTUAL PROPERTY.
1. Copyright. You agree that all right, title, and interest in and to the SOFTWARE (including, but not limited to, any images, photographs, animations, video, audio, music, text, and “applets” incorporated into the SOFTWARE), and any copies of the SOFTWARE, and any copyrights and other intellectual properties therein or related there to are owned exclusively by CSIDPS, except to the limited extent that CSIDPS may be the rightful license holder of certain third-party technologies incorporated into the SOFTWARE. The SOFTWARE is protected by copyright laws and international treaty provisions. The SOFTWARE is licensed to you, not sold to you. CSIDPS reserves all rights not otherwise expressly and specifically granted to you in this EULA.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Synchronous request :
NSLog(@"error: %@, result: %@", error, dict)
```
[SWIFT](http://www.wikipedia.org/wiki/Swift_(programming_language) language :
[Swift](http://www.wikipedia.org/wiki/Swift_programming_language) language :
``` swift
var soap = SOAPEngine()
Expand Down
2 changes: 1 addition & 1 deletion SOAPEngine.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SOAPEngine'
s.version = '1.20.2'
s.version = ‘1.21.0
s.summary = 'This generic SOAP client allows you to access web services using a your iOS and Mac OS X app.'
s.license = { :type => 'Shareware', :file => 'LICENSE.txt' }
s.authors = { 'Danilo Priore' => '[email protected]' }
Expand Down
13 changes: 9 additions & 4 deletions SOAPEngine64.framework/Versions/A/Headers/SOAPEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// https://github.com/priore
// https://twitter.com/DaniloPriore
//
// Version : 1.20.2
// Version : 1.21.0
// Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt
// Updates : https://github.com/priore/SOAPEngine
//
Expand Down Expand Up @@ -198,16 +198,21 @@ typedef enum
- (BOOL)isNull;

// add a parameter to post
- (void)setValue:(id)value;
- (void)setValue:(id)value forKey:(NSString *)key; // can also be used with user-defined objects
- (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName;
- (void)setIntegerValue:(NSInteger)value forKey:(NSString*)key;
- (void)setDoubleValue:(double)value forKey:(NSString*)key;
- (void)setFloatValue:(float)value forKey:(NSString*)key;
- (void)setLongValue:(long)value forKey:(NSString*)key;

// add a parameter to post, can also be used with user-defined objects
- (void)setValue:(id)value;
- (void)setValue:(id)value forKey:(NSString *)key;
- (void)setValue:(id)value forKey:(NSString *)key attributes:(NSDictionary*)attributes;
- (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName;
- (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName attributes:(NSDictionary*)attrbitues;

#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
- (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

// clear all parameters
Expand Down
Binary file modified SOAPEngine64.framework/Versions/A/SOAPEngine64
Binary file not shown.
13 changes: 9 additions & 4 deletions SOAPEngineOSX.framework/Versions/A/Headers/SOAPEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// https://github.com/priore
// https://twitter.com/DaniloPriore
//
// Version : 1.20.2
// Version : 1.21.0
// Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt
// Updates : https://github.com/priore/SOAPEngine
//
Expand Down Expand Up @@ -198,16 +198,21 @@ typedef enum
- (BOOL)isNull;

// add a parameter to post
- (void)setValue:(id)value;
- (void)setValue:(id)value forKey:(NSString *)key; // can also be used with user-defined objects
- (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName;
- (void)setIntegerValue:(NSInteger)value forKey:(NSString*)key;
- (void)setDoubleValue:(double)value forKey:(NSString*)key;
- (void)setFloatValue:(float)value forKey:(NSString*)key;
- (void)setLongValue:(long)value forKey:(NSString*)key;

// add a parameter to post, can also be used with user-defined objects
- (void)setValue:(id)value;
- (void)setValue:(id)value forKey:(NSString *)key;
- (void)setValue:(id)value forKey:(NSString *)key attributes:(NSDictionary*)attributes;
- (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName;
- (void)setValue:(id)value forKey:(NSString *)key subKeyName:(NSString*)subKeyName attributes:(NSDictionary*)attrbitues;

#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
- (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

// clear all parameters
Expand Down
Binary file modified SOAPEngineOSX.framework/Versions/A/SOAPEngineOSX
Binary file not shown.

0 comments on commit f765c2e

Please sign in to comment.