wunderbar 0.16.3 → 0.16.4

data/lib/wunderbar/builder.rb

@@ -169,6 +169,14 @@ module Wunderbar
       end
     end
 
+    def proxiable_tag!(sym, *args, &block)
+      if block
+        tag!(sym, *args, &block)
+      else
+        CssProxy.new(@_builder, @_builder.target!, sym, args)
+      end
+    end
+
     def pdf=(value)
       @_pdf = value
     end

data/lib/wunderbar/cssproxy.rb

@@ -36,11 +36,8 @@ module Wunderbar
         @attrs[:class] = @attrs[:class] ? "#{@attrs[:class]} #{id}".strip : id
       end
 
-      unless args.empty?
-        if args.last.respond_to? :to_hash
-          @attrs.merge! args.pop.to_hash
-        end
-      end
+      @attrs.merge! args.pop.to_hash  if args.last.respond_to? :to_hash
+      @attrs.merge! @args.pop.to_hash if @args.last.respond_to? :to_hash
 
       args.push(@attrs)
       args = @args + args unless block or String === args.first

data/lib/wunderbar/html-methods.rb

@@ -175,7 +175,7 @@ module Wunderbar
     def _svg(*args, &block)
       args << {} if args.empty?
       args.first['xmlns'] = 'http://www.w3.org/2000/svg' if Hash === args.first
-      @x.tag! :svg, *args, &block
+      @x.proxiable_tag! :svg, *args, &block
     end
 
     def _math(*args, &block)
@@ -183,7 +183,7 @@ module Wunderbar
       if Hash === args.first
         args.first['xmlns'] = 'http://www.w3.org/1998/Math/MathML'
       end
-      @x.tag! :math, *args, &block
+      @x.proxiable_tag! :math, *args, &block
     end
     
     def _pre(*args, &block)

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 16
-    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.16.3"
+  s.version = "0.16.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-05-17"
+  s.date = "2012-05-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/websocket.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.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: 89
+version: !ruby/object:Gem::Version
+  version: 0.16.4
   prerelease: 
-  segments: 
-  - 0
-  - 16
-  - 3
-  version: 0.16.3
 platform: ruby
-authors: 
+authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19386820 !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: *19386820
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &19386280 !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: *19386280
+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
@@ -75,36 +62,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: []
-