wunderbar 0.18.2 → 0.18.3

data/lib/wunderbar/angular-resource.min.js

@@ -0,0 +1,12 @@
+/*
+ AngularJS v1.2.0
+ (c) 2010-2012 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(H,h,C){'use strict';var x=h.$$minErr("$resource");h.module("ngResource",["ng"]).factory("$resource",["$http","$parse","$q",function(D,y,E){function n(h,k){this.template=h;this.defaults=k||{};this.urlParams={}}function t(e,k,f){function q(b,c){var d={};c=u({},k,c);r(c,function(a,c){s(a)&&(a=a());var m;a&&a.charAt&&"@"==a.charAt(0)?(m=a.substr(1),m=y(m)(b)):m=a;d[c]=m});return d}function d(b){return b.resource}function g(b){z(b||{},this)}var F=new n(e);f=u({},G,f);r(f,function(b,c){var A=
+/^(POST|PUT|PATCH)$/i.test(b.method);g[c]=function(a,c,m,k){var p={},e,f,v;switch(arguments.length){case 4:v=k,f=m;case 3:case 2:if(s(c)){if(s(a)){f=a;v=c;break}f=c;v=m}else{p=a;e=c;f=m;break}case 1:s(a)?f=a:A?e=a:p=a;break;case 0:break;default:throw x("badargs",arguments.length);}var n=e instanceof g,l=n?e:b.isArray?[]:new g(e),w={},t=b.interceptor&&b.interceptor.response||d,y=b.interceptor&&b.interceptor.responseError||C;r(b,function(a,c){"params"!=c&&("isArray"!=c&&"interceptor"!=c)&&(w[c]=z(a))});
+A&&(w.data=e);F.setUrlParams(w,u({},q(e,b.params||{}),p),b.url);p=D(w).then(function(c){var a=c.data,d=l.$promise;if(a){if(h.isArray(a)!==!!b.isArray)throw x("badcfg",b.isArray?"array":"object",h.isArray(a)?"array":"object");b.isArray?(l.length=0,r(a,function(a){l.push(new g(a))})):(z(a,l),l.$promise=d)}l.$resolved=!0;c.resource=l;return c},function(a){l.$resolved=!0;(v||B)(a);return E.reject(a)});p=p.then(function(a){var c=t(a);(f||B)(c,a.headers);return c},y);return n?p:(l.$promise=p,l.$resolved=
+!1,l)};g.prototype["$"+c]=function(a,b,d){s(a)&&(d=b,b=a,a={});a=g[c](a,this,b,d);return a.$promise||a}});g.bind=function(b){return t(e,u({},k,b),f)};return g}var G={get:{method:"GET"},save:{method:"POST"},query:{method:"GET",isArray:!0},remove:{method:"DELETE"},"delete":{method:"DELETE"}},B=h.noop,r=h.forEach,u=h.extend,z=h.copy,s=h.isFunction;n.prototype={setUrlParams:function(e,k,f){var q=this,d=f||q.template,g,n,b=q.urlParams={};r(d.split(/\W/),function(c){if("hasOwnProperty"===c)throw x("badname");
+!/^\d+$/.test(c)&&(c&&RegExp("(^|[^\\\\]):"+c+"(\\W|$)").test(d))&&(b[c]=!0)});d=d.replace(/\\:/g,":");k=k||{};r(q.urlParams,function(c,b){g=k.hasOwnProperty(b)?k[b]:q.defaults[b];h.isDefined(g)&&null!==g?(n=encodeURIComponent(g).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"%20").replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+"),d=d.replace(RegExp(":"+b+"(\\W|$)","g"),n+"$1")):d=d.replace(RegExp("(/?):"+b+"(\\W|$)","g"),function(a,
+c,b){return"/"==b.charAt(0)?b:c+b})});d=d.replace(/\/+$/,"");d=d.replace(/\/\.(?=\w+($|\?))/,".");e.url=d.replace(/\/\\\./,"/.");r(k,function(c,b){q.urlParams[b]||(e.params=e.params||{},e.params[b]=c)})}};return t}])})(window,window.angular);
+//# sourceMappingURL=angular-resource.min.js.map

data/lib/wunderbar/angular-resource.rb

@@ -0,0 +1,6 @@
+require 'wunderbar/angularjs'
+require 'ruby2js/filter/angular-resource'
+
+source = File.expand_path('../angular-resource.min.js', __FILE__)
+
+Wunderbar::Asset.script :name => 'angular-resource.min.js', :file => source

data/lib/wunderbar/angular-route.min.js

@@ -0,0 +1,14 @@
+/*
+ AngularJS v1.2.0
+ (c) 2010-2012 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(t,c,B){'use strict';function w(s,r,g,a,h){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(k,d,A){return function(u,k,d){function v(){l&&(l.$destroy(),l=null);m&&(h.leave(m),m=null)}function x(){var f=s.current&&s.current.locals,y=f&&f.$template;if(y){var z=u.$new();A(z,function(e){e.html(y);h.enter(e,null,m||k,function(){!c.isDefined(n)||n&&!u.$eval(n)||r()});v();var p=g(e.contents()),q=s.current;l=q.scope=z;m=e;if(q.controller){f.$scope=l;var d=a(q.controller,
+f);q.controllerAs&&(l[q.controllerAs]=d);e.data("$ngControllerController",d);e.children().data("$ngControllerController",d)}p(l);l.$emit("$viewContentLoaded");l.$eval(b)})}else v()}var l,m,n=d.autoscroll,b=d.onload||"";u.$on("$routeChangeSuccess",x);x()}}}}t=c.module("ngRoute",["ng"]).provider("$route",function(){function s(a,h){return c.extend(new (c.extend(function(){},{prototype:a})),h)}function r(a,c){var k=c.caseInsensitiveMatch,d={originalPath:a,regexp:a},g=d.keys=[];a=a.replace(/([().])/g,
+"\\$1").replace(/(\/)?:(\w+)([\?|\*])?/g,function(a,c,h,d){a="?"===d?d:null;d="*"===d?d:null;g.push({name:h,optional:!!a});c=c||"";return""+(a?"":c)+"(?:"+(a?c:"")+(d&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");d.regexp=RegExp("^"+a+"$",k?"i":"");return d}var g={};this.when=function(a,h){g[a]=c.extend({reloadOnSearch:!0},h,a&&r(a,h));if(a){var k="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";g[k]=c.extend({redirectTo:a},r(k,h))}return this};this.otherwise=function(a){this.when(null,
+a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$http","$templateCache","$sce",function(a,h,k,d,r,u,t,w){function v(){var b=x(),f=n.current;if(b&&f&&b.$$route===f.$$route&&c.equals(b.pathParams,f.pathParams)&&!b.reloadOnSearch&&!m)f.params=b.params,c.copy(f.params,k),a.$broadcast("$routeUpdate",f);else if(b||f)m=!1,a.$broadcast("$routeChangeStart",b,f),(n.current=b)&&b.redirectTo&&(c.isString(b.redirectTo)?h.path(l(b.redirectTo,b.params)).search(b.params).replace():
+h.url(b.redirectTo(b.pathParams,h.path(),h.search())).replace()),d.when(b).then(function(){if(b){var a=c.extend({},b.resolve),f,e;c.forEach(a,function(b,f){a[f]=c.isString(b)?r.get(b):r.invoke(b)});c.isDefined(f=b.template)?c.isFunction(f)&&(f=f(b.params)):c.isDefined(e=b.templateUrl)&&(c.isFunction(e)&&(e=e(b.params)),e=w.getTrustedResourceUrl(e),c.isDefined(e)&&(b.loadedTemplateUrl=e,f=u.get(e,{cache:t}).then(function(b){return b.data})));c.isDefined(f)&&(a.$template=f);return d.all(a)}}).then(function(d){b==
+n.current&&(b&&(b.locals=d,c.copy(b.params,k)),a.$broadcast("$routeChangeSuccess",b,f))},function(c){b==n.current&&a.$broadcast("$routeChangeError",b,f,c)})}function x(){var b,a;c.forEach(g,function(d,l){var e;if(e=!a){var p=h.path();e=d.keys;var q={};if(d.regexp)if(p=d.regexp.exec(p)){for(var g=1,k=p.length;g<k;++g){var m=e[g-1],n="string"==typeof p[g]?decodeURIComponent(p[g]):p[g];m&&n&&(q[m.name]=n)}e=q}else e=null;else e=null;e=b=e}e&&(a=s(d,{params:c.extend({},h.search(),b),pathParams:b}),a.$$route=
+d)});return a||g[null]&&s(g[null],{params:{},pathParams:{}})}function l(a,d){var g=[];c.forEach((a||"").split(":"),function(a,b){if(0===b)g.push(a);else{var c=a.match(/(\w+)(.*)/),h=c[1];g.push(d[h]);g.push(c[2]||"");delete d[h]}});return g.join("")}var m=!1,n={routes:g,reload:function(){m=!0;a.$evalAsync(v)}};a.$on("$locationChangeSuccess",v);return n}]});t.provider("$routeParams",function(){this.$get=function(){return{}}});t.directive("ngView",w);w.$inject=["$route","$anchorScroll","$compile","$controller",
+"$animate"]})(window,window.angular);
+//# sourceMappingURL=angular-route.min.js.map

data/lib/wunderbar/angular-route.rb

@@ -0,0 +1,6 @@
+require 'wunderbar/angularjs'
+require 'ruby2js/filter/angular-route'
+
+source = File.expand_path('../angular-route.min.js', __FILE__)
+
+Wunderbar::Asset.script :name => 'angular-route.min.js', :file => source

data/lib/wunderbar/angularjs.rb

@@ -1,20 +1,6 @@
-require 'wunderbar'
+require 'wunderbar/script'
 require 'ruby2js/filter/angularrb'
 
 source = File.expand_path('../angular.min.js', __FILE__)
 
 Wunderbar::Asset.script :name => 'angular-min.js', :file => source
-
-module Wunderbar
-  class HtmlMarkup
-    def _script(*args, &block)
-      if block
-        args.unshift Ruby2JS.convert(block, 
-          filters: [Ruby2JS::Filter::AngularRB])
-        super *args, &nil
-      else
-        super
-      end
-    end
-  end
-end

data/lib/wunderbar/builder.rb

@@ -239,30 +239,30 @@ module Wunderbar
 
     # insert verbatim
     def <<(data)
-      if not String === data or data.include? '<' or data.include? '&'
-        require 'nokogiri'
-        data = Nokogiri::HTML::fragment(data.to_s).to_xml
-
-        # fix CDATA in most cases (notably scripts)
-        data.gsub!(/<!\[CDATA\[(.*?)\]\]>/m) do
-          if $1.include? '<' or $1.include? '&'
-            "//<![CDATA[\n#{$1}\n//]]>"
-          else
-            $1
+      if defined? Nokogiri
+        if not String === data or data.include? '<' or data.include? '&'
+          data = Nokogiri::HTML::fragment(data.to_s).to_xml
+
+          # fix CDATA in most cases (notably scripts)
+          data.gsub!(/<!\[CDATA\[(.*?)\]\]>/m) do
+            if $1.include? '<' or $1.include? '&'
+              "//<![CDATA[\n#{$1}\n//]]>"
+            else
+              $1
+            end
           end
-        end
 
-        # fix CDATA for style elements
-        data.gsub!(/<style([^>])*>\/\/<!\[CDATA\[\n(.*?)\s+\/\/\]\]>/m) do
-          if $2.include? '<' or $2.include? '&'
-            "<style#{$1}>/*<![CDATA[*/\n#{$2.gsub("\n\Z",'')}\n/*]]>*/"
-          else
-            $1
+          # fix CDATA for style elements
+          data.gsub!(/<style([^>])*>\/\/<!\[CDATA\[\n(.*?)\s+\/\/\]\]>/m) do
+            if $2.include? '<' or $2.include? '&'
+              "<style#{$1}>/*<![CDATA[*/\n#{$2.gsub("\n\Z",'')}\n/*]]>*/"
+            else
+              $1
+            end
           end
         end
       end
-    rescue LoadError
-    ensure
+
       if String === data
         @node.children << data
       else
@@ -284,11 +284,13 @@ module Wunderbar
         children.pop if children.last.text? and children.last.text.strip.empty?
       end
 
-      children.each do |child|
+      children.map do |child|
         if child.text? or child.cdata?
           text = child.text
-          if text.strip.empty?
-            text! "\n" if text.count("\n")>1
+          if not @indentation_enabled
+            text! text
+          elsif text.strip.empty?
+            text! "" if text.count("\n")>1
           else
             indented_text! text
           end
@@ -328,6 +330,17 @@ module Wunderbar
           tag!(child, child.text.strip)
         elsif child.children.any?(&:cdata?) and child.text =~ /[<&]/
           self << child
+        elsif child.name == 'pre'
+          compact!(nil) { tag!(child) {self[*child.children]} }
+        elsif child.name == 'head'
+          head = tag!(child) {self[*child.children]}
+          html = @doc.children.last
+          if html.name == :html
+            head.parent.children.pop
+            html.children.unshift head
+            head.parent = html
+          end
+          head
         else
           tag!(child) {self[*child.children]}
         end

data/lib/wunderbar/coderay.rb

@@ -0,0 +1,44 @@
+require 'wunderbar'
+require 'coderay'
+require 'nokogiri'
+
+# workaround for https://github.com/rubychan/coderay/pull/159
+module CodeRay::PluginHost
+  alias_method :old_plugin_path, :plugin_path
+  def plugin_path *args
+    args.first.untaint if args.first == CodeRay::CODERAY_PATH
+    old_plugin_path *args
+  end
+end
+
+module Wunderbar
+  class HtmlMarkup
+    def _coderay(*args)
+
+      # allow arguments in any order, disambiguate based on type
+      lang, string, attrs = :ruby, '', {}
+      args.each do |arg|
+        case arg
+          when Symbol; lang = arg
+          when String; string = arg
+          when Hash;   attrs = arg
+        end
+      end
+
+      base = _{ CodeRay.scan(CDATANode.normalize(string), lang).div }
+
+      # remove wrapping divs
+      while base.length == 1 and base.first.name == 'div'
+        div = base.first.parent.children.pop
+        div.children.each {|child| child.parent = base.first.parent}
+        base.first.parent.children += base.first.children
+        base = div.children
+      end
+
+      # add attrs provided to pre element
+      if base.length == 1 and base.first.name == 'pre'
+        base.first.attrs.merge! attrs
+      end
+    end
+  end
+end

data/lib/wunderbar/coffeescript.rb

@@ -0,0 +1,10 @@
+require 'wunderbar'
+require 'coffee-script'
+
+module Wunderbar
+  class HtmlMarkup
+    def _coffeescript(text)
+      _script CoffeeScript.compile(text)
+    end
+  end
+end

data/lib/wunderbar/cssproxy.rb

@@ -16,8 +16,9 @@ module Wunderbar
     def method_missing(id_or_class, *args, &block)
       empty = args.empty?
       attrs = @node.attrs
+      id_or_class = id_or_class.to_s.gsub('_', '-')
 
-      if id_or_class.to_s =~ /(.*)!$/
+      if id_or_class =~ /(.*)!$/
         attrs[:id] = $1
       elsif attrs[:class]
         attrs[:class] = "#{attrs[:class]} #{id_or_class}"
@@ -34,6 +35,8 @@ module Wunderbar
         @builder.proxiable_tag! @node.name, *args
       elsif SpacedNode === @node
         @builder.__send__ "_#{@node.name}_", *args, &block
+      elsif CompactNode === @node and @node.name != :pre
+        @builder.__send__ "_#{@node.name}!", *args, &block
       else
         @builder.__send__ "_#{@node.name}", *args, &block
       end

data/lib/wunderbar/environment.rb

@@ -43,23 +43,8 @@ module Wunderbar
   def self.templates
     @@templates
   end
-end
 
-require 'socket'
-$SERVER = ENV['HTTP_HOST'] || Socket::gethostname
-
-# set encoding to UTF-8
-ENV['LANG'] ||= "en_US.UTF-8"
-if defined? Encoding
-  Encoding.default_external = Encoding::UTF_8
-  Encoding.default_internal = Encoding::UTF_8
-else
-  $KCODE = 'U'
-end
-
-# Add methods to the 'main' object
-if self.to_s == 'main'
-  class << self
+  module API
     def _html(*args, &block)
       Wunderbar.html(*args, &block)
     end
@@ -84,6 +69,25 @@ if self.to_s == 'main'
     def _template(name, &block)
       Wunderbar.templates[name.to_s.gsub('_','-')] = block
     end
+  end
+end
+
+require 'socket'
+$SERVER = ENV['HTTP_HOST'] || Socket::gethostname
+
+# set encoding to UTF-8
+ENV['LANG'] ||= "en_US.UTF-8"
+if defined? Encoding
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
+else
+  $KCODE = 'U'
+end
+
+# Add methods to the 'main' object
+if self.to_s == 'main'
+  class << self
+    include Wunderbar::API
 
     def env
       ENV

data/lib/wunderbar/html-methods.rb

@@ -110,6 +110,11 @@ module Wunderbar
         head.add_child Node.new('title', h1.text) if h1 and h1.text
       end
 
+      title = head.children.index {|child| child.name == 'title'}
+      if title and title > 1
+        head.children.insert 1, head.children.delete_at(title)
+      end
+
       bom + @x.target!
     end
 
@@ -261,7 +266,7 @@ module Wunderbar
     
     def _pre(*args, &block)
       args.first.chomp! if String === args.first and args.first.end_with? "\n"
-      @x.compact!(@_width) { tag! :pre, *args, &block }
+      @x.compact!(nil) { tag! :pre, *args, &block }
     end
 
     def _ul(*args, &block)
@@ -315,14 +320,35 @@ module Wunderbar
       if String === children
         safe = !children.tainted?
         safe ||= children.html_safe? if children.respond_to? :html_safe?
+        safe &&= defined? Nokogiri
 
         if safe and (children.include? '<' or children.include? '&')
-          require 'nokogiri'
-          children = Nokogiri::HTML::fragment(children.to_s).children
+          children = Nokogiri::HTML::fragment(children.to_s).children.to_a
+
+          # ignore leading whitespace
+          while not children.empty? and children.first.text?
+            break unless children.first.text.strip.empty?
+            children.shift
+          end
+
+          # gather up candidate head elements
+          pending_head = []
+          while not children.empty? and children.first.element?
+            break unless (HEAD+['script']).include? children.first.name
+            pending_head << children.shift
+          end
+
+          # rebuild head element if any candidates were found
+          unless pending_head.empty?
+            head = Nokogiri::XML::Node.new('head', pending_head.first.document) 
+            pending_head.each {|child| head << child}
+            children.unshift head
+          end
         else
           return @x.indented_text! children
         end
       end
+
       @x[*children]
     end
 
@@ -335,13 +361,6 @@ module Wunderbar
       end
     end
 
-    def _coffeescript(text)
-      require 'coffee-script'
-      _script CoffeeScript.compile(text)
-    rescue LoadError
-      _script text, :lang => 'text/coffeescript'
-    end
-
     def clear!
       @x.clear!
     end

data/lib/wunderbar/jquery.rb

@@ -1,5 +1,10 @@
 require 'wunderbar'
 
+begin
+  require 'ruby2js/filter/jquery'
+rescue LoadError
+end
+
 source = Dir[File.expand_path('../jquery-*.min.js', __FILE__)].
   sort_by {|name| name[/-([.\d]*)\.min.js$/,1].split('.').map(&:to_i)}.last
 

data/lib/wunderbar/markdown.rb

@@ -0,0 +1,11 @@
+require 'wunderbar'
+require 'kramdown'
+require 'nokogiri'
+
+module Wunderbar
+  class HtmlMarkup
+    def _markdown(string)
+      _{ Kramdown::Document.new(CDATANode.normalize(string)).to_html }
+    end
+  end
+end

data/lib/wunderbar/node.rb

@@ -88,7 +88,7 @@ module Wunderbar
           (work+["</#{name}>"]).each do |node|
             if line.length + node.length > @width
               result << line.rstrip
-              line = indent
+              line = indent.to_s
             end
             line += node
           end
@@ -132,7 +132,7 @@ module Wunderbar
   end
 
   class CDATANode < Node
-    def self.normalize(data, indent)
+    def self.normalize(data, indent='')
       data = data.sub(/\n\s*\Z/, '').sub(/\A\s*\n/, '')
 
       unindent = data.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 0

data/lib/wunderbar/rack.rb

@@ -1,3 +1,6 @@
+require 'wunderbar'
+require 'rack'
+
 module Wunderbar
   class RackApp
     # entry point for Rack
@@ -42,3 +45,12 @@ module Wunderbar
     end
   end
 end
+
+class Rack::Builder
+  include Wunderbar::API
+
+  def _app
+    Wunderbar::RackApp.new
+  end
+end
+

data/lib/wunderbar/script.rb

@@ -0,0 +1,74 @@
+require 'wunderbar'
+require 'ruby2js'
+
+# convert script blocks to JavaScript.  If binding_of_caller is available,
+# full access to all variables defined in the callers scope may be made
+# by execute strings (`` or %x()).
+
+module Wunderbar
+  class HtmlMarkup
+    def _script(*args, &block)
+      if block
+        if binding.respond_to? :of_caller
+          # provided by require 'binding_of_caller'
+          args.unshift Ruby2JS.convert(block, binding: binding.of_caller(1))
+        else
+          args.unshift Ruby2JS.convert(block, binding: binding)
+        end
+        super *args, &nil
+      else
+        super
+      end
+    end
+  end
+end
+
+module Wunderbar
+  module API
+    def _js(*args, &block)
+      Wunderbar.ruby2js(*args, &block)
+    end
+  end
+
+  def self.ruby2js(*args, &block)
+    callback = Proc.new do |scope, args, block| 
+      ruby2js(scope, *args, &block)
+    end
+    @queue << [callback, args, block]
+  end
+  
+  class CGI
+    def ruby2js(scope, *args, &block)
+      headers = { 'type' => 'application/javascript', 'charset' => 'UTF-8' }
+
+      begin
+        output = Ruby2JS.convert(block) + "\n"
+      rescue ::Exception => exception
+        headers['status'] =  "500 Internal Server Error"
+        output = "// Internal Server Error\n#{exception}\n"
+      end
+
+      out?(scope, headers) { output }
+    end
+  end
+
+  module Template
+    module Js
+      def self.ext; :_js; end
+      def self.mime; 'application/javascript'; end
+
+      def evaluate(scope, locals, &block)
+        scope.content_type self.class.default_mime_type, charset: 'utf-8'
+        begin
+          Ruby2JS.convert(data)
+        rescue Exception => exception
+          scope.response.status = 500
+          "// Internal Server Error\n#{exception}\n"
+        end
+      end
+    end
+
+    register Js if respond_to? :register
+  end
+end
+

data/lib/wunderbar/server.rb

@@ -14,21 +14,22 @@ end
 
 port = ARGV.find {|arg| arg =~ /--port=(.*)/}
 if port and ARGV.delete(port)
-  port = $1.to_i
-  ENV['SERVER_PORT'] = port.to_s
+  ENV['SERVER_PORT'] = port.split('=').last
 
   # Evaluate optional data from the script (after __END__)
   eval Wunderbar.data if Object.const_defined? :DATA
 
   # Allow optional environment override
   environment = ARGV.find {|arg| arg =~ /--environment=(.*)/}
-  ENV['RACK_ENV'] = environment if environment and ARGV.delete(environment)
+  if environment and ARGV.delete(environment)
+    ENV['RACK_ENV'] = environment.split('=').last
+  end
 
   at_exit do
     # start the server
-    require 'rack'
     require 'wunderbar/rack'
 
+    # whenever reloading adds to the queue, cull old entries
     class QueueCleanup
       def initialize(app)
         @app = app
@@ -44,10 +45,15 @@ if port and ARGV.delete(port)
       end
     end
 
-    app = Rack::Lock.new(Wunderbar::RackApp.new)
-    app = Rack::Reloader.new(QueueCleanup.new(app), 0)
-    Rack::Server.start :app => app, :Port => port,
-      :environment => (ENV['RACK_ENV'] || 'development')
+    # avoid Ruby 1.9.3 bug if var names match those used to extract from ARGV
+    app_port = ENV['SERVER_PORT'].to_i
+    app_env = (ENV['RACK_ENV'] || 'development')
+
+    app = Wunderbar::RackApp.new
+    app = QueueCleanup.new(app)
+    app = Rack::Reloader.new(app, 0) if app_env == 'development'
+
+    Rack::Handler.default.run app, environment: app_env, Port: app_port
   end
 
 elsif defined? Sinatra
@@ -58,6 +64,10 @@ elsif defined? ActionView::Template
 
   require 'wunderbar/rails'
 
+elsif defined? Rack
+
+  require 'wunderbar/rack'
+
 else
 
   require 'etc'

data/lib/wunderbar/sinatra.rb

@@ -3,7 +3,38 @@ require 'wunderbar'
 require 'digest/md5'
 require 'nokogiri'
 
+begin
+  require "sinatra/reloader" if development? # gem install sinatra-contrib
+rescue LoadError
+end
+
 module Wunderbar
+  module SinatraHelpers
+    def _html(*args, &block)
+      if block
+        Wunderbar::Template::Html.evaluate('_html', self) do
+          _html(*args) { instance_eval &block }
+        end
+      else
+        Wunderbar::Template::Html.evaluate('_html', self, *args)
+      end
+    end
+
+    def _xhtml(*args, &block)
+      if env['HTTP_ACCEPT'] and not env['HTTP_ACCEPT'].include? 'xhtml'
+        return _html(*args, &block)
+      end
+
+      if block
+        Wunderbar::Template::Xhtml.evaluate('_xhtml', self) do
+          _xhtml(*args) { instance_eval &block }
+        end
+      else
+        Wunderbar::Template::Xhtml.evaluate('_xhtml', self, *args)
+      end
+    end
+  end
+
   # Tilt template implementation
   module Template
     class Base < Tilt::Template
@@ -90,8 +121,9 @@ module Wunderbar
       self.default_mime_type = 'application/xhtml+xml'
     end
 
-    class Json < Base
-      self.default_mime_type = 'application/json'
+    module Json
+      def self.ext; :_json; end
+      def self.mime; 'application/json'; end
 
       def evaluate(scope, locals, &block)
         builder = JsonBuilder.new(scope)
@@ -106,8 +138,9 @@ module Wunderbar
       end
     end
 
-    class Text < Base
-      self.default_mime_type = 'text/plain'
+    module Text
+      def self.ext; :_text; end
+      def self.mime; 'text/plain'; end
 
       def evaluate(scope, locals, &block)
         builder = TextBuilder.new(scope)
@@ -122,47 +155,29 @@ module Wunderbar
         builder.target!
       end
     end
-  end
 
-  module SinatraHelpers
-    def _html(*args, &block)
-      if block
-        Wunderbar::Template::Html.evaluate('_html', self) do
-          _html(*args) { instance_eval &block }
-        end
-      else
-        Wunderbar::Template::Html.evaluate('_html', self, *args)
+    def self.register(language, base=Base)
+      template = Class.new(Template::Base) do 
+        self.default_mime_type = language.mime
+        include language
       end
-    end
 
-    def _xhtml(*args, &block)
-      if env['HTTP_ACCEPT'] and not env['HTTP_ACCEPT'].include? 'xhtml'
-        return _html(*args, &block)
-      end
-
-      if block
-        Wunderbar::Template::Xhtml.evaluate('_xhtml', self) do
-          _xhtml(*args) { instance_eval &block }
-        end
-      else
-        Wunderbar::Template::Xhtml.evaluate('_xhtml', self, *args)
+      SinatraHelpers.send :define_method, language.ext do |*args, &block|
+        template.evaluate(language.ext, self, *args, &block)
       end
-    end
 
-    def _json(*args, &block)
-      Wunderbar::Template::Json.evaluate('_json', self, *args, &block)
+      Tilt.register language.ext.to_s, template
     end
 
-    def _text(*args, &block)
-      Wunderbar::Template::Text.evaluate('_text', self, *args, &block)
+    constants.each do |language|
+      language = const_get(language)
+      register language if language.respond_to? :mime
     end
   end
 end
 
 Tilt.register '_html',  Wunderbar::Template::Html
 Tilt.register '_xhtml', Wunderbar::Template::Xhtml
-Tilt.register '_json',  Wunderbar::Template::Json
-Tilt.register '_text',  Wunderbar::Template::Text
 
 helpers Wunderbar::SinatraHelpers
 

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.18.2"
+  s.version = "0.18.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-11-12"
+  s.date = "2013-12-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", "lib/wunderbar/asset.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/angular.min.js", "lib/wunderbar/installation.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/node.rb", "lib/wunderbar/polymer-v0.0.20131003.min.js", "lib/wunderbar/opal-jquery.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb", "lib/wunderbar/jquery-1.10.2.min.js", "lib/wunderbar/html-methods.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/opal-browser.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/server.rb", "lib/wunderbar.rb"]
+  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar", "lib/wunderbar/asset.rb", "lib/wunderbar/script.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/angular.min.js", "lib/wunderbar/angular-route.min.js", "lib/wunderbar/installation.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/angular-route.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/node.rb", "lib/wunderbar/polymer-v0.0.20131003.min.js", "lib/wunderbar/opal-jquery.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/jquery-1.10.2.min.js", "lib/wunderbar/html-methods.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/opal-browser.rb", "lib/wunderbar/angular-resource.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/server.rb", "lib/wunderbar/angular-resource.min.js", "lib/wunderbar.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14226580 !ruby/object:Gem::Requirement
+  requirement: &11779760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14226580
+  version_requirements: *11779760
 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
@@ -35,11 +35,15 @@ files:
 - README.md
 - COPYING
 - lib/wunderbar/asset.rb
+- lib/wunderbar/script.rb
 - lib/wunderbar/environment.rb
 - lib/wunderbar/angular.min.js
+- lib/wunderbar/angular-route.min.js
 - lib/wunderbar/installation.rb
 - lib/wunderbar/websocket.rb
 - lib/wunderbar/opal.rb
+- lib/wunderbar/angular-route.rb
+- lib/wunderbar/coffeescript.rb
 - lib/wunderbar/jquery.rb
 - lib/wunderbar/sinatra.rb
 - lib/wunderbar/node.rb
@@ -53,12 +57,16 @@ files:
 - lib/wunderbar/cgi-methods.rb
 - lib/wunderbar/cssproxy.rb
 - lib/wunderbar/version.rb
+- lib/wunderbar/coderay.rb
 - lib/wunderbar/jquery-1.10.2.min.js
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/rails.rb
 - lib/wunderbar/opal-browser.rb
+- lib/wunderbar/angular-resource.rb
 - lib/wunderbar/builder.rb
+- lib/wunderbar/markdown.rb
 - lib/wunderbar/server.rb
+- lib/wunderbar/angular-resource.min.js
 - lib/wunderbar.rb
 homepage: http://github.com/rubys/wunderbar
 licenses: