wunderbar 0.18.0 → 0.18.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGU4NjkyOTQzNDNhNzc3NTk1Y2ViY2EzYWExYmU1ZTZkMTI5MmYyMA==
+  data.tar.gz: !binary |-
+    ZGY0OTkxNTcxMWEzYWVmY2U5YjZmMjYzMmFiNDZkYWRhZDMzMmYyNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGIwODZiNDMxOWFhNjE1NDI4ZjI0MmFjOGUwN2IxZDQ4YTE5MWIzODI0ZjVl
+    N2Q1ZjA0N2U5YTgwYWZkMDU5MzBiOGJhNjllMWNkMTk3ODAxNmRjMjcwYTMw
+    MjY2M2M1Njg0Yzg0OWNkN2Y0ZDY5OTQ5MTIyZGY1ZDY1YzU0NjQ=
+  data.tar.gz: !binary |-
+    ZGYzNjI0MWUyNTdkNjBmMjRjYWY0YjdlZWEwMzYzMjY4Y2I0ZTE0NGI4OWJj
+    NjNkMTFkOGU5MTJmYjJhN2M5YWM3Njk0MmRlNmY4ZjUxZmQ4YWU5MmYzM2U5
+    M2FlZTU1YzM1YTkwODBjZjUzZDMyNThhNjBhZTgyZThmZjNkMjA=

data/lib/wunderbar/builder.rb

@@ -19,7 +19,7 @@ module Wunderbar
     def websocket(*args, &block)
       if Hash === args.last
         args.last[:locals] = Hash[instance_variables.
-          map { |name| [name.sub('@',''), instance_variable_get(name)] } ]
+          map { |name| [name.to_s.sub('@',''), instance_variable_get(name)] } ]
       end
       Wunderbar.websocket(*args, &block)
     end

data/lib/wunderbar/version.rb

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

data/lib/wunderbar/websocket.rb

@@ -3,10 +3,7 @@ require 'rubygems'
 require 'open3'
 require 'socket'
 
-begin
-  require 'em-websocket'
-rescue LoadError
-end
+require 'em-websocket'
 
 module Wunderbar
   class Channel < BuilderBase
@@ -171,54 +168,52 @@ module Wunderbar
     end
   end
 
-  if defined? EventMachine::WebSocket
-    def self.websocket(opts={}, &block)
-      opts = {:port => opts} if Fixnum === opts
-      port = opts[:port]
-      buffer = opts.fetch(:buffer,1)
-
-      if not port
-        socket = TCPServer.new(0)
-        port = Socket.unpack_sockaddr_in(socket.getsockname).first
-        socket.close
-      end
-
-      sock1 = nil
-
-      proc = Proc.new do
-        begin
-          channel = Wunderbar::Channel.new(port, buffer, opts[:locals])
-          if sock1
-            sock1.send('x',0)
-            sock1.close
-          end
-          channel.instance_eval &block
-        rescue Exception => exception
-          channel._ :type=>:stderr, :line=>exception.inspect
-          exception.backtrace.each do |frame| 
-            next if Wunderbar::CALLERS_TO_IGNORE.any? {|re| frame =~ re}
-            channel._ :type=>:stderr, :line=>"  #{frame}"
-          end
-        ensure
-          if channel
-            channel.complete = true
-            sleep 5
-            sleep 60 unless channel.connected or opts[:sync]
-            channel.close
-          end
-        end
-      end
-
-      if opts[:sync]
-        instance_eval &proc
-      else
-        sock1, sock2 = UNIXSocket.pair
-        submit &proc
-        sleep 0.3 while sock2.recv(1) != 'x'
-        sock2.close
+  def self.websocket(opts={}, &block)
+    opts = {:port => opts} if Fixnum === opts
+    port = opts[:port]
+    buffer = opts.fetch(:buffer,1)
+
+    if not port
+      socket = TCPServer.new(0)
+      port = Socket.unpack_sockaddr_in(socket.getsockname).first
+      socket.close
+    end
+
+    sock1 = nil
+
+    proc = Proc.new do
+      begin
+	channel = Wunderbar::Channel.new(port, buffer, opts[:locals])
+	if sock1
+	  sock1.send('x',0)
+	  sock1.close
+	end
+	channel.instance_eval &block
+      rescue Exception => exception
+	channel._ :type=>:stderr, :line=>exception.inspect
+	exception.backtrace.each do |frame| 
+	  next if Wunderbar::CALLERS_TO_IGNORE.any? {|re| frame =~ re}
+	  channel._ :type=>:stderr, :line=>"  #{frame}"
+	end
+      ensure
+	if channel
+	  channel.complete = true
+	  sleep 5
+	  sleep 60 unless channel.connected or opts[:sync]
+	  channel.close
+	end
       end
+    end
 
-      port
+    if opts[:sync]
+      instance_eval &proc
+    else
+      sock1, sock2 = UNIXSocket.pair
+      submit &proc
+      sleep 0.3 while sock2.recv(1) != 'x'
+      sock2.close
     end
+
+    port
   end
 end

data/lib/wunderbar.rb

@@ -12,6 +12,5 @@ require 'wunderbar/job-control'
 require 'wunderbar/logger'
 require 'wunderbar/node'
 require 'wunderbar/server'
-require 'wunderbar/websocket'
 
 W_ = Wunderbar

data/wunderbar.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.18.0"
+  s.version = "0.18.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-10-19"
+  s.date = "2013-10-21"
   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/logger.rb", "lib/wunderbar/polymer-v0.0.20131003.min.js", "lib/wunderbar/rails.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/jquery-1.10.2.min.js", "lib/wunderbar/environment.rb", "lib/wunderbar/server.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/version.rb", "lib/wunderbar/node.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/opal-jquery.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/opal-browser.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.7"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.18.0
-  prerelease: 
+  version: 0.18.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,26 +62,25 @@ files:
 - lib/wunderbar/opal-browser.rb
 homepage: http://github.com/rubys/wunderbar
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTML Generator and CGI application support
 test_files: []