wunderbar 0.17.2 → 0.17.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQ5M2Y3ZTQwNmY2NjdmYWJiZGFjYjMxODg3YWFiNWIzZWJkOTRmMQ==
+    NTg5MmNjNzk0MzIzN2RlNWE4ZDI4YThiOGY1OTdhYzBiNTdmOTkyYg==
   data.tar.gz: !binary |-
-    ZTE4NzljMTM3ZTI4MzdlMTkyYjQ2Mjc2YTVmYTgwOWQyYjY5NTMyMw==
+    MmJmZTQ3ZDI4N2FmOTMzNGQ3MzkyNWEyMWVjNTUzMWY1MDNkOGI2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2NhYzRhNGNjMjM3NTczZDA1MDVlNThhYTcwMTQ3NGI4N2QzZDNiNzQ1ODky
-    YzkwMmExNjQzOTcwMjdkYTk4NTAzOTI5NTFiYzEyMjhlNGRkZmIyMTZiMjQy
-    MzEyNTcyMWFhNGI0MGNkYzdiZjEzMDlhMTU1M2VhMjExM2FmMWI=
+    YmM2NTRlZDZlNTkwZGNiNzEzZTJmMTBiMjc4Y2Y1ZDNjYzMwNDgwNjE2NzRm
+    MDBjZmU1YTMxODhiZTFmMzAxZjJkZDJhMzZhMTgzMDkxNDY2YjdjNWIwNGU4
+    YWU0YWY3Nzc2YTNjNmQ4OTBhMDc1YmU5NzE4MWM3OTgxYjgyYzM=
   data.tar.gz: !binary |-
-    ZDc4OTFkNGY5ODU4MzY0OWM5N2ExNDA2ODcwZDUwYzk3OGJhMDg2Mzg5MGI0
-    ODhlMTg0NzBhZWQ4YjZmODg0NmU5ZTA1MGQzMmMyZTIwYWIwNzkxNmE4ZGYy
-    ODE2ZDEyNzFhMDYwMWFhODljZWNiMmFmZWY2MmZkMzc1ZjU0MTU=
+    M2JhYTZhNGY0ODJjMmNkODgwOWRlMmU4MDQyNGUyMDJmN2U1ZDRhNzM2YzYx
+    MjRiNTI4MjY3YWFjNmFlMTIwNWYxODZmNGI5MTY5ZGIzMTgwZjkzYTlhMjEy
+    YzkwOTBmNThkYTk4ZWU3NjlmOGYxNmE4ODRlYjUwNzg1YzFhYTg=

data/lib/wunderbar/cgi-methods.rb

@@ -121,17 +121,35 @@ module Wunderbar
     end
 
     def call(scope)
+      # asset support for Rack
+      request = (scope.respond_to? :request) ? scope.request : nil
+      if request and request.path =~ %r{/assets/\w[-.\w]+}
+        path = ('.' + scope.request.path).untaint
+        headers = {'type' => 'text/plain'}
+        headers['type'] = 'application/javascript' if path =~ /\.js$/
+        out?(scope, headers) { File.read path if File.exist? path }
+        return
+      end
+
       env = scope.env
       accept    = env['HTTP_ACCEPT'].to_s
       path_info = env['PATH_INFO'].to_s
 
       # implied request types
-      xhr_json = Wunderbar::Options::XHR_JSON  || (accept =~ /json/)
+      xhr_json = Wunderbar::Options::XHR_JSON || (accept =~ /json/) ||
+        env['HTTP_X_REQUESTED_WITH'].to_s == 'XMLHttpRequest'
       text = Wunderbar::Options::TEXT || 
         (accept =~ /plain/ and accept !~ /html/)
       @xhtml = (accept =~ /xhtml/ or accept == '')
       @pdf   = (accept =~ /pdf/)
 
+      # parse json arguments
+      if xhr_json and request and request.respond_to? :body
+        if env['CONTENT_TYPE'] =~ %r{^application/json(;.*)?$}
+          scope.params.merge! JSON.parse(scope.request.body.read)
+        end
+      end
+
       # overrides via the command line
       xhtml_override = ARGV.include?('--xhtml')
       html_override  = ARGV.include?('--html')

data/lib/wunderbar/server.rb

@@ -28,7 +28,8 @@ if port and ARGV.delete(port)
     # start the server
     require 'rack'
     require 'wunderbar/rack'
-    Rack::Server.start :app => Wunderbar::RackApp.new, :Port => port,
+    app = Rack::Lock.new(Wunderbar::RackApp.new)
+    Rack::Server.start :app => app, :Port => port,
       :environment => (ENV['RACK_ENV'] || 'development')
   end
 
@@ -84,7 +85,17 @@ else
       ARGV.push '' if ARGV.empty?
       ARGV.delete('--prompt') or ARGV.delete('--offline')
 
+      payload = nil
+      if env['CONTENT_TYPE'] =~ %r{^application/json(;.*)?$}
+        # read payload before CGI.new eats $stdin
+        payload = JSON.parse($stdin.read) rescue nil
+      end
+
       cgi = CGI.new
+
+      cgi.params.merge!(payload) if payload rescue nil
+      payload = nil
+
       cgi.instance_variable_set '@env', ENV
       class << cgi
         attr_accessor :env

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.17.2"
+  s.version = "0.17.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-09-19"
+  s.date = "2013-09-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/rails.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/jquery-1.10.2.min.js", "lib/wunderbar/environment.rb", "lib/wunderbar/server.rb", "lib/wunderbar/version.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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder