goat 0.3.14 → 0.3.15

data/bin/yodel

@@ -1,11 +1,52 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '../lib/goat/yodel')
+require 'rubygems'
+require 'eventmachine'
 require 'optparse'
 
+$:.unshift(File.join(File.dirname(__FILE__), '../lib'))
+
+require 'goat/common'
+require 'goat/net-common'
+
 $bport = 8000
 $rport = 8001
 $host = '127.0.0.1'
+$verbose = ARGV.include?('-v')
+
+module Yodel
+  NotifChannel = EM::Channel.new
+
+  class BroadcastServer < EM::Connection
+    def self.start(host='127.0.0.1', port=8000)
+      EM.start_server(host, port, self)
+    end
+
+    def post_init
+      Goat.logw "listener connected"
+      @sub = NotifChannel.subscribe do |msg|
+        send_data(msg + "\n")
+      end
+    end
+
+    def unbind
+      NotifChannel.unsubscribe(@sub)
+    end
+  end
+
+  class RecvServer < EM::Connection
+    include EM::P::LineText2
+
+    def self.start(host='127.0.0.1', port=8001)
+      EM.start_server(host, port, self)
+    end
+
+    def receive_line(line)
+      Goat.logd "got #{line}"
+      NotifChannel << line
+    end
+  end
+end
 
 def usage
   $stderr.puts <<-EOH

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.14'
+  s.version = '0.3.15'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'
@@ -14,7 +14,6 @@ spec = Gem::Specification.new do |s|
     bin/channel-srv
     bin/press
     bin/state-srv
-    bin/sync
     bin/yodel
     goat.gemspec
     examples/jq.js
@@ -30,7 +29,6 @@ spec = Gem::Specification.new do |s|
     lib/goat/notifications.rb
     lib/goat/state-srv.rb
     lib/goat/static.rb
-    lib/goat/yodel.rb
     lib/goat.rb
     lib/views/plain_layout.erb
   }

data/lib/goat.rb

@@ -55,10 +55,6 @@ class String
   end
 end
 
-def h!(str)
-  Goat::HTMLString.new(str)
-end
-
 module Goat
   class HTMLString < String; end
 

data/lib/goat/html.rb

@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Goat
   module DOMTools
     class Traverser
@@ -154,7 +156,13 @@ module Goat
 
     class ::String
       def to_html(builder)
-        builder.string_to_html(self)
+        Rack::Utils.escape_html(self)
+      end
+    end
+
+    class ::Goat::HTMLString < String
+      def to_html(builder)
+        self
       end
     end
 
@@ -229,10 +237,6 @@ module Goat
         attrs.map {|k, v| "#{k}=\"#{v}\""}.join(' ')
       end
 
-      def string_to_html(str)
-        str
-      end
-
       def array_to_html(ar)
         if ar.first.kind_of?(Symbol)
           tag = ar[0]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 3
-  - 14
-  version: 0.3.14
+  - 15
+  version: 0.3.15
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 +00:00
+date: 2010-11-22 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -33,7 +33,6 @@ files:
 - bin/channel-srv
 - bin/press
 - bin/state-srv
-- bin/sync
 - bin/yodel
 - goat.gemspec
 - examples/jq.js
@@ -49,7 +48,6 @@ files:
 - lib/goat/notifications.rb
 - lib/goat/state-srv.rb
 - lib/goat/static.rb
-- lib/goat/yodel.rb
 - lib/goat.rb
 - lib/views/plain_layout.erb
 has_rdoc: true

data/bin/sync

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-
-module Goat
-  module Sync
-    NotifChannel = EM::Channel.new
-    
-    @viewports = {}
-    
-    class Viewport
-      attr_reader :created, :viewport, :components
-      
-      def initialize(v, cs)
-        @created = Time.now
-        @viewport = v
-        @components = cs
-      end
-    end
-
-    class ComponentServer < EM::Connection
-      def self.start(host='127.0.0.1', port=8010)
-        EM.start_server(host, port, self)
-      end
-
-      def viewport_components(v, cs)
-        @viewports[v] = Viewport.new(v, cs)
-      end
-      
-      def receive_line(line)
-        msg = JSON.load(line)
-        meth = msg['type']
-        args = msg['data']
-        self.send(meth.to_sym, *args)
-      end
-    end
-    
-    NotificationServer.subscribe() do |notif|
-      
-    end
-
-    class RecvServer < EM::Connection
-      include EM::P::LineText2
-
-      def self.start(host='127.0.0.1', port=8001)
-        EM.start_server(host, port, self)
-      end
-
-      def receive_line(line)
-        $stdout.puts "got #{line}" if $verbose
-        NotifChannel << line
-      end
-    end
-  end
-end

data/lib/goat/yodel.rb

@@ -1,39 +0,0 @@
-require 'rubygems'
-require 'eventmachine'
-require File.join(File.dirname(__FILE__), 'net-common')
-
-$verbose = ARGV.include?('-v')
-
-module Yodel
-  NotifChannel = EM::Channel.new
-
-  class BroadcastServer < EM::Connection
-    def self.start(host='127.0.0.1', port=8000)
-      EM.start_server(host, port, self)
-    end
-
-    def post_init
-      Goat.logw "listener connected"
-      @sub = NotifChannel.subscribe do |msg|
-        send_data(msg + "\n")
-      end
-    end
-
-    def unbind
-      NotifChannel.unsubscribe(@sub)
-    end
-  end
-
-  class RecvServer < EM::Connection
-    include EM::P::LineText2
-
-    def self.start(host='127.0.0.1', port=8001)
-      EM.start_server(host, port, self)
-    end
-
-    def receive_line(line)
-      Goat.logd "got #{line}"
-      NotifChannel << line
-    end
-  end
-end