goat 0.3.45 → 0.3.46

data/lib/goat/extn.rb

@@ -39,7 +39,7 @@ class Object
     while c
       cs << c
       return cs if c == upto
-      raise "#{upto} isn't in the hierachy of #{start.inspect}" if c == Object && upto != Object
+      raise "#{start.inspect} isn't in the hierachy of #{upto}" if c == Object && upto != Object
 
       c = c.superclass
     end

data/lib/goat/goat.js

@@ -53,34 +53,40 @@ var Goat = {}
 Goat.RT = {
   version: 0,
   pendingTxns: {},
+  completedTxns: {},
   ops: {},
   consecutiveFailures: 0
 };
 
 (function(rt) {
   function updateFailed(msg) {
-    console.error(msg);
+    Goat.error('updateFailed', msg);
   }
 
   function node(par, pos) {
-    if(pos === null)
+    Goat.debug('node', par, pos, pos === null)
+    if(pos === null || pos === undefined)
       return $('#' + par);
     else
       return $("#" + par + " > :nth-child(" + (pos + 1) + ")");
   }
 
   function removeNode(par, pos, html) {
+    Goat.debug('removeNode', node(par, pos));
     node(par, pos).remove();
   }
 
   function addNode(par, pos, html) {
-    node(par, pos).before(html);
+    Goat.debug('addNode', node(par, pos), html);
+    if(pos == 0)
+      node(par).prepend(html)
+    else
+      node(par, pos - 1).after(html);
   }
 
   function replaceNode(par, pos, html) {
-    console.log("rep " + par + " " + pos);
-    console.log(node(par, pos));
-    node(par, pos).html(html);
+    Goat.warn('Replace fault', node(par, pos));
+    node(par, pos).replaceWith(html);
     if(pos === null)
       delete Goat.components[par];
   }
@@ -92,9 +98,10 @@ Goat.RT = {
     var html = up.html;
     var js = up.js;
     var css = up.css;
+    var id = up.id; // only for rem
 
     if(t == "rem") {
-      removeNode(par, pos, html);
+      removeNode(par, pos, id);
     } else if(t == "add") {
       addNode(par, pos, html);
     } else if(t == "rep") {
@@ -121,8 +128,6 @@ Goat.RT = {
     script.innerHTML = js;
     addToHead(script);
     Goat.loadComponents();
-    /*console.log("Eval " + js);
-    eval(js);*/
   }
 
   function updateReceived(m) {
@@ -164,31 +169,30 @@ Goat.RT = {
     return pending;
   }
 
-  function completeTxn(txn) {
-    if(rt.pendingTxns[txn]) {
-      delete rt.pendingTxns[txn];
+  function completeTxn(txnid) {
+    if(rt.pendingTxns[txnid]) {
+      var txn = rt.ops[txnid];
+
+      delete rt.pendingTxns[txnid];
+      rt.completedTxns[txnid] = true
 
       if(pendingCount() == 0) {
         Goat.LoadingIndicator.hide();
       }
 
       if(txn.complete) txn.complete();
+    } else if(rt.completedTxns[txnid]) {
+      Goat.warn('Duplicate txn_complete message for txn ' + txnid);
     } else {
-      console.error("Can't complete txn " + txn + ": no such txn was started");
+      Goat.error('Can\'t complete txn ' + txn + ': no such txn was started');
     }
   }
 
-  function txnCompleteMsg(msg) {
-    console.log('txnCompleteMsg');
-    console.log(msg);
-    completeTxn(msg['txn']);
-  }
-
   rt.updateReceived = updateReceived;
   rt.node = node;
   rt.newTxn = newTxn;
   rt.beginTxn = beginTxn;
-  rt.txnCompleteMsg = txnCompleteMsg;
+  rt.completeTxn = completeTxn;
 
   return rt;
 })(Goat.RT);
@@ -203,7 +207,7 @@ Goat.LoadingIndicator = {
 (function(ld) {
   function initIndicator() {
     if(!ld.url || !ld.where) {
-      console.error("Loading indicator not configured");
+      Goat.error("Loading indicator not configured");
       return;
     }
     ld.indicator = $("<img id=\"loading_indicator\" src=\"" + ld.url + "\">");
@@ -278,7 +282,7 @@ Goat.RPC = Class.extend({
   },
 
   rpcFailure: function() {
-    console.error("RPC error: couldn't load " + this.name);
+    Goat.error("RPC error: couldn't load " + this.name);
     alert("An error was encountered connecting to the server. This could be because of a problem with your internet connection, or with the server itself. You should try refreshing this page.");
     if(this.rpcError) this.rpcError(this);
   },
@@ -351,14 +355,28 @@ $.extend(Goat, {
   activeChannel: null,
   pageDead: false,
   components: {},
-  page_id: null
+  page_id: null,
 });
 
 $.extend(Goat, {
+  isLocal: function() { 
+    return window.location.host.match(/127\.0\.0\.1/) || window.location.host.match(/localhost/)
+  },
+
+  console_apply: function(f, a) {
+    if(this.isLocal() || f == 'warn' || f == 'error')
+      console[f].apply(console, a);
+  },
+
+  debug: function() { this.console_apply('debug', arguments); },
+  warn: function() { this.console_apply('warn', arguments); },
+  error: function() { this.console_apply('error', arguments); },
+  log: function() { this.console_apply('log', arguments); },
+
   closure: function(fn) { return closure(this, fn); },
   
   channelURL: function() {
-    if(window.location.host.match(/127\.0\.0\.1/) || window.location.host.match(/localhost/))
+    if(this.isLocal())
       return 'http://127.0.0.1:8050/channel';
     else
       return '/channel';
@@ -378,34 +396,34 @@ $.extend(Goat, {
   },
 
   messageReceived: function(m) {
-    console.log(m);
+    Goat.log('messageReceived', m.type, m);
 
     var t = m['type'];
     if(t == 'component_updated') {
       Goat.RT.updateReceived(m);
     } else if(t == 'redirect') {
       if(m["location"]) {
-        console.log("Redirecting to " + m['location']);
+        Goat.log('Redirecting to ' + m['location']);
         sleep(2);
         window.location = m['location'];
       } else {
-        console.error("Tried to redirect to null. Buggy message: " + m);
+        Goat.error('Tried to redirect to null. Buggy message: ', m);
       }
     } else if(t == 'page_expired') {
       alert("Due to inactivity, you'll need to refresh this page.");
       Goat.setPageDead();
     } else if(t == 'txn_complete') {
-      Goat.RT.txnCompleteMsg(m);
+      Goat.RT.completeTxn(m['txn']);
     } else if(t == 'alert') {
       this.showAlert(m);
     } else {
-      console.log("Unknown message type: " + m);
+      Goat.error('Unknown message type: ', m);
     }
   },
 
   channelDataReceived: function(data) {
     if(!data) {
-      console.log("Null data received in channelDataReceived")
+      Goat.error('Null data received in channelDataReceived')
       this.reopenChannel();
       return;
     }
@@ -415,12 +433,11 @@ $.extend(Goat, {
     if(data['messages']) {
       $(data['messages']).each(this.closure(function(i, m) { this.messageReceived(m) }));
     } else {
-      console.error("Bad channel data: " + data)
+      Goat.error('Bad channel data: ', data)
     }
   },
 
   reopenChannel: function() {
-    console.log("reopenChannel()");
     var fails = this.channelOpenFails;
     setTimeout(function() { Goat.openChannel(); }, Math.min(30000, Math.max(1000, Math.pow(1.5, fails))));
     this.channelOpenFails++;
@@ -428,14 +445,14 @@ $.extend(Goat, {
 
   openChannel: function() {
     if(Goat.pageDead) {
-      console.log("not opening channel: page dead");
+      Goat.log("not opening channel: page dead");
       return;
     }
 
-    console.log("opening channel");
+    Goat.debug("opening channel");
     
     if(this.activeChannel) {
-      console.error("can't open channel: channel already open");
+      Goat.error('can\'t open channel: channel already open');
       return;
     }
     
@@ -456,7 +473,7 @@ $.extend(Goat, {
     function injectScriptTag(tag) {
       
       var logError = closure(this, function() {
-        console.error("Goat: error loading " + src);
+        Goat.error('Goat: error loading ', src);
       });
 
       var base = Goat.channelURL();
@@ -487,8 +504,7 @@ $.extend(Goat, {
       cache: false,
       success: function(data) {},
       error: function(req, stat, err) {
-        console.log("submit form error");
-        console.log({req: req, status: stat, err: err});
+        Goat.error('submit form error', req, stat, err);
       }
     });
 
@@ -499,6 +515,12 @@ $.extend(Goat, {
     this.components[id] = obj;
   },
 
+  init: function() {
+    if(Goat.isLocal())
+      Goat.log('Running in debug mode');
+    this.loadComponents();
+  },
+
   loadComponents: function() {
     $.each(Goat.components, function(_, c) {
       if(!c.isLoaded())
@@ -508,7 +530,7 @@ $.extend(Goat, {
 });
 
 $(document).ready(function() {
-  Goat.loadComponents();
+  Goat.init();
   setTimeout(function() { if(Goat.page_id) Goat.openChannel(); }, 1000);
 });
 

data/lib/goat/state-srv.rb

@@ -22,6 +22,14 @@ module Goat
       send_message('register_page', 'pgid' => pgid, 'user' => user, 'components' => cs.map(&:to_hash))
     end
 
+    def self.update_page(pgid, txn, updates)
+      send_message('update_page',
+        'pgid' => pgid,
+        'txn' => txn,
+        'updates' => updates.map(&:to_hash)
+      )
+    end
+
     def self.live_components(cls, spec)
       resp = send_message('live_components', {'class' => cls, 'spec' => spec}, true)
       JSON.load(resp)['response'].map{|h| ComponentSkeleton.from_hash(h)}
@@ -36,17 +44,23 @@ module Goat
       components_updated(txn, pgid, [update])
     end
 
+    def self.components_update_completed(cs)
+      puts "Ack for components_updated: #{cs.inspect}"
+    end
+
     def self.components_updated(txn, pgid, updates)
-      send_message('components_updated',
+      send_message('components_updated', {
         'txn' => txn,
         'pgid' => pgid,
-        'updates' => updates.map(&:to_hash)
+        'updates' => updates.map(&:to_hash)},
+        true
       )
     end
   end
 
   class NoStateSrvConnectionError < RuntimeError; end
 
+  # this is an ugly mix of sync and async stuff
   class StateSrvConnection < EM::Connection
     include EM::P::LineText2
 
@@ -66,13 +80,29 @@ module Goat
       self.connect(@host, @port)
     end
 
-    def self.send_message_sync(msg)
-      s = TCPSocket.open(@host, @port)
-      s.write(msg.to_json + "\n")
-      resp = s.readline
+    def self.reconnect_sync
+      @sock = TCPSocket.open(@host, @port)
+    end
+
+    def self.sync_connection_active?
+      @sock && !@sock.closed?
+    end
+
+    def self.send_message_sync(msg, failed_last_time=false)
+      reconnect_sync unless sync_connection_active?
+      @sock.write(msg.to_json + "\n")
+      resp = @sock.readline
       Goat.logd("=> #{resp.inspect}") if $verbose
-      s.close
       resp
+    rescue Errno::ECONNRESET, EOFError => e
+      # almost certainly connection was closed and we didn't notice
+      if failed_last_time
+        raise e
+      else
+        Goat.logw "Reinitializing sync connection to state-srv (#{e.inspect})"
+        reconnect_sync
+        send_message_sync(msg, true)
+      end
     end
 
     def self.send_message(*args)
@@ -103,6 +133,16 @@ module Goat
       end
     end
 
+    def message_received(msg)
+      msg = msg['response']
+
+      if msg['type'] = 'update_ack'
+        StateSrvClient.components_update_completed(msg['components'])
+      else
+        raise "Unknown message type: #{msg['type']}"
+      end
+    end
+
     def send_message(t, msg, sync=false)
       msg = msg.merge('type' => t)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 3
-  - 45
-  version: 0.3.45
+  - 46
+  version: 0.3.46
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +00:00
+date: 2011-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +151,7 @@ files:
 - lib/goat/dynamic.rb
 - lib/goat/extn.rb
 - lib/goat/goat.js
-- lib/goat/html.rb
+- lib/goat/dom.rb
 - lib/goat/js/component.js
 - lib/goat/mongo.rb
 - lib/goat/net-common.rb

data/lib/goat/html.rb

@@ -1,301 +0,0 @@
-require 'rack/utils'
-
-module Goat
-  module DOMTools
-    class Traverser
-      def initialize(tree, dlg, transpose)
-        @tree = tree
-        @dlg = dlg
-        @transpose = transpose
-      end
-
-      def dom_node?(node)
-        node.is_a?(Array) && node.first.is_a?(Symbol)
-      end
-
-      def tag(node); node[0]; end
-      def attrs(node); node[1] if node[1].is_a?(Hash); end
-      def body(node); node[1].is_a?(Hash) ? node[2..-1] : node[1..-1]; end
-      def domid(node); attrs(node) ? attrs(node)[:id] : nil; end
-
-      def to_node(tag, attrs, body)
-        tag = [tag]
-        tag << attrs if attrs
-        tag << body
-      end
-
-      def replacement_block
-        @rep = nil
-        @replacement_block ||= lambda {|new| @rep = new}
-      end
-
-      def traverse(node)
-        if node.is_a?(String)
-          @dlg.string(node, &replacement_block)
-          @rep || node
-        elsif node == nil
-          @dlg.string('', &replacement_block)
-          @rep || nil
-        elsif dom_node?(node)
-          @dlg.node(node, &replacement_block)
-          rep = @rep || node
-
-          if @transpose
-            if rep != node
-              rep
-            else
-              to_node(tag(node), attrs(node), traverse(body(node)))
-            end
-          else
-            traverse(body(node))
-          end
-        elsif node.is_a?(Array)
-          if node.size == 1
-            traverse(node.first)
-          else
-            if @transpose
-              node.map{|x| traverse(x)}
-            else
-              node.each{|x| traverse(x)}
-            end
-          end
-        elsif node.kind_of?(Component)
-          @dlg.component(node, &replacement_block)
-          @rep || node
-        else
-          raise "Unknown object in the dom: #{node.inspect}"
-        end
-      end
-
-      def traverse!
-        traverse(@tree)
-      end
-
-      class BlockTraverser
-        # would be infinitely nicer if you could just yield from a block
-        def initialize(blk, transpose)
-          @blk = blk
-          @transpose = transpose
-        end
-
-        def node(node, &blk)
-          if @transpose
-            @blk.call(node, blk)
-          else
-            @blk.call(node)
-          end
-        end
-
-        def string(str, &blk)
-          if @transpose
-            @blk.call(str, blk)
-          else
-            @blk.call(str)
-          end
-        end
-
-        def component(c, &blk)
-          if @transpose
-            @blk.call(c, blk)
-          else
-            @blk.call(c)
-          end
-        end
-      end
-
-      def self.traverse(tree, dlg=nil, transpose=false, &blk)
-        d = nil
-
-        if dlg
-          d = dlg
-        elsif blk
-          d = BlockTraverser.new(blk, transpose)
-        else
-          raise "Need a delegate"
-        end
-
-        self.new(tree, d, transpose).traverse!
-      end
-
-      def self.transpose(tree, dlg=nil, &blk)
-        traverse(tree, dlg, true, &blk)
-      end
-    end
-
-    def self.traverse(tree, dlg=nil, &blk); Traverser.traverse(tree, dlg, &blk); end
-    def self.transpose(tree, dlg=nil, &blk); Traverser.transpose(tree, dlg, &blk); end
-
-    def self.expanded_dom(dom)
-      DOMTools.transpose(dom) do |elt, update|
-        if elt.kind_of?(Component)
-          raise "Component #{elt} has no ID: was super's initialize called?" unless elt.id
-          Dynamic[:expander].component_used(elt)
-          update.call(elt.component(elt.expanded_dom))
-        end
-      end
-    end
-
-    def self.inject_prefixes(id, dom)
-      DOMTools.traverse(dom) do |elt|
-        if elt.kind_of?(Array) && elt.first.is_a?(Symbol) && elt[1].is_a?(Hash)
-          attrs = elt[1]
-          elt[1] = attrs.map_to_hash do |k, v|
-            if v.kind_of?(String)
-              [k, v.prefix_ns(id)]
-            elsif v.kind_of?(Array) && HTMLBuilder::ARRAY_ATTRS.include?(k)
-              [k, v]
-            elsif v.kind_of?(Integer) && HTMLBuilder::INTEGER_ATTRS.include?(k)
-              [k, v]
-            else
-              raise "Invalid object #{v.inspect} to get a prefix in dom:\n#{dom.inspect}"
-            end
-          end
-        end
-      end
-      dom
-    end
-
-    class ::String
-      def to_html(builder)
-        Rack::Utils.escape_html(self)
-      end
-    end
-
-    class ::NilClass
-      def to_html(builder)
-        ''
-      end
-    end
-
-    class ::Goat::HTMLString < String
-      def to_html(builder)
-        self
-      end
-    end
-
-    class ::Array
-      def to_html(builder)
-        builder.array_to_html(self)
-      end
-    end
-
-    class InvalidBodyError < RuntimeError
-      attr_reader :body
-
-      def initialize(body)
-        super("Invalid body: #{body.inspect}")
-        @body = body
-      end
-    end
-
-    class HTMLBuilder
-      ARRAY_ATTRS = [:class]
-      INTEGER_ATTRS = [:colspan, :rowspan]
-
-      class TagBuilder
-        # TODO: gmail trick of only a single onclick() handler
-
-        def self.build(tag, attrs, body)
-          self.new(tag, attrs, body).dispatch
-        end
-
-        def initialize(tag, attrs, body)
-          @tag = tag
-          @attrs = attrs
-          @body = body
-
-          rewrite_attrs
-        end
-
-        def rewrite_attrs
-          new = {}
-
-          @attrs.map_to_hash do |k, v|
-            if k == :class && v.kind_of?(Array)
-              new[:class] = @attrs[:class].join(' ')
-            else
-              new[k] = v
-            end
-          end
-
-          @attrs = new
-        end
-
-        def build_node
-          [@tag, @attrs, @body]
-        end
-
-        def a_tag
-          unless @attrs.include?(:href)
-            @attrs[:href] = 'javascript:void(0)'
-          end
-
-          build_node
-        end
-
-        def input_tag
-          unless @attrs.include?(:name)
-            $stderr.puts "Warning: no name for <#{@tag} #{@attrs.inspect}>#{@body.inspect}</#{@tag}>"
-
-            # this is somewhat ungainly: we generate a name automatically by hashing the values of the
-            # other attrs. this may conflict - ideally would track per-page state for these.
-            # purpose is to have name-less inputs preserve their values when user goes back to page.
-            # webkit in safari 5 gets confused when inputs are nameless.
-            unless (vals = @attrs.values{|k, v| v.kind_of?(String)}).empty?
-              $stderr.puts "Generating a name automatically..."
-              @attrs[:name] = vals.join.md5[0..10]
-            end
-          end
-
-          build_node
-        end
-
-        def dispatch
-          meth = "#{@tag}_tag".to_sym
-
-          if self.respond_to?(meth)
-            self.send(meth)
-          else
-            build_node
-          end
-        end
-      end
-
-      def standalone_tags
-        %w{br img input}
-      end
-
-      def attrs_to_html(attrs)
-        attrs.map {|k, v| "#{k}=\"#{v}\""}.join(' ')
-      end
-
-      def array_to_html(ar)
-        if ar.first.kind_of?(Symbol)
-          tag = ar[0]
-          have_attrs = ar[1].is_a?(Hash)
-          attrs = have_attrs ? ar[1] : {}
-          body = ar[(have_attrs ? 2 : 1)..-1]
-
-          tag, attrs, body = TagBuilder.build(tag, attrs, body)
-          lonely = standalone_tags.include?(tag.to_s)
-
-          open_tag = "<#{tag}#{attrs.empty? ? '' : (' ' + attrs_to_html(attrs))}>"
-          body_html = body.empty? ? '' : body.map{|x| x.to_html(self)}.join
-          close_tag = (lonely ? '' : "</#{tag}>")
-
-          "#{open_tag}#{body_html}#{close_tag}"
-        else
-          ar.map{|x| x.to_html(self)}.join
-        end
-      end
-
-      def initialize(input)
-        @input = input
-      end
-
-      def html
-        @input.to_html(self)
-      end
-    end
-  end
-end