wunderbar 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16c327ed4da4e317601758ab9df7bd58f7a2795
-  data.tar.gz: 5a9d3685491ef6d5c5262d02b0b35f36f7f635bb
+  metadata.gz: ea64892ba5117879969e9e060d74a3dc627a26bf
+  data.tar.gz: a4811ebeebb86646e94d25c4d4a17b8c2f59d05f
 SHA512:
-  metadata.gz: 33911408b08b8e78334e410d86eafd384d9cf29f0ebbd7e745e3d851465fec801ba77a58cf62d5d421754ffc94dbc2faa9485e9c48f066f34dbd3cb05d96be37
-  data.tar.gz: d5d88a4a33e81020027403cdd7c4cb9949d156a2f055f6dce0e2fcd67f54325149b63c4112ec16e381f13dd5b2aaa7fa22604b5510edbac586e4714b2a64fc82
+  metadata.gz: ebdb54ad7f8bcc232518f8c8a1c3f064b5b68fc85bee7f0418fbbd6cb4291e799c936285629c0df7588bffde3bdbc15ce6059d07d8d89fd6c8ec1263cffb10df
+  data.tar.gz: 29c28b4811be4c1d7b82f73a049bdbdcd655005b8e4b3483e0432b5ab62473fe6d3514bbc3ccc626ae92e749126119df1f7301ff56de24180025708b63631121

data/lib/wunderbar/html-methods.rb

@@ -133,15 +133,19 @@ module Wunderbar
         # * Proxied Rack server.  Document base may be relate to the
         #   HTTP_X_WUNDERBAR_BASE 
         #
+        cwd = File.realpath(Dir.pwd.untaint)
         base = @_scope.env['DOCUMENT_ROOT'] if @_scope.env.respond_to? :[]
-        base ||= Dir.pwd
+        base ||= cwd
         href = (head.children[1].attrs[:href] || '')
-        _base = @_scope.env['HTTP_X_WUNDERBAR_BASE']
-        href = href[_base.length-1..-1] if _base and href.start_with? _base
+        _base = @_scope.env['HTTP_X_WUNDERBAR_BASE'] ||
+          @_scope.env['SCRIPT_NAME']
+        if _base and not _base.empty? and href.start_with? _base
+          href = href[_base.length-1..-1]
+        end
         base += href
         base += 'index.html' if base.end_with? '/'
         base = Pathname.new(base).parent
-        prefix = Pathname.new(Dir.pwd).relative_path_from(base).to_s + '/'
+        prefix = Pathname.new(cwd).relative_path_from(base).to_s + '/'
         prefix = nil unless prefix.start_with? '..'
       elsif @_scope.respond_to? :env and @_scope.env['PATH_INFO'].to_s.length>1
         prefix = '../' * (@_scope.env['PATH_INFO'].count('/') - 1)

data/lib/wunderbar/react.rb

@@ -93,6 +93,7 @@ class Wunderbar::XmlMarkup
           end 
           src = File.join(path.join('/'), src) unless path.empty?
         end
+        src.untaint
 
         name = File.expand_path(src, @_scope.settings.public_folder.untaint)
         name.untaint unless src.tainted?

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: wunderbar 1.0.15 ruby lib
+# stub: wunderbar 1.0.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "1.0.15"
+  s.version = "1.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Sam Ruby"]
-  s.date = "2016-01-23"
+  s.date = "2016-01-24"
   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 = ["COPYING", "README.md", "lib/wunderbar", "lib/wunderbar.rb", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs.rb", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/bootstrap/theme.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.rb", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.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/Markdown.Converter.js", "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/marked.min.js", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/react-dom.min.js", "lib/wunderbar/vendor/react-with-addons.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/version.rb", "lib/wunderbar/websocket.rb", "wunderbar.gemspec"]

metadata

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