You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/03/19 01:38:48 UTC
ios commit: CB-7767 - Removed NSData+Base64 files, updated unit tests.
Repository: cordova-ios
Updated Branches:
refs/heads/4.0.x acb703aeb -> 2e5510ea9
CB-7767 - Removed NSData+Base64 files, updated unit tests.
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/2e5510ea
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/2e5510ea
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/2e5510ea
Branch: refs/heads/4.0.x
Commit: 2e5510ea919546850bfc9553fa20bdd2eb562bed
Parents: acb703a
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Mar 18 17:38:49 2015 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Mar 18 17:38:49 2015 -0700
----------------------------------------------------------------------
CordovaLib/Classes/Public/CDV.h | 1 -
CordovaLib/Classes/Public/NSData+Base64.h | 43 ---
CordovaLib/Classes/Public/NSData+Base64.m | 298 -------------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 8 -
tests/CordovaLibTests/CDVBase64Tests.m | 6 +-
5 files changed, 2 insertions(+), 354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e5510ea/CordovaLib/Classes/Public/CDV.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDV.h b/CordovaLib/Classes/Public/CDV.h
index 732494c..bfc3e44 100644
--- a/CordovaLib/Classes/Public/CDV.h
+++ b/CordovaLib/Classes/Public/CDV.h
@@ -32,4 +32,3 @@
#import "CDVScreenOrientationDelegate.h"
#import "CDVTimer.h"
#import "CDVUserAgentUtil.h"
-#import "NSData+Base64.h"
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e5510ea/CordovaLib/Classes/Public/NSData+Base64.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/NSData+Base64.h b/CordovaLib/Classes/Public/NSData+Base64.h
deleted file mode 100644
index 02d960c..0000000
--- a/CordovaLib/Classes/Public/NSData+Base64.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// NSData+Base64.h
-// base64
-//
-// Created by Matt Gallagher on 2009/06/03.
-// Copyright 2009 Matt Gallagher. All rights reserved.
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software. Permission is granted to anyone to
-// use this software for any purpose, including commercial applications, and to
-// alter it and redistribute it freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source
-// distribution.
-//
-
-#import <Foundation/Foundation.h>
-#import "CDVAvailabilityDeprecated.h"
-
-void *CDVNewBase64Decode(
- const char* inputBuffer,
- size_t length,
- size_t * outputLength);
-
-char *CDVNewBase64Encode(
- const void* inputBuffer,
- size_t length,
- bool separateLines,
- size_t * outputLength);
-
-@interface NSData (CDVBase64)
-
-+ (NSData*)cdv_dataFromBase64String:(NSString*)aString;
-- (NSString*)cdv_base64EncodedString;
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e5510ea/CordovaLib/Classes/Public/NSData+Base64.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/NSData+Base64.m b/CordovaLib/Classes/Public/NSData+Base64.m
deleted file mode 100644
index 43560f0..0000000
--- a/CordovaLib/Classes/Public/NSData+Base64.m
+++ /dev/null
@@ -1,298 +0,0 @@
-//
-// NSData+Base64.m
-// base64
-//
-// Created by Matt Gallagher on 2009/06/03.
-// Copyright 2009 Matt Gallagher. All rights reserved.
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software. Permission is granted to anyone to
-// use this software for any purpose, including commercial applications, and to
-// alter it and redistribute it freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source
-// distribution.
-//
-
-#import "NSData+Base64.h"
-
-//
-// Mapping from 6 bit pattern to ASCII character.
-//
-static unsigned char base64EncodeLookup[65] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-//
-// Definition for "masked-out" areas of the base64DecodeLookup mapping
-//
-#define xx 65
-
-//
-// Mapping from ASCII character to 6 bit pattern.
-//
-static unsigned char base64DecodeLookup[256] =
-{
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 62, xx, xx, xx, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, xx, xx, xx, xx, xx, xx,
- xx, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, xx, xx, xx, xx, xx,
- xx, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
- xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
-};
-
-//
-// Fundamental sizes of the binary and base64 encode/decode units in bytes
-//
-#define BINARY_UNIT_SIZE 3
-#define BASE64_UNIT_SIZE 4
-
-//
-// NewBase64Decode
-//
-// Decodes the base64 ASCII string in the inputBuffer to a newly malloced
-// output buffer.
-//
-// inputBuffer - the source ASCII string for the decode
-// length - the length of the string or -1 (to specify strlen should be used)
-// outputLength - if not-NULL, on output will contain the decoded length
-//
-// returns the decoded buffer. Must be free'd by caller. Length is given by
-// outputLength.
-//
-void *CDVNewBase64Decode(
- const char* inputBuffer,
- size_t length,
- size_t * outputLength)
-{
- if (length == -1) {
- length = strlen(inputBuffer);
- }
-
- size_t outputBufferSize =
- ((length + BASE64_UNIT_SIZE - 1) / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE;
- unsigned char* outputBuffer = (unsigned char*)malloc(outputBufferSize);
-
- size_t i = 0;
- size_t j = 0;
-
- while (i < length) {
- //
- // Accumulate 4 valid characters (ignore everything else)
- //
- unsigned char accumulated[BASE64_UNIT_SIZE];
- size_t accumulateIndex = 0;
-
- while (i < length) {
- unsigned char decode = base64DecodeLookup[inputBuffer[i++]];
- if (decode != xx) {
- accumulated[accumulateIndex] = decode;
- accumulateIndex++;
-
- if (accumulateIndex == BASE64_UNIT_SIZE) {
- break;
- }
- }
- }
-
- //
- // Store the 6 bits from each of the 4 characters as 3 bytes
- //
- // (Uses improved bounds checking suggested by Alexandre Colucci)
- //
- if (accumulateIndex >= 2) {
- outputBuffer[j] = (accumulated[0] << 2) | (accumulated[1] >> 4);
- }
- if (accumulateIndex >= 3) {
- outputBuffer[j + 1] = (accumulated[1] << 4) | (accumulated[2] >> 2);
- }
- if (accumulateIndex >= 4) {
- outputBuffer[j + 2] = (accumulated[2] << 6) | accumulated[3];
- }
- j += accumulateIndex - 1;
- }
-
- if (outputLength) {
- *outputLength = j;
- }
- return outputBuffer;
-}
-
-//
-// NewBase64Encode
-//
-// Encodes the arbitrary data in the inputBuffer as base64 into a newly malloced
-// output buffer.
-//
-// inputBuffer - the source data for the encode
-// length - the length of the input in bytes
-// separateLines - if zero, no CR/LF characters will be added. Otherwise
-// a CR/LF pair will be added every 64 encoded chars.
-// outputLength - if not-NULL, on output will contain the encoded length
-// (not including terminating 0 char)
-//
-// returns the encoded buffer. Must be free'd by caller. Length is given by
-// outputLength.
-//
-char *CDVNewBase64Encode(
- const void* buffer,
- size_t length,
- bool separateLines,
- size_t * outputLength)
-{
- const unsigned char* inputBuffer = (const unsigned char*)buffer;
-
-#define MAX_NUM_PADDING_CHARS 2
-#define OUTPUT_LINE_LENGTH 64
-#define INPUT_LINE_LENGTH ((OUTPUT_LINE_LENGTH / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE)
-#define CR_LF_SIZE 2
-
- //
- // Byte accurate calculation of final buffer size
- //
- size_t outputBufferSize =
- ((length / BINARY_UNIT_SIZE)
- + ((length % BINARY_UNIT_SIZE) ? 1 : 0))
- * BASE64_UNIT_SIZE;
- if (separateLines) {
- outputBufferSize +=
- (outputBufferSize / OUTPUT_LINE_LENGTH) * CR_LF_SIZE;
- }
-
- //
- // Include space for a terminating zero
- //
- outputBufferSize += 1;
-
- //
- // Allocate the output buffer
- //
- char* outputBuffer = (char*)malloc(outputBufferSize);
- if (!outputBuffer) {
- return NULL;
- }
-
- size_t i = 0;
- size_t j = 0;
- const size_t lineLength = separateLines ? INPUT_LINE_LENGTH : length;
- size_t lineEnd = lineLength;
-
- while (true) {
- if (lineEnd > length) {
- lineEnd = length;
- }
-
- for (; i + BINARY_UNIT_SIZE - 1 < lineEnd; i += BINARY_UNIT_SIZE) {
- //
- // Inner loop: turn 48 bytes into 64 base64 characters
- //
- outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
- outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
- | ((inputBuffer[i + 1] & 0xF0) >> 4)];
- outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i + 1] & 0x0F) << 2)
- | ((inputBuffer[i + 2] & 0xC0) >> 6)];
- outputBuffer[j++] = base64EncodeLookup[inputBuffer[i + 2] & 0x3F];
- }
-
- if (lineEnd == length) {
- break;
- }
-
- //
- // Add the newline
- //
- // outputBuffer[j++] = '\r';
- // outputBuffer[j++] = '\n';
- lineEnd += lineLength;
- }
-
- if (i + 1 < length) {
- //
- // Handle the single '=' case
- //
- outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
- outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
- | ((inputBuffer[i + 1] & 0xF0) >> 4)];
- outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i + 1] & 0x0F) << 2];
- outputBuffer[j++] = '=';
- } else if (i < length) {
- //
- // Handle the double '=' case
- //
- outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
- outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0x03) << 4];
- outputBuffer[j++] = '=';
- outputBuffer[j++] = '=';
- }
- outputBuffer[j] = 0;
-
- //
- // Set the output length and return the buffer
- //
- if (outputLength) {
- *outputLength = j;
- }
- return outputBuffer;
-}
-
-@implementation NSData (CDVBase64)
-
-//
-// dataFromBase64String:
-//
-// Creates an NSData object containing the base64 decoded representation of
-// the base64 string 'aString'
-//
-// Parameters:
-// aString - the base64 string to decode
-//
-// returns the autoreleased NSData representation of the base64 string
-//
-+ (NSData*)cdv_dataFromBase64String:(NSString*)aString
-{
- size_t outputLength = 0;
- void* outputBuffer = CDVNewBase64Decode([aString UTF8String], [aString length], &outputLength);
-
- return [NSData dataWithBytesNoCopy:outputBuffer length:outputLength freeWhenDone:YES];
-}
-
-//
-// base64EncodedString
-//
-// Creates an NSString object that contains the base 64 encoding of the
-// receiver's data. Lines are broken at 64 characters long.
-//
-// returns an autoreleased NSString being the base 64 representation of the
-// receiver.
-//
-- (NSString*)cdv_base64EncodedString
-{
- size_t outputLength = 0;
- char* outputBuffer =
- CDVNewBase64Encode([self bytes], [self length], true, &outputLength);
-
- NSString* result = [[NSString alloc] initWithBytesNoCopy:outputBuffer
- length:outputLength
- encoding:NSASCIIStringEncoding
- freeWhenDone:YES];
-
- return result;
-}
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e5510ea/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index c926943..be4f0f4 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -51,8 +51,6 @@
7ED95D521AB9029B008C4574 /* CDVWebViewEngineProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95D2C1AB9029B008C4574 /* CDVWebViewEngineProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
7ED95D531AB9029B008C4574 /* CDVWhitelist.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95D2D1AB9029B008C4574 /* CDVWhitelist.h */; settings = {ATTRIBUTES = (Public, ); }; };
7ED95D541AB9029B008C4574 /* CDVWhitelist.m in Sources */ = {isa = PBXBuildFile; fileRef = 7ED95D2E1AB9029B008C4574 /* CDVWhitelist.m */; };
- 7ED95D551AB9029B008C4574 /* NSData+Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95D2F1AB9029B008C4574 /* NSData+Base64.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 7ED95D561AB9029B008C4574 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 7ED95D301AB9029B008C4574 /* NSData+Base64.m */; };
7ED95D571AB9029B008C4574 /* NSDictionary+CordovaPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95D311AB9029B008C4574 /* NSDictionary+CordovaPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
7ED95D581AB9029B008C4574 /* NSDictionary+CordovaPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 7ED95D321AB9029B008C4574 /* NSDictionary+CordovaPreferences.m */; };
7ED95D591AB9029B008C4574 /* NSMutableArray+QueueAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95D331AB9029B008C4574 /* NSMutableArray+QueueAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -106,8 +104,6 @@
7ED95D2C1AB9029B008C4574 /* CDVWebViewEngineProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVWebViewEngineProtocol.h; sourceTree = "<group>"; };
7ED95D2D1AB9029B008C4574 /* CDVWhitelist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVWhitelist.h; sourceTree = "<group>"; };
7ED95D2E1AB9029B008C4574 /* CDVWhitelist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVWhitelist.m; sourceTree = "<group>"; };
- 7ED95D2F1AB9029B008C4574 /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
- 7ED95D301AB9029B008C4574 /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
7ED95D311AB9029B008C4574 /* NSDictionary+CordovaPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+CordovaPreferences.h"; sourceTree = "<group>"; };
7ED95D321AB9029B008C4574 /* NSDictionary+CordovaPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+CordovaPreferences.m"; sourceTree = "<group>"; };
7ED95D331AB9029B008C4574 /* NSMutableArray+QueueAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+QueueAdditions.h"; sourceTree = "<group>"; };
@@ -233,8 +229,6 @@
7ED95D2C1AB9029B008C4574 /* CDVWebViewEngineProtocol.h */,
7ED95D2D1AB9029B008C4574 /* CDVWhitelist.h */,
7ED95D2E1AB9029B008C4574 /* CDVWhitelist.m */,
- 7ED95D2F1AB9029B008C4574 /* NSData+Base64.h */,
- 7ED95D301AB9029B008C4574 /* NSData+Base64.m */,
7ED95D311AB9029B008C4574 /* NSDictionary+CordovaPreferences.h */,
7ED95D321AB9029B008C4574 /* NSDictionary+CordovaPreferences.m */,
7ED95D331AB9029B008C4574 /* NSMutableArray+QueueAdditions.h */,
@@ -258,7 +252,6 @@
7ED95D3D1AB9029B008C4574 /* CDVCommandQueue.h in Headers */,
7ED95D531AB9029B008C4574 /* CDVWhitelist.h in Headers */,
7ED95D361AB9029B008C4574 /* CDVAppDelegate.h in Headers */,
- 7ED95D551AB9029B008C4574 /* NSData+Base64.h in Headers */,
7ED95D431AB9029B008C4574 /* CDVPlugin+Resources.h in Headers */,
7ED95D381AB9029B008C4574 /* CDVAvailability.h in Headers */,
7ED95D0A1AB9028C008C4574 /* CDVUIWebViewDelegate.h in Headers */,
@@ -337,7 +330,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 7ED95D561AB9029B008C4574 /* NSData+Base64.m in Sources */,
7ED95D511AB9029B008C4574 /* CDVViewController.m in Sources */,
7ED95D581AB9029B008C4574 /* NSDictionary+CordovaPreferences.m in Sources */,
7ED95D371AB9029B008C4574 /* CDVAppDelegate.m in Sources */,
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e5510ea/tests/CordovaLibTests/CDVBase64Tests.m
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CDVBase64Tests.m b/tests/CordovaLibTests/CDVBase64Tests.m
index 34c010e..d4647f5 100644
--- a/tests/CordovaLibTests/CDVBase64Tests.m
+++ b/tests/CordovaLibTests/CDVBase64Tests.m
@@ -19,8 +19,6 @@
#import <XCTest/XCTest.h>
-#import <Cordova/NSData+Base64.h>
-
@interface CDVBase64Tests : XCTestCase
@end
@@ -46,7 +44,7 @@
NSData* decodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
NSString* expectedEncodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
- NSString* actualEncodedString = [decodedData cdv_base64EncodedString];
+ NSString* actualEncodedString = [decodedData base64EncodedStringWithOptions:0];
XCTAssertTrue([expectedEncodedString isEqualToString:actualEncodedString]);
}
@@ -56,7 +54,7 @@
NSString* encodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
NSString* decodedString = @"abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&";
NSData* encodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
- NSData* decodedData = [NSData cdv_dataFromBase64String:encodedString];
+ NSData* decodedData = [[NSData alloc] initWithBase64EncodedString:encodedString options:0];
XCTAssertTrue([encodedData isEqualToData:decodedData]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org