redom 0.1.0 → 0.1.1

data/lib/redom/runtime.rb

@@ -8,7 +8,7 @@ module Redom
   TYPE_PROXY     = 1,
   TYPE_ARRAY     = 2,
   TYPE_ERROR     = 3,
-  TYPE_METHOD    = 4
+  TYPE_METHOD    = 4,
 
   REQ_HANDSHAKE         = 0,
   REQ_METHOD_INVOCATION = 1,
@@ -19,26 +19,24 @@ module Redom
   P_INFO_NAME = 2,
   P_INFO_ARGS = 3;
 
+  var connections = {};
+
   if (window.Opal) {
-    Object.prototype.$djsCall = function(name) {
-        if (name == '') {
-          return (function(obj) {
-            return function(key) {
-              return obj[key];
-             };
-        })(this);
+    Opal.$method = function(cid, name) {
+      if (Opal.top['$' + name]) {
+        return Opal.top['$' + name];
+      } else {
+        return connections[cid](name);
       }
+    }
 
-      if (name == '$method') {
-        return function(methodName) {
-          if (Opal.top['$' + methodName]) {
-            return Opal.top['$' + methodName];
-          } else {
-            return function(e) {
-              window.djs.invoke(methodName, [e]);
-            };
-          }
-        };
+    Object.prototype.$djsCall = function(name) {
+      if (name == '') {
+        return (function(obj) {
+          return function(key) {
+            return obj[key];
+          };
+        })(this);
       }
 
       if (Opal.top[name]) {
@@ -55,7 +53,7 @@ module Redom
       if (name[0] == "$" && this[name] == null) {
         name = name.substring(1);
       };
-
+      
       if (this[name] != null) {
         if (typeof this[name] == 'function') {
           return (function(obj) {
@@ -81,7 +79,7 @@ module Redom
           };
         }
       }
-
+  
       return function() {
         return null;
       };
@@ -97,6 +95,7 @@ module Redom
     Opal.top.$document = window.document;
     Opal.top.$navigator = window.navigator;
     Opal.top.$location = window.location;
+    Opal.top.$history = window.history;
   }
 
   var Redom = function(server) {
@@ -165,7 +164,7 @@ module Redom
     // Close this WebSocket connection
     function close() {
       ws.close();
-    }
+    };
 
     // Serialize JavaScript object into message
     function serialize(data) {
@@ -190,7 +189,7 @@ module Redom
           return refs.get(args[1]);
           break;
         case TYPE_METHOD:
-          return (function(name) {
+          return (function(cid, name) {
             if (window[name] && typeof(window[name]) == 'function') {
               return function() {
                 window[name];
@@ -209,10 +208,10 @@ module Redom
                       break;
                   }
                 }
-                ws.send(serialize([REQ_METHOD_INVOCATION, name, args]));
+                ws.send(serialize([REQ_METHOD_INVOCATION, cid, name, args]));
               }
             }
-          })(args[1]);
+          })(args[1], args[2]);
           break;
         }
       } else {
@@ -233,7 +232,7 @@ module Redom
 
         if (rcvr) {
           result = execute(rcvr, name, args);
-          if (result == undefined) {
+          if (typeof result == "undefined") {
             rsps.push([oid, [TYPE_UNDEFINED]]);
             ws.send(serialize([REQ_PROXY_RESULT, tid, rsps]));
             return;
@@ -250,9 +249,19 @@ module Redom
             };
           }
         } else {
-          rsps.push([oid, TYPE_ERROR, "no such object. ID='" + proxy[P_INFO_RCVR] + "'."]);
-          ws.send(serialize([REQ_PROXY_RESULT, tid, rsps]));
-          return;
+          if (name) {
+            rsps.push([oid, TYPE_ERROR, "no such object. ID='" + proxy[P_INFO_RCVR] + "'."]);
+            ws.send(serialize([REQ_PROXY_RESULT, tid, rsps]));
+            return;
+          } else {
+            connections[args] = (function(ws, cid) {
+              return function(name) {
+                return function(e) {
+                  ws.send(serialize([REQ_METHOD_INVOCATION, cid, name, [[TYPE_PROXY, refs.put(e)]]]));
+                };
+              };
+            })(ws, args);
+          }
         }
       }
       ws.send(serialize([REQ_PROXY_RESULT, tid, rsps]));
@@ -278,7 +287,7 @@ module Redom
           return TYPE_METHOD;
       }
       return TYPE_UNDEFINED;
-    }
+    };
 
     // Method invocation
     function execute(rcvr, name, args) {
@@ -297,6 +306,7 @@ module Redom
           result = rcvr[name];
           if (typeof result == "function") {
             result = result.apply(rcvr, args);
+            result = typeof result == "undefined" ? null : result;
           }
         }
       }

data/lib/redom/version.rb

@@ -1,3 +1,3 @@
 module Redom
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000Z
+date: 2012-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70180056191480 !ruby/object:Gem::Requirement
+  requirement: &70227380221180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70180056191480
+  version_requirements: *70227380221180
 - !ruby/object:Gem::Dependency
   name: opal
-  requirement: &70180056190760 !ruby/object:Gem::Requirement
+  requirement: &70227380220300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 0.3.27
   type: :runtime
   prerelease: false
-  version_requirements: *70180056190760
+  version_requirements: *70227380220300
 description: A distributed object based server-centric web framework.
 email: future.azure@gmail.com
 executables: