wunderbar 0.10.4 → 0.10.5

data/lib/wunderbar/builder.rb

@@ -192,14 +192,14 @@ module Wunderbar
     end
 
     # insert verbatim
-    def <<(string)
-      if not String === string or string.include? '<' or string.include? '&'
+    def <<(data)
+      if not String === data or data.include? '<' or data.include? '&'
         require 'nokogiri'
-        string = Nokogiri::HTML::fragment(string.to_s).to_xml
+        data = Nokogiri::HTML::fragment(data.to_s).to_xml
       end
 
       # fix CDATA in most cases (notably scripts)
-      string.gsub!(/<!\[CDATA\[(.*?)\]\]>/m) do |cdata|
+      data.gsub!(/<!\[CDATA\[(.*?)\]\]>/m) do |cdata|
         if $1.include? '<' or $1.include? '&'
           "//<![CDATA[\n#{$1}\n//]]>"
         else
@@ -208,15 +208,15 @@ module Wunderbar
       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/*]]>*/"
+      data.gsub!(/<style([^>])*>\/\/<!\[CDATA\[\n(.*?)\s+\/\/\]\]>/m) do |cdata|
+        if $2.include? '<' or $2.include? '&'
+          "<style#{$1}>/*<![CDATA[*/\n#{$2.gsub("\n\Z",'')}\n/*]]>*/"
         else
           $1
         end
       end
 
-      @_builder << string.to_s
+      @_builder << data
     rescue LoadError
       @_builder << string
     end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.10.4"
+  s.version = "0.10.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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.15"
+  s.rubygems_version = "1.8.21"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,47 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wunderbar
-version: !ruby/object:Gem::Version
-  version: 0.10.4
+version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: 
+  segments: 
+  - 0
+  - 10
+  - 5
+  version: 0.10.5
 platform: ruby
-authors:
+authors: 
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: &13584540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *13584540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &13583500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  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"
+  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"
 email: rubys@intertwingly.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - wunderbar.gemspec
 - README.md
 - COPYING
@@ -60,26 +73,36 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: []
+