wunderbar 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67318202c4e41980e0fb2fa7d9af8099497a07cd
-  data.tar.gz: 7b57e93be96f460ca39fd1b1fc6d10b30ea3b48a
+  metadata.gz: cb5b1e488c39649096635f0d794283d15bd94da6
+  data.tar.gz: 330d0001b28b0fdb38dd5077ce240e80ce993f08
 SHA512:
-  metadata.gz: 8d571f09d5a7993f600fcc12464278bf29adae12e035d3a795bf8578e8d34452d71a7dd680eaa7da8295e36f816323d7a904968378df582f8e2bdde95918fd2f
-  data.tar.gz: 79f8527e6968328b4f9a6d213c489b496fd5eb0c6ecde786d98dabcd96afa10b91fad009345248a4cce80cfbb1ad308034944e40170771d3bf83cb99d223db95
+  metadata.gz: 00cfc80008a5c687ed7ef832c5c3bfa21fe821d210b4136fe8197915ac7e86d6e4f15b7567fd9c4d4018ca46be6f442249f59f59ebc14f1b14f87d6982fa0591
+  data.tar.gz: cdbc2207899c4ecc6197cb1fb6115b272a16230ced7725eeeaf4c14cdf81f4f994675849849e65e6963de985f01d45761b6ae05d11f488926aadd776a2e2b9c4

data/lib/wunderbar/cgi-methods.rb

@@ -9,9 +9,9 @@ module Wunderbar
         'Cache-Control' => 'no-cache' }
       builder = JsonBuilder.new(scope)
       output = builder.encode(&block)
-      headers['status'] =  "404 Not Found" if output == {}
+      headers['status'] = "404 Not Found" if output == {}
     rescue Exception => exception
-      headers['status'] =  "531 Internal Server Error"
+      headers['status'] = Wunderbar::ServerError.text
       builder._! Hash.new unless builder.target? Hash
       builder._exception exception
     ensure
@@ -23,9 +23,9 @@ module Wunderbar
       headers = {'type' => 'text/plain', 'charset' => 'UTF-8'}
       builder = TextBuilder.new(scope)
       output = builder.encode(&block)
-      headers['status'] =  "404 Not Found" if output == ''
+      headers['status'] = "404 Not Found" if output == ''
     rescue Exception => exception
-      headers['status'] =  "531 Internal Server Error"
+      headers['status'] = Wunderbar::ServerError.text
       builder._exception exception
     ensure
       out?(scope, headers) { builder.target! }
@@ -101,7 +101,7 @@ module Wunderbar
           output = x.html *args, &block
         end
       rescue ::Exception => exception
-        headers['status'] =  "531 Internal Server Error"
+        headers['status'] = Wunderbar::ServerError.text
         x.clear!
         output = x.html(*args) do
           _h1 'Internal Server Error'

data/lib/wunderbar/environment.rb

@@ -75,6 +75,33 @@ module Wunderbar
       Wunderbar.templates[name.to_s.gsub('_','-')] = block
     end
   end
+
+  #
+  # Some proxies will replace server errors with their own output, and
+  # some applications will want to indicate that there is useful, parseable,
+  # content in controlled failures.  For this reason, allow the server
+  # error responses to be customized by the application.
+  #
+  module ServerError
+    @@status = 500
+    @@text = 'Internal Server Error'
+
+    def self.status=(status)
+      @@status = status
+    end
+
+    def self.text=(text)
+      @@text = text
+    end
+
+    def self.status
+      @@status
+    end
+
+    def self.text
+      "#{@@status} #{@@text}"
+    end
+  end
 end
 
 require 'socket'

data/lib/wunderbar/polymer.rb

@@ -31,7 +31,7 @@ if self.to_s == 'main'
           end
           output = element.serialize.join("\n") + "\n"
         rescue ::Exception => exception
-          headers['status'] =  "531 Internal Server Error"
+          headers['status'] = Wunderbar::ServerError.text
           x.clear!
           output = x.html(*args) do
             _h1 'Internal Server Error'

data/lib/wunderbar/script.rb

@@ -58,12 +58,12 @@ module Wunderbar
       begin
         output = Ruby2JS.convert(block) + "\n"
       rescue Parser::SyntaxError => exception
-        headers['status'] =  "531 Internal Server Error"
+        headers['status'] = Wunderbar::ServerError.text
         location = exception.diagnostic.location
         output = "// Syntax Error: line #{location.line}, " +
           "column: #{location.column}\n#{exception}\n"
       rescue ::Exception => exception
-        headers['status'] =  "531 Internal Server Error"
+        headers['status'] = Wunderbar::ServerError.text
         output = "// Internal Server Error: #{exception}\n"
         exception.backtrace.each do |frame| 
           next if CALLERS_TO_IGNORE.any? {|re| frame =~ re}
@@ -85,12 +85,12 @@ module Wunderbar
         begin
           Ruby2JS.convert(block ? block : data, ivars: locals, file: file).to_s
         rescue Parser::SyntaxError => exception
-          scope.response.status = 531
+          scope.response.status = Wunderbar::ServerError.status
           location = exception.diagnostic.location
           "Syntax Error: line #{location.line}, column: #{location.column}" +
             "\n#{exception}\n"
         rescue Exception => exception
-          scope.response.status = 531
+          scope.response.status = Wunderbar::ServerError.status
           output = "Internal Server Error: #{exception}\n"
           exception.backtrace.each do |frame| 
             next if CALLERS_TO_IGNORE.any? {|re| frame =~ re}

data/lib/wunderbar/sinatra.rb

@@ -110,7 +110,7 @@ module Wunderbar
         begin
           _evaluate_safely(builder, scope, locals, &block)
         rescue Exception => exception
-          scope.response.status = 531
+          scope.response.status = Wunderbar::ServerError.status
           builder.clear!
           builder.html do
             _h1 'Internal Server Error'
@@ -139,7 +139,7 @@ module Wunderbar
 
         rescue Exception => exception
           scope.content_type self.class.default_mime_type, :charset => 'utf-8'
-          scope.response.status = 531
+          scope.response.status = Wunderbar::ServerError.status
           builder._exception exception
         end
         scope.cache_control :no_cache
@@ -162,7 +162,7 @@ module Wunderbar
           scope.response.status = 404 if builder.target!.empty?
         rescue Exception => exception
           scope.headers['Content-Type'] = self.class.default_mime_type
-          scope.response.status = 531
+          scope.response.status = Wunderbar::ServerError.status
           builder._exception exception
         end
         builder.target!

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "1.0.12"
+  s.version = "1.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2016-01-11"
+  s.date = "2016-01-12"
   s.description = "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.'\n"
   s.email = "rubys@intertwingly.net"
   s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/eventsource.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/listen.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/marked.rb", "lib/wunderbar/node.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/react.rb", "lib/wunderbar/script.rb", "lib/wunderbar/server.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/eventsource.min.js", "lib/wunderbar/vendor/jquery-1.11.2.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/marked.min.js", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/react-dom-0.14.3.min.js", "lib/wunderbar/vendor/react-with-addons-0.14.3.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/version.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json