goat 0.2.12 → 0.3.0

data/lib/goat/notifications.rb

@@ -1,7 +1,5 @@
 require 'eventmachine'
 
-require File.join(File.dirname(__FILE__), 'logger')
-
 module Goat
   module NotificationCenter
     class Receiver < EM::Connection
@@ -10,7 +8,7 @@ module Goat
       def self.start(host, port)
         EM.connect(host, port, self)
       rescue RuntimeError => e
-        Logger.error :live, "Couldn't connect to notification server at #{host}:#{port}"
+        log :live, "Couldn't connect to notification server at #{host}:#{port}"
         raise e
       end
 
@@ -19,27 +17,18 @@ module Goat
       end
 
       def unbind
-        Logger.error :live, "Lost notification server connection"
+        logw "Lost notification server connection"
         EM.add_timer(1) do
           NotificationCenter.start_receiver
         end
       end
     end
 
-    def self.init
-      unless @running
-        start if @configured
-      end
-    end
-    
     def self.start_receiver
       Receiver.start(@host, @recv_port)
     end
 
-    def self.start
-      start_receiver
-      @running = true
-    end
+    def self.enabled?; @configured; end
 
     def self.configure(opts={})
       opts = {:host => '127.0.0.1', :recv_port => 8000, :send_port => 8001}.merge(opts)
@@ -48,9 +37,11 @@ module Goat
       @recv_port = opts[:recv_port]
       @send_port = opts[:send_port]
 
-      @subscribers = Set.new
+      EM.next_tick { self.start_receiver }
     end
 
+    def self.subscribers; @subscribers ||= Set.new; end
+
     def self.wants_notification(sub, notif)
       wants = true
       sub[:sig].each do |k, v|
@@ -66,56 +57,70 @@ module Goat
     def self.notif_to_json(notif)
       notif.to_json
     end
-    
-    def self.delegate_gc
-      kill_list = Set.new
-      Logger.log :gc, "Delegate gc"
-      @subscribers.each do |sub|
-        # $stderr.puts "Testing removal of #{sub.inspect}"
-        dlg = sub[:delegate]        
-        # $stderr.puts "Responds to dead? #{dlg.respond_to?(:dead?)}"
-        if dlg.respond_to?(:dead?) && dlg.dead?
-          Logger.log :gc, "Dead"
-          kill_list << sub
-          next
-        end        
-      end
-      # $stderr.puts "Removing #{kill_list.inspect}"
-      kill_list.each {|sub| @subscribers.delete(sub)}      
-      # $stderr.puts "subscribers now: #{@subscribers.map{|x| x.inspect[0..50]}.inspect}"
-    end
+
+    def self.received_notifications; @recv_notif ||= Set.new; end
 
     def self.receive(line)
       notif = load_notif(line)
-      Logger.log :live, "received notif #{notif.inspect}" if $verbose
-      
-      delegate_gc
-
-      @subscribers.each do |sub|
-        blk = sub[:block]
-        if wants_notification(sub, notif)
-          blk.arity == 1 ? blk.call(notif) : blk.call
+      nid = notif['_nid']
+      logd "received notif #{notif.inspect}" if $verbose
+
+      raise "No _nid" unless nid
+
+      unless received_notifications.include?(nid)
+        received_notifications << nid
+        process_notification(notif)
+      end
+    end
+
+    def self.process_notification(notif)
+      if(notif['txn'])
+        bind = {:txn => notif['txn'], :txn_pgid => notif['txn_pgid']}
+      else
+        bind = {}
+      end
+
+      Dynamic.let(bind) do
+        subscribers.each do |sub|
+          if wants_notification(sub, notif)
+            $stderr.puts "Dispatching to #{sub[:delegate]}"
+            meth = sub[:meth]
+            sub[:delegate].send(meth, notif)
+          end
         end
       end
     end
 
     def self.notify(notif)
+      if Dynamic.variable?(:txn)
+        notif['txn'] = Dynamic[:txn]
+        notif['txn_pgid'] = Dynamic[:txn_pgid]
+      end
+
+      nid = String.random
+      notif['_nid'] = nid
+
+      process_notification(notif) # ensure local delivery happens first
+      received_notifications << nid
+
       if EM.reactor_running?
         EM.connect(@host, @send_port) do |c|
           # TODO: alert if this fails
           c.send_data(notif_to_json(notif) + "\n")
-          # TODO: 2 secs right here?
-          EM.add_timer(2) { c.close_connection }
+          c.close_connection(true)
         end
       else
         s = TCPSocket.open(@host, @send_port)
         s.write(notif_to_json(notif) + "\n")
         s.close
       end
+    rescue SocketError => e
+      $stderr.puts "Couldn't notify host #{@host.inspect}:#{@send_port.inspect}"
+      raise e
     end
 
-    def self.subscribe(obj, sig, &blk)
-      @subscribers << {:sig => sig, :block => blk, :delegate => obj}
+    def self.subscribe(obj, meth, sig)
+      subscribers << {:sig => sig, :meth => meth, :delegate => obj}
     end
   end
-end
+end

data/lib/goat/state-srv.rb

@@ -0,0 +1,119 @@
+module Goat
+  module StateSrvClient
+    def self.configure(opts={})
+      # TODO implement fully
+      EM.next_tick { StateSrvConnection.connect }
+    end
+
+    def self.send_message(type, m, sync=false)
+      StateSrvConnection.send_message(type, m, sync)
+    end
+
+    def self.register_page(pgid, cs)
+      send_message('register_page', 'pgid' => pgid, 'components' => cs.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)}
+    end
+
+    def self.fetch_component(id)
+      resp = send_message('fetch_component', {'id' => id}, true)
+      ComponentSkeleton.from_hash(JSON.load(resp)['response'])
+    end
+
+    def self.component_updated(txn, pgid, update)
+      components_updated(txn, pgid, [update])
+    end
+
+    def self.components_updated(txn, pgid, updates)
+      send_message('components_updated',
+        'txn' => txn,
+        'pgid' => pgid,
+        'updates' => updates.map(&:to_hash)
+      )
+    end
+  end
+
+  class NoStateSrvConnectionError < RuntimeError; end
+
+  class StateSrvConnection < EM::Connection
+    include EM::P::LineText2
+
+    @@connection = nil
+    def self.connection; @@connection; end
+    def self.connection=(c); @@connection = c; end
+    def self.connected?; @@connection != nil; end
+
+    def self.connect(host='127.0.0.1', port=8011, &dlg)
+      @host = host
+      @port = port
+      EM.connect(host, port, self)
+    end
+
+    def self.send_message_sync(msg)
+      s = TCPSocket.open(@host, @port)
+      s.write(msg.to_json + "\n")
+      resp = s.readline
+      logd("=> #{resp.inspect}") if $verbose
+      s.close
+      resp
+    end
+
+    def self.send_message(*args)
+      if self.connected?
+        self.connection.send_message(*args)
+      else
+        raise NoStateSrvConnectionError
+      end
+    end
+
+    attr_accessor :pusher
+
+    def connection_completed
+      @was_connected = true
+      logw "Connected to StateSrv"
+      StateSrvConnection.connection = self
+    end
+
+    def receive_line(line)
+      msg = JSON.load(line)
+
+      logd("=> #{msg.inspect}") if $verbose
+
+      if msg.is_a?(Array) 
+        msg.each{|m| message_received(m)}
+      else
+        message_received(msg)
+      end
+    end
+
+    def send_message(t, msg, sync=false)
+      msg = msg.merge('type' => t)
+
+      logd(">> #{msg.inspect}") if $verbose
+
+      if sync
+        self.class.send_message_sync(msg) # TODO better way to do this?
+      else
+        send_data(msg.to_json + "\n")
+      end
+    end
+
+    def close
+      close_connection
+    end
+
+    def unbind
+      if @was_connected
+        logw "Lost StateSrv connection"
+      else
+        logw "Couldn't open StateSrv connection"
+      end
+
+      StateSrvConnection.connection = nil
+      EM.add_timer(5) { self.class.connect }
+    end
+  end
+end

data/lib/goat/yodel.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'rubygems'
 require 'eventmachine'
+require File.join(File.dirname(__FILE__), 'net-common')
 
 $verbose = ARGV.include?('-v')
 
@@ -13,6 +13,7 @@ module Yodel
     end
 
     def post_init
+      logw "listener connected"
       @sub = NotifChannel.subscribe do |msg|
         send_data(msg + "\n")
       end
@@ -31,7 +32,7 @@ module Yodel
     end
 
     def receive_line(line)
-      $stdout.puts "got #{line}" if $verbose
+      logd "got #{line}"
       NotifChannel << line
     end
   end

data/lib/views/plain_layout.erb

@@ -1,7 +1,11 @@
 <html><head>
-  <title><%= page.canvas.title %></title>
-  <script src="/jq.js"></script><% if page.class.live_updates_enabled? %><script>Goat.page_id = '<%= page.id %>'</script><% end %>
+  <title><%= canvas.title %></title>
+  <style><%= canvas.style %></style>
 </head>
 <body>
 <%= yield %>
-</body></html>
+<script src="/static/jquery.js"></script>
+<script src="/static/goat.js"></script>
+<script><%= canvas.script %></script>
+<% if page.class.live_updates_enabled? %><script>Goat.page_id = '<%= page.id %>'</script><% end %>
+</body></html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 12
-  version: 0.2.12
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +00:00
+date: 2010-11-18 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -28,20 +28,28 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README.md
+- bin/channel-srv
+- bin/press
+- bin/state-srv
+- bin/sync
 - bin/yodel
+- goat.gemspec
 - lib/goat/autobind.rb
+- lib/goat/common.rb
+- lib/goat/dynamic.rb
 - lib/goat/extn.rb
 - lib/goat/goat.js
-- lib/goat.rb
 - lib/goat/html.rb
-- lib/goat/logger.rb
+- lib/goat/js/component.js
 - lib/goat/mongo.rb
+- lib/goat/net-common.rb
 - lib/goat/notifications.rb
-- lib/goat/sinatra.rb
-- lib/goat/yodel.rb
+- lib/goat/state-srv.rb
 - lib/goat/static.rb
+- lib/goat/yodel.rb
+- lib/goat.rb
 - lib/views/plain_layout.erb
-- lib/goat/js/component.js
 has_rdoc: true
 homepage: http://goatweb.org
 licenses: []

data/lib/goat/logger.rb

@@ -1,39 +0,0 @@
-require 'term/ansicolor'
-
-module Goat
-  class Logger
-    class << self
-      def init
-        @levels = [:error]
-        @categories = nil
-      end
-    
-      def levels=(types)
-        @levels = types
-      end
-    
-      def categories=(cats)
-        @categories = cats
-      end
-    
-      def error(cat, str)
-        log(cat, str, :error)
-      end      
-    
-      def log(cat, str, level = :debug)
-        if @categories.kind_of?(Array) && level != :error
-          return unless @categories.include?(cat)
-        end
-      
-        return unless @levels.include?(level)
-      
-        levelstr = level.to_s.ljust(13)
-        colorlevel = level == :error ? Term::ANSIColor.red(levelstr) : levelstr
-      
-        $stderr.puts "#{colorlevel} [#{Time.now.strftime("%d/%b/%Y %H:%M:%S")}] #{Term::ANSIColor.green(str)}"
-      end
-    end
-    
-    init
-  end  
-end

data/lib/goat/sinatra.rb

@@ -1,11 +0,0 @@
-class HTMLString < String; end
-
-def h!(str)
-  HTMLString.new(str)
-end
-
-class String
-  def h!
-    HTMLString.new(self)
-  end
-end