Merge branch 'remove-fragments-and-facade'

Credits.rtf

@@ -1,9 +1,10 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 ArialMT;}
 {\colortbl;\red255\green255\blue255;}
-{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}
-{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}}
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
+\paperw12240\paperh15840\vieww9000\viewh8400\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\b\fs24 \cf0 Blake Seely
@@ -71,4 +72,10 @@ Provided patch to fix crash when parsing facebook chat responses.\
 
 \b0 Pointed out embarrasing mistake in logic to report errors in the category methods of 2.2.1.\
 \
+
+\b dewvinci & Tobias Hoehman\
+
+\b0 Performance patch for integer numbers and strings without special characters.\
+
+\b \
 }

JSON.xcodeproj/project.pbxproj

@@ -45,10 +45,6 @@
 		535158710F70DE7A00C8AABD /* SBJsonBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5351586F0F70DE7A00C8AABD /* SBJsonBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		535158730F70DE7B00C8AABD /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 535158720F70DE7B00C8AABD /* SBJsonBase.m */; };
 		535158740F70DE7B00C8AABD /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 535158720F70DE7B00C8AABD /* SBJsonBase.m */; };
-		539191D20DBB896D00714DA2 /* SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 539191D00DBB896D00714DA2 /* SBJSON.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		539191D30DBB896D00714DA2 /* SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 539191D10DBB896D00714DA2 /* SBJSON.m */; };
-		539191D40DBB896D00714DA2 /* SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 539191D00DBB896D00714DA2 /* SBJSON.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		539191D50DBB896D00714DA2 /* SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 539191D10DBB896D00714DA2 /* SBJSON.m */; };
 		53C45B9C0C98A87600546F66 /* ErrorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 53C45B9B0C98A87600546F66 /* ErrorTest.m */; };
 		53D2299C0C96129800276605 /* JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D2299A0C96129800276605 /* JSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53D229AD0C961B9900276605 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53D229810C96121600276605 /* JSON.framework */; };
@@ -108,8 +104,6 @@
 		535158720F70DE7B00C8AABD /* SBJsonBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonBase.m; sourceTree = "<group>"; };
 		5355C86B0E392B2A00A18C15 /* ErrorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ErrorTest.h; sourceTree = "<group>"; };
 		5355C86C0E392B2A00A18C15 /* DataDrivenTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDrivenTest.h; sourceTree = "<group>"; };
-		539191D00DBB896D00714DA2 /* SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJSON.h; sourceTree = "<group>"; };
-		539191D10DBB896D00714DA2 /* SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJSON.m; sourceTree = "<group>"; };
 		53C45B9B0C98A87600546F66 /* ErrorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ErrorTest.m; sourceTree = "<group>"; };
 		53D229810C96121600276605 /* JSON.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JSON.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		53D229830C96121600276605 /* JSON-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "JSON-Info.plist"; sourceTree = "<group>"; };
@@ -212,8 +206,6 @@
 			isa = PBXGroup;
 			children = (
 				53D2299A0C96129800276605 /* JSON.h */,
-				539191D00DBB896D00714DA2 /* SBJSON.h */,
-				539191D10DBB896D00714DA2 /* SBJSON.m */,
 				E75716430C96DB530084A449 /* NSObject+SBJSON.h */,
 				E75716440C96DB530084A449 /* NSObject+SBJSON.m */,
 				E757164B0C96E39B0084A449 /* NSString+SBJSON.h */,
@@ -295,7 +287,6 @@
 				53D2299C0C96129800276605 /* JSON.h in Headers */,
 				E75716450C96DB530084A449 /* NSObject+SBJSON.h in Headers */,
 				E757164D0C96E39B0084A449 /* NSString+SBJSON.h in Headers */,
-				539191D20DBB896D00714DA2 /* SBJSON.h in Headers */,
 				5351577C0F6E3BE100C8AABD /* SBJsonParser.h in Headers */,
 				535157A70F6EE4A800C8AABD /* SBJsonWriter.h in Headers */,
 				535158700F70DE7A00C8AABD /* SBJsonBase.h in Headers */,
@@ -309,7 +300,6 @@
 				FE2BBD860D8B0D6000184787 /* JSON.h in Headers */,
 				FE2BBD870D8B0D6000184787 /* NSObject+SBJSON.h in Headers */,
 				FE2BBD8B0D8B0D6000184787 /* NSString+SBJSON.h in Headers */,
-				539191D40DBB896D00714DA2 /* SBJSON.h in Headers */,
 				5351577A0F6E3BE100C8AABD /* SBJsonParser.h in Headers */,
 				535157A50F6EE4A800C8AABD /* SBJsonWriter.h in Headers */,
 				535158710F70DE7A00C8AABD /* SBJsonBase.h in Headers */,
@@ -534,7 +524,6 @@
 			files = (
 				E75716460C96DB530084A449 /* NSObject+SBJSON.m in Sources */,
 				E757164E0C96E39B0084A449 /* NSString+SBJSON.m in Sources */,
-				539191D30DBB896D00714DA2 /* SBJSON.m in Sources */,
 				5351577D0F6E3BE100C8AABD /* SBJsonParser.m in Sources */,
 				535157A80F6EE4A800C8AABD /* SBJsonWriter.m in Sources */,
 				535158730F70DE7B00C8AABD /* SBJsonBase.m in Sources */,
@@ -567,7 +556,6 @@
 			files = (
 				FE2BBD880D8B0D6000184787 /* NSObject+SBJSON.m in Sources */,
 				FE2BBD8C0D8B0D6000184787 /* NSString+SBJSON.m in Sources */,
-				539191D50DBB896D00714DA2 /* SBJSON.m in Sources */,
 				5351577B0F6E3BE100C8AABD /* SBJsonParser.m in Sources */,
 				535157A60F6EE4A800C8AABD /* SBJsonWriter.m in Sources */,
 				535158740F70DE7B00C8AABD /* SBJsonBase.m in Sources */,

README.md

@@ -10,5 +10,5 @@ JSON parser and generator in Objective-C.
 Please see the project site for more information:
 http://code.google.com/p/json-framework/
 
-The Source is now officially on GitHub:
+The source is available on GitHub, under a BSD license:
 http://github.com/stig/json-framework/

Source/JSON.h

@@ -44,7 +44,8 @@
  
 */
 
-#import "SBJSON.h"
+#import "SBJsonParser.h"
+#import "SBJsonWriter.h"
 #import "NSObject+SBJSON.h"
 #import "NSString+SBJSON.h"
 

Source/NSObject+SBJSON.h

@@ -39,21 +39,6 @@
  */
 @interface NSObject (NSObject_SBJSON)
 
-/**
- @brief Returns a string containing the receiver encoded as a JSON fragment.
- 
- This method is added as a category on NSObject but is only actually
- supported for the following objects:
- @li NSDictionary
- @li NSArray
- @li NSString
- @li NSNumber (also used for booleans)
- @li NSNull 
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (NSString *)JSONFragment;
-
 /**
  @brief Returns a string containing the receiver encoded in JSON.
 

Source/NSObject+SBJSON.m

@@ -32,15 +32,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
 @implementation NSObject (NSObject_SBJSON)
 
-- (NSString *)JSONFragment {
-    SBJsonWriter *jsonWriter = [SBJsonWriter new];
-    NSString *json = [jsonWriter stringWithFragment:self];    
-    if (!json)
-        NSLog(@"-JSONFragment failed. Error trace is: %@", [jsonWriter errorTrace]);
-    [jsonWriter release];
-    return json;
-}
-
 - (NSString *)JSONRepresentation {
     SBJsonWriter *jsonWriter = [SBJsonWriter new];    
     NSString *json = [jsonWriter stringWithObject:self];

Source/NSString+SBJSON.h

@@ -36,16 +36,6 @@ This is a category on NSString that adds methods for parsing the target string.
 */
 @interface NSString (NSString_SBJSON)
 
-
-/**
- @brief Returns the object represented in the receiver, or nil on error. 
- 
- Returns a a scalar object represented by the string's JSON fragment representation.
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (id)JSONFragmentValue;
-
 /**
  @brief Returns the NSDictionary or NSArray represented by the current string's JSON representation.
  

Source/NSString+SBJSON.m

@@ -32,16 +32,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
 @implementation NSString (NSString_SBJSON)
 
-- (id)JSONFragmentValue
-{
-    SBJsonParser *jsonParser = [SBJsonParser new];    
-    id repr = [jsonParser fragmentWithString:self];    
-    if (!repr)
-        NSLog(@"-JSONFragmentValue failed. Error trace is: %@", [jsonParser errorTrace]);
-    [jsonParser release];
-    return repr;
-}
-
 - (id)JSONValue
 {
     SBJsonParser *jsonParser = [SBJsonParser new];