From c480e9c316dc79f6661f3a0b5c1d01d21f55c8fb Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Tue, 3 Jun 2014 21:54:58 +0100 Subject: [PATCH 1/5] Create TCMXMLWriter.podspec Added podspec for version 1.0.0 --- TCMXMLWriter.podspec | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 TCMXMLWriter.podspec diff --git a/TCMXMLWriter.podspec b/TCMXMLWriter.podspec new file mode 100644 index 0000000..313579c --- /dev/null +++ b/TCMXMLWriter.podspec @@ -0,0 +1,12 @@ +Pod::Spec.new do |spec| + spec.name = 'TCMXMLWriter' + spec.version = '1.0.0' + spec.license = 'MIT' + spec.homepage = 'https://github.com/monkeydom/TCMXMLWriter' + spec.author = 'Dominik Wagner' + spec.summary = 'Elegant cocoa XML marshalling with a small memory footprint' + spec.source = { :git => 'https://github.com/monkeydom/TCMXMLWriter.git', :tag => spec.version.to_s } + spec.source_files = 'TCMXML/TCMXMLWriter.{h,m}' + spec.framework = 'Foundation' + spec.requires_arc = true +end From 81b8375dfb3b1cae8b171cb3970192cd6cbfe42c Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Tue, 3 Jun 2014 21:57:27 +0100 Subject: [PATCH 2/5] Create LICENSE Added MIT license file --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d287f66 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Dominik Wagner + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 2c838a2eb1bff18565b4c7fe474a4d55f10c5895 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Tue, 3 Jun 2014 22:15:45 +0100 Subject: [PATCH 3/5] Update TCMXMLWriter.podspec Added iOS 6 and OS X 10.8 for minimum deployment --- TCMXMLWriter.podspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TCMXMLWriter.podspec b/TCMXMLWriter.podspec index 313579c..7130a17 100644 --- a/TCMXMLWriter.podspec +++ b/TCMXMLWriter.podspec @@ -9,4 +9,6 @@ Pod::Spec.new do |spec| spec.source_files = 'TCMXML/TCMXMLWriter.{h,m}' spec.framework = 'Foundation' spec.requires_arc = true + spec.ios.deployment_target = "6.0" + spec.osx.deployment_target = "10.8" end From acbaf9906a09a1b093c93c48b0044ab02337b594 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Tue, 3 Jun 2014 22:17:26 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Changed=20to=20use=20=E2=80=98instancetype?= =?UTF-8?q?=E2=80=99=20for=20init=20methods=20as=20per=20modern=20Objectiv?= =?UTF-8?q?e-C=20conventions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TCMXML/TCMXMLWriter.h | 6 +++--- TCMXML/TCMXMLWriter.m | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TCMXML/TCMXMLWriter.h b/TCMXML/TCMXMLWriter.h index f18b75c..cd22aff 100644 --- a/TCMXML/TCMXMLWriter.h +++ b/TCMXML/TCMXMLWriter.h @@ -26,10 +26,10 @@ typedef NSUInteger TCMXMLWriterOptions; @property (nonatomic, strong) NSString *boolYESValue; @property (nonatomic, strong) NSString *boolNOValue; -- (id)initWithOptions:(TCMXMLWriterOptions)anOptionField; // stores marshalled stuff in string -- (id)initWithOptions:(TCMXMLWriterOptions)anOptionField fileURL:(NSURL *)aFileURL; +- (instancetype)initWithOptions:(TCMXMLWriterOptions)anOptionField; // stores marshalled stuff in string +- (instancetype)initWithOptions:(TCMXMLWriterOptions)anOptionField fileURL:(NSURL *)aFileURL; // stream must be open -- (id)initWithOptions:(TCMXMLWriterOptions)anOptionField outputStream:(NSOutputStream *)anOutputStream; +- (instancetype)initWithOptions:(TCMXMLWriterOptions)anOptionField outputStream:(NSOutputStream *)anOutputStream; // meta - (void)instructXMLStandalone; // diff --git a/TCMXML/TCMXMLWriter.m b/TCMXML/TCMXMLWriter.m index 4ce54f5..c8cf040 100644 --- a/TCMXML/TCMXMLWriter.m +++ b/TCMXML/TCMXMLWriter.m @@ -40,11 +40,11 @@ @implementation TCMXMLWriter @synthesize fileURL = _fileURL; -- (id)init { +- (instancetype)init { return [self initWithOptions:0]; } -- (id)initWithOptions:(TCMXMLWriterOptions)anOptionField { +- (instancetype)initWithOptions:(TCMXMLWriterOptions)anOptionField { if ((self = [super init])) { _elementNameStackArray = [NSMutableArray new]; self.writerOptions = anOptionField; @@ -57,14 +57,14 @@ - (id)initWithOptions:(TCMXMLWriterOptions)anOptionField { } return self; } -- (id)initWithOptions:(TCMXMLWriterOptions)anOptionField fileURL:(NSURL *)aFileURL { +- (instancetype)initWithOptions:(TCMXMLWriterOptions)anOptionField fileURL:(NSURL *)aFileURL { if ((self = [self initWithOptions:anOptionField])) { self.fileURL = aFileURL; } return self; } -- (id)initWithOptions:(TCMXMLWriterOptions)anOptionField outputStream:(NSOutputStream *)anOutputStream { +- (instancetype)initWithOptions:(TCMXMLWriterOptions)anOptionField outputStream:(NSOutputStream *)anOutputStream { if ((self = [self initWithOptions:anOptionField])) { self.outputStream = anOutputStream; } From df361b15e33cbd536e801ecacdcf95a72c866ba1 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Tue, 3 Jun 2014 22:24:53 +0100 Subject: [PATCH 5/5] Changed to use modern Objective-C NS_OPTIONS convention for bit-mask option enums. Also moved TCMWriterOptionNoOptions to be part of the enums --- TCMXML/TCMXMLWriter.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/TCMXML/TCMXMLWriter.h b/TCMXML/TCMXMLWriter.h index cd22aff..a3dcefe 100644 --- a/TCMXML/TCMXMLWriter.h +++ b/TCMXML/TCMXMLWriter.h @@ -8,14 +8,13 @@ #import -#define TCMWriterOptionNoOptions = 0UL; - -enum { +typedef NS_OPTIONS(NSUInteger, TCMXMLWriterOptions) +{ + TCMWriterOptionNoOptions = 0UL, TCMXMLWriterOptionPrettyPrinted = 1UL << 0, TCMXMLWriterOptionOrderedAttributes = 1UL << 1, // mainly for unit testing to get reproducible results, but can also be helpful otherwise for stable results TCMXMLWriterOptionPrettyBOOL = 1UL << 2 // prints BOOLEAN NSNumbers as boolYESValue and boolNOValue values - default is "yes" and "no" }; -typedef NSUInteger TCMXMLWriterOptions; @interface TCMXMLWriter : NSObject {}