wunderbar 1.0.5 → 1.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9da84e95d78148773cdc10411a6f2d3834882ac5
+  data.tar.gz: 132ffd6d3a48389bf68f8f5b6de90d87d709808d
+SHA512:
+  metadata.gz: f5c86953491b1b2cee5a3e840c933166c3536fc633253c0da965b8288585a40f70ce662e6a3c5ccf616730f3fced6a67ba800939fbb83e55f53239a240b242d8
+  data.tar.gz: c621cf5d3f7ebe4551bcda858b3329349f38add5e6fd58e270725f7d4f4a6c9a4fce3af71a2075d878cfb4a6a6a566f58c44c2a16fb17112b7a31b1ad3b6219d

data/lib/wunderbar/react.rb

@@ -16,6 +16,16 @@ source = Dir[File.expand_path('../vendor/react-*.min.js', __FILE__)].
 Wunderbar::Asset.script name: 'react-min.js', file: source,
   react: ['global=this']
 
+class Wunderbar::Asset
+  @@cached_scripts = {}
+  def self.convert(file)
+    cached = @@cached_scripts[file]
+    return cached if cached and cached.uptodate?
+    return nil unless File.exist? file
+    @@cached_scripts[file] = Ruby2JS.convert(File.read(file), file: file)
+  end
+end
+
 class Wunderbar::ClientScriptNode < Wunderbar::ScriptNode
 end
 
@@ -72,10 +82,8 @@ class Wunderbar::XmlMarkup
         if File.exist? name
           result = File.read(name)
         else
-          name = File.expand_path(src+'.rb', @_scope.settings.views.untaint)
-          if File.exist? name
-            result = Ruby2JS.convert(File.read(name), file: name)
-          end
+          file = File.expand_path(src+'.rb', @_scope.settings.views.untaint)
+          result = Wunderbar::Asset.convert(file)
         end
       else
         result = Ruby2JS.convert(script.block, binding: script.binding)
@@ -126,27 +134,24 @@ class Ruby2JS::Serializer
   end
 end
 
-SCRIPTS = {}
 get %r{^/([-\w]+)\.js$} do |script|
-  unless SCRIPTS[script] and SCRIPTS[script].uptodate?
-    file = File.join(settings.views, "#{script}.js.rb")
-    pass unless File.exist? file
-    begin
-      SCRIPTS[script] = Ruby2JS.convert(File.read(file), file: file)
-    rescue
-      # if conversion fails, use Wunderbar's error recovery
-      _js :"#{script}"
-      return
-    end
+  file = File.join(settings.views, "#{script}.js.rb")
+  begin
+    js = Wunderbar::Asset.convert(file)
+    pass unless js
+  rescue
+    # if conversion fails, use Wunderbar's error recovery
+    _js :"#{script}"
+    return
   end
 
   response.headers['SourceMap'] = "#{script}.js.map"
 
-  etag SCRIPTS[script].etag
+  etag js.etag
 
   content_type 'application/javascript;charset:utf8'
 
-  SCRIPTS[script].to_s
+  js.to_s
 end
 
 get %r{^/((?:\w+\/)*[-\w]+)\.js.rb$} do |script|
@@ -156,11 +161,13 @@ get %r{^/((?:\w+\/)*[-\w]+)\.js.rb$} do |script|
 end
 
 get %r{^/([-\w]+)\.js.map$} do |script|
-  pass unless SCRIPTS[script]
+  file = File.join(settings.views, "#{script}.js.rb")
+  js = Wunderbar::Asset.convert(file)
+  pass unless js
 
-  etag SCRIPTS[script].sourcemap_etag
+  etag js.sourcemap_etag
 
-  sourcemap = SCRIPTS[script].sourcemap
+  sourcemap = js.sourcemap
 
   content_type 'application/json;charset:utf8'
   base = settings.views + '/'

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -1,24 +1,25 @@
 # -*- encoding: utf-8 -*-
+# stub: wunderbar 1.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   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-05-04"
+  s.date = "2015-05-06"
   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 = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/script.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/marked.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/react-0.13.2.min.js", "lib/wunderbar/vendor/jquery-1.11.2.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/eventsource.min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/websocket.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/listen.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/version.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/server.rb", "lib/wunderbar/eventsource.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/marked.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/node.rb", "lib/wunderbar/react.rb"]
+  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-0.13.2.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.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 = "1.8.23.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])

metadata

@@ -1,116 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-  name: json
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-description: ! "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML,
-  Unicode\n    (utf-8), consistently indented, readable applications.'\n"
+description: |2
+      Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode
+      (utf-8), consistently indented, readable applications.'
 email: rubys@intertwingly.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- wunderbar.gemspec
-- README.md
 - COPYING
+- README.md
 - lib/wunderbar.rb
-- lib/wunderbar/script.rb
-- lib/wunderbar/jquery.rb
-- lib/wunderbar/underscore.rb
-- lib/wunderbar/polymer.rb
-- lib/wunderbar/jquery/filter.rb
-- lib/wunderbar/jquery/stupidtable.rb
-- lib/wunderbar/vendor/polymer-v0.0.20131003.min.js
-- lib/wunderbar/vendor/marked.min.js
-- lib/wunderbar/vendor/stupidtable.min.js
-- lib/wunderbar/vendor/bootstrap.min.js
-- lib/wunderbar/vendor/Markdown.Converter.js
-- lib/wunderbar/vendor/angular.min.js
-- lib/wunderbar/vendor/react-0.13.2.min.js
-- lib/wunderbar/vendor/jquery-1.11.2.min.js
-- lib/wunderbar/vendor/bootstrap-theme.min.css
-- lib/wunderbar/vendor/angular-resource.min.js
-- lib/wunderbar/vendor/bootstrap.min.css
-- lib/wunderbar/vendor/underscore-min.js
-- lib/wunderbar/vendor/eventsource.min.js
-- lib/wunderbar/vendor/angular-route.min.js
-- lib/wunderbar/websocket.rb
-- lib/wunderbar/environment.rb
-- lib/wunderbar/listen.rb
-- lib/wunderbar/pagedown.rb
-- lib/wunderbar/version.rb
-- lib/wunderbar/cgi-methods.rb
-- lib/wunderbar/server.rb
-- lib/wunderbar/eventsource.rb
 - lib/wunderbar/angularjs.rb
-- lib/wunderbar/logger.rb
+- lib/wunderbar/angularjs/resource.rb
+- lib/wunderbar/angularjs/route.rb
 - lib/wunderbar/asset.rb
 - lib/wunderbar/backtick.rb
-- lib/wunderbar/coffeescript.rb
-- lib/wunderbar/markdown.rb
-- lib/wunderbar/installation.rb
 - lib/wunderbar/bootstrap.rb
-- lib/wunderbar/job-control.rb
-- lib/wunderbar/sinatra.rb
-- lib/wunderbar/rails.rb
-- lib/wunderbar/angularjs/resource.rb
-- lib/wunderbar/angularjs/route.rb
-- lib/wunderbar/rack.rb
-- lib/wunderbar/coderay.rb
-- lib/wunderbar/builder.rb
-- lib/wunderbar/marked.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.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/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-0.13.2.min.js
+- lib/wunderbar/vendor/stupidtable.min.js
+- lib/wunderbar/vendor/underscore-min.js
+- lib/wunderbar/version.rb
+- lib/wunderbar/websocket.rb
+- wunderbar.gemspec
 homepage: http://github.com/rubys/wunderbar
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTML Generator and CGI application support
 test_files: []