Changeset 3246

Timestamp:

12/18/07 02:31:48 (13 months ago)

Author:

mootoh

Message:

re-writing with RubyCocoa?.

Location:

lang/objective-c/SafariHatenaBookmark

Files:

• Menu.nib/classes.nib (modified) (2 diffs)
• Menu.nib/keyedobjects.nib (modified) (previous)
• PluginLoader.h (modified) (1 diff)
• PluginLoader.m (modified) (2 diffs)
• SHBController.h (deleted)
• SHBController.m (modified) (4 diffs)
• SafariHatenaBookmark.xcodeproj/project.pbxproj (modified) (7 diffs)
• shb_controller.rb (added)
• shb_init.rb (added)

lang/objective-c/SafariHatenaBookmark/Menu.nib/classes.nib

@@ -14 +14 @@
                 </dict>
                 <dict>
-                        <key>ACTIONS</key>
-                        <dict>
-                                <key>bookmark</key>
-                                <string>id</string>
-                                <key>diary</key>
-                                <string>id</string>
-                                <key>haiku</key>
-                                <string>id</string>
-                        </dict>
                         <key>CLASS</key>
                         <string>SHBController</string>
@@ -29 +20 @@
                         <key>OUTLETS</key>
                         <dict>
-                                <key>topMenu</key>
-                                <string>NSMenu</string>
+                                <key>top_menu</key>
+                                <string>id</string>
                         </dict>
                         <key>SUPERCLASS</key>

lang/objective-c/SafariHatenaBookmark/PluginLoader.h

@@ -11 +11 @@
 @interface PluginLoader : NSObject {
 }
-+ (PluginLoader *) sharedInstance;
 
 @end

lang/objective-c/SafariHatenaBookmark/PluginLoader.m

@@ -7 +7 @@
 
 #import "PluginLoader.h"
-#import "SHBController.h"
+//#import "SHBController.h"
+#import <RubyCocoa/RubyCocoa.h>
 
 @implementation PluginLoader
-/**
- * A special method called by SIMBL once the application has started and all classes are initialized.
- */
-+ (void) load
+
++ (void) install
 {
 //        MySamplePlugin* plugin = [MySamplePlugin sharedInstance];
@@ -19 +18 @@
 
         NSLog(@"PluginLoader:load");
-        [[SHBController alloc] init];}
-
-/**
- * @return the single static instance of the plugin object
- */
-+ (PluginLoader *) sharedInstance
-{
-        static PluginLoader* plugin = nil;
-
-        if (plugin == nil)
-                plugin = [[PluginLoader alloc] init];
-
-        return plugin;
+        //[[SHBController alloc] init];
+        
+  static int installed = 0;
+  if (! installed) {
+    if (RBBundleInit("shb_init.rb", self, nil))
+      NSLog(@"PluginLoader.install: failed");
+    else
+      installed = 1;
+  }
 }
 @end

lang/objective-c/SafariHatenaBookmark/SHBController.m

@@ -48 +48 @@
 - (void) progressStarted: (NSNotification*) n
 {
-    WebView* webView = [n object];
-    WebDataSource* source = [[webView mainFrame] provisionalDataSource];
-    if (! source) {
-        // source = [[webView mainFrame] provisionalDataSource];
-    }
-    NSURL* cur_url = [[source request] URL];
+  WebView* webView = [n object];
+  WebDataSource* source = [[webView mainFrame] provisionalDataSource];
+  if (! source) {
+    // source = [[webView mainFrame] provisionalDataSource];
+  }
+  NSURL* cur_url = [[source request] URL];
 
-    NSLog(@"progressStarted: cur_url = %@", cur_url);
+  NSLog(@"progressStarted: cur_url = %@", cur_url);
 
   // construct request
@@ -80 +80 @@
 - (void) progressFinished: (NSNotification*) n
 {
-    WebView* webView = [n object];
-    //NSURL* url = WebFrameRequestURL([webView mainFrame]);
-    WebDataSource* source = [[webView mainFrame] provisionalDataSource];
-    if (! source) {
-        // source = [[webView mainFrame] provisionalDataSource];
-    }
-    NSURL* url = [[source request] URL];
-    NSLog(@"progressFinished: url = %@", url);
+  WebView* webView = [n object];
+  //NSURL* url = WebFrameRequestURL([webView mainFrame]);
+  WebDataSource* source = [[webView mainFrame] provisionalDataSource];
+  if (! source) {
+    // source = [[webView mainFrame] provisionalDataSource];
+  }
+  NSURL* url = [[source request] URL];
+  NSLog(@"progressFinished: url = %@", url);
 }
 
@@ -118 +118 @@
 // callbacks
 - (void) connection : (NSURLConnection *) connection
-         didReceiveResponse : (NSURLResponse *) response {
+didReceiveResponse : (NSURLResponse *) response {
   NSDictionary *dicHead = [(NSHTTPURLResponse *)response allHeaderFields];
   NSLog(@"didReceiveResponse : %@", [dicHead objectForKey:@"Status"]);
@@ -125 +125 @@
 
 - (void) connection : (NSURLConnection *) connection
-         didReceiveData : (NSData *) data {
+didReceiveData : (NSData *) data {
   [receivedData appendData:data];
 }
 
- - (void) connection : (NSURLConnection *) connection 
-        didFailWithError : (NSError *) error {
-        NSLog(@"didFailWithError 1");
-        // [connection release];
-        [receivedData release]; 
-        NSLog(@"didFailWithError 2");
+- (void) connection : (NSURLConnection *) connection 
+didFailWithError : (NSError *) error {
+  NSLog(@"didFailWithError 1");
+  // [connection release];
+  [receivedData release];       
+  NSLog(@"didFailWithError 2");
 }
 
 - (void) connectionDidFinishLoading:(NSURLConnection *)connection {
-        NSLog(@"connectionDidFinishLoading: succeeded to load %d bytes", [receivedData length]);
+  NSLog(@"connectionDidFinishLoading: succeeded to load %d bytes", [receivedData length]);
   NSString *result = [[NSString alloc] initWithData:receivedData encoding:NSUTF8StringEncoding];
   NSLog(@"connectionDidFinishLoading: result=%@", result);
-  id json = [result JSONValue];
-  NSLog(@"connectionDidFinishLoading: id=%@", json);
-  
-//      [connection release];
-        [receivedData release];
+  //id json = [result JSONValue];
+  //NSLog(@"connectionDidFinishLoading: id=%@", json);
+
+  //    [connection release];
+  [receivedData release];
 }
 
-
 @end

lang/objective-c/SafariHatenaBookmark/SafariHatenaBookmark.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* Begin PBXBuildFile section */
+                868C20510D16E39E00CA07C9 /* shb_init.rb in Resources */ = {isa = PBXBuildFile; fileRef = 868C20500D16E39E00CA07C9 /* shb_init.rb */; };
                 86A7D1C40D16634600D35D4C /* Info in Resources */ = {isa = PBXBuildFile; fileRef = 86A7D1C30D16634600D35D4C /* Info */; };
                 86A7D1C80D16635D00D35D4C /* Menu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 86A7D1C70D16635D00D35D4C /* Menu.nib */; };
-                86A7D1D10D16639600D35D4C /* SHBController.m in Sources */ = {isa = PBXBuildFile; fileRef = 86A7D1CE0D16639600D35D4C /* SHBController.m */; };
                 86A7D1D20D16639600D35D4C /* PluginLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 86A7D1D00D16639600D35D4C /* PluginLoader.m */; };
+                86B04CD30D16DDD300EB7A83 /* RubyCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86B04CD20D16DDD300EB7A83 /* RubyCocoa.framework */; };
+                86B04CE10D16DE6B00EB7A83 /* shb_controller.rb in Resources */ = {isa = PBXBuildFile; fileRef = 86B04CE00D16DE6B00EB7A83 /* shb_controller.rb */; };
                 86C597AA0D166CC10000340D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86C597A90D166CC10000340D /* WebKit.framework */; };
-                86C597D00D1673140000340D /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86C597CF0D1673140000340D /* JSON.framework */; };
                 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
                 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
@@ -24 +25 @@
                 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                 32DBCF630370AF2F00C91783 /* SafariHatenaBookmark_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafariHatenaBookmark_Prefix.pch; sourceTree = "<group>"; };
+                868C20500D16E39E00CA07C9 /* shb_init.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = shb_init.rb; sourceTree = "<group>"; };
                 86A7D1C30D16634600D35D4C /* Info */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info; sourceTree = "<group>"; };
                 86A7D1C70D16635D00D35D4C /* Menu.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = Menu.nib; sourceTree = "<group>"; };
-                86A7D1CD0D16639600D35D4C /* SHBController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHBController.h; sourceTree = "<group>"; };
                 86A7D1CE0D16639600D35D4C /* SHBController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHBController.m; sourceTree = "<group>"; };
                 86A7D1CF0D16639600D35D4C /* PluginLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginLoader.h; sourceTree = "<group>"; };
                 86A7D1D00D16639600D35D4C /* PluginLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginLoader.m; sourceTree = "<group>"; };
+                86B04CD20D16DDD300EB7A83 /* RubyCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RubyCocoa.framework; path = /System/Library/Frameworks/RubyCocoa.framework; sourceTree = "<absolute>"; };
+                86B04CE00D16DE6B00EB7A83 /* shb_controller.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = shb_controller.rb; sourceTree = "<group>"; };
                 86C597A90D166CC10000340D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
-                86C597CF0D1673140000340D /* JSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JSON.framework; sourceTree = "<group>"; };
                 8D5B49B6048680CD000E48DA /* SafariHatenaBookmark.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SafariHatenaBookmark.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -44 +46 @@
                                 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
                                 86C597AA0D166CC10000340D /* WebKit.framework in Frameworks */,
-                                86C597D00D1673140000340D /* JSON.framework in Frameworks */,
+                                86B04CD30D16DDD300EB7A83 /* RubyCocoa.framework in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -66 +68 @@
                         isa = PBXGroup;
                         children = (
+                                86B04CD20D16DDD300EB7A83 /* RubyCocoa.framework */,
                                 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */,
                                 1058C7AEFEA557BF11CA2CBB /* Other Frameworks */,
@@ -86 +89 @@
                         isa = PBXGroup;
                         children = (
-                                86A7D1CD0D16639600D35D4C /* SHBController.h */,
                                 86A7D1CE0D16639600D35D4C /* SHBController.m */,
-                                86C597CF0D1673140000340D /* JSON.framework */,
                                 86C597A90D166CC10000340D /* WebKit.framework */,
                                 86A7D1CF0D16639600D35D4C /* PluginLoader.h */,
                                 86A7D1D00D16639600D35D4C /* PluginLoader.m */,
+                                86B04CE00D16DE6B00EB7A83 /* shb_controller.rb */,
+                                868C20500D16E39E00CA07C9 /* shb_init.rb */,
                         );
                         name = Classes;
@@ -176 +179 @@
                                 86A7D1C40D16634600D35D4C /* Info in Resources */,
                                 86A7D1C80D16635D00D35D4C /* Menu.nib in Resources */,
+                                86B04CE10D16DE6B00EB7A83 /* shb_controller.rb in Resources */,
+                                868C20510D16E39E00CA07C9 /* shb_init.rb in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -186 +191 @@
                         buildActionMask = 2147483647;
                         files = (
-                                86A7D1D10D16639600D35D4C /* SHBController.m in Sources */,
                                 86A7D1D20D16639600D35D4C /* PluginLoader.m in Sources */,
                         );