wunderbar 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c171f3bd768e21db2c12b3776ef414db16cb8cc5
-  data.tar.gz: cbaf1ab1828fd54e0cada61c139520aaa54248d0
+  metadata.gz: 960b2286efaf87963603361c6a1f3dc15eb86956
+  data.tar.gz: 5af237e03df44700a049ee82e7d93dc7d3f271ab
 SHA512:
-  metadata.gz: 19d3bd9f11bd83e2309b0f96ea379d26460b6617f103bdb658adb982af065ecd55b0edb55711b033ae22f6f88522bbcbf808579e4abfd45a7717820460f6ef6a
-  data.tar.gz: b62899679bc94e9edcaf613b5b0dbc5a36493885942c1b350ee8ba98e9402ce2f200e3bb0813205bf00b25ee5b9da8d74a6a2706513b77ac34fe710a945dea16
+  metadata.gz: 09984eb6693c92d4f1e0694e593d7985444af1d30f579e0090e5bac7fce793148e0365918ddf81ed8a69b9729e2ca5ca2024a83a3ba27f645cbed3f47ea9fdec
+  data.tar.gz: 8a0a622ae748183d9a99eb00c5bbd3881c73506694102cf411ef592e3e28e005f36cbaf017c1c67e1faf87ed6f8fc5435e7c122b65620407a5be4b335525c87c

data/lib/wunderbar/listen.rb

@@ -7,6 +7,43 @@
 
 require 'listen'
 
+#
+# support for excluding files/directories from triggering restart.
+#
+# Usage:
+#
+#   module Wunderbar::Listen
+#     EXCLUDE = ['file', 'dir']
+#   end
+#
+module Wunderbar
+  module Listen
+    EXCLUDE = [] unless defined? EXCLUDE
+
+    EXCLUDE.each_with_index do |filename, index|
+      EXCLUDE[index] = File.realpath(filename)
+    end
+
+    # add a path to the exclude list
+    def self.exclude(*files)
+      files.each do |file|
+        file = File.realpath(file)
+        EXCLUDE << file unless EXCLUDE.include? file
+      end
+    end
+
+    # check to see if all of the files are excluded
+    def self.exclude?(files)
+      files.all? do |file|
+        file = File.realpath(file) if File.exist? file
+        EXCLUDE.any? do |exclude|
+          file == exclude or file.start_with? exclude + '/'
+        end
+      end
+    end
+  end
+end
+
 $HOME = ENV['HOME']
 
 pids = `lsof -t -i tcp:9292`.split
@@ -29,6 +66,8 @@ dirs.each {|dir| puts "Watching #{dir}"}
 puts unless dirs.empty?
 
 listener = Listen.to(*dirs) do |modified, added, removed|
+  next if Wunderbar::Listen.exclude? modified+added+removed
+
   puts
   modified.each {|file| puts "#{file} modified"}
   added.each {|file| puts "#{file} added"}

data/lib/wunderbar/react.rb

@@ -81,7 +81,21 @@ class Wunderbar::XmlMarkup
 
       if script.attrs[:src]
         src = script.attrs[:src]
-        src = File.join(base, src) unless base.empty?
+
+        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
+
         name = File.expand_path(src, @_scope.settings.public_folder.untaint)
         name.untaint unless src.tainted?
         if File.exist? name
@@ -121,7 +135,7 @@ class Wunderbar::XmlMarkup
       nodes.each {|node| node.parent = target}
       target.children += nodes
     rescue ExecJS::ProgramError => e
-      STDERR.puts e
+      Wunderbar.error e
       target.children << builder._pre(e.message).node?
     end
 
@@ -145,10 +159,9 @@ get %r{^/([-\w]+)\.js$} do |script|
   begin
     js = Wunderbar::Asset.convert(file)
     pass unless js
-  rescue
-    # if conversion fails, use Wunderbar's error recovery
-    _js :"#{script}"
-    return
+  rescue Exception => e
+    Wunderbar.error e.to_s
+    return [500, {'Content-type' => 'text/plain'}, "*** ERROR ***\n\n#{e}"]
   end
 
   response.headers['SourceMap'] = "#{script}.js.map"

data/lib/wunderbar/sinatra.rb

@@ -240,7 +240,7 @@ Tilt.register 'xhtml.rb', Wunderbar::Template::Xhtml
 helpers Wunderbar::SinatraHelpers
 
 if Dir.exist? settings.public_folder
-  Wunderbar::Asset.root = File.join(settings.public_folder, 'assets')
+  Wunderbar::Asset.root = File.join(settings.public_folder, 'assets').untaint
 end
 
 Wunderbar::Asset.virtual = true

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -1,21 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: wunderbar 1.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   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 = "2015-12-11"
+  s.date = "2015-12-18"
   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-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", "wunderbar.gemspec"]
+  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"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
-  s.rubygems_version = "2.4.5.1"
+  s.rubygems_version = "2.0.14"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -32,16 +32,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- COPYING
+- wunderbar.gemspec
 - README.md
-- lib/wunderbar.rb
-- lib/wunderbar/angularjs.rb
+- COPYING
 - 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.rb
 - lib/wunderbar/bootstrap/theme.rb
+- lib/wunderbar/bootstrap.rb
 - lib/wunderbar/builder.rb
 - lib/wunderbar/cgi-methods.rb
 - lib/wunderbar/coderay.rb
@@ -52,9 +52,9 @@ files:
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/installation.rb
 - lib/wunderbar/job-control.rb
-- lib/wunderbar/jquery.rb
 - 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
@@ -69,7 +69,6 @@ files:
 - lib/wunderbar/server.rb
 - lib/wunderbar/sinatra.rb
 - lib/wunderbar/underscore.rb
-- 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
@@ -78,6 +77,7 @@ files:
 - 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
@@ -86,7 +86,7 @@ files:
 - lib/wunderbar/vendor/underscore-min.js
 - lib/wunderbar/version.rb
 - lib/wunderbar/websocket.rb
-- wunderbar.gemspec
+- lib/wunderbar.rb
 homepage: http://github.com/rubys/wunderbar
 licenses:
 - MIT
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: HTML Generator and CGI application support