wunderbar 0.11.1 → 0.12.0

data/README.md

@@ -80,9 +80,13 @@ Element with optional (omitted) attributes:
 
     _tr class: nil
 
-Text:
+Text (may contain markup):
 
-    _ "hello"
+    _ "<em>hello</em>!!!"
+
+Text (markup is escaped):
+
+    _? "<3"
 
 Mixed content (autospaced):
 
@@ -183,6 +187,7 @@ The "`_`" method serves a number of purposes.  Calling it with a single argument
 produces text nodes.  Inserting markup verbatim is done by "`_ << text`".  A
 number of other convenience methods are defined:
 
+* `_?`: insert markup with indentation matching the current output
 * `_.post?`  -- was this invoked via HTTP POST?
 * `_.system` -- invokes a shell command, captures stdin, stdout, and stderr
 * `_.submit` -- runs command (or block) as a deamon process
@@ -192,7 +197,6 @@ Access to all of the builder _defined_ methods (typically these end in an esclam
 
 * `_.tag! :foo`: insert elements where the name can be dynamic
 * `_.error 'Log message'`: write a message to the server log
-* `_import!`: insert markup with indentation matching the current output
 
 XHTML differs from HTML in the escaping of inline style and script elements.
 XHTML will also fall back to HTML output unless the user agent indicates it

data/lib/wunderbar/html-methods.rb

@@ -101,6 +101,7 @@ class HtmlMarkup < Wunderbar::BuilderBase
 
     if name.sub!(/_$/,'')
       @x.margin!
+      return __send__ "_#{name}", *args, &block if respond_to? "_#{name}"
     end
 
     if flag != '!'
@@ -218,14 +219,12 @@ class HtmlMarkup < Wunderbar::BuilderBase
     @x.tag! :math, *args, &block
   end
 
-  def _(text=nil)
-    @x.indented_text! text if text
-    @x
+  def _?(text)
+    @x.indented_text! text
   end
 
-  def _!(text=nil)
-    @x.text! text if text
-    @x
+  def _!(text)
+    @x.text! text
   end
 
   def _coffeescript(text)
@@ -257,10 +256,16 @@ class HtmlMarkup < Wunderbar::BuilderBase
     flatten
   end
 
-  def _import!(children)
+  def _(children=nil)
+    return @x if children == nil
+
     if String === children
-      require 'nokogiri'
-      children = Nokogiri::HTML::fragment(children.to_s).children
+      if children.include? '<' or children.include? '&'
+        require 'nokogiri'
+        children = Nokogiri::HTML::fragment(children.to_s).children
+      else
+        return @x.indented_text! children
+      end
     end
 
     # remove leading and trailing space
@@ -295,10 +300,10 @@ class HtmlMarkup < Wunderbar::BuilderBase
             while not children.empty?
               stop = children.index(&block_element)
               if stop == 0
-                _import! [children.shift]
+                _ [children.shift]
               else
                 @x.disable_indentation! do
-                  _import! children.shift(stop || children.length)
+                  _ children.shift(stop || children.length)
                 end
               end
             end
@@ -306,15 +311,18 @@ class HtmlMarkup < Wunderbar::BuilderBase
         else
           # disable indentation on the entire element
           @x.disable_indentation! do
-            @x.tag!(child.name, child.attributes) {_import! child.children}
+            @x.tag!(child.name, child.attributes) {_ child.children}
           end
         end
       elsif child.children.empty?
         @x.tag!(child.name, child.attributes)
       elsif child.children.all? {|gchild| gchild.text?}
         @x.tag!(child.name, child.text.strip, child.attributes)
+      elsif child.children.any? {|gchild| gchild.cdata?} and 
+        (child.text.include? '<' or child.text.include? '&')
+        @x << child
       else
-        @x.tag!(child.name, child.attributes) {_import! child.children}
+        @x.tag!(child.name, child.attributes) {_ child.children}
       end
     end
   end

data/lib/wunderbar/rails.rb

@@ -2,35 +2,20 @@ require 'active_support/core_ext'
 
 module Wunderbar
   module Rails
-    class HelperProxy < HtmlMarkup
-      def method_missing(symbol, *args, &block)
-        if @_scope.respond_to? symbol
-          if @_scope.method(symbol).owner.parents.include?  ActionView::Helpers
-            return _import! @_scope.__send__(symbol, *args, &block)
-          end
-        elsif @_scope.helpers.instance_methods.include? symbol
-          return _import! @_scope.__send__(symbol, *args, &block)
-        end
-        super
-      end
-    end
-
     class HtmlHandler
       cattr_accessor :default_format
       self.default_format = Mime::HTML
 
       def self.call(template)
-        pre = %{
-          x = Wunderbar::Rails::HelperProxy.new(self);
+        %{
+          compiled = Proc.new {#{template.source}}
+          x = HtmlMarkup.new(self);
           instance_variables.each do |var|
             x.instance_variable_set var, instance_variable_get(var)
           end
-        }.strip.gsub(/\s+/, ' ')
-
-        post ="x._.target!.join"
-
-        # take care to preserve line numbers in original source
-        "#{pre}; x.instance_eval { #{template.source} }; #{post}"
+          x.instance_eval &compiled
+          x._.target!.join
+        }.strip # take care to preserve line numbers in original source
       end
     end
 
@@ -39,17 +24,15 @@ module Wunderbar
       self.default_format = Mime::JSON
 
       def self.call(template)
-        pre = %{
+        %{
+          compiled = Proc.new {#{template.source}}
           x = Wunderbar::JsonBuilder.new(self);
           instance_variables.each do |var|
             x.instance_variable_set var, instance_variable_get(var)
           end
-        }.strip.gsub(/\s+/, ' ')
-
-        post ="x.target!"
-
-        # take care to preserve line numbers in original source
-        "#{pre}; x.instance_eval { #{template.source} }; #{post}"
+          x.instance_eval &compiled
+          x.target!
+        }.strip # take care to preserve line numbers in original source
       end
     end
 

data/lib/wunderbar/sinatra.rb

@@ -56,7 +56,7 @@ module Wunderbar
           builder.instance_eval(&block)
         else
           context = builder.get_binding do
-            builder.instance_eval {_import! block.call}
+            builder.instance_eval {_ block.call}
           end
           context.eval(data.untaint, eval_file)
         end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.11.1"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
   s.date = "2012-04-24"
   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/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]
+  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/version.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/server.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/cgi-methods.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.23"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,109 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wunderbar
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.12.0
   prerelease: 
-  segments: 
-  - 0
-  - 11
-  - 1
-  version: 0.11.1
 platform: ruby
-authors: 
+authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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"
 email: rubys@intertwingly.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - wunderbar.gemspec
 - README.md
 - COPYING
 - lib/wunderbar.rb
+- lib/wunderbar/version.rb
 - lib/wunderbar/installation.rb
-- lib/wunderbar/html-methods.rb
-- lib/wunderbar/job-control.rb
-- lib/wunderbar/server.rb
-- lib/wunderbar/logger.rb
+- lib/wunderbar/cssproxy.rb
 - lib/wunderbar/rack.rb
+- lib/wunderbar/logger.rb
 - lib/wunderbar/builder.rb
 - lib/wunderbar/sinatra.rb
-- lib/wunderbar/environment.rb
 - lib/wunderbar/rails.rb
+- lib/wunderbar/server.rb
+- lib/wunderbar/html-methods.rb
+- lib/wunderbar/job-control.rb
+- lib/wunderbar/environment.rb
 - lib/wunderbar/cgi-methods.rb
-- lib/wunderbar/cssproxy.rb
-- lib/wunderbar/version.rb
 homepage: http://github.com/rubys/wunderbar
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: []
-