From 157ec38ee2b089ec583804c2134847c84f1f9020 Mon Sep 17 00:00:00 2001 From: segiddins Date: Thu, 9 May 2013 15:09:21 -0400 Subject: [PATCH 01/14] Moved to TBXML --- RKXMLReaderSerialization.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RKXMLReaderSerialization.podspec b/RKXMLReaderSerialization.podspec index 4fe660e..490498a 100644 --- a/RKXMLReaderSerialization.podspec +++ b/RKXMLReaderSerialization.podspec @@ -9,10 +9,10 @@ Pod::Spec.new do |s| s.requires_arc = true s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' - + s.source = { :git => "https://github.com/RestKit/RKXMLReaderSerialization.git" } s.source_files = '*.{h,m}' - + s.dependency 'RestKit', '>= 0.20.0dev' - s.dependency 'XMLReader', '>= 0.0.2' + s.dependency 'TBXML-NSDictionary', '>= 0.0.1' end From d7695af2db5a73b2f1199800b68ef1bea29145a1 Mon Sep 17 00:00:00 2001 From: segiddins Date: Thu, 9 May 2013 16:09:46 -0300 Subject: [PATCH 02/14] Moved to TBXML --- RKXMLReaderSerialization.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKXMLReaderSerialization.m b/RKXMLReaderSerialization.m index 25bbc37..61407bf 100644 --- a/RKXMLReaderSerialization.m +++ b/RKXMLReaderSerialization.m @@ -24,7 +24,7 @@ @implementation RKXMLReaderSerialization + (id)objectFromData:(NSData *)data error:(NSError **)error { - return [XMLReader dictionaryForXMLData:data error:error]; + return [TBXML dictionaryForXMLData:data error:error]; } + (NSData *)dataFromObject:(id)object error:(NSError **)error From 33e7eb6ef80f9603907c7a67f9321cdffa87e2a4 Mon Sep 17 00:00:00 2001 From: segiddins Date: Thu, 9 May 2013 16:12:44 -0300 Subject: [PATCH 03/14] Update RKXMLReaderSerialization.podspec --- RKXMLReaderSerialization.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKXMLReaderSerialization.podspec b/RKXMLReaderSerialization.podspec index 490498a..0c2e5db 100644 --- a/RKXMLReaderSerialization.podspec +++ b/RKXMLReaderSerialization.podspec @@ -14,5 +14,5 @@ Pod::Spec.new do |s| s.source_files = '*.{h,m}' s.dependency 'RestKit', '>= 0.20.0dev' - s.dependency 'TBXML-NSDictionary', '>= 0.0.1' + s.dependency 'TBXML+NSDictionary', '>= 0.0.1' end From 64a9daaae1411335f84582517a7f00faba024129 Mon Sep 17 00:00:00 2001 From: segiddins Date: Thu, 9 May 2013 16:15:23 -0300 Subject: [PATCH 04/14] Update RKXMLReaderSerialization.h --- RKXMLReaderSerialization.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKXMLReaderSerialization.h b/RKXMLReaderSerialization.h index 8bede81..c492c74 100644 --- a/RKXMLReaderSerialization.h +++ b/RKXMLReaderSerialization.h @@ -34,7 +34,7 @@ the parsed dictionary at the `@"text"` key. */ -#import "XMLReader.h" +#import "TBXML+NSDictionary.h" #import @interface RKXMLReaderSerialization : NSObject From 5e7e37ddfa843a9212f08ba50ceddaefaf01fea7 Mon Sep 17 00:00:00 2001 From: segiddins Date: Thu, 9 May 2013 16:42:52 -0300 Subject: [PATCH 05/14] source now points to my repo --- RKXMLReaderSerialization.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKXMLReaderSerialization.podspec b/RKXMLReaderSerialization.podspec index 0c2e5db..e6b511d 100644 --- a/RKXMLReaderSerialization.podspec +++ b/RKXMLReaderSerialization.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' - s.source = { :git => "https://github.com/RestKit/RKXMLReaderSerialization.git" } + s.source = { :git => "https://github.com/segiddins/RKXMLReaderSerialization.git" } s.source_files = '*.{h,m}' s.dependency 'RestKit', '>= 0.20.0dev' From a44dfedb6fef5ba74c2f0643a87ed9034344920a Mon Sep 17 00:00:00 2001 From: segiddins Date: Thu, 9 May 2013 16:43:16 -0300 Subject: [PATCH 06/14] Update RKXMLReaderSerialization.m --- RKXMLReaderSerialization.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKXMLReaderSerialization.m b/RKXMLReaderSerialization.m index 61407bf..ff6a426 100644 --- a/RKXMLReaderSerialization.m +++ b/RKXMLReaderSerialization.m @@ -24,7 +24,7 @@ @implementation RKXMLReaderSerialization + (id)objectFromData:(NSData *)data error:(NSError **)error { - return [TBXML dictionaryForXMLData:data error:error]; + return [TBXML dictionaryWithXMLData:data error:error]; } + (NSData *)dataFromObject:(id)object error:(NSError **)error From 28f5c9624f7d9c35e76963fd019d3fbddbbcdb09 Mon Sep 17 00:00:00 2001 From: segiddins Date: Fri, 7 Jun 2013 18:46:04 -0300 Subject: [PATCH 07/14] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a1b1273..a174358 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -RKXMLReaderSerialization +RKTBXMLSerialization ====================== -A RestKit XML serialization implementation using the XMLReader class. +A RestKit XML serialization implementation using the TBXML class. ## Installation -Install via Cocoapods or add the source files to your project. If you are installing directly from source, you will also need to obtain a copy of XMLReader from https://github.com/RestKit/XML-to-NSDictionary. +Install via Cocoapods or add the source files to your project. If you are installing directly from source, you will also need to obtain a copy of TBXML from https://github.com/mackoj/TBXML-NSDictionary. Once installed, register the serialization in your app delegate (or wherever you handle RestKit setup): ``` objc -#import "RKXMLReaderSerialization.h" +#import "RKTBXMLSerialization.h" -[RKMIMETypeSerialization registerClass:[RKXMLReaderSerialization class] forMIMEType:@"application/xml"]; +[RKMIMETypeSerialization registerClass:[RKTBXMLSerialization class] forMIMEType:@"application/xml"]; ``` From 3c8d37af9c0bbd3dff417b396b284d2e5fa9733c Mon Sep 17 00:00:00 2001 From: segiddins Date: Fri, 7 Jun 2013 18:47:07 -0300 Subject: [PATCH 08/14] Update RKXMLReaderSerialization.podspec --- RKXMLReaderSerialization.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RKXMLReaderSerialization.podspec b/RKXMLReaderSerialization.podspec index e6b511d..76d61a2 100644 --- a/RKXMLReaderSerialization.podspec +++ b/RKXMLReaderSerialization.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "RKXMLReaderSerialization" s.version = "0.20.0" s.summary = "A RestKit serialization format implementation for XML using XMLReader." - s.homepage = "https://github.com/RestKit/RKXMLReaderSerialization" + s.homepage = "https://github.com/segiddins/RKTBXMLSerialization" s.license = { :type => 'Apache', :file => 'LICENSE'} s.author = { "Blake Watters" => "blakewatters@gmail.com" } @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' - s.source = { :git => "https://github.com/segiddins/RKXMLReaderSerialization.git" } + s.source = { :git => "https://github.com/segiddins/RKTBXMLSerialization.git" } s.source_files = '*.{h,m}' s.dependency 'RestKit', '>= 0.20.0dev' From c821f189b0925d3305a8d54e9a5f09057c7457ea Mon Sep 17 00:00:00 2001 From: segiddins Date: Fri, 7 Jun 2013 18:47:14 -0300 Subject: [PATCH 09/14] Rename RKXMLReaderSerialization.podspec to RKTBXMLSerialization --- RKXMLReaderSerialization.podspec => RKTBXMLSerialization | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename RKXMLReaderSerialization.podspec => RKTBXMLSerialization (100%) diff --git a/RKXMLReaderSerialization.podspec b/RKTBXMLSerialization similarity index 100% rename from RKXMLReaderSerialization.podspec rename to RKTBXMLSerialization From 3c6bf9abfb9f3d916017c8045cef7ab402050c77 Mon Sep 17 00:00:00 2001 From: segiddins Date: Fri, 7 Jun 2013 17:47:24 -0400 Subject: [PATCH 10/14] Rename RKTBXMLSerialization to RKTBXMLSerialization.podspec --- RKTBXMLSerialization => RKTBXMLSerialization.podspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename RKTBXMLSerialization => RKTBXMLSerialization.podspec (100%) diff --git a/RKTBXMLSerialization b/RKTBXMLSerialization.podspec similarity index 100% rename from RKTBXMLSerialization rename to RKTBXMLSerialization.podspec From 0da9e1db52056174300865a07b728ae6ad87aa58 Mon Sep 17 00:00:00 2001 From: segiddins Date: Fri, 7 Jun 2013 18:48:47 -0300 Subject: [PATCH 11/14] Update and rename RKXMLReaderSerialization.h to RKTBXMLSerialization.h --- RKXMLReaderSerialization.h => RKTBXMLSerialization.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename RKXMLReaderSerialization.h => RKTBXMLSerialization.h (80%) diff --git a/RKXMLReaderSerialization.h b/RKTBXMLSerialization.h similarity index 80% rename from RKXMLReaderSerialization.h rename to RKTBXMLSerialization.h index c492c74..867ea61 100644 --- a/RKXMLReaderSerialization.h +++ b/RKTBXMLSerialization.h @@ -1,5 +1,5 @@ // -// RKXMLReaderSerialization.h +// RKTBXMLSerialization.h // RestKit // // Created by Christopher Swasey on 1/24/12. @@ -20,10 +20,10 @@ /** Provides a basic XML implementation using an adapted version - of the XMLReader class by "Insert-Witty-Name" available at: - https://github.com/RestKit/XML-to-NSDictionary + of the TBXML class by "Insert-Witty-Name" available at: + https://github.com/mackoj/TBXML-NSDictionary - `RKXMLReaderSerialization` will parse an XML document into an NSDictionary + `RKTBXMLSerialization` will parse an XML document into an NSDictionary representation suitable for use with RestKit's key-value coding based object mapping implementation. @@ -37,5 +37,5 @@ #import "TBXML+NSDictionary.h" #import -@interface RKXMLReaderSerialization : NSObject +@interface RKTBXMLSerialization : NSObject @end From 09a77b640bd0c66bc3a3af0dca23325b6cfc010f Mon Sep 17 00:00:00 2001 From: segiddins Date: Fri, 7 Jun 2013 18:51:26 -0300 Subject: [PATCH 12/14] Update and rename RKXMLReaderSerialization.m to RKTBXMLSerialization.m --- RKXMLReaderSerialization.m => RKTBXMLSerialization.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename RKXMLReaderSerialization.m => RKTBXMLSerialization.m (92%) diff --git a/RKXMLReaderSerialization.m b/RKTBXMLSerialization.m similarity index 92% rename from RKXMLReaderSerialization.m rename to RKTBXMLSerialization.m index ff6a426..3747140 100644 --- a/RKXMLReaderSerialization.m +++ b/RKTBXMLSerialization.m @@ -18,9 +18,9 @@ // limitations under the License. // -#import "RKXMLReaderSerialization.h" +#import "RKTBXMLSerialization.h" -@implementation RKXMLReaderSerialization +@implementation RKTBXMLSerialization + (id)objectFromData:(NSData *)data error:(NSError **)error { From 9d04533b262f234baf1a3981f63ac3d83bb6e1cd Mon Sep 17 00:00:00 2001 From: Jesse Read Date: Sat, 29 Jun 2013 16:49:36 -0400 Subject: [PATCH 13/14] Renamed project within podspec file to RKTBXMLSerialization. --- RKTBXMLSerialization.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKTBXMLSerialization.podspec b/RKTBXMLSerialization.podspec index 76d61a2..c7bd0d5 100644 --- a/RKTBXMLSerialization.podspec +++ b/RKTBXMLSerialization.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.name = "RKXMLReaderSerialization" + s.name = "RKTBXMLSerialization" s.version = "0.20.0" s.summary = "A RestKit serialization format implementation for XML using XMLReader." s.homepage = "https://github.com/segiddins/RKTBXMLSerialization" From 05b651384e56b80dd8d5a21d5ec395b436811a35 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Wed, 3 Jul 2013 16:52:56 -0400 Subject: [PATCH 14/14] Update Podspec to point at new home --- RKTBXMLSerialization.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RKTBXMLSerialization.podspec b/RKTBXMLSerialization.podspec index c7bd0d5..90282d4 100644 --- a/RKTBXMLSerialization.podspec +++ b/RKTBXMLSerialization.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' - s.source = { :git => "https://github.com/segiddins/RKTBXMLSerialization.git" } + s.source = { :git => "https://github.com/RestKit/RKTBXMLSerialization.git" } s.source_files = '*.{h,m}' s.dependency 'RestKit', '>= 0.20.0dev'