From a4ea6e71a0975d2afb02ad5d2e0dfbcfc3b70f91 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <stig@brautaset.org>
Date: Sun, 30 Jan 2011 16:04:41 +0000
Subject: [PATCH] Remove the hacky dataToHere method in favour of just exposing
 the internal NSMutableData buffer

---
 Classes/SBJsonStreamWriter.h | 10 ++++++++--
 Classes/SBJsonStreamWriter.m |  6 ------
 Classes/SBJsonWriter.m       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Classes/SBJsonStreamWriter.h b/Classes/SBJsonStreamWriter.h
index f917fc3f..b7a0372e 100644
--- a/Classes/SBJsonStreamWriter.h
+++ b/Classes/SBJsonStreamWriter.h
@@ -78,7 +78,14 @@
     BOOL sortKeys, humanReadable;
 }
 
-- (NSData*)dataToHere;
+/**
+ @brief The data written to the stream so far.
+ 
+ This is a mutable object. This means that you can write a chunk of its
+ contents to an NSOutputStream, then chop as many bytes as you wrote off
+ the beginning of the buffer.
+ */
+@property(readonly) NSMutableData *data;
 
 @property(readonly) NSObject **states;
 @property(readonly) NSUInteger depth;
@@ -152,6 +159,5 @@
 
 @interface SBJsonStreamWriter (Private)
 - (BOOL)writeValue:(id)v;
-@property (readonly) NSMutableData*data;
 @end
 
diff --git a/Classes/SBJsonStreamWriter.m b/Classes/SBJsonStreamWriter.m
index 76410192..1ac124f7 100644
--- a/Classes/SBJsonStreamWriter.m
+++ b/Classes/SBJsonStreamWriter.m
@@ -352,12 +352,6 @@ - (BOOL)writeNumber:(NSNumber*)number {
 	return YES;
 }
 
-- (NSData*)dataToHere {
-	NSData *ret = [data autorelease];
-	data = [[NSMutableData alloc] initWithCapacity:data.length];
-	return ret;
-}
-
 #pragma mark Private methods
 
 - (NSUInteger)depth {
diff --git a/Classes/SBJsonWriter.m b/Classes/SBJsonWriter.m
index caf34539..8321786b 100644
--- a/Classes/SBJsonWriter.m
+++ b/Classes/SBJsonWriter.m
@@ -91,7 +91,7 @@ - (NSData*)dataWithObject:(id)object {
 	}
 	
 	if (ok)
-		return [streamWriter dataToHere];
+		return streamWriter.data;
 	
 	self.error = streamWriter.error;
 	return nil;