wunderbar 0.18.3 → 0.19.0

data/README.md

@@ -16,6 +16,8 @@ the element id and class id syntax and based on the implementation from
 Wunderbar's JSON support is inspired by David Heinemeier Hansson's
 [jbuilder](https://github.com/rails/jbuilder).
 
+A [tutorial](https://github.com/rubys/wunderbar/blob/master/docs/Introduction1.md) is under development.
+
 Overview
 ---
 
@@ -76,6 +78,10 @@ Element with boolean attributes:
 
     _input 'Cheese', type: 'checkbox', name: 'cheese', checked: true
 
+Element with boolean attributes (alternate form):
+
+    _input 'Cheese', :checked, type: 'checkbox', name: 'cheese'
+
 Element with optional (omitted) attributes:
 
     _tr class: nil

data/lib/wunderbar/{angular-resource.rb → angularjs/resource.rb}

@@ -1,6 +1,6 @@
 require 'wunderbar/angularjs'
 require 'ruby2js/filter/angular-resource'
 
-source = File.expand_path('../angular-resource.min.js', __FILE__)
+source = File.expand_path('../../vendor/angular-resource.min.js', __FILE__)
 
 Wunderbar::Asset.script :name => 'angular-resource.min.js', :file => source

data/lib/wunderbar/{angular-route.rb → angularjs/route.rb}

@@ -1,6 +1,6 @@
 require 'wunderbar/angularjs'
 require 'ruby2js/filter/angular-route'
 
-source = File.expand_path('../angular-route.min.js', __FILE__)
+source = File.expand_path('../../vendor/angular-route.min.js', __FILE__)
 
 Wunderbar::Asset.script :name => 'angular-route.min.js', :file => source

data/lib/wunderbar/angularjs.rb

@@ -1,6 +1,6 @@
 require 'wunderbar/script'
 require 'ruby2js/filter/angularrb'
 
-source = File.expand_path('../angular.min.js', __FILE__)
+source = File.expand_path('../vendor/angular.min.js', __FILE__)
 
 Wunderbar::Asset.script :name => 'angular-min.js', :file => source

data/lib/wunderbar/asset.rb

@@ -21,10 +21,21 @@ module Wunderbar
       @@stylesheets = []
     end
 
+    def self.content_type_for(path)
+      if @@scripts.any? {|script| script.path == path}
+        'application/javascript'
+      elsif @@stylesheets.any? {|script| script.path == path}
+        'text/css'
+      else
+        'application/octet-stream'
+      end
+    end
+
     clear
 
-    @path = '../' * ENV['PATH_INFO'].to_s.count('/')
+    @path = '../' * ENV['PATH_INFO'].to_s.count('/') + 'assets'
     @root = File.dirname(ENV['SCRIPT_FILENAME']) if ENV['SCRIPT_FILENAME']
+    @root = File.expand_path((@root || Dir.pwd) + "/assets")
 
     # Options: typically :name plus either :file or :contents
     #   :name => name to be used for the asset
@@ -37,8 +48,8 @@ module Wunderbar
       options[:name] ||= File.basename(options[:file]) if source
 
       if options[:name]
-        @path = "assets/#{options[:name]}"
-        dest = File.expand_path(@path, Asset.root || Dir.pwd)
+        @path = options[:name]
+        dest = File.expand_path(@path, Asset.root)
 
         if not File.exist?(dest) or File.mtime(dest) < File.mtime(source)
           begin
@@ -69,7 +80,7 @@ module Wunderbar
       Proc.new do 
         @@scripts.each do |script|
           if script.path
-            _script :src => Asset.path+script.path
+            _script src: "#{Asset.path}/#{script.path}"
           elsif script.contents
             _script script.contents
           end
@@ -77,8 +88,8 @@ module Wunderbar
 
         @@stylesheets.each do |stylesheet|
           if stylesheet.path
-            _link :rel => "stylesheet", :href => Asset.path+stylesheet.path,
-              :type => "text/css"
+            _link rel: "stylesheet", href: "#{Asset.path}/#{stylesheet.path}",
+              type: "text/css"
           elsif stylesheet.contents
             _style stylesheet.contents
           end

data/lib/wunderbar/builder.rb

@@ -37,6 +37,8 @@ module Wunderbar
       @spaced = false
     end
 
+    attr_accessor :width
+
     # forward to Wunderbar or @_scope
     def method_missing(method, *args, &block)
       if Wunderbar.respond_to? method
@@ -81,7 +83,7 @@ module Wunderbar
     end
 
     def target!
-      "#{@doc.serialize(indent: ' ' * @_indent).join("\n")}\n"
+      "#{@doc.serialize(indent: ' ' * @_indent, width: @width).join("\n")}\n"
     end
 
     def clear!
@@ -89,9 +91,8 @@ module Wunderbar
       @node = @doc
     end
 
-    def compact!(width, &block)
+    def compact!(&block)
       begin
-        @width = width
         @indentation_enabled = false
         block.call
       ensure
@@ -118,8 +119,7 @@ module Wunderbar
         attributes.merge!(node.namespaces) if node.namespaces
         args.push attributes
         if node.namespace and node.namespace.prefix
-          args.unshift node.name.to_sym
-          sym = node.namespace.prefix
+          sym = "#{node.namespace.prefix}:#{node.name}"
         else
           sym = node.name
         end
@@ -131,10 +131,7 @@ module Wunderbar
         node = Node.new sym, *args
       end
 
-      unless @indentation_enabled
-        node.extend CompactNode 
-        node.width = @width
-      end
+      node.extend CompactNode unless @indentation_enabled
 
       if @spaced
         node.extend SpacedNode
@@ -320,7 +317,7 @@ module Wunderbar
             end
           else
             # disable indentation on the entire element
-            compact!(nil) do
+            compact! do
               tag!(child) {self[*child.children]}
             end
           end
@@ -331,7 +328,7 @@ module Wunderbar
         elsif child.children.any?(&:cdata?) and child.text =~ /[<&]/
           self << child
         elsif child.name == 'pre'
-          compact!(nil) { tag!(child) {self[*child.children]} }
+          compact! { tag!(child) {self[*child.children]} }
         elsif child.name == 'head'
           head = tag!(child) {self[*child.children]}
           html = @doc.children.last

data/lib/wunderbar/cgi-methods.rb

@@ -131,10 +131,9 @@ module Wunderbar
       path_info = env['PATH_INFO'].to_s
 
       # implied request types
-      xhr_json = Wunderbar::Options::XHR_JSON || (accept =~ /json/) ||
-        env['HTTP_X_REQUESTED_WITH'].to_s == 'XMLHttpRequest'
-      text = Wunderbar::Options::TEXT || 
-        (accept =~ /plain/ and accept !~ /html/)
+      text = Wunderbar::Options::TEXT || (accept =~ /plain/ && accept !~ /html/)
+      xhr_json = Wunderbar::Options::XHR_JSON || (accept =~ /json/)
+      xhr_json ||= !text && env['HTTP_X_REQUESTED_WITH'].to_s=='XMLHttpRequest'
       @xhtml = (accept =~ /xhtml/ or accept == '')
       @pdf   = (accept =~ /pdf/)
 
@@ -151,7 +150,7 @@ module Wunderbar
       @pdf           ||= ARGV.include?('--pdf')
 
       # overrides via the uri query parameter
-      xhr_json       ||= (path_info.end_with? '.json')
+      # xhr_json       ||= (path_info.end_with? '.json')
       text           ||= (path_info.end_with? '.text')
       @pdf           ||= (path_info.end_with? '.pdf')
       xhtml_override ||= (path_info.end_with? '.xhtml')

data/lib/wunderbar/cssproxy.rb

@@ -9,6 +9,10 @@ module Wunderbar
       @node = node
     end
 
+    def node?
+      @node
+    end
+
   private
 
     # Adds attributes to an element.  Bang methods set the :id attribute.

data/lib/wunderbar/html-methods.rb

@@ -49,7 +49,7 @@ module Wunderbar
       args << {} if args.empty?
       if Hash === args.first
         args.first[:xmlns] ||= 'http://www.w3.org/1999/xhtml'
-        @_width = args.first.delete(:_width).to_i if args.first[:_width]
+        @x.width = args.first.delete(:_width).to_i if args.first[:_width]
       end
 
       if ''.respond_to? :encoding
@@ -150,7 +150,7 @@ module Wunderbar
       end
 
       if flag == '!'
-        @x.compact!(@_width) { tag! name, *args, &block }
+        @x.compact! { tag! name, *args, &block }
       elsif flag == '?'
         # capture exceptions, produce filtered tracebacks
         tag!(name, *args) do
@@ -266,7 +266,7 @@ module Wunderbar
     
     def _pre(*args, &block)
       args.first.chomp! if String === args.first and args.first.end_with? "\n"
-      @x.compact!(nil) { tag! :pre, *args, &block }
+      @x.compact! { tag! :pre, *args, &block }
     end
 
     def _ul(*args, &block)
@@ -321,9 +321,13 @@ module Wunderbar
         safe = !children.tainted?
         safe ||= children.html_safe? if children.respond_to? :html_safe?
         safe &&= defined? Nokogiri
+        ok = safe || defined? Sanitize
+        safe = true
 
-        if safe and (children.include? '<' or children.include? '&')
-          children = Nokogiri::HTML::fragment(children.to_s).children.to_a
+        if ok and (children.include? '<' or children.include? '&')
+          doc = Nokogiri::HTML::fragment(children.to_s)
+          Sanitize.new.clean_node! doc.dup.untaint if not safe
+          children = doc.children.to_a
 
           # ignore leading whitespace
           while not children.empty? and children.first.text?

data/lib/wunderbar/job-control.rb

@@ -1,3 +1,5 @@
+require 'wunderbar'
+
 # run command/block as a background daemon
 module Wunderbar
   def self.submit(cmd=nil)

data/lib/wunderbar/jquery/stupidtable.rb

@@ -0,0 +1,5 @@
+require 'wunderbar/jquery'
+
+source = File.expand_path('../../vendor/stupidtable.min.js', __FILE__)
+
+Wunderbar::Asset.script :name => 'stupidtable.min.js', :file => source

data/lib/wunderbar/jquery.rb

@@ -2,10 +2,11 @@ require 'wunderbar'
 
 begin
   require 'ruby2js/filter/jquery'
+  require 'wunderbar/script'
 rescue LoadError
 end
 
-source = Dir[File.expand_path('../jquery-*.min.js', __FILE__)].
+source = Dir[File.expand_path('../vendor/jquery-*.min.js', __FILE__)].
   sort_by {|name| name[/-([.\d]*)\.min.js$/,1].split('.').map(&:to_i)}.last
 
 Wunderbar::Asset.script :name => 'jquery-min.js', :file => source

data/lib/wunderbar/markdown.rb

@@ -1,6 +1,7 @@
 require 'wunderbar'
 require 'kramdown'
 require 'nokogiri'
+require 'sanitize'
 
 module Wunderbar
   class HtmlMarkup

data/lib/wunderbar/node.rb

@@ -20,9 +20,10 @@ module Wunderbar
       @text = nil
       @attrs = {}
       @children = []
-      @name += args.shift.inspect if Symbol === args.first
+      args -= symbols = args.find_all {|arg| Symbol === arg}
       @attrs = args.pop.to_hash if args.last.respond_to? :to_hash
       @text = args.shift.to_s unless args.empty?
+      symbols.each {|sym| @attrs[sym] = true}
     end
 
     def method_missing(*args)
@@ -73,7 +74,13 @@ module Wunderbar
           if options[:pre]
             line += ">#{options[:pre]}#{text}#{options[:post]}</#{name}>"
           else
+            width = options[:width] if name != :pre
             line += ">#{text.to_s.gsub(/[&<>]/,ESCAPE)}</#{name}>"
+            if width and line.length > width
+              reflowed = IndentedTextNode.reflow(indent, line, width)
+              line = reflowed.pop
+              result.push *reflowed
+            end
           end
         elsif VOID.include? name.to_s
           line += "/>"
@@ -83,12 +90,19 @@ module Wunderbar
       elsif CompactNode === self
         work = []
         walk(work, nil, options)
-        if @width
+        width = options[:width]
+        if width
           line += ">"
           (work+["</#{name}>"]).each do |node|
-            if line.length + node.length > @width
+            if line.length + node.length > width
               result << line.rstrip
               line = indent.to_s
+              if line.length + node.length > width and !node.include? '<'
+                reflowed = IndentedTextNode.reflow(indent.to_s, 
+                  "#{indent}#{node}", width)
+                node = reflowed.pop.sub(/^#{indent}/, '')
+                result.push *reflowed
+              end
             end
             line += node
           end
@@ -175,6 +189,20 @@ module Wunderbar
   end
 
   class IndentedTextNode < TextNode
+    def self.reflow(indent, line, width)
+      return [line] if line.include? "\n" or not width
+
+      result = []
+      while line.length > width
+        split = line.rindex(' ', width)
+        break if not split or split <= indent.to_s.length
+        result << line[0...split]
+        line = "#{indent}#{line[split+1..-1]}"
+      end
+
+      result << line
+    end
+
     def serialize(options, result, indent)
       if indent
         text = CDATANode.normalize(@text, indent)
@@ -182,7 +210,8 @@ module Wunderbar
         text = @text
       end
 
-      result << text.to_s.gsub(/[&<>]/,ESCAPE)
+      result.push *IndentedTextNode.reflow(indent, 
+        text.to_s.gsub(/[&<>]/,ESCAPE), options[:width])
     end
   end
 
@@ -196,14 +225,7 @@ module Wunderbar
     def post; "/*]]>*/"; end
   end
 
-  module CompactNode
-    def width=(value)
-      @width = value
-    end
-    def width
-      @width
-    end
-  end
+  module CompactNode; end
 
   module SpacedNode; end
 

data/lib/wunderbar/pagedown.rb

@@ -0,0 +1,5 @@
+require 'wunderbar'
+
+source = File.expand_path('../vendor/Markdown.Converter.js', __FILE__)
+
+Wunderbar::Asset.script name: 'Markdown.Converter.js', file: source

data/lib/wunderbar/polymer.rb

@@ -1,6 +1,6 @@
 require 'wunderbar'
 
-source = Dir[File.expand_path('../polymer-*.min.js', __FILE__)].
+source = Dir[File.expand_path('../vendor/polymer-*.min.js', __FILE__)].
   sort_by {|name| name[/-v?([.\d]*)\.min.js$/,1].split('.').map(&:to_i)}.last
 
 Wunderbar::Asset.script :name => 'polymer-min.js', :file => source

data/lib/wunderbar/script.rb

@@ -6,16 +6,29 @@ require 'ruby2js'
 # by execute strings (`` or %x()).
 
 module Wunderbar
+  class ScriptNode
+    attr_accessor :block, :binding
+    def serialize(options, result, indent)
+      if @block
+        width = options[:width]
+        width -= indent.to_s.length if width
+        @text = Ruby2JS.convert(@block, binding: @binding, width: width)
+      end
+      super
+    end
+  end
+
   class HtmlMarkup
     def _script(*args, &block)
       if block
+        node = super(*args, &nil).node?
+        node.block = block
         if binding.respond_to? :of_caller
           # provided by require 'binding_of_caller'
-          args.unshift Ruby2JS.convert(block, binding: binding.of_caller(1))
+          node.binding = binding.of_caller(1)
         else
-          args.unshift Ruby2JS.convert(block, binding: binding)
+          node.binding = binding
         end
-        super *args, &nil
       else
         super
       end

data/lib/wunderbar/sinatra.rb

@@ -181,6 +181,11 @@ Tilt.register '_xhtml', Wunderbar::Template::Xhtml
 
 helpers Wunderbar::SinatraHelpers
 
-get '/assets/:name' do
-  File.read("assets/#{params[:name]}")
+get "/#{Wunderbar::Asset.path}/:name" do
+  begin
+    content_type Wunderbar::Asset.content_type_for(params[:name])
+    File.read("#{Wunderbar::Asset.root}/#{params[:name]}")
+  rescue Errno::ENOENT
+    raise Sinatra::NotFound
+  end
 end