wunderbar 0.14.2 → 0.14.3

data/lib/wunderbar/builder.rb

@@ -78,7 +78,33 @@ module Wunderbar
     end
   end
 
-  class XmlMarkup
+  class BuilderBase
+    def set_variables_from_params(locals={})
+      @_scope.params.merge(locals).each do |key,value|
+        value = value.first if Array === value
+        value.gsub! "\r\n", "\n" if String === value
+        if key =~ /^[a-z]\w+$/
+          instance_variable_set "@#{key.dup.untaint}", value 
+        end
+      end
+    end
+
+    def get_binding
+      binding
+    end
+  end
+
+  class BuilderClass < BuilderBase
+    def websocket(*args, &block)
+      if Hash === args.last
+        args.last[:locals] = Hash[instance_variables.
+          map { |name| [name.sub('@',''), instance_variable_get(name)] } ]
+      end
+      Wunderbar.websocket(*args, &block)
+    end
+  end
+
+  class XmlMarkup < BuilderClass
     def initialize(args)
       @_scope = args.delete(:scope)
       @_builder = SpacedMarkup.new(args)
@@ -222,24 +248,8 @@ module Wunderbar
     end
   end
 
-  class BuilderBase
-    def set_variables_from_params(locals={})
-      @_scope.params.merge(locals).each do |key,value|
-        value = value.first if Array === value
-        value.gsub! "\r\n", "\n" if String === value
-        if key =~ /^[a-z]\w+$/
-          instance_variable_set "@#{key.dup.untaint}", value 
-        end
-      end
-    end
-
-    def get_binding
-      binding
-    end
-  end
-
   require 'stringio'
-  class TextBuilder < BuilderBase
+  class TextBuilder < BuilderClass
     def initialize(scope)
       @_target = StringIO.new
       @_scope = scope
@@ -290,7 +300,7 @@ module Wunderbar
     end
   end
 
-  class JsonBuilder < BuilderBase
+  class JsonBuilder < BuilderClass
     def initialize(scope)
       @_scope = scope
       @_target = {}

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 14
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/wunderbar/websocket.rb

@@ -9,16 +9,18 @@ rescue LoadError
 end
 
 module Wunderbar
-  class Channel
+  class Channel < BuilderBase
     attr_reader :port, :connected, :complete
 
-    def initialize(port, limit)
+    def initialize(port, limit, locals=nil)
       # verify that the port is available
       TCPServer.new('0.0.0.0', port).close 
 
       super()
       @port = port
       @connected = @complete = false
+      @onopen = @onmessage = @onerror = @onclose = Proc.new {}
+      @_scope = Struct.new(:params).new({})
       @channel1 = EM::Channel.new
       @channel2 = EM::Channel.new
       @memory = []
@@ -26,6 +28,13 @@ module Wunderbar
         @memory << msg.chomp unless Symbol === msg
         @memory.shift while @connected and limit and @memory.length > limit
       end
+
+      if locals
+        @_scope = locals['_scope'] || @_scope
+        set_variables_from_params(locals)
+        _ :type => 'stdout', :line => locals['_scope'].methods.inspect
+      end
+
       websocket.run
     end
 
@@ -38,6 +47,7 @@ module Wunderbar
           connection = EventMachine::WebSocket::Connection
           EM.start_server('0.0.0.0', @port, connection, {}) do |ws|
             ws.onopen do
+              @onopen.call(ws)
               @memory.each {|msg| ws.send msg }
               @connected = true
               ws.close_websocket if complete
@@ -51,9 +61,11 @@ module Wunderbar
               end
             end
         
-            ws.onmessage {|msg| @channel2.push msg}
+            ws.onmessage {|msg| @onmessage.call(msg); @channel2.push msg}
+
+            ws.onerror {|e| @onerror.call(e)}
 
-            ws.onclose {@channel1.unsubscribe sid}
+            ws.onclose {@onclose.call(ws); @channel1.unsubscribe sid}
           end
           EM.add_timer(0.1) {ready = true}
         end
@@ -86,6 +98,30 @@ module Wunderbar
       @channel2.pop(*args)
     end
 
+    def onopen(&block)
+      @onopen = block
+    end
+
+    def onmessage(&block)
+      @onmessage = block
+    end
+
+    def onerror(&block)
+      @onerror = block
+    end
+
+    def onclose(&block)
+      @onclose = block
+    end
+
+    def method_missing(method, *args, &block)
+      if @_scope and @_scope.respond_to? :method
+        @_scope.__send__ method, *args, &block
+      else
+        super
+      end
+    end
+
     def _(*args, &block)
       if block or args.length > 1 
         begin
@@ -151,7 +187,7 @@ module Wunderbar
 
       proc = Proc.new do
         begin
-          channel = Wunderbar::Channel.new(port, buffer)
+          channel = Wunderbar::Channel.new(port, buffer, opts[:locals])
           if sock1
             sock1.send('x',0)
             sock1.close
@@ -167,7 +203,7 @@ module Wunderbar
           if channel
             channel.complete = true
             sleep 5
-            sleep 60 unless channel.connected
+            sleep 60 unless channel.connected or opts[:sync]
             channel.close
           end
         end

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.14.2"
+  s.version = "0.14.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-30"
+  s.date = "2012-05-01"
   s.description = "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.  This includes\n    output that conforms to the Polyglot specification and the emerging\n    results from the XML Error Recovery Community Group.\n"
   s.email = "rubys@intertwingly.net"
   s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 14
-  - 2
-  version: 0.14.2
+  - 3
+  version: 0.14.3
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder