wunderbar 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 975a0ebdb8ed585e047ee343fa18ee036f8ba38f
-  data.tar.gz: 50267ba72ed73050b23a217d9f3abfc2bbf268b8
+  metadata.gz: 00c358e7d9d5c8f139420478422150c4b46824be
+  data.tar.gz: 90340d40d3746a7c45bedc2a81a160bea4030b15
 SHA512:
-  metadata.gz: 5d5073c760970ace45d4a4c95a1bebdcac696a09a8e50bcc42ad7503f4697bd4e8d7ceec5b02b71895a4d4ca93ed69168fa0c455354fcf3c03e8b0b265e6ecb9
-  data.tar.gz: c0fe79197a3e9abae9cba6be47327614be66df098860179ef56dda4f3a040e229a399b78270f8bd741d771bee21d2f2491118f600f2a2b3c13999922f21d14fb
+  metadata.gz: 11c25ff2196ba3c7156d7c86a78bf3e83bd89408234ff99f8d096434414ad39dc0493fb9de4e7b688fd3672d7cab2ea505919bc0b3626f495d0cf44c687a6126
+  data.tar.gz: 4631f32d215109cd501e4abd32b0e4669cd380151d2a27470068e5c13c42f2bbea3610b7407f433f0a8cdef6152a20fd5f80b7aa0443a8afd336578ce19fa285

data/lib/wunderbar/react.rb

@@ -43,13 +43,13 @@ class Wunderbar::XmlMarkup
     _base = @_scope.env['HTTP_X_WUNDERBAR_BASE']
     base = base[_base.length..-1] if _base and base.start_with? _base
 
-    script = @_scope.env['SCRIPT_NAME']
-    base = base[script.length..-1] if script and base.start_with? script
-
     if base == '..' or base.end_with? '/..'
-      base = (Pathname.new(@_scope.env['REQUEST_URI']) + base).to_s
+      base = (Pathname.new(@_scope.env['REQUEST_URI']) + '../' + base).to_s
     end
 
+    script = @_scope.env['SCRIPT_NAME']
+    base = base[script.length..-1] if script and base.start_with? script
+
     base = base[1..-1] if base.start_with? '/'
 
     # compute client side container
@@ -80,19 +80,7 @@ class Wunderbar::XmlMarkup
       if script.attrs[:src]
         src = script.attrs[:src]
 
-        if not base.empty?
-          src = File.join(base, src)
-        elsif @_scope.env['PATH_INFO']
-          # evaluate src relative to PATH_INFO
-          path = @_scope.env['PATH_INFO'].split('/')
-          path.shift
-          path.pop
-          while src.start_with? '../' and not path.empty?
-            src = src.sub('../', '')
-            path.pop
-          end 
-          src = File.join(path.join('/'), src) unless path.empty?
-        end
+        src = File.join(base, src) if not base.empty?
         src.untaint
 
         name = File.expand_path(src, @_scope.settings.public_folder.untaint)

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: wunderbar 1.0.18 ruby lib
+# stub: wunderbar 1.0.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "1.0.18"
+  s.version = "1.0.19"
 
   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-02-08"
+  s.date = "2016-02-11"
   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.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json