wunderbar 0.22.2 → 0.22.3

data/lib/wunderbar/builder.rb

@@ -1,4 +1,10 @@
 module Wunderbar
+  @@options = {indent: 2}
+  def self.option(values={})
+    @@options.merge!(values)
+    @@options
+  end
+
   class BuilderBase
     def set_variables_from_params(locals={})
       params = @_scope.params.map do |key, value|
@@ -121,16 +127,16 @@ module Wunderbar
 
     def initialize(args={})
       @_scope = args.delete(:scope)
-      @_indent = args.delete(:indent) || 2
+      @_indent = args.delete(:indent) || Wunderbar.option[:indent]
+      @_width = args.delete(:width) || Wunderbar.option[:width]
       @_pdf = false
       @doc = Node.new(nil)
       @node = @doc
       @indentation_enabled = true
-      @width = nil
       @spaced = false
     end
 
-    attr_accessor :width
+    attr_accessor :_width
 
     # forward to Wunderbar or @_scope
     def method_missing(method, *args, &block)
@@ -176,7 +182,7 @@ module Wunderbar
     end
 
     def target!
-      "#{@doc.serialize(indent: ' ' * @_indent, width: @width).join("\n")}\n"
+      "#{@doc.serialize(indent: ' ' * @_indent, width: @_width).join("\n")}\n"
     end
 
     def clear!

data/lib/wunderbar/html-methods.rb

@@ -39,7 +39,7 @@ module Wunderbar
 
     def initialize(scope)
       @_scope = scope
-      @_x = XmlMarkup.new :scope => scope, :indent => 2
+      @_x = XmlMarkup.new :scope => scope
     end
 
     def html(*args, &block)
@@ -47,7 +47,7 @@ module Wunderbar
       args << {} if args.empty?
       if Hash === args.first
         args.first[:xmlns] ||= 'http://www.w3.org/1999/xhtml'
-        @_x.width = args.first.delete(:_width).to_i if args.first[:_width]
+        @_x._width = args.first.delete(:_width).to_i if args.first[:_width]
       end
 
       bom = "\ufeff"
@@ -292,9 +292,7 @@ module Wunderbar
     end
 
     def _textarea(*args, &block)
-      @_x.compact! do
-        proxiable_tag! :textarea, PreformattedNode, *args, &block
-      end
+      proxiable_tag! :textarea, PreformattedNode, *args, &block
     end
 
     def _ul(*args, &block)

data/lib/wunderbar/node.rb

@@ -91,8 +91,9 @@ module Wunderbar
             line += "></#{name}>"
           end
 
-          if indent and width and line.length > width
-            reflowed = IndentedTextNode.reflow(indent, line, width)
+          if indent and width and (line.length > width or line.include? "\n")
+            reflowed = IndentedTextNode.reflow(indent, line, width,
+              options[:indent])
             line = reflowed.pop
             result.push *reflowed
           end
@@ -224,10 +225,10 @@ module Wunderbar
   end
 
   class IndentedTextNode < TextNode
-    def self.reflow(indent, line, width)
+    def self.reflow(indent, line, width, next_indent)
       return [line] unless width and indent
-      line = indent + line.gsub!(/\s+/, ' ').strip
-      indent += '  '
+      line = indent + line.gsub(/\s+/, ' ').strip
+      indent += next_indent
 
       result = []
       while line.length > width
@@ -248,7 +249,7 @@ module Wunderbar
       end
 
       result.push *IndentedTextNode.reflow(indent, 
-        text.to_s.gsub(/[&<>\u00A0]/,ESCAPE), options[:width])
+        text.to_s.gsub(/[&<>\u00A0]/,ESCAPE), options[:width], '')
     end
   end
 

data/lib/wunderbar/sinatra.rb

@@ -201,6 +201,16 @@ module Wunderbar
             end
           end
 
+          # text, json shortcuts
+          if block == nil and args.length >= 1
+            case args.first
+            when Array, Hash
+              block = proc { _! args.first } if ext == :_json
+            when String
+              block = proc { _ args.first } if ext == :_text
+            end
+          end
+
           template.evaluate(ext, self, *args, &block)
         end
 

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.22.2"
+  s.version = "0.22.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-01-08"
+  s.date = "2015-01-14"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json