wunderbar 0.22.1 → 0.22.2

data/README.md

@@ -394,8 +394,7 @@ Also, the following environment variables are set if they aren't already:
 * `LANG`
 * `REMOTE_USER`
 
-Finally, the (Ruby 1.9.x) default external and internal encodings are set to
-UTF-8.  For Ruby 1.8, `$KCODE` is set to `U`
+Finally, the default external and internal encodings are set to UTF-8.
 
 Logging:
 ---

data/lib/wunderbar/environment.rb

@@ -77,12 +77,8 @@ $SERVER = ENV['HTTP_HOST'] || Socket::gethostname
 
 # set encoding to UTF-8
 ENV['LANG'] ||= "en_US.UTF-8"
-if defined? Encoding
-  Encoding.default_external = Encoding::UTF_8
-  Encoding.default_internal = Encoding::UTF_8
-else
-  $KCODE = 'U'
-end
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 
 # Add methods to the 'main' object
 if self.to_s == 'main'

data/lib/wunderbar/html-methods.rb

@@ -50,11 +50,7 @@ module Wunderbar
         @_x.width = args.first.delete(:_width).to_i if args.first[:_width]
       end
 
-      if ''.respond_to? :encoding
-        bom = "\ufeff"
-      else
-        bom = "\xEF\xBB\xBF"
-      end
+      bom = "\ufeff"
 
       title = args.shift if String === args.first
       @_x.declare! :DOCTYPE, :html
@@ -295,6 +291,12 @@ module Wunderbar
       end
     end
 
+    def _textarea(*args, &block)
+      @_x.compact! do
+        proxiable_tag! :textarea, PreformattedNode, *args, &block
+      end
+    end
+
     def _ul(*args, &block)
       iterable = args.first.respond_to? :each
       if iterable and (args.length > 1 or not args.first.respond_to? :to_hash)

data/lib/wunderbar/node.rb

@@ -13,6 +13,7 @@ module Wunderbar
       '"' => '"',
       '<' => '&lt;',
       '>' => '&gt;',
+      "\u00A0" => '&#xA0;',
     }
 
     def initialize(name, *args)
@@ -73,7 +74,7 @@ module Wunderbar
         next unless value
         name = name.to_s.gsub('_','-') if Symbol === name
         value=name if value==true
-        line += " #{name}=\"#{value.to_s.gsub(/[&\"<>]/,ESCAPE)}\""
+        line += " #{name}=\"#{value.to_s.gsub(/[&\"<>\u00A0]/,ESCAPE)}\""
       end
 
       if children.empty? 
@@ -83,7 +84,7 @@ module Wunderbar
           width = options[:width] unless preserve_spaces?
 
           if text
-            line += ">#{text.to_s.gsub(/[&<>]/,ESCAPE)}</#{name}>"
+            line += ">#{text.to_s.gsub(/[&<>\u00A0]/,ESCAPE)}</#{name}>"
           elsif VOID.include? name.to_s
             line += "/>"
           else
@@ -215,9 +216,9 @@ module Wunderbar
 
     def serialize(options, result, indent)
       if options[:space] == :preserve
-        result << @text.to_s.gsub(/[&<>]/,ESCAPE)
+        result << @text.to_s.gsub(/[&<>\u00A0]/,ESCAPE)
       else
-        result << @text.to_s.gsub(/[&<>]/,ESCAPE).gsub(/\s+/, ' ')
+        result << @text.to_s.gsub(/[&<>\u00A0]/,ESCAPE).gsub(/\s+/, ' ')
       end
     end
   end
@@ -247,7 +248,7 @@ module Wunderbar
       end
 
       result.push *IndentedTextNode.reflow(indent, 
-        text.to_s.gsub(/[&<>]/,ESCAPE), options[:width])
+        text.to_s.gsub(/[&<>\u00A0]/,ESCAPE), options[:width])
     end
   end
 

data/lib/wunderbar/script.rb

@@ -76,7 +76,7 @@ module Wunderbar
 
   module Template
     module Js
-      def self.ext; :_js; end
+      def self.ext; ['js.rb', :_js]; end
       def self.mime; 'application/javascript'; end
 
       def evaluate(scope, locals, &block)

data/lib/wunderbar/sinatra.rb

@@ -14,11 +14,11 @@ module Wunderbar
       Wunderbar::Template.locals(self, args)
 
       if block
-        Wunderbar::Template::Html.evaluate('_html', self) do
+        Wunderbar::Template::Html.evaluate('html.rb', self) do
           _html(*args) { instance_eval &block }
         end
       else
-        Wunderbar::Template::Html.evaluate('_html', self, *args)
+        Wunderbar::Template::Html.evaluate('html.rb', self, *args)
       end
     end
 
@@ -27,12 +27,14 @@ module Wunderbar
         return _html(*args, &block)
       end
 
+      Wunderbar::Template.locals(self, args)
+
       if block
-        Wunderbar::Template::Xhtml.evaluate('_xhtml', self) do
+        Wunderbar::Template::Xhtml.evaluate('xhtml.rb', self) do
           _xhtml(*args) { instance_eval &block }
         end
       else
-        Wunderbar::Template::Xhtml.evaluate('_xhtml', self, *args)
+        Wunderbar::Template::Xhtml.evaluate('xhtml.rb', self, *args)
       end
     end
   end
@@ -124,7 +126,7 @@ module Wunderbar
     end
 
     module Json
-      def self.ext; :_json; end
+      def self.ext; ['json.rb', :_json]; end
       def self.mime; 'application/json'; end
 
       def evaluate(scope, locals, &block)
@@ -142,7 +144,7 @@ module Wunderbar
     end
 
     module Text
-      def self.ext; :_text; end
+      def self.ext; ['text.rb', :_text]; end
       def self.mime; 'text/plain'; end
 
       def evaluate(scope, locals, &block)
@@ -184,24 +186,26 @@ module Wunderbar
         include language
       end
 
-      SinatraHelpers.send :define_method, language.ext do |*args, &block|
-        # parse json
-        if env['CONTENT_TYPE'] =~ /^\w+\/json/
-          json = JSON.parse(env['rack.input'].read)
-          @params.merge! json if Hash === json
-        end
+      Array(language.ext).each do |ext|
+        SinatraHelpers.send :define_method, ext do |*args, &block|
+          # parse json
+          if env['CONTENT_TYPE'] =~ /^\w+\/json/
+            json = JSON.parse(env['rack.input'].read)
+            @params.merge! json if Hash === json
+          end
 
-        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
+          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(ext, self, *args, &block)
         end
 
-        template.evaluate(language.ext, self, *args, &block)
+        Tilt.register ext.to_s, template
       end
-
-      Tilt.register language.ext.to_s, template
     end
 
     constants.each do |language|
@@ -212,7 +216,9 @@ module Wunderbar
 end
 
 Tilt.register '_html',  Wunderbar::Template::Html
+Tilt.register 'html.rb',  Wunderbar::Template::Html
 Tilt.register '_xhtml', Wunderbar::Template::Xhtml
+Tilt.register 'xhtml.rb', Wunderbar::Template::Xhtml
 
 helpers Wunderbar::SinatraHelpers
 

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,17 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.22.1"
+  s.version = "0.22.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-01-02"
+  s.date = "2015-01-08"
   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/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/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/jquery-1.11.0.min.js", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/websocket.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/version.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/server.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/opal.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/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/node.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 = "1.8.23"
   s.summary = "HTML Generator and CGI application support"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: