goat 0.3.11 → 0.3.12

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.11'
+  s.version = '0.3.12'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat/goat.js

@@ -1,33 +1,18 @@
 (function(){
   var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
-  // The base Class implementation (does nothing)
   this.Class = function(){};
-  
-  // Create a new Class that inherits from this class
   Class.extend = function(prop) {
     var _super = this.prototype;
-    
-    // Instantiate a base class (but only create the instance,
-    // don't run the init constructor)
     initializing = true;
     var prototype = new this();
     initializing = false;
-    
-    // Copy the properties over onto the new prototype
     for (var name in prop) {
-      // Check if we're overwriting an existing function
       prototype[name] = typeof prop[name] == "function" && 
         typeof _super[name] == "function" && fnTest.test(prop[name]) ?
         (function(name, fn){
           return function() {
             var tmp = this._super;
-            
-            // Add a new ._super() method that is the same method
-            // but on the super-class
             this._super = _super[name];
-            
-            // The method only need to be bound temporarily, so we
-            // remove it when we're done executing
             var ret = fn.apply(this, arguments);        
             this._super = tmp;
             
@@ -36,23 +21,14 @@
         })(name, prop[name]) :
         prop[name];
     }
-    
-    // The dummy class constructor
     function Class() {
       // All construction is actually done in the init method
       if ( !initializing && this.init )
         this.init.apply(this, arguments);
     }
-    
-    // Populate our constructed prototype object
     Class.prototype = prototype;
-    
-    // Enforce the constructor to be what we expect
     Class.constructor = Class;
-
-    // And make this class extendable
     Class.extend = arguments.callee;
-    
     return Class;
   };
 })();
@@ -67,12 +43,9 @@ String.random = function string_random(len, pref) {
   return pref ? (pref + '_' + str) : str;
 }
 
-$(document).ready(function() {
-  Goat.loadComponents();
-  setTimeout(function() { if(Goat.page_id) Goat.openChannel(); }, 1000);
-});
+var Goat = {}
 
-var GoatRT = {
+Goat.RT = {
   version: 0,
   pendingTxns: {},
   ops: {},
@@ -171,7 +144,7 @@ var GoatRT = {
   }
 
   function newTxn() {
-    var op = new RTTxn();
+    var op = new Goat.RTTxn();
     rt.ops[op.code] = op;
     return op;
   }
@@ -191,7 +164,7 @@ var GoatRT = {
       delete rt.pendingTxns[txn];
 
       if(pendingCount() == 0) {
-        LoadingIndicator.hide();
+        Goat.LoadingIndicator.hide();
       }
 
       if(txn.complete) txn.complete();
@@ -213,9 +186,9 @@ var GoatRT = {
   rt.txnCompleteMsg = txnCompleteMsg;
 
   return rt;
-})(GoatRT);
+})(Goat.RT);
 
-var LoadingIndicator = {
+Goat.LoadingIndicator = {
   url: null,
   indicator: null,
   where: null,
@@ -247,9 +220,9 @@ var LoadingIndicator = {
   ld.hide = hide;
 
   return ld;
-})(LoadingIndicator);
+})(Goat.LoadingIndicator);
 
-var RTTxn = Class.extend({
+Goat.RTTxn = Class.extend({
   init: function() {
     this.code = String.random(8, 'txn');
   },
@@ -263,7 +236,7 @@ var RTTxn = Class.extend({
   }
 });
 
-var GoatRPC = Class.extend({
+Goat.RPC = Class.extend({
   init: function(c, n) {
     this.component = c;
     this.name = n;
@@ -324,14 +297,14 @@ var GoatRPC = Class.extend({
     data['args'] = JSON.stringify(this.args);
 
     if(this.rt) {
-      var txn = GoatRT.newTxn();
+      var txn = Goat.RT.newTxn();
       data['rttxn'] = txn.code;
       txn.onComplete(this.updateComplete);
-      GoatRT.beginTxn(txn);
+      Goat.RT.beginTxn(txn);
     }
 
     if(this.start) this.start()
-    else if(this.rt) LoadingIndicator.show();
+    else if(this.rt) Goat.LoadingIndicator.show();
 
     $.ajax({
       type: 'POST',
@@ -352,20 +325,20 @@ var GoatRPC = Class.extend({
   }
 });
 
-var Goat = {
-  channelOpenFails: 0,
-  activeChannel: null,
-  pageDead: false,
-  components: {},
-  page_id: null
-}
-
 function closure(target, fn) {
   return function() {
     return fn.apply(target, arguments);
   }
 }
 
+$.extend(Goat, {
+  channelOpenFails: 0,
+  activeChannel: null,
+  pageDead: false,
+  components: {},
+  page_id: null
+});
+
 $.extend(Goat, {
   closure: function(fn) { return closure(this, fn); },
   
@@ -394,7 +367,7 @@ $.extend(Goat, {
 
     var t = m['type'];
     if(t == 'component_updated') {
-      GoatRT.updateReceived(m);
+      Goat.RT.updateReceived(m);
     } else if(t == 'redirect') {
       console.log("Redirecting to " + m['location']);
       sleep(2);
@@ -403,7 +376,7 @@ $.extend(Goat, {
       alert("Due to inactivity, you'll need to refresh this page.");
       Goat.setPageDead();
     } else if(t == 'txn_complete') {
-      GoatRT.txnCompleteMsg(m);
+      Goat.RT.txnCompleteMsg(m);
     } else if(t == 'alert') {
       this.showAlert(m);
     } else {
@@ -468,7 +441,7 @@ $.extend(Goat, {
       });
 
       var base = Goat.channelURL();
-      var src = base + '?_id=' + Goat.page_id + '&jsonp=' + jsonp + '&version=' + GoatRT.version;
+      var src = base + '?_id=' + Goat.page_id + '&jsonp=' + jsonp + '&version=' + Goat.RT.version;
       
       scriptTag.addEventListener('load', function() { cleanup(); Goat.reopenChannel(); }, false);
       scriptTag.addEventListener('error', function() { cleanup(); logError(); Goat.reopenChannel(); }, false);
@@ -514,3 +487,9 @@ $.extend(Goat, {
     });
   }
 });
+
+$(document).ready(function() {
+  Goat.loadComponents();
+  setTimeout(function() { if(Goat.page_id) Goat.openChannel(); }, 1000);
+});
+

data/lib/goat/js/component.js

@@ -23,7 +23,7 @@ var Component = Class.extend({
   },
   
   rpc: function(name) {
-    return new GoatRPC(this, name);
+    return new Goat.RPC(this, name);
   },
   
   $: function(sel) {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Patrick Collison