Permalink
Browse files

replace SBJson with JSONKit

  • Loading branch information...
1 parent 9896bb1 commit 422794c72c6c4a752d53f984a410b8f4b38f8ccd @ohsc committed Jul 18, 2012
View
@@ -24,36 +24,3 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-
------
-
-This software contains code from the following open source projects:
-
-* [SBJson](http://stig.github.com/json-framework/)
-
-```
-Copyright (C) 2007-2012 Stig Brautaset. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-* Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-```
View
@@ -1,10 +0,0 @@
-//
-// JSON.h
-// SBJson
-//
-// Created by Stig Brautaset on 01/06/2011.
-// Copyright 2011 Stig Brautaset. All rights reserved.
-//
-
-#warning The JSON.h header is deprecated, and will disappear in a future release. Please change to include SBJson.h instead.
-#include "SBJson.h"
@@ -1,67 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-#pragma mark JSON Writing
-
-/// Adds JSON generation to NSObject
-@interface NSObject (NSObject_SBJsonWriting)
-
-/**
- @brief Encodes the receiver into a JSON string
-
- Although defined as a category on NSObject it is only defined for NSArray and NSDictionary.
-
- @return the receiver encoded in JSON, or nil on error.
-
- @see @ref objc2json
- */
-- (NSString *)JSONRepresentation;
-
-@end
-
-
-#pragma mark JSON Parsing
-
-/// Adds JSON parsing methods to NSString
-@interface NSString (NSString_SBJsonParsing)
-
-/**
- @brief Decodes the receiver's JSON text
-
- @return the NSDictionary or NSArray represented by the receiver, or nil on error.
-
- @see @ref json2objc
- */
-- (id)JSONValue;
-
-@end
-
-
@@ -1,58 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "NSObject+SBJson.h"
-#import "SBJsonWriter.h"
-#import "SBJsonParser.h"
-
-@implementation NSObject (NSObject_SBJsonWriting)
-
-- (NSString *)JSONRepresentation {
- SBJsonWriter *writer = [[[SBJsonWriter alloc] init] autorelease];
- NSString *json = [writer stringWithObject:self];
- if (!json)
- NSLog(@"-JSONRepresentation failed. Error is: %@", writer.error);
- return json;
-}
-
-@end
-
-
-
-@implementation NSString (NSString_SBJsonParsing)
-
-- (id)JSONValue {
- SBJsonParser *parser = [[[SBJsonParser alloc] init] autorelease];
- id repr = [parser objectWithString:self];
- if (!repr)
- NSLog(@"-JSONValue failed. Error is: %@", parser.error);
- return repr;
-}
-
-@end
View
@@ -1,84 +0,0 @@
-/*
- Copyright (C) 2009-2011 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- @page json2objc JSON to Objective-C
-
- JSON is mapped to Objective-C types in the following way:
-
- @li null -> NSNull
- @li string -> NSString
- @li array -> NSMutableArray
- @li object -> NSMutableDictionary
- @li true -> NSNumber's -numberWithBool:YES
- @li false -> NSNumber's -numberWithBool:NO
- @li integer up to 19 digits -> NSNumber's -numberWithLongLong:
- @li all other numbers -> NSDecimalNumber
-
- Since Objective-C doesn't have a dedicated class for boolean values,
- these turns into NSNumber instances. However, since these are
- initialised with the -initWithBool: method they round-trip back to JSON
- properly. In other words, they won't silently suddenly become 0 or 1;
- they'll be represented as 'true' and 'false' again.
-
- As an optimisation integers up to 19 digits in length (the max length
- for signed long long integers) turn into NSNumber instances, while
- complex ones turn into NSDecimalNumber instances. We can thus avoid any
- loss of precision as JSON allows ridiculously large numbers.
-
- @page objc2json Objective-C to JSON
-
- Objective-C types are mapped to JSON types in the following way:
-
- @li NSNull -> null
- @li NSString -> string
- @li NSArray -> array
- @li NSDictionary -> object
- @li NSNumber's -initWithBool:YES -> true
- @li NSNumber's -initWithBool:NO -> false
- @li NSNumber -> number
-
- @note In JSON the keys of an object must be strings. NSDictionary
- keys need not be, but attempting to convert an NSDictionary with
- non-string keys into JSON will throw an exception.
-
- NSNumber instances created with the -numberWithBool: method are
- converted into the JSON boolean "true" and "false" values, and vice
- versa. Any other NSNumber instances are converted to a JSON number the
- way you would expect.
-
- */
-
-#import "SBJsonParser.h"
-#import "SBJsonWriter.h"
-#import "SBJsonStreamParser.h"
-#import "SBJsonStreamParserAdapter.h"
-#import "SBJsonStreamWriter.h"
-#import "NSObject+SBJson.h"
-
View
@@ -1,107 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- @brief Parse JSON Strings and NSData objects
-
- This uses SBJsonStreamParser internally.
-
- @see @ref objc2json
-
- */
-
-@interface SBJsonParser : NSObject {
-
-@private
- NSString *error;
- NSUInteger depth, maxDepth;
-
-}
-
-/**
- @brief The maximum recursing depth.
-
- Defaults to 32. If the input is nested deeper than this the input will be deemed to be
- malicious and the parser returns nil, signalling an error. ("Nested too deep".) You can
- turn off this security feature by setting the maxDepth value to 0.
- */
-@property NSUInteger maxDepth;
-
-/**
- @brief Description of parse error
-
- This method returns the trace of the last method that failed.
- You need to check the return value of the call you're making to figure out
- if the call actually failed, before you know call this method.
-
- @return A string describing the error encountered, or nil if no error occured.
-
- */
-@property(copy) NSString *error;
-
-/**
- @brief Return the object represented by the given NSData object.
-
- The data *must* be UTF8 encoded.
-
- @param data An NSData containing UTF8 encoded data to parse.
- @return The NSArray or NSDictionary represented by the object, or nil if an error occured.
-
- */
-- (id)objectWithData:(NSData*)data;
-
-/**
- @brief Return the object represented by the given string
-
- This method converts its input to an NSData object containing UTF8 and calls -objectWithData: with it.
-
- @return The NSArray or NSDictionary represented by the object, or nil if an error occured.
- */
-- (id)objectWithString:(NSString *)repr;
-
-/**
- @brief Return the object represented by the given string
-
- This method calls objectWithString: internally. If an error occurs, and if @p error
- is not nil, it creates an NSError object and returns this through its second argument.
-
- @param jsonText the json string to parse
- @param error pointer to an NSError object to populate on error
-
- @return The NSArray or NSDictionary represented by the object, or nil if an error occured.
- */
-
-- (id)objectWithString:(NSString*)jsonText
- error:(NSError**)error;
-
-@end
-
-
Oops, something went wrong.

0 comments on commit 422794c

Please sign in to comment.