wunderbar 0.20.0 → 0.20.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2M4ZjRjOWU4YmY0NjlmYzU2MzA3ZmFhYzczNWEzNmU0MmY2MmY4YQ==
+    Y2JmMTZlN2Y1ZDRlNzcxNGVkNTc5NGRkZGNkMDY2ZTA1NGU2ZGU1OA==
   data.tar.gz: !binary |-
-    YzQyNzI2MWNmMzJjYTFiZDE5MWFkYWYxOWY2ODI3NGFlZjc0MTYwZg==
+    MWE5MjgwOWJjZjNjZDQxMmEzNmZiNzhmZjFhY2E1OGMxM2VmMDkwOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjFkYzZmOWRlZGE0ZTIxYzM1ZDgxNjFhZWRkOTEwMTBjNTNlYzNhYjQ5ZjQ0
-    NGI0NGIyMmQzODUxODUwNjY2NjExYjM0NjE5NTc2MWQ4NTY3MDY5YTViYmVh
-    NjFkYTVkMGQwM2MzODJlNjgxYjQwODU3ZDkwYjU0Nzc1ZDYzNDM=
+    MWRkNTFmYWI4ZjNhNDE0YjUzYjhiMGMxZWZiMzM4YWM2ODEyNjAwYzM0OTBl
+    MGFkMzg1Zjc2YTg5MGFiOTZlMTcyNGM5NTVmYjYwZmZiODYzMzJjMzRlOTI5
+    NDUwOGI4MWE3N2E4MDNmOGQ5YjJjYTY3Mjc1NDJjNGY1NmYyMzE=
   data.tar.gz: !binary |-
-    NTBjZWZhY2U5M2VhZDQ0ODM2N2Y1ZGVjZDUyMzQ0ZTgyYWJmYzI5ZTNiZjI2
-    ODI1MTRjMDVmMTI3MWNmYmQ2ZTQ3MjRmMzRhNDUzOTIyZTJlMzFhNGIzZWQ1
-    Y2UyMDg5OTI0ZTFmY2E3M2I4ZTdhMDMzYWRjYWU1ODMwYTFiNjE=
+    NjUzMGFlYzIxOGFjYWI5OTA4MzBlZGEwYjNmOGNiOTc1NTA1ZDhjM2JlNjYx
+    OTA4MmJkYzIzNjI1ODUxMDU0MDcyNGNlZWRhMDY1ZDY5OTQ5YmE1YmQwNGU4
+    YzdlMWY5NjZlY2E4N2YzODhkNDliNjUyMmVlYzVjZmQ2NmRlNWI=

data/lib/wunderbar/asset.rb

@@ -87,25 +87,26 @@ module Wunderbar
       @@stylesheets << self.new(options)
     end
 
-    def self.declarations
-      Proc.new do 
-        @@scripts.each do |script|
-          if script.path
-            _script src: "#{Asset.path}/#{script.path}"
-          elsif script.contents
-            _script script.contents
-          end
+    def self.declarations(parent, base)
+      path = base.to_s.sub(/^\//,'').split('/').map {'../'}.join + Asset.path
+      nodes = []
+      @@scripts.each do |script|
+        if script.path
+          nodes << Node.new(:script, src: "#{path}/#{script.path}")
+        elsif script.contents
+          nodes << ScriptNode.new(:script, script.contents)
         end
+      end
 
-        @@stylesheets.each do |stylesheet|
-          if stylesheet.path
-            _link rel: "stylesheet", href: "#{Asset.path}/#{stylesheet.path}",
-              type: "text/css"
-          elsif stylesheet.contents
-            _style stylesheet.contents
-          end
+      @@stylesheets.each do |stylesheet|
+        if stylesheet.path
+          nodes << Node.new(:link, rel: "stylesheet", type: "text/css",
+            href: "#{path}/#{stylesheet.path}")
+        elsif stylesheet.contents
+          nodes << StyleNode.new(:style, stylesheet.contents)
         end
       end
+      nodes.each {|node| node.parent = parent}
     end
   end
 end

data/lib/wunderbar/cssproxy.rb

@@ -50,11 +50,11 @@ module Wunderbar
         end
         proxy
       elsif SpacedNode === @node
-        @builder.__send__ "_#{@node.name}_", *args, &block
+        @builder.__send__ "_#{@node.name.to_s.gsub('-', '_')}_", *args, &block
       elsif CompactNode === @node and @node.name != :pre
-        @builder.__send__ "_#{@node.name}!", *args, &block
+        @builder.__send__ "_#{@node.name.to_s.gsub('-', '_')}!", *args, &block
       else
-        @builder.__send__ "_#{@node.name}", *args, &block
+        @builder.__send__ "_#{@node.name.to_s.gsub('-', '_')}", *args, &block
       end
     end
   end

data/lib/wunderbar/html-methods.rb

@@ -110,6 +110,15 @@ module Wunderbar
         head.add_child Node.new('title', h1.text) if h1 and h1.text
       end
 
+      base = head.children.index {|child| child.name == 'base'}
+      if base
+        head.children.insert 1, head.children.delete_at(base) if base > 1
+        base_href = head.children[1].attrs[:href]
+        head.children.insert 2, *Asset.declarations(head, base_href)
+      else
+        head.children.insert 1, *Asset.declarations(head, nil)
+      end
+
       title = head.children.index {|child| child.name == 'title'}
       if title and title > 1
         head.children.insert 1, head.children.delete_at(title)
@@ -234,7 +243,6 @@ module Wunderbar
     def _head(*args, &block)
       tag!('head', *args) do
         tag! :meta, :charset => 'utf-8'
-        instance_eval &Wunderbar::Asset.declarations
         block.call if block
       end
     end

data/lib/wunderbar/script.rb

@@ -63,7 +63,7 @@ module Wunderbar
           "column: #{location.column}\n#{exception}\n"
       rescue ::Exception => exception
         headers['status'] =  "500 Internal Server Error"
-        output = "// Internal Server Error\n#{exception}\n"
+        output = "// Internal Server Error: #{exception}\n"
         exception.backtrace.each do |frame| 
           next if CALLERS_TO_IGNORE.any? {|re| frame =~ re}
           output += "  #{frame}\n"
@@ -86,15 +86,16 @@ module Wunderbar
         rescue Parser::SyntaxError => exception
           scope.response.status = 500
           location = exception.diagnostic.location
-          "// Syntax Error: line #{location.line}, column: #{location.column}" +
+          "Syntax Error: line #{location.line}, column: #{location.column}" +
             "\n#{exception}\n"
         rescue Exception => exception
           scope.response.status = 500
-          output = "// Internal Server Error\n#{exception}\n"
+          output = "Internal Server Error: #{exception}\n"
           exception.backtrace.each do |frame| 
             next if CALLERS_TO_IGNORE.any? {|re| frame =~ re}
             output += "  #{frame}\n"
           end
+          output
         end
       end
     end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.20.0"
+  s.version = "0.20.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-01-07"
+  s.date = "2014-01-18"
   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/coderay.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/jquery-1.10.2.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/markdown.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/server.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/version.rb", "lib/wunderbar/node.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/script.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json