Merge branch 'apacherpc'

Milyardo · Apr 4, 2012 · 3b2c520 · 3b2c520
2 parents 62809ff + 45d43c4
commit 3b2c520
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 126 deletions.
diff --git a/XMLRPC copy-Info.plist b/XMLRPC copy-Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>XMLRPC</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.divisiblebyzero.XMLRPC</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>XMLRPC</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>ZERO</string>
+	<key>CFBundleVersion</key>
+	<string>2.2.1</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.2.1</string>
+</dict>
+</plist>
diff --git a/XMLRPC.xcodeproj/project.pbxproj b/XMLRPC.xcodeproj/project.pbxproj
@@ -14,11 +14,6 @@
 		0707047810114B9400CB7702 /* XMLRPCEventBasedParserDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0707047610114B9400CB7702 /* XMLRPCEventBasedParserDelegate.h */; };
 		0707047910114B9400CB7702 /* XMLRPCEventBasedParserDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0707047710114B9400CB7702 /* XMLRPCEventBasedParserDelegate.m */; };
 		07075BAE10C5FE3800589A27 /* AlternativeDateFormatsTestCase.xml in Resources */ = {isa = PBXBuildFile; fileRef = 07075BAD10C5FE3800589A27 /* AlternativeDateFormatsTestCase.xml */; };
-		07452BE30E469C9000A57686 /* XMLRPCConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07452BE20E469C9000A57686 /* XMLRPCConnectionDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		075137FB0E429E560019E4F6 /* XMLRPCConnectionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 075137F90E429E560019E4F6 /* XMLRPCConnectionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		075137FC0E429E560019E4F6 /* XMLRPCConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 075137FA0E429E560019E4F6 /* XMLRPCConnectionManager.m */; };
-		0759A6F31143495E000DFE98 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0759A6F11143495E000DFE98 /* InfoPlist.strings */; };
-		0799AF270F6724E300B71B22 /* XMLRPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* XMLRPC.framework */; };
 		0799AF5E0F67266400B71B22 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0799AF5D0F67266400B71B22 /* SenTestingKit.framework */; };
 		07A0A9071016A51000CEE3C7 /* EmptyBooleanTestCase.xml in Resources */ = {isa = PBXBuildFile; fileRef = 07A0A9021016A51000CEE3C7 /* EmptyBooleanTestCase.xml */; };
 		07A0A9081016A51000CEE3C7 /* EmptyDataTestCase.xml in Resources */ = {isa = PBXBuildFile; fileRef = 07A0A9031016A51000CEE3C7 /* EmptyDataTestCase.xml */; };
@@ -54,8 +49,8 @@
 		903B0DC712F7581200BD6E09 /* XMLRPCConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B0C5FC0E33A659006453B4 /* XMLRPCConnection.m */; };
 		903B0DC812F7581200BD6E09 /* XMLRPCConnectionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 075137F90E429E560019E4F6 /* XMLRPCConnectionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		903B0DC912F7581200BD6E09 /* XMLRPCConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 075137FA0E429E560019E4F6 /* XMLRPCConnectionManager.m */; };
-		903B0DCA12F7581200BD6E09 /* XMLRPCEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B0C5FF0E33A659006453B4 /* XMLRPCEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		903B0DCB12F7581200BD6E09 /* XMLRPCEncoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B0C6000E33A659006453B4 /* XMLRPCEncoder.m */; };
+		903B0DCA12F7581200BD6E09 /* XMLRPCEncoderImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B0C5FF0E33A659006453B4 /* XMLRPCEncoderImpl.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		903B0DCB12F7581200BD6E09 /* XMLRPCEncoderImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B0C6000E33A659006453B4 /* XMLRPCEncoderImpl.m */; };
 		903B0DCC12F7581200BD6E09 /* XMLRPCEventBasedParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EF45390E721A5D009F2708 /* XMLRPCEventBasedParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		903B0DCD12F7581200BD6E09 /* XMLRPCEventBasedParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 07EF453A0E721A5D009F2708 /* XMLRPCEventBasedParser.m */; };
 		903B0DCE12F7581200BD6E09 /* XMLRPCEventBasedParserDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0707047610114B9400CB7702 /* XMLRPCEventBasedParserDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -67,16 +62,6 @@
 		903B0DD412F7581F00BD6E09 /* XMLRPC.pch in Headers */ = {isa = PBXBuildFile; fileRef = 07B0C6160E33A672006453B4 /* XMLRPC.pch */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		0799AF180F67240B00B71B22 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-			remoteInfo = XMLRPC;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
 		033836811527905D00EF8E8A /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
 		033836821527905D00EF8E8A /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
@@ -110,8 +95,8 @@
 		07B0C5FA0E33A659006453B4 /* XMLRPC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLRPC.h; sourceTree = "<group>"; };
 		07B0C5FB0E33A659006453B4 /* XMLRPCConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLRPCConnection.h; sourceTree = "<group>"; };
 		07B0C5FC0E33A659006453B4 /* XMLRPCConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLRPCConnection.m; sourceTree = "<group>"; };
-		07B0C5FF0E33A659006453B4 /* XMLRPCEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLRPCEncoder.h; sourceTree = "<group>"; };
-		07B0C6000E33A659006453B4 /* XMLRPCEncoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLRPCEncoder.m; sourceTree = "<group>"; };
+		07B0C5FF0E33A659006453B4 /* XMLRPCEncoderImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLRPCEncoderImpl.h; sourceTree = "<group>"; };
+		07B0C6000E33A659006453B4 /* XMLRPCEncoderImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLRPCEncoderImpl.m; sourceTree = "<group>"; };
 		07B0C6010E33A659006453B4 /* XMLRPCRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLRPCRequest.h; sourceTree = "<group>"; };
 		07B0C6020E33A659006453B4 /* XMLRPCRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLRPCRequest.m; sourceTree = "<group>"; };
 		07B0C6030E33A659006453B4 /* XMLRPCResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLRPCResponse.h; sourceTree = "<group>"; };
@@ -128,7 +113,8 @@
 		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		8DC2EF5B0486A6940098B216 /* XMLRPC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = XMLRPC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		2D9A4225152B3C0400AC8BB8 /* XMLRPC copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "XMLRPC copy-Info.plist"; path = "/Users/zpowers/workspace/eczarny-xmlrpc/XMLRPC copy-Info.plist"; sourceTree = "<absolute>"; };
+		2DCADED91529E06900B47A4F /* XMLRPCEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XMLRPCEncoder.h; sourceTree = "<group>"; };
 		903B0DB612F7574800BD6E09 /* libXMLRPC.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMLRPC.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
@@ -140,15 +126,6 @@
 			files = (
 				07E761001011788B00E9BDEE /* Cocoa.framework in Frameworks */,
 				0799AF5E0F67266400B71B22 /* SenTestingKit.framework in Frameworks */,
-				0799AF270F6724E300B71B22 /* XMLRPC.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF560486A6940098B216 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -165,7 +142,6 @@
 		034768DFFF38A50411DB9C8B /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8DC2EF5B0486A6940098B216 /* XMLRPC.framework */,
 				0799AF030F6721FF00B71B22 /* XMLRPCUnitTests.octest */,
 				903B0DB612F7574800BD6E09 /* libXMLRPC.a */,
 			);
@@ -259,6 +235,7 @@
 				2D704E6215222345001D6964 /* Resources-iPad */,
 				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
 				034768DFFF38A50411DB9C8B /* Products */,
+				2D9A4225152B3C0400AC8BB8 /* XMLRPC copy-Info.plist */,
 			);
 			name = XMLRPC;
 			sourceTree = "<group>";
@@ -293,8 +270,9 @@
 				07B0C5FC0E33A659006453B4 /* XMLRPCConnection.m */,
 				075137F90E429E560019E4F6 /* XMLRPCConnectionManager.h */,
 				075137FA0E429E560019E4F6 /* XMLRPCConnectionManager.m */,
-				07B0C5FF0E33A659006453B4 /* XMLRPCEncoder.h */,
-				07B0C6000E33A659006453B4 /* XMLRPCEncoder.m */,
+				2DCADED91529E06900B47A4F /* XMLRPCEncoder.h */,
+				07B0C5FF0E33A659006453B4 /* XMLRPCEncoderImpl.h */,
+				07B0C6000E33A659006453B4 /* XMLRPCEncoderImpl.m */,
 				07EF45390E721A5D009F2708 /* XMLRPCEventBasedParser.h */,
 				07EF453A0E721A5D009F2708 /* XMLRPCEventBasedParser.m */,
 				0707047610114B9400CB7702 /* XMLRPCEventBasedParserDelegate.h */,
@@ -373,7 +351,8 @@
 				903B0DC512F7581200BD6E09 /* XMLRPC.h in Headers */,
 				903B0DC612F7581200BD6E09 /* XMLRPCConnection.h in Headers */,
 				903B0DC812F7581200BD6E09 /* XMLRPCConnectionManager.h in Headers */,
-				903B0DCA12F7581200BD6E09 /* XMLRPCEncoder.h in Headers */,
+				2DCADEDB1529E24300B47A4F /* XMLRPCEncoder.h in Headers */,
+				903B0DCA12F7581200BD6E09 /* XMLRPCEncoderImpl.h in Headers */,
 				903B0DCC12F7581200BD6E09 /* XMLRPCEventBasedParser.h in Headers */,
 				903B0DCE12F7581200BD6E09 /* XMLRPCEventBasedParserDelegate.h in Headers */,
 				903B0DD012F7581200BD6E09 /* XMLRPCRequest.h in Headers */,
@@ -398,33 +377,12 @@
 			buildRules = (
 			);
 			dependencies = (
-				0799AF190F67240B00B71B22 /* PBXTargetDependency */,
 			);
 			name = XMLRPCUnitTests;
 			productName = XMLRPCUnitTests;
 			productReference = 0799AF030F6721FF00B71B22 /* XMLRPCUnitTests.octest */;
 			productType = "com.apple.product-type.bundle";
 		};
-		8DC2EF4F0486A6940098B216 /* XMLRPC */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "XMLRPC" */;
-			buildPhases = (
-				8DC2EF500486A6940098B216 /* Headers */,
-				8DC2EF520486A6940098B216 /* Resources */,
-				8DC2EF540486A6940098B216 /* Sources */,
-				8DC2EF560486A6940098B216 /* Frameworks */,
-				0715852011432A78003D3454 /* Run Script: Include Git commit hash */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = XMLRPC;
-			productInstallPath = "$(HOME)/Library/Frameworks";
-			productName = XMLRPC;
-			productReference = 8DC2EF5B0486A6940098B216 /* XMLRPC.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 		903B0DB512F7574800BD6E09 /* libXMLRPC */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 903B0DB912F7577B00BD6E09 /* Build configuration list for PBXNativeTarget "libXMLRPC" */;
@@ -466,7 +424,6 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8DC2EF4F0486A6940098B216 /* XMLRPC */,
 				903B0DB512F7574800BD6E09 /* libXMLRPC */,
 				0799AF020F6721FF00B71B22 /* XMLRPCUnitTests */,
 			);
@@ -491,31 +448,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		8DC2EF520486A6940098B216 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0759A6F31143495E000DFE98 /* InfoPlist.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0715852011432A78003D3454 /* Run Script: Include Git commit hash */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script: Include Git commit hash";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /usr/bin/ruby;
-			shellScript = "raise \"Must be executed from within Xcode.\" unless ENV['XCODE_VERSION_ACTUAL']\n\ninfo_plist = \"#{ENV['BUILT_PRODUCTS_DIR']}/#{ENV['WRAPPER_NAME']}/Resources/Info.plist\"\n\nif !File.exist?('/usr/local/bin/git')\n    exit\nend\n\ncommit = `/usr/local/bin/git rev-parse --short HEAD`.chomp!\n\nif commit.nil? or commit.empty?\n    exit\nend\n\nlines = IO.readlines(info_plist).join\n\nlines.gsub! /(<key>CFBundleShortVersionString<\\/key>\\W*)<string>(\\d+\\.\\d+(?:\\.\\d)*[a-z]?)<\\/string>/, \"\\\\1<string>\\\\2 rev. #{commit}</string>\"\n\nFile.open(info_plist, 'w') { |f| f.puts lines }";
-		};
 		0799AF010F6721FF00B71B22 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -577,7 +512,7 @@
 				903B0DC312F7581200BD6E09 /* NSStringAdditions.m in Sources */,
 				903B0DC712F7581200BD6E09 /* XMLRPCConnection.m in Sources */,
 				903B0DC912F7581200BD6E09 /* XMLRPCConnectionManager.m in Sources */,
-				903B0DCB12F7581200BD6E09 /* XMLRPCEncoder.m in Sources */,
+				903B0DCB12F7581200BD6E09 /* XMLRPCEncoderImpl.m in Sources */,
 				903B0DCD12F7581200BD6E09 /* XMLRPCEventBasedParser.m in Sources */,
 				903B0DCF12F7581200BD6E09 /* XMLRPCEventBasedParserDelegate.m in Sources */,
 				903B0DD112F7581200BD6E09 /* XMLRPCRequest.m in Sources */,
@@ -588,14 +523,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		0799AF190F67240B00B71B22 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 8DC2EF4F0486A6940098B216 /* XMLRPC */;
-			targetProxy = 0799AF180F67240B00B71B22 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		0759A6F11143495E000DFE98 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
@@ -634,24 +561,6 @@
 			};
 			name = Release;
 		};
-		1DEB91AE08733DA50010E9CD /* Development */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0799AF100F6722D600B71B22 /* XMLRPCDevelopment.xcconfig */;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				VERSION_INFO_FILE = "";
-			};
-			name = Development;
-		};
-		1DEB91AF08733DA50010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0799AF110F6722D600B71B22 /* XMLRPCRelease.xcconfig */;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				VERSION_INFO_FILE = "";
-			};
-			name = Release;
-		};
 		1DEB91B208733DA50010E9CD /* Development */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 07127C590F4266F4009C7476 /* CommonDevelopment.xcconfig */;
@@ -717,15 +626,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "XMLRPC" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB91AE08733DA50010E9CD /* Development */,
-				1DEB91AF08733DA50010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "XMLRPC" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

diff --git a/XMLRPCEncoder.h b/XMLRPCEncoder.h
@@ -1,18 +1,13 @@
 #import <Foundation/Foundation.h>
 
-@interface XMLRPCEncoder : NSObject {
-    NSString *myMethod;
-    NSArray *myParameters;
-}
-
+@protocol XMLRPCEncoder <NSObject>
 - (NSString *)encode;
 
 #pragma mark -
 
 - (void)setMethod: (NSString *)method withParameters: (NSArray *)parameters;
 
 - (void)setParameters: (NSArray*)parameters;
-
 #pragma mark -
 
 - (NSString *)method;

diff --git a/XMLRPCEncoderImpl.h b/XMLRPCEncoderImpl.h
@@ -0,0 +1,23 @@
+#import <Foundation/Foundation.h>
+#import "XMLRPCEncoder.h"
+
+@interface XMLRPCEncoderImpl : NSObject <XMLRPCEncoder> {
+    NSString *myMethod;
+    NSArray *myParameters;
+}
+
+- (NSString *)encode;
+
+#pragma mark -
+
+- (void)setMethod: (NSString *)method withParameters: (NSArray *)parameters;
+
+- (void)setParameters: (NSArray*)parameters;
+
+#pragma mark -
+
+- (NSString *)method;
+
+- (NSArray *)parameters;
+
+@end
diff --git a/XMLRPCEncoder.m → XMLRPCEncoderImpl.m b/XMLRPCEncoder.m → XMLRPCEncoderImpl.m
@@ -1,8 +1,8 @@
-#import "XMLRPCEncoder.h"
+#import "XMLRPCEncoderImpl.h"
 #import "NSStringAdditions.h"
 #import "NSData+Base64.h"
 
-@interface XMLRPCEncoder (XMLRPCEncoderPrivate)
+@interface XMLRPCEncoderImpl (XMLRPCEncoderPrivate)
 
 - (NSString *)valueTag: (NSString *)tag value: (NSString *)value;
 
@@ -36,7 +36,7 @@ - (NSString *)encodeData: (NSData *)data;
 
 #pragma mark -
 
-@implementation XMLRPCEncoder
+@implementation XMLRPCEncoderImpl
 
 - (id)init {
     self = [super init];
@@ -134,7 +134,7 @@ - (void)dealloc {
 
 #pragma mark -
 
-@implementation XMLRPCEncoder (XMLRPCEncoderPrivate)
+@implementation XMLRPCEncoderImpl (XMLRPCEncoderPrivate)
 
 - (NSString *)valueTag: (NSString *)tag value: (NSString *)value {
     return [NSString stringWithFormat: @"<value><%@>%@</%@></value>", tag, value, tag];

diff --git a/XMLRPCRequest.h b/XMLRPCRequest.h
@@ -1,10 +1,10 @@
 #import <Foundation/Foundation.h>
 
-@class XMLRPCEncoder;
+#import "XMlRPCEncoder.h"
 
 @interface XMLRPCRequest : NSObject {
     NSMutableURLRequest *myRequest;
-    XMLRPCEncoder *myXMLEncoder;
+    id <XMLRPCEncoder> myXMLEncoder;
 }
 
 - (id)initWithURL: (NSURL *)URL;
@@ -22,6 +22,7 @@
 - (NSString *)userAgent;
 
 #pragma mark -
+- (void)setEncoder: (id <XMLRPCEncoder>) encoder;
 
 - (void)setMethod: (NSString *)method;