wunderbar 0.10.3 → 0.10.4

data/lib/wunderbar/builder.rb

@@ -6,9 +6,11 @@ module Wunderbar
       indented_data!(text) {|data| text! data}
     end
 
-    def indented_data!(data, &block)
+    def indented_data!(data, pre=nil, post=nil, &block)
       return if data.strip.length == 0
 
+      self << pre + target!.pop if pre
+
       if @indent > 0
         data.sub! /\n\s*\Z/, ''
         data.sub! /\A\s*\n/, ''
@@ -31,6 +33,8 @@ module Wunderbar
       end
 
       _newline unless data =~ /\n\Z/
+
+      self << post if post
     end
 
     def disable_indendation!(&block)
@@ -189,8 +193,30 @@ module Wunderbar
 
     # insert verbatim
     def <<(string)
-      require 'nokogiri'
-      @_builder << Nokogiri::HTML::fragment(string).to_xml
+      if not String === string or string.include? '<' or string.include? '&'
+        require 'nokogiri'
+        string = Nokogiri::HTML::fragment(string.to_s).to_xml
+      end
+
+      # fix CDATA in most cases (notably scripts)
+      string.gsub!(/<!\[CDATA\[(.*?)\]\]>/m) do |cdata|
+        if $1.include? '<' or $1.include? '&'
+          "//<![CDATA[\n#{$1}\n//]]>"
+        else
+          $1
+        end
+      end
+
+      # fix CDATA for style elements
+      string.gsub!(/<style>\/\/<!\[CDATA\[\n(.*?)\s+\/\/\]\]>/m) do |cdata|
+        if $1.include? '<' or $1.include? '&'
+          "<style>/*<![CDATA[*/\n#{$1.gsub("\n\Z",'')}\n/*]]>*/"
+        else
+          $1
+        end
+      end
+
+      @_builder << string.to_s
     rescue LoadError
       @_builder << string
     end

data/lib/wunderbar/environment.rb

@@ -49,5 +49,9 @@ if self.to_s == 'main'
     def _text(*args, &block)
       Wunderbar.text(*args, &block)
     end
+
+    def env
+      ENV
+    end
   end
 end

data/lib/wunderbar/html-methods.rb

@@ -62,10 +62,18 @@ class HtmlMarkup < Wunderbar::BuilderBase
       if %w(script style).include?(name)
         if String === args.first and not block
           text = args.shift
-          if @xhtml
-            block = Proc.new {@x.indented_text! text}
+          if !text.include? '&' and !text.include? '<'
+            block = Proc.new do
+              @x.indented_data!(text)
+            end
+          elsif name == 'style'
+            block = Proc.new do
+              @x.indented_data!(text, "/*<![CDATA[*/", "/*]]>*/")
+            end
           else
-            block = Proc.new {@x.indented_data! text}
+            block = Proc.new do
+              @x.indented_data!(text, "//<![CDATA[", "//]]>")
+            end
           end
         end
 
@@ -106,20 +114,14 @@ class HtmlMarkup < Wunderbar::BuilderBase
         end
       end
     else
-      @x.tag! name, *args, &block
-    end
-  end
-
-  def <<(string)
-    STDERR.puts @xhtml
-    if @xhtml
-      begin
-        require 'nokogiri'
-        string = Nokogiri::HTML::fragment(string).to_xml
-      rescue LoadError
+      target = @x.tag! name, *args, &block
+      if block and %w(script style).include?(name)
+        if %w{//]]> /*]]>*/}.include? target[-4]
+          target[-4], target[-3] = target[-3], target[-4]
+        end
       end
+      target
     end
-    super(string)
   end
 
   def _exception(*args)

data/lib/wunderbar/server.rb

@@ -12,70 +12,74 @@ module Wunderbar
 
 end
 
-at_exit do
-  port = ARGV.find {|arg| arg =~ /--port=(.*)/}
-  if port and ARGV.delete(port)
-    port = $1.to_i
+port = ARGV.find {|arg| arg =~ /--port=(.*)/}
+if port and ARGV.delete(port)
+  port = $1.to_i
 
-    # Evaluate optional data from the script (after __END__)
-    eval Wunderbar.data if Object.const_defined? :DATA
+  # Evaluate optional data from the script (after __END__)
+  eval Wunderbar.data if Object.const_defined? :DATA
 
-    # Allow optional environment override
-    environment = ARGV.find {|arg| arg =~ /--environment=(.*)/}
-    ENV['RACK_ENV'] = environment if environment and ARGV.delete(environment)
+  # Allow optional environment override
+  environment = ARGV.find {|arg| arg =~ /--environment=(.*)/}
+  ENV['RACK_ENV'] = environment if environment and ARGV.delete(environment)
 
+  at_exit do
     # start the server
     require 'rack'
     require 'wunderbar/rack'
     Rack::Server.start :app => Wunderbar::RackApp.new, :Port => port,
       :environment => (ENV['RACK_ENV'] || 'development')
+  end
 
-  elsif defined? Sinatra
+elsif defined? Sinatra
 
-    require 'wunderbar/sinatra'
+  require 'wunderbar/sinatra'
 
-  elsif Wunderbar.queue.length > 0
+else
 
-    # Only prompt if explicitly asked for
-    ARGV.push '' if ARGV.empty?
-    ARGV.delete('--prompt') or ARGV.delete('--offline')
+  require 'etc'
+  $USER = ENV['REMOTE_USER'] ||= ENV['USER'] || Etc.getlogin
+  if $USER.nil?
+    if RUBY_PLATFORM =~ /darwin/i
+      $USER = `dscl . -search /Users UniqueID #{Process.uid}`.split.first
+    elsif RUBY_PLATFORM =~ /linux/i
+      $USER = `getent passwd #{Process.uid}`.split(':').first
+    end
 
-    cgi = CGI.new
-    cgi.instance_variable_set '@env', ENV
-    class << cgi
-      attr_accessor :env
+    ENV['USER'] ||= $USER
+  end
 
-      # was this invoked via HTTP POST?
-      %w(delete get head options post put trace).each do |http_method|
-        define_method "#{http_method}?" do
-          env['REQUEST_METHOD'].to_s.downcase == http_method
+  ENV['HOME'] ||= Dir.home($USER) rescue nil
+  ENV['HOME'] = ENV['DOCUMENT_ROOT'] if not File.exist? ENV['HOME'].to_s
+
+  at_exit do
+    if Wunderbar.queue.length > 0
+      # Only prompt if explicitly asked for
+      ARGV.push '' if ARGV.empty?
+      ARGV.delete('--prompt') or ARGV.delete('--offline')
+
+      cgi = CGI.new
+      cgi.instance_variable_set '@env', ENV
+      class << cgi
+        attr_accessor :env
+
+        # was this invoked via HTTP POST?
+        %w(delete get head options post put trace).each do |http_method|
+          define_method "#{http_method}?" do
+            env['REQUEST_METHOD'].to_s.downcase == http_method
+          end
         end
       end
-    end
 
-    # get arguments if CGI couldn't find any... 
-    cgi.params.merge!(CGI.parse(ARGV.join('&'))) if cgi.params.empty?
+      # get arguments if CGI couldn't find any... 
+      cgi.params.merge!(CGI.parse(ARGV.join('&'))) if cgi.params.empty?
 
-    require 'etc'
-    $USER = ENV['REMOTE_USER'] ||= ENV['USER'] || Etc.getlogin
-    if $USER.nil?
-      if RUBY_PLATFORM =~ /darwin/i
-        $USER = `dscl . -search /Users UniqueID #{Process.uid}`.split.first
-      elsif RUBY_PLATFORM =~ /linux/i
-        $USER = `getent passwd #{Process.uid}`.split(':').first
-      end
+      # allow the REQUEST_METHOD to be set for command line invocations
+      ENV['REQUEST_METHOD'] ||= 'POST' if ARGV.delete('--post')
+      ENV['REQUEST_METHOD'] ||= 'GET'  if ARGV.delete('--get')
 
-      ENV['USER'] ||= $USER
+      # CGI or command line
+      Wunderbar::CGI.call(cgi)
     end
-
-    ENV['HOME'] ||= Dir.home($USER) rescue nil
-    ENV['HOME'] = ENV['DOCUMENT_ROOT'] if not File.exist? ENV['HOME'].to_s
-
-    # allow the REQUEST_METHOD to be set for command line invocations
-    ENV['REQUEST_METHOD'] ||= 'POST' if ARGV.delete('--post')
-    ENV['REQUEST_METHOD'] ||= 'GET'  if ARGV.delete('--get')
-
-    # CGI or command line
-    Wunderbar::CGI.call(cgi)
   end
 end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-13"
+  s.date = "2012-04-15"
   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/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.15"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,60 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wunderbar
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.10.4
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 3
-  version: 0.10.3
 platform: ruby
-authors: 
+authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &13584540 !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: *13584540
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &13583500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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: *13583500
+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
@@ -73,36 +60,26 @@ files:
 - 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.15
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: []
-