Overview
Comment: | Add +[elementWithText:] and +[elementWithComment:] to OFXMLElement. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
29384131f792145fabb1665081be8413 |
User & Date: | js on 2010-06-13 15:40:18 |
Other Links: | manifest | tags |
Context
2010-06-13
| ||
16:50 | Work around a stupid gcc bug. check-in: 8c23ddc0a0 user: js tags: trunk | |
15:40 | Add +[elementWithText:] and +[elementWithComment:] to OFXMLElement. check-in: 29384131f7 user: js tags: trunk | |
12:15 | Improve OFSocketObserver API. check-in: 4ca583737c user: js tags: trunk | |
Changes
Modified src/OFXMLElement.h from [9c0874a8f4] to [ab1302a21f].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" @class OFString; @class OFMutableArray; @class OFMutableDictionary; @class OFXMLAttribute; @interface OFXMLElement: OFObject { OFString *name; OFString *namespace; OFString *defaultNamespace; OFMutableArray *attributes; | > < > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" @class OFString; @class OFMutableString; @class OFMutableArray; @class OFMutableDictionary; @class OFXMLAttribute; @interface OFXMLElement: OFObject { OFString *name; OFString *namespace; OFString *defaultNamespace; OFMutableArray *attributes; OFMutableDictionary *namespaces; OFMutableArray *children; OFString *text; OFMutableString *comment; } /** * \param name The name for the element * \return A new autoreleased OFXMLElement with the specified element name */ + elementWithName: (OFString*)name; |
︙ | ︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | * \return A new autoreleased OFXMLElement with the specified element name, * namespace and value */ + elementWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval; /** * Initializes an already allocated OFXMLElement with the specified element * name. * * \param name The name for the element * \return An initialized OFXMLElement with the specified element name */ | > > > > > > > > > > > > > > > > | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | * \return A new autoreleased OFXMLElement with the specified element name, * namespace and value */ + elementWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval; /** * Creates a new element, only consisting of the specified text. * * \param text The text the element represents * \return A new autoreleased OFXMLElement consisting of the specified text */ + elementWithText: (OFString*)text; /** * Creates a new element, only consisting of the specified comment. * * \param comment The comment the element represents * \return A new autoreleased OFXMLElement consisting of the specified comment */ + elementWithComment: (OFString*)text; /** * Initializes an already allocated OFXMLElement with the specified element * name. * * \param name The name for the element * \return An initialized OFXMLElement with the specified element name */ |
︙ | ︙ | |||
105 106 107 108 109 110 111 112 113 114 115 116 117 118 | * \return An initialized OFXMLElement with the specified element name, * namespace and value */ - initWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval; /** * \return A new autoreleased OFString representing the OFXMLElement as an * XML string */ - (OFString*)string; /** | > > > > > > > > > > > > > > > > > > | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | * \return An initialized OFXMLElement with the specified element name, * namespace and value */ - initWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval; /** * Initializes an already allocated OFXMLElement so that it only consists of the * specified text. * * \param text The text the element represents * \return An initialized OFXMLElement consisting of the specified text */ - initWithText: (OFString*)text; /** * Initializes an already allocated OFXMLElement so that it only consists of the * specified comment. * * \param comment The comment the element represents * \return An initialized OFXMLElement consisting of the specified comment */ - initWithComment: (OFString*)text; /** * \return A new autoreleased OFString representing the OFXMLElement as an * XML string */ - (OFString*)string; /** |
︙ | ︙ |
Modified src/OFXMLElement.m from [2e589492fa] to [33f24ec239].
︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 | namespace: (OFString*)ns stringValue: (OFString*)stringval { return [[[self alloc] initWithName: name namespace: ns stringValue: stringval] autorelease]; } - init { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } | > > > > > > > > > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | namespace: (OFString*)ns stringValue: (OFString*)stringval { return [[[self alloc] initWithName: name namespace: ns stringValue: stringval] autorelease]; } + elementWithText: (OFString*)text { return [[[self alloc] initWithText: text] autorelease]; } + elementWithComment: (OFString*)comment { return [[[self alloc] initWithComment: comment] autorelease]; } - init { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } |
︙ | ︙ | |||
84 85 86 87 88 89 90 | namespace: (OFString*)ns stringValue: (OFString*)stringval { self = [super init]; name = [name_ copy]; namespace = [ns copy]; | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 | namespace: (OFString*)ns stringValue: (OFString*)stringval { self = [super init]; name = [name_ copy]; namespace = [ns copy]; if (stringval != nil) { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];; [self addChild: [OFXMLElement elementWithText: stringval]]; [pool release]; } namespaces = [[OFMutableDictionary alloc] initWithKeysAndObjects: @"http://www.w3.org/XML/1998/namespace", @"xml", @"http://www.w3.org/2000/xmlns/", @"xmlns", nil]; return self; } - initWithText: (OFString*)text_ { self = [super init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; text = [[text_ stringByXMLEscaping] retain]; [pool release]; } @catch (OFException *e) { [self dealloc]; @throw e; } return self; } - initWithComment: (OFString*)comment_ { self = [super init]; @try { comment = [[OFMutableString alloc] initWithString: @"<!--"]; [comment appendString: comment_]; [comment appendString: @"-->"]; } @catch (OFException *e) { [self dealloc]; @throw e; } return self; } - (OFString*)_stringWithParentNamespaces: (OFDictionary*)parent_namespaces parentDefaultNamespace: (OFString*)parent_default_ns { OFAutoreleasePool *pool, *pool2; char *str_c; size_t len, i, j, attrs_count; OFString *prefix = nil; OFXMLAttribute **attrs_carray; OFString *ret, *tmp; OFMutableDictionary *all_namespaces; OFString *def_ns; if (text != nil) return [[text retain] autorelease]; if (comment != nil) return [[comment retain] autorelease]; pool = [[OFAutoreleasePool alloc] init]; def_ns = (defaultNamespace != nil ? defaultNamespace : parent_default_ns); if (parent_namespaces != nil) { OFEnumerator *key_enum = [namespaces keyEnumerator]; OFEnumerator *obj_enum = [namespaces objectEnumerator]; id key, obj; |
︙ | ︙ | |||
208 209 210 211 212 213 214 | i += [tmp cStringLength]; str_c[i++] = '\''; [pool2 releaseObjects]; } /* Childen */ | < < < | | | | | | | | | | | | < | < < | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | i += [tmp cStringLength]; str_c[i++] = '\''; [pool2 releaseObjects]; } /* Childen */ if (children != nil) { OFXMLElement **children_carray = [children cArray]; size_t children_count = [children count]; IMP append; tmp = [OFMutableString string]; append = [tmp methodForSelector: @selector(appendCStringWithoutUTF8Checking:)]; for (j = 0; j < children_count; j++) append(tmp, @selector( appendCStringWithoutUTF8Checking:), [[children_carray[j] _stringWithParentNamespaces: all_namespaces parentDefaultNamespace: defaultNamespace] cString]); len += [tmp cStringLength] + [name cStringLength] + 2; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (OFException *e) { [self freeMemory: str_c]; |
︙ | ︙ | |||
286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 | { return [self _stringWithParentNamespaces: nil parentDefaultNamespace: nil]; } - (void)addAttribute: (OFXMLAttribute*)attr { if (attributes == nil) attributes = [[OFMutableArray alloc] init]; /* FIXME: Prevent having it twice! */ [attributes addObject: attr]; } - (void)addAttributeWithName: (OFString*)name_ stringValue: (OFString*)value { | > > > > | > > > > > > | > > > > > > | > > > > > > > > | < > > | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 | { return [self _stringWithParentNamespaces: nil parentDefaultNamespace: nil]; } - (void)addAttribute: (OFXMLAttribute*)attr { if (name == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if (attributes == nil) attributes = [[OFMutableArray alloc] init]; /* FIXME: Prevent having it twice! */ [attributes addObject: attr]; } - (void)addAttributeWithName: (OFString*)name_ stringValue: (OFString*)value { OFAutoreleasePool *pool; if (name == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; pool = [[OFAutoreleasePool alloc] init]; [self addAttribute: [OFXMLAttribute attributeWithName: name_ namespace: nil stringValue: value]]; [pool release]; } - (void)addAttributeWithName: (OFString*)name_ namespace: (OFString*)ns stringValue: (OFString*)value { OFAutoreleasePool *pool; if (name == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; pool = [[OFAutoreleasePool alloc] init]; [self addAttribute: [OFXMLAttribute attributeWithName: name_ namespace: ns stringValue: value]]; [pool release]; } /* TODO: Replace attribute */ /* TODO: Remove attribute */ - (void)setPrefix: (OFString*)prefix forNamespace: (OFString*)ns { if (name == nil || prefix == nil || [prefix isEqual: @""]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if (ns == nil) ns = @""; [namespaces setObject: prefix forKey: ns]; } - (OFString*)defaultNamespace { if (name == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; return [[defaultNamespace retain] autorelease]; } - (void)setDefaultNamespace: (OFString*)ns { if (name == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; OFString *old = defaultNamespace; defaultNamespace = [ns copy]; [old release]; } - (void)addChild: (OFXMLElement*)child { if (name == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if (children == nil) children = [[OFMutableArray alloc] init]; [children addObject: child]; } - (void)dealloc { [name release]; [namespace release]; [attributes release]; [namespaces release]; [children release]; [text release]; [comment release]; [super dealloc]; } @end |
Modified tests/OFXMLElementTests.m from [0b94bf1d4a] to [e3337d2bec].
︙ | ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 | (elem[3] = [OFXMLElement elementWithName: @"foo" namespace: @"urn:objfw:test" stringValue: @"x"]) && R([elem[3] setPrefix: @"objfw-test" forNamespace: @"urn:objfw:test"]) && [[elem[3] string] isEqual: @"<objfw-test:foo>x</objfw-test:foo>"]) TEST(@"-[addAttributeWithName:stringValue:]", R([elem[0] addAttributeWithName: @"foo" stringValue: @"b&ar"]) && [[elem[0] string] isEqual: @"<foo foo='b&ar'/>"] && R([elem[1] addAttributeWithName: @"foo" stringValue: @"b&ar"]) && [[elem[1] string] isEqual: @"<foo foo='b&ar'>b&ar</foo>"]) | > > > > > > > > | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | (elem[3] = [OFXMLElement elementWithName: @"foo" namespace: @"urn:objfw:test" stringValue: @"x"]) && R([elem[3] setPrefix: @"objfw-test" forNamespace: @"urn:objfw:test"]) && [[elem[3] string] isEqual: @"<objfw-test:foo>x</objfw-test:foo>"]) TEST(@"+[elementWithText:]", (elem[3] = [OFXMLElement elementWithText: @"<foo>"]) && [[elem[3] string] isEqual: @"<foo>"]) TEST(@"+[elementWithComment:]", (elem[3] = [OFXMLElement elementWithComment: @" comment "]) && [[elem[3] string] isEqual: @"<!-- comment -->"]) TEST(@"-[addAttributeWithName:stringValue:]", R([elem[0] addAttributeWithName: @"foo" stringValue: @"b&ar"]) && [[elem[0] string] isEqual: @"<foo foo='b&ar'/>"] && R([elem[1] addAttributeWithName: @"foo" stringValue: @"b&ar"]) && [[elem[1] string] isEqual: @"<foo foo='b&ar'>b&ar</foo>"]) |
︙ | ︙ |