wunderbar 0.20.2 → 0.21.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2YzNjNkYzA1OGY4Zjk5ODk1NjhmNzI0NTRhMTExNjdhYzUzYjQ3YQ==
+    OTFhYjVkZGYwMGZmMWJkMDE3OWVhNTYzOTg0YWMwMjc0OWE0MTMzZQ==
   data.tar.gz: !binary |-
-    YTdjYTE3ZWM4ZTY0ZTEzOWViMTk2NjhjOGViYzFlYmZhZTVhMWFmNQ==
+    YmJkOTM5YTQ3Yjc2MDQ5YjhmYTVjNjRhODAxOWUwYzdjZjFmNmU0MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmNhMjk3ZjA5YzkxZDhmODU1ZjE3ZTc0NzQ0MmUyODdmZjU2NDU5NjRmYjU2
-    YzQ5NWNkOGEyMTljNWJkNjI3ODY3MWVhMGU0MDQ2ZjU2YTQzYjdjOWMzY2Zl
-    NmQ5MDZlNGQxYWU2YzNjMTEyYjVmYWM4ZWNjMGFjOTZkMGUxNTE=
+    OTZmZWMyZWRmMTc1NTc0ZTM4NDFlNjMzNzQ4YTRiNWUxMDVjNzQxZmJiMmU0
+    N2ZjZGQ3MWJiN2YyMjRmMGJiOGYzYTYxNTQyMTRjMGJiOTE0MGIzMjFhMmMz
+    ZTU4YTI4NmQxZGU3YjY0ODI0Nzk2OTRkMWM2OWMyZWRlYTM2NzA=
   data.tar.gz: !binary |-
-    MzgxMTk0ODFlYTliNmMxY2E1N2YwMWM0ODhmY2Y4YzE2NTc1M2QyM2U1OGU2
-    MGI1YzIzOWIwYTQ4Yjg4MTFkNGM1Yjg0Mzk1MDdkODNmMWEzMDk3MTdiYjc2
-    NTlmYzM0YTlmZThlZTgzYjAwODkxYWQ0ODMxNjVjOWE0Y2VjNWM=
+    ZDg2NDI0ZDYxNDdlOWY5M2JjY2Q3MTJhYzYzMzg2YTlmODhmN2Y4NTVmM2Jl
+    ZmQzYWNmYmE2ODNlNWM1MmYyZTkyOGMzYTAzMzhjOWQ1NTA4ZTlmOTVmZDYy
+    MDNiOTFhNWFiOWEzNGNmYmQyZmFmNDM3MTcwMWZjNWFjODdmMTg=

data/README.md

@@ -422,10 +422,26 @@ Additionally, the following options are supported:
 Optional dependencies:
 ---
 
+The following gems are needed based on what functions you use:
+
+* `em-websocket' is required by `wunderbar/websocket`
+* `kramdown' is required by `wunderbar/markdown`
+* `ruby2js' adds support for scripts written as blocks
+* `sourcify' is required by `wunderbar/opal`
+
+The following gems are required by extensions of the same name:
+
+* `coderay` - syntax highlighting
+* `opal` - ruby to javascript compiler
+* `rack` - webserver interface
+* `rails` - web application framework
+* `sinatra` - DSL for creating web applications
+
 The following gems, if installed, will produce cleaner and prettier output:
 
 * `nokogiri` cleans up HTML fragments inserted via `<<`
 * `escape` prettier quoting of `system` commands
+* `sanitize` will remove unsafe markup from tainted input
 
 Related efforts:
 ---

data/lib/wunderbar/cssproxy.rb

@@ -43,18 +43,22 @@ module Wunderbar
 
       if empty and not block
         proxy = @builder.proxiable_tag! @node.name, *args
-        if SpacedNode === @node
-          class << proxy.node?; include SpacedNode; end
-        elsif CompactNode === @node
-          class << proxy.node?; include CompactNode; end
-        end
+        class << proxy.node?; include SpacedNode; end  if SpacedNode  === @node
+        class << proxy.node?; include CompactNode; end if CompactNode === @node
         proxy
-      elsif SpacedNode === @node
-        @builder.__send__ "_#{@node.name.to_s.gsub('-', '_')}_", *args, &block
-      elsif CompactNode === @node and @node.name != :pre
-        @builder.__send__ "_#{@node.name.to_s.gsub('-', '_')}!", *args, &block
       else
-        @builder.__send__ "_#{@node.name.to_s.gsub('-', '_')}", *args, &block
+        name = @node.name.to_s.gsub('-', '_')
+        if CompactNode === @node and @node.name != :pre
+          if SpacedNode === @node
+            @builder.__send__ "_#{name}_!", *args, &block
+          else
+            @builder.__send__ "_#{name}!", *args, &block
+          end
+        elsif SpacedNode === @node
+          @builder.__send__ "_#{name}_", *args, &block
+        else
+          @builder.__send__ "_#{name}", *args, &block
+        end
       end
     end
   end

data/lib/wunderbar/html-methods.rb

@@ -105,12 +105,16 @@ module Wunderbar
         end
       end
 
-      if not head.children.any? {|child| child.name == 'title'}
-        h1 = body.children.find {|child| child.name == 'h1'}
+      def find_name(name)
+        proc {|child| child.respond_to? :name and child.name == name}
+      end
+
+      if not head.children.any? &find_name('title')
+        h1 = body.children.find &find_name('h1')
         head.add_child Node.new('title', h1.text) if h1 and h1.text
       end
 
-      base = head.children.index {|child| child.name == 'base'}
+      base = head.children.index &find_name('base')
       if base
         head.children.insert 1, head.children.delete_at(base) if base > 1
         base_href = head.children[1].attrs[:href]
@@ -144,7 +148,9 @@ module Wunderbar
 
       if name.sub!(/_$/,'')
         @_x.spaced!
-        return __send__ "_#{name}", *args, &block if respond_to? "_#{name}"
+        if flag != '!' and respond_to? "_#{name}"
+          return __send__ "_#{name}#{flag}", *args, &block 
+        end
       end
 
       name = name.to_s.gsub('_', '-')

data/lib/wunderbar/jquery/filter.rb

@@ -0,0 +1,141 @@
+require 'wunderbar/jquery'
+require 'ruby2js/filter/jquery'
+#
+
+module Wunderbar
+  module Filter
+    module JQuery
+      include Ruby2JS::Filter::SEXP
+
+      def on_send(node)
+        if node.children[0] == nil and node.children[1] =~ /^_\w/
+          # map method calls starting with an underscore to jquery calls
+          # to create an element.  
+          #
+          # input:
+          #   _a 'name', href: 'link'
+          # output:
+          #  $('<a></a>').text('name').attr(href: 'link')
+          #
+          tag = node.children[1].to_s[1..-1]
+          if Node::VOID.include? tag
+            element = s(:send, s(:str, "<#{tag}/>"), :~) 
+          else
+            element = s(:send, s(:str, "<#{tag}></#{tag}>"), :~) 
+          end
+          node.children[2..-1].each do |child|
+            if child.type == :hash
+              # convert _ to - in attribute names
+              pairs = child.children.map do |pair|
+                key, value = pair.children
+                if key.type == :sym
+                  s(:pair, s(:str, key.children[0].to_s.gsub('_', '-')), value)
+                else
+                  pair
+                end
+              end
+
+              element = s(:send, element, :attr, s(:hash, *pairs))
+
+            elsif child.type == :addClass
+              # :addClass arguments are inserted by "css proxy" logic below
+              element = s(:send, element, :addClass, s(:sym, *child.children))
+
+            elsif child.type == :block
+              # :block arguments are inserted by on_block logic below
+              element = s(:block, s(:send, element, :each!), 
+                *node.children.last.children[1..-1])
+
+            else
+              # everything else added as text
+              element = s(:send, element, :text, child)
+
+            end
+          end
+
+          begin
+            jqchild, @_jqchild = @_jqchild, true
+
+            # have nested elements append themselves to their parent
+            if jqchild
+              element = s(:send, element, :appendTo, 
+                s(:send, s(:lvar, :_parent), :~))
+            end
+
+            process element
+          ensure
+            @_jqchild = jqchild
+          end
+
+        elsif node.children[0] and node.children[0].type == :send
+          # determine if markaby style class and id names are being used
+          child = node
+          test = child.children.first
+          while test and test.type == :send and not test.is_method?
+            child, test = test, test.children.first
+          end
+
+          if child.children[0] == nil and child.children[1] =~ /^_\w/
+            # capture the arguments provided on the current node
+            children = node.children[2..-1]
+
+            # convert method calls to id and class values
+            prefix = []
+            while node != child
+              if node.children[1] !~ /!$/
+                # add class (mapping underscores to dashes)
+                prefix.unshift s(:addClass, node.children[1].to_s.gsub('_','-'))
+              else
+                # convert method name to hash {id: name} pair
+                pair = s(:pair, s(:sym, :id), 
+                  s(:str, node.children[1].to_s[0..-2].gsub('_','-')))
+
+                # if a hash argument is already passed, merge in id value
+                hash = children.find_index {|node| node.type == :hash}
+                if hash
+                  children[hash] = s(:hash, pair, *children[hash].children)
+                else
+                  prefix.unshift s(:hash, pair)
+                end
+              end
+
+              # advance to next node
+              node = node.children.first
+            end
+
+            # collapse series of method calls into a single call
+            return process(s(:send, *node.children[0..1], *prefix, *children))
+          else
+            super
+          end
+
+        else
+          super
+        end
+      end
+
+      def on_block(node)
+        return super unless node.children[1].children.empty?
+
+        # traverse through potential "css proxy" style method calls
+        child = node.children.first
+        test = child.children.first
+        while test and test.type == :send and not test.is_method?
+          child, test = test, test.children.first
+        end
+
+        # append block as a standalone proc to wunderbar style method call
+        if child.children[0] == nil and child.children[1] =~ /^_\w/
+          block = s(:block, s(:send, nil, :proc), 
+            s(:args, s(:arg, :_index), s(:arg, :_parent)),
+            *node.children[2..-1])
+          return on_send s(:send, *node.children.first.children, block)
+        end
+
+        super
+      end
+    end
+
+    Ruby2JS::Filter::DEFAULTS.push JQuery
+  end
+end

data/lib/wunderbar/node.rb

@@ -76,7 +76,7 @@ module Wunderbar
           else
             width = options[:width] if name != :pre
             line += ">#{text.to_s.gsub(/[&<>]/,ESCAPE)}</#{name}>"
-            if width and line.length > width
+            if indent and width and line.length > width
               reflowed = IndentedTextNode.reflow(indent, line, width)
               line = reflowed.pop
               result.push *reflowed
@@ -87,24 +87,35 @@ module Wunderbar
         else
           line += "></#{name}>"
         end
-      elsif CompactNode === self
+      elsif CompactNode === self and not CompactNode === parent
         work = []
         walk(work, nil, options)
         width = options[:width]
         if width
           line += ">"
-          (work+["</#{name}>"]).each do |node|
-            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
+          work = work.join + "</#{name}>"
+          if line.length + work.length <= width
+            line += work
+          else
+            # split work into tokens with balanced <>
+            tokens = work.split(' ')
+            (tokens.length-1).downto(1)  do |i|
+              if tokens[i].count('<') != tokens[i].count('>')
+                tokens[i-1,2] = tokens[i-1] + ' ' + tokens[i]
+              end
+            end
+
+            line += tokens.shift
+
+            # add tokens to line, breaking when line length would exceed width
+            tokens.each do |token|
+              if line.length + token.length < width
+                line += ' ' + token
+              else
+                result << line
+                line = indent.to_s + token
               end
             end
-            line += node
           end
         else
           line += ">#{work.join}</#{name}>"

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.20.2"
+  s.version = "0.21.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-01-23"
+  s.date = "2014-01-26"
   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/bootstrap.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/bootstrap-theme.min.css", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/markdown.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/underscore.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/bootstrap.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/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb"]
+  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/bootstrap.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/bootstrap-theme.min.css", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/markdown.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/underscore.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/bootstrap.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "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/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -65,6 +65,7 @@ files:
 - lib/wunderbar/script.rb
 - lib/wunderbar/websocket.rb
 - lib/wunderbar/bootstrap.rb
+- lib/wunderbar/jquery/filter.rb
 - lib/wunderbar/jquery/stupidtable.rb
 - lib/wunderbar/angularjs/route.rb
 - lib/wunderbar/angularjs/resource.rb