wunderbar 0.19.1 → 0.19.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGRmMDMxMzI4Y2JkMWZjYjIyNjZiYzhkMzY2YjEzNjcwODhjODQxZA==
+    MTI3ZTFhMDA4ODRhZGQ5M2VhYjA3Yjk3ODg1NjNlMjM1NjFlMjM3OA==
   data.tar.gz: !binary |-
-    OTAyMGVlNzBjMDllYzFlMmI2ZDgwM2ZlNzkxYzlkMTBiMmFiMWEyMQ==
+    NDJlZTExMzdkMDc1YzMzNjIyYzM2Y2VkYTQxZTFhZWE1YWQ0NDMzYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mjk1MGUzMWZmZTVhMzRjOTg1OWU3YWI2ODkwNThlMWUzN2U0NzRmNGU3OGJk
-    N2NiMzQ0MDgzYmQ3ZjIxMTk3MzNjOTMxMzdiZmMyOTdhZjJlZDNmNjhkMzA2
-    YTg2MDllNDY3YTkzZTZiOTlhMDJmNGZmMWJjNWM0ODUwY2FlNjU=
+    MTBmNzJkYzVmMjMwNTdmZDA3YWQwNGRkNGFiYjJkZDE3ZTdjYWY3OWY5MjYy
+    NTBkOWE2NjRhYmY3OWMxZjEyODA0NTZkOWJmYjI5MTYwODQwYTkyNWZjNDYy
+    ZTEwOGMxMjdiNWU3NmU2MjUxNjk0NWFiN2NkZTliYTc3MDg1OTI=
   data.tar.gz: !binary |-
-    ODM2ODg1ZjkyNDBkMjg0NDg0ODc3YTk5NTVmZjc1ZjNiMmNjODQ4ODNhYjEx
-    YWQ0ZjczYjY3ODlhZmYzM2IxYzFlYWJiNTkxMTdlOWVkOWI4MDA4NDc5MGZh
-    Yzk2NmZhZjllYTU4ZTZlNzY5ZTU4MGJjNGU2ZWFmODI5MzdlZTY=
+    ZTVkZThhNDU2N2UyMDRkYzNmY2RlZTZlYTE0OWRjNDA2M2FhMWU1MDQ0Mjcx
+    MjQ3MmRlMWU5M2VkOTM5ZTcyMDI0NmFkZjc0YTg5NGE3YTQ2MmRiY2Q4NDkx
+    MWUyMTcxNDY0ODNmOGIwNWE5MTk0ZGI3YTA4NGVlNmQyZTBlOGY=

data/lib/wunderbar/builder.rb

@@ -1,11 +1,15 @@
 module Wunderbar
   class BuilderBase
     def set_variables_from_params(locals={})
-      @_scope.params.merge(locals).each do |key,value|
+      params = @_scope.params.map do |key, value|
         value = value.first if Array === value
         value.gsub! "\r\n", "\n" if String === value
-        if key =~ /^[a-z]\w+$/
-          instance_variable_set "@#{key.dup.untaint}", value 
+        ["@#{key}", value]
+      end
+
+      Hash[params].merge(locals).each do |key,value|
+        if key =~ /^@[a-z]\w+$/
+          instance_variable_set key, value 
         end
       end
     end

data/lib/wunderbar/script.rb

@@ -56,6 +56,11 @@ module Wunderbar
 
       begin
         output = Ruby2JS.convert(block) + "\n"
+      rescue Parser::SyntaxError => exception
+        headers['status'] =  "500 Internal Server Error"
+        location = exception.diagnostic.location
+        output = "// Syntax Error: line #{location.line}, " +
+          "column: #{location.column}\n#{exception}\n"
       rescue ::Exception => exception
         headers['status'] =  "500 Internal Server Error"
         output = "// Internal Server Error\n#{exception}\n"
@@ -73,7 +78,12 @@ module Wunderbar
       def evaluate(scope, locals, &block)
         scope.content_type self.class.default_mime_type, charset: 'utf-8'
         begin
-          Ruby2JS.convert(data)
+          Ruby2JS.convert(data, ivars: locals)
+        rescue Parser::SyntaxError => exception
+          scope.response.status = 500
+          location = exception.diagnostic.location
+          "// Syntax Error: line #{location.line}, column: #{location.column}" +
+            "\n#{exception}\n"
         rescue Exception => exception
           scope.response.status = 500
           "// Internal Server Error\n#{exception}\n"

data/lib/wunderbar/sinatra.rb

@@ -11,6 +11,8 @@ end
 module Wunderbar
   module SinatraHelpers
     def _html(*args, &block)
+      Wunderbar::Template.locals(self, args)
+
       if block
         Wunderbar::Template::Html.evaluate('_html', self) do
           _html(*args) { instance_eval &block }
@@ -156,6 +158,25 @@ module Wunderbar
       end
     end
 
+    PASSABLE = [Numeric, String, Hash, Array]
+
+    def self.locals(scope, args)
+      args.push({}) if args.length == 1
+
+      return unless Hash === args.last and not args.last[:locals]
+
+      locals = {}
+
+      scope.instance_variables.each do |ivar|
+        next if [:@env, :@params].include? ivar
+        value = scope.instance_variable_get(ivar)
+        next unless PASSABLE.find {|klass| klass === value}
+        locals[ivar] = value
+      end
+
+      args.last[:locals] = locals
+    end
+
     def self.register(language, base=Base)
       template = Class.new(Template::Base) do 
         self.default_mime_type = language.mime
@@ -163,6 +184,13 @@ module Wunderbar
       end
 
       SinatraHelpers.send :define_method, language.ext do |*args, &block|
+        Wunderbar::Template.locals(self, args)
+        if Hash === args.last and args.last[:locals]
+          @params.each do |name, value| 
+            args.last[:locals]["@#{name}".to_sym] = value
+          end
+        end
+
         template.evaluate(language.ext, self, *args, &block)
       end
 

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.19.1"
+  s.version = "0.19.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2013-12-11"
+  s.date = "2013-12-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/angular-resource.min.js", "lib/wunderbar/vendor/jquery-1.10.2.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "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/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/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.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json