Changeset 14252 for lang/objective-c

Timestamp:

06/19/08 16:05:22 (5 years ago)

Author:

lyokato

Message:

lang/objective-c/Atompub: made trunk and tags directory, and moved files appropriately

Location:

lang/objective-c/Atompub

Files:

• tags (added)
• trunk (added)
• trunk/Classes (moved) (moved from lang/objective-c/Atompub/Classes)
• trunk/Classes/AtomService.m (modified) (1 diff)
• trunk/Classes/AtompubClient.h (modified) (7 diffs)
• trunk/Classes/AtompubClient.m (modified) (11 diffs)
• trunk/EXAMPLE.txt (moved) (moved from lang/objective-c/Atompub/EXAMPLE.txt)
• trunk/README.txt (moved) (moved from lang/objective-c/Atompub/README.txt) (1 diff)
• trunk/TASK.txt (moved) (moved from lang/objective-c/Atompub/TASK.txt) (1 diff)
• trunk/Tests (moved) (moved from lang/objective-c/Atompub/Tests)

lang/objective-c/Atompub/trunk/Classes/AtomService.m

@@ -52 +52 @@
 
 @end
+

lang/objective-c/Atompub/trunk/Classes/AtompubClient.h

@@ -1 +1 @@
 #import <Foundation/Foundation.h>
 #import "AtompubCredential.h"
+#import "AtompubClientDelegate.h"
+
+#define defaultTimeoutInterval 60.0
+
+typedef enum {
+  None,
+  GettingService,
+  GettingCategories,
+  GettingFeed,
+  GettingEntry,
+  GettingMedia,
+  PostingEntry,
+  PostingMedia,
+  PuttingEntry,
+  PuttingMedia,
+  DeletingEntry,
+  DeletingMedia
+} AtompubClientFetchMode;
 
 @class AtompubCacheStorage, AtomEntry;
@@ -6 +24 @@
 @interface AtompubClient : NSObject {
   NSObject <AtompubCredential> *credential;
-  id                            delegate;
-  unsigned int                  timeoutInterval;
-  NSString                     *agentName;
-  int                           fetchMode;
-  NSMutableData                *responseData;
-  NSHTTPURLResponse            *lastResponse;
-  NSURLConnection              *connection;
-  AtompubCacheStorage          *cacheStorage;
-  NSURL                        *lastRequestURL;
+  NSObject <AtompubClientDelegate> *delegate;
+  unsigned int timeoutInterval;
+  NSString *agentName;
+  AtompubClientFetchMode fetchMode;
+  NSMutableData *responseData;
+  NSHTTPURLResponse *lastResponse;
+  NSURLConnection *connection;
+  AtompubCacheStorage *cacheStorage;
+  NSURL *lastRequestURL;
 }
 
@@ -24 +42 @@
 - (AtompubCacheStorage *)cacheStorage;
 - (void)setCacheStorage:(AtompubCacheStorage *)storage;
-- (id)delegate;
-- (void)setDelegate:(id)target;
+- (NSObject <AtompubClientDelegate> *)delegate;
+- (void)setDelegate:(NSObject <AtompubClientDelegate> *)target;
 - (void)setCredential:(NSObject <AtompubCredential> *)aCredential;
 - (unsigned int)timeoutInterval;
@@ -49 +67 @@
                contentType:(NSString *)aType
                       slug:(NSString *)slug;
+- (void)cancel;
+- (void)closeConnection;
+- (void)clear;
+- (void)dealloc;
+@end
+
+
+@interface AtompubClient (PrivateMethods)
 - (void)connection:(NSURLConnection *)conn
 didReceiveResponse:(NSURLResponse *)response;
@@ -56 +82 @@
   didFailWithError:(NSError *)error;
 - (void)connectionDidFinishLoading:(NSURLConnection *)conn;
-- (void)cancel;
-- (void)closeConnection;
-- (void)clear;
-- (void)dealloc;
 - (void)startLoadingResponseWithURL:(NSURL *)url
-                               mode:(int)mode;
+                               mode:(AtompubClientFetchMode)mode;
 - (void)startConnectionWithRequest:(NSMutableURLRequest *)request
-                              mode:(int)mode;
+                              mode:(AtompubClientFetchMode)mode;
 - (void)dispatchErrorWithStatus:(int)status
                     description:(NSString *)description;
@@ -70 +92 @@
                   contentType:(NSString *)aType
                          slug:(NSString *)slug
-                         mode:(int)mode;
+                         mode:(AtompubClientFetchMode)mode;
 - (void)startUpdatingResource:(NSData *)resource
                       withURL:(NSURL *)url
                   contentType:(NSString *)aType
-                         mode:(int)mode;
+                         mode:(AtompubClientFetchMode)mode;
 - (void)startDeletingResourceWithURL:(NSURL *)url
-                                mode:(int)mode;
+                                mode:(AtompubClientFetchMode)mode;
 - (void)handleResponseWithType:(NSString *)aType
                     dispatcher:(SEL)dispatcher
@@ -85 +107 @@
 - (void)handleResponseForPuttingOrDeletingResourceWithDispatcher:(SEL)dispatcher;
 @end
-

lang/objective-c/Atompub/trunk/Classes/AtompubClient.m

@@ -9 +9 @@
 #import "AtompubCacheStorage.h"
 
-#define defaultTimeoutInterval 60.0
-
-enum FetchMode {
-  None,
-  GettingService,
-  GettingCategories,
-  GettingFeed,
-  GettingEntry,
-  GettingMedia,
-  PostingEntry,
-  PostingMedia,
-  PuttingEntry,
-  PuttingMedia,
-  DeletingEntry,
-  DeletingMedia
-};
-
 @implementation AtompubClient
 
@@ -130 +113 @@
 
 - (void)startLoadingResponseWithURL:(NSURL *)url
-                               mode:(int)mode {
+                               mode:(AtompubClientFetchMode)mode {
   if ([ self isFetching ])
     return;
@@ -212 +195 @@
                   contentType:(NSString *)aType
                          slug:(NSString *)slug
-                         mode:(int)mode {
+                         mode:(AtompubClientFetchMode)mode {
   if ([ self isFetching ])
     return;
@@ -263 +246 @@
                       withURL:(NSURL *)url
                   contentType:(NSString *)aType
-                         mode:(int)mode {
+                         mode:(AtompubClientFetchMode)mode {
 
   if ([ self isFetching ])
@@ -310 +293 @@
 
 - (void)startDeletingResourceWithURL:(NSURL *)url
-                                mode:(int)mode {
+                                mode:(AtompubClientFetchMode)mode {
   if ([ self isFetching ])
     return;
@@ -330 +313 @@
 
 - (void)startConnectionWithRequest:(NSMutableURLRequest *)request
-                              mode:(int)mode {
+                              mode:(AtompubClientFetchMode)mode {
   connection = [ [ NSURLConnection alloc ] initWithRequest:request
                                                   delegate:self ];
@@ -372 +355 @@
 
   NSLog(@"finished loading");
-  int mode = fetchMode;
+  AtompubClientFetchMode mode = fetchMode;
 
   [ self closeConnection ];
@@ -445 +428 @@
   if (status >= 200 && status < 300) {
     if (status != 200 && status != 204)
-      NSLog([ NSString stringWithFormat:@"Bad status code: %d", status ]);
+      NSLog(@"Bad status code: %d", status);
     [ cacheStorage removeCacheForURL:lastRequestURL ];
     if (delegate != nil
@@ -465 +448 @@
 
     if (status != 201)
-      NSLog( [ NSString stringWithFormat:@"Bad status code: %d", status ] );
+      NSLog(@"Bad status code: %d", status);
 
     NSString *type = (NSString *)[ headers objectForKey:@"Content-Type" ];
     if (![ type isEqualToString:@"application/atom+xml;type=entry" ])
-      NSLog( [ NSString stringWithFormat:@"Bad Content-Type: %@", type ] );
+      NSLog(@"Bad Content-Type: %@", type);
 
     NSString *location = (NSString *)[ headers objectForKey:@"Location" ];
@@ -509 +492 @@
     //if (![ type isEqualToString:@"application/atomsvc+xml" ])
     if (![ type isEqualToString:@"application/atom+xml;type=entry" ])
-      NSLog( [ NSString stringWithFormat:@"Bad Content-Type: %@", type ] );
+      NSLog(@"Bad Content-Type: %@", type);
     if (cacheStorage != nil) {
       AtompubCache *newCache = [ AtompubCache cache ];
@@ -622 +605 @@
     //if (![ type isEqualToString:@"application/atomsvc+xml" ])
     if (![ type isEqualToString:aType ])
-      NSLog( [ NSString stringWithFormat:@"Bad Content-Type: %@", type ] );
+      NSLog(@"Bad Content-Type: %@", type);
     NSXMLDocument *doc =
       [ [ NSXMLDocument alloc ] initWithData:responseData

lang/objective-c/Atompub/trunk/README.txt

@@ -14 +14 @@
 ** SSCrypto
 
-Copyright (c) 2003-2006, Septicus Software All rights reserved.
-
 This library depends on SSCrypto by SEPTICUS SOFTWARE(BSD License).
 (http://septicus.com/products/opensource/)
 See the document.
  
+Copyright (c) 2003-2006, Septicus Software All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

lang/objective-c/Atompub/trunk/TASK.txt

@@ -11 +11 @@
 - add KeyChain controller to each AtompubCredential class for both Mac OSX and iPhone OS
 - make this package one single framework.
+