wunderbar 0.22.4 → 0.23.0

data/README.md

@@ -157,6 +157,13 @@ Complete lists/rows can be defined using arrays:
       _tr %w(apple orange pear)
     end
 
+Arbitrary iteration can be done over Enumerables:
+
+    _dl.colors red: '#F00', green: '#0F0', blue: '#00F' do |color, hex|
+      _dt color.to_s
+      _dd hex
+    end
+
 Basic interface
 ---
 

data/lib/wunderbar/builder.rb

@@ -246,11 +246,17 @@ module Wunderbar
         @spaced = false
       end
 
-      node.text = args.first if String === args.first
+      node.text = args.shift if String === args.first
       @node.add_child node
       @node = node
       if block
-        block.call(self)
+        if args.first and args.first.respond_to? :each and block.arity != 0
+          args.shift.each do |arg|
+            block.call(arg)
+          end
+        else
+          block.call(self)
+        end
         @node.children << nil if @node.children.empty?
       end
 
@@ -383,7 +389,9 @@ module Wunderbar
 
     def encode(&block)
       set_variables_from_params
-      self.instance_eval(&block)
+      before = @_target.string
+      result = self.instance_eval(&block)
+      _ result if before.empty? and result and @_target.string == before
       @_target.string
     end
 
@@ -444,7 +452,9 @@ module Wunderbar
 
     def encode(&block)
       set_variables_from_params
-      self.instance_eval(&block)
+      before = @_target.dup
+      result = self.instance_eval(&block)
+      _! result if before.empty? and result and @_target == before
       @_target
     end
 

data/lib/wunderbar/cssproxy.rb

@@ -30,7 +30,8 @@ module Wunderbar
         attrs[:class] = id_or_class
       end
 
-      if args.last.respond_to? :to_hash
+      iterable = block and block.arity != 0
+      if args.last.respond_to? :to_hash and not iterable
         hash = args.pop.to_hash 
         if attrs[:class] and hash[:class]
           hash[:class] = "#{attrs[:class]} #{hash[:class]}"

data/lib/wunderbar/html-methods.rb

@@ -296,6 +296,7 @@ module Wunderbar
     end
 
     def _ul(*args, &block)
+      return super if block
       iterable = args.first.respond_to? :each
       if iterable and (args.length > 1 or not args.first.respond_to? :to_hash)
         list = args.shift.dup
@@ -306,6 +307,7 @@ module Wunderbar
     end
 
     def _ol(*args, &block)
+      return super if block
       iterable = args.first.respond_to? :each
       if iterable and (args.length > 1 or not args.first.respond_to? :to_hash)
         list = args.shift
@@ -316,6 +318,7 @@ module Wunderbar
     end
 
     def _tr(*args, &block)
+      return super if block
       iterable = args.first.respond_to? :each
       if iterable and (args.length > 1 or not args.first.respond_to? :to_hash)
         list = args.shift

data/lib/wunderbar/node.rb

@@ -148,7 +148,7 @@ module Wunderbar
     end
   end
 
-  class CommentNode
+  class CommentNode < Node
     def initialize(text)
       @text = text
     end
@@ -159,7 +159,7 @@ module Wunderbar
     end
   end
 
-  class DocTypeNode
+  class DocTypeNode < Node
     def initialize(*args)
       @declare = args.shift
       @name = args.shift

data/lib/wunderbar/script.rb

@@ -29,6 +29,7 @@ module Wunderbar
         else
           node.binding = binding
         end
+        node
       else
         super
       end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.22.4"
+  s.version = "0.23.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2015-01-23"
+  s.date = "2015-02-02"
   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/script.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/jquery-1.11.0.min.js", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/websocket.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/version.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/server.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/node.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.22.4
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json