wunderbar 0.8.11 → 0.8.12

data/lib/wunderbar/cgi-methods.rb

@@ -69,7 +69,7 @@ end
 
 # Conditionally provide output, based on ETAG
 def $cgi.out?(headers, &block)
-  content = block.call.join
+  content = block.call
   require 'digest/md5'
   etag = Digest::MD5.hexdigest(content)
 

data/lib/wunderbar/cssproxy.rb

@@ -0,0 +1,67 @@
+module Wunderbar
+  # Class "lifted" from Markaby to store element options.  Methods called
+  # against the CssProxy object are added as element classes or IDs.
+  #
+  # Modified to accept args for empty, non-void elements, and to capture and
+  # restore indentation state.
+  #
+  # See the README for examples.
+  class CssProxy
+    def initialize(builder, stream, sym, args)
+      @builder = builder
+      @indent  = builder.indentation_state!
+      @stream  = stream
+      @sym     = sym
+      @args    = args
+      @attrs   = {}
+
+      @original_stream_length = @stream.length
+
+      @builder.tag! sym, *args
+    end
+
+    def respond_to?(sym, include_private = false)
+      include_private || !private_methods.map { |m| m.to_sym }.include?(sym.to_sym) ? true : false
+    end
+
+  private
+
+    # Adds attributes to an element.  Bang methods set the :id attribute.
+    # Other methods add to the :class attribute.
+    def method_missing(id_or_class, *args, &block)
+      if id_or_class.to_s =~ /(.*)!$/
+        @attrs[:id] = $1
+      else
+        id = id_or_class
+        @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
+
+      args.push(@attrs)
+      args = @args + args unless block or String === args.first
+
+      while @stream.length > @original_stream_length
+        @stream.pop
+      end
+
+      begin
+        indent = @builder.indentation_state! @indent
+
+        if block
+          @builder.tag! @sym, *args, &block
+        else
+          @builder.tag! @sym, *args
+        end
+      ensure
+        @builder.indentation_state! indent
+      end
+
+      self
+    end
+  end
+end

data/lib/wunderbar/html-methods.rb

@@ -16,6 +16,7 @@ class HtmlMarkup
       end
       instance_exec(@x, &block)
     end
+    target!
   end
 
   def method_missing(name, *args, &block)

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.11"
+  s.version = "0.8.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
   s.date = "2012-03-23"
   s.description = "    Provides a number of globals, helper methods, and monkey patches which\n    simplify the generation of HTML and the development of CGI scripts.\n"
   s.email = "rubys@intertwingly.net"
-  s.extra_rdoc_files = ["COPYING", "README.md", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb"]
-  s.files = ["COPYING", "README.md", "Rakefile", "demo/envdump.rb", "demo/helloworld.rb", "demo/wiki.html", "demo/wiki.rb", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb", "test/test_builder.rb", "test/test_html_markup.rb", "test/test_logger.rb", "tools/web2script.rb", "wunderbar.gemspec", "Manifest"]
+  s.extra_rdoc_files = ["COPYING", "README.md", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb"]
+  s.files = ["COPYING", "README.md", "Rakefile", "demo/envdump.rb", "demo/helloworld.rb", "demo/wiki.html", "demo/wiki.rb", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb", "test/test_builder.rb", "test/test_html_markup.rb", "test/test_logger.rb", "tools/web2script.rb", "wunderbar.gemspec", "Manifest"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Wunderbar", "--main", "README.md"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &10419980 !ruby/object:Gem::Requirement
+  requirement: &20890340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10419980
+  version_requirements: *20890340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10418220 !ruby/object:Gem::Requirement
+  requirement: &20889580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10418220
+  version_requirements: *20889580
 description: ! "    Provides a number of globals, helper methods, and monkey patches
   which\n    simplify the generation of HTML and the development of CGI scripts.\n"
 email: rubys@intertwingly.net
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - lib/wunderbar.rb
 - lib/wunderbar/builder.rb
 - lib/wunderbar/cgi-methods.rb
+- lib/wunderbar/cssproxy.rb
 - lib/wunderbar/environment.rb
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/installation.rb
@@ -61,6 +62,7 @@ files:
 - lib/wunderbar.rb
 - lib/wunderbar/builder.rb
 - lib/wunderbar/cgi-methods.rb
+- lib/wunderbar/cssproxy.rb
 - lib/wunderbar/environment.rb
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/installation.rb