Changeset 26085

Timestamp:

12/08/08 07:52:49 (4 years ago)

Author:

suVene

Message:

*libty.js bug fix.
*それに伴うmulti_requester.jsの修正
*subject_test.js rename to subject_hatelabo_bottle.js(途中)
*etc.

Location:

lang/javascript/vimperator-plugins

Files:

• branches/1.2/multi_requester.js (modified) (3 diffs)
• trunk/libly.js (modified) (3 diffs)
• trunk/multi_requester.js (modified) (3 diffs)
• trunk/notifier.js (modified) (3 diffs)
• trunk/notifier/observer_growl.js (modified) (1 diff)
• trunk/notifier/subject_hatelabo_bottle.js (moved) (moved from lang/javascript/vimperator-plugins/trunk/notifier/subject_test.js) (2 diffs)

lang/javascript/vimperator-plugins/branches/1.2/multi_requester.js

@@ -5 +5 @@
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.4.2
+ * @version          0.4.3
  * @minVersion       1.2
  * @maxVersion       1.2
- * Last Change:      07-Dec-2008.
+ * Last Change:      08-Dec-2008.
  * ==/VimperatorPlugin==
  *
@@ -361 +361 @@
         try {
 
-            if (!res.isSuccess || res.responseText == '') throw 'response is fail or null';
+            if (!res.isSuccess() || res.responseText == '') throw 'response is fail or null';
 
             url = res.req.url;
@@ -373 +373 @@
             }
 
-            doc = res.getHTMLDocument(xpath);
+            doc = res.getHTMLDocument(xpath, null, res.req.options.siteinfo.ignoreTags);
             if (!doc) throw 'XPath result is undefined or null.: XPath -> ' + xpath;
 

lang/javascript/vimperator-plugins/trunk/libly.js

@@ -5 +5 @@
  * @description-ja  適当なライブラリっぽいものたち
  * @author          suVene suvene@zeromemory.info
- * @version         0.1.0
+ * @version         0.1.1
  * @minVersion      1.2
  * @maxVersion      2.0pre
- * Last Change:     07-Dec-2008.
+ * Last Change:     08-Dec-2008.
  * ==/VimperatorPlugin==
  *
@@ -247 +247 @@
         this.req = req;
         this.transport = req.transport;
-        this.isSuccess = req.isSuccess();
+        this.isSuccess = req.isSuccess;
         this.readyState = this.transport.readyState;
 
@@ -267 +267 @@
         } catch (e) { return ''; }
     },
-    getHTMLDocument: function(xpath, xmlns) {
+    getHTMLDocument: function(xpath, xmlns, ignoreTags) {
         if (!this.doc) {
             this.htmlFragmentstr = this.responseText.replace(/^[\s\S]*?<html(?:[ \t\n\r][^>]*)?>|<\/html[ \t\r\n]*>[\S\s]*$/ig, '').replace(/[\r\n]+/g, ' ');
-            let ignoreTags = ['script'];
-            if (this.req.options.siteinfo.ignoreTags) {
-                ignoreTags.concat(this.req.options.siteinfo.ignoreTags.split(','));
-            }
-            this.htmlStripScriptFragmentstr = lib.$U.stripTags(this.htmlFragmentstr, 'script');
+            var iTags = ['script'];
+            if (ignoreTags) {
+                iTags.concat(ignoreTags.split(','));
+            }
+            this.htmlStripScriptFragmentstr = lib.$U.stripTags(this.htmlFragmentstr, iTags);
             this.doc = this._createHTMLDocument(this.htmlStripScriptFragmentstr, xmlns);
         }

lang/javascript/vimperator-plugins/trunk/multi_requester.js

@@ -5 +5 @@
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.4.2
+ * @version          0.4.3
  * @minVersion       2.0pre
  * @maxVersion       2.0pre
- * Last Change:      07-Dec-2008.
+ * Last Change:      08-Dec-2008.
  * ==/VimperatorPlugin==
  *
@@ -366 +366 @@
         try {
 
-            if (!res.isSuccess || res.responseText == '') throw 'response is fail or null';
+            if (!res.isSuccess() || res.responseText == '') throw 'response is fail or null';
 
             url = res.req.url;
@@ -378 +378 @@
             }
 
-            doc = res.getHTMLDocument(xpath);
+            doc = res.getHTMLDocument(xpath, null, res.req.options.siteinfo.ignoreTags);
             if (!doc) throw 'XPath result is undefined or null.: XPath -> ' + xpath;
 

lang/javascript/vimperator-plugins/trunk/notifier.js

@@ -30 +30 @@
 function bootstrap() {
 
-    var lib = liberator.plugins.libly;
-    var $U = lib.$U;
+    var libly = liberator.plugins.libly;
+    var $U = libly.$U;
     var logger = $U.getLogger('notifier');
 
@@ -161 +161 @@
             );
 
-            liberator.plugins.notifier.lib = lib;
+            liberator.plugins.notifier.libly = libly;
             liberator.plugins.notifier.Message = Message;
 
@@ -214 +214 @@
             }), 10);
 
-            logger.log('start end');
         },//}}}
         stop: function(finallycallback) {//{{{

lang/javascript/vimperator-plugins/trunk/notifier/observer_growl.js

@@ -18 +18 @@
 if (!notifier) return;
 
-var lib = notifier.lib;
-var $U = lib.$U;
+var libly = notifier.libly;
+var $U = libly.$U;
 var logger = $U.getLogger('observer_growl');
 

lang/javascript/vimperator-plugins/trunk/notifier/subject_hatelabo_bottle.js

@@ -1 +1 @@
 /**
  * notifier.js plugin subject
- * @name            subject_test.js
- * @description     notify if ...
- * @description-ja  ... の時ポップアップ通知。
+ * @name            subject_hatena_bottle.js
+ * @description     notify if hatena bottle changed.
+ * @description-ja  はてなボトルの変更通知。
  * @author          suVene suvene@zeromemory.info
  * @version         0.1.0
- * Last Change:     07-Dec-2008.
+ * Last Change:     08-Dec-2008.
  */
 (function() {
@@ -13 +13 @@
 if (!notifier) return;
 
-var lib = notifier.lib;
-var $U = lib.$U;
-var logger = $U.getLogger('subject_test');
+var libly = notifier.libly;
+var $U = libly.$U;
+var logger = $U.getLogger('subject_hatelabo_bottle');
+
+var URL = 'http://bottle.hatelabo.jp';
 
 notifier.subject.register({
-    interval: 3,
+    interval: 30,
     initialize: function() {
-        logger.log('initialize');
         this.count = 0;
+        this.initialized = false;
+        this.cache;
+
+        var req = new libly.Request(URL);
+        req.addEventListener('onSuccess', $U.bind(this, function(res) {
+            logger.log('initialized');
+            this.cache = this.parse(res);
+            if (this.cache)
+                this.initialized = true;
+        }));
+        req.get();
+    },
+    parse: function(res) {
+
+        var ret, dom;
+
+        if (!res.isSuccess() || res.responseText == '') return ret;
+
+        dom = res.getHTMLDocument('id("body")//div[contains(concat(" ", @class, " "), " entry ")]');
+        if (!dom) return ret;
+
+        ret = [];
+        for (let i = 0, len < dom.childNodes.length; i < len; i++) {
+            ret.push(dom.childNodes[i]);
+        }
+
+        return ret;
     },
     check: function() {
+
+        if (!this.initialized) return;
+
         this.count++;
         logger.log('check');
-        var req = new lib.Request(
-            'http://localhost:8080/index.html',
-            null,  // headers {}
-            {
-                encode: 'shift_jis'
-            }
-        );
+        var req = new libly.Request(URL);
         req.addEventListener('onSuccess', $U.bind(this, function(res) {
             var text = res.responseText;