undies 3.0.0.rc.1 → 3.0.0.rc.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    undies (3.0.0.rc.1)
+    undies (3.0.0.rc.2)
 
 GEM
   remote: http://rubygems.org/

data/Rakefile

@@ -24,9 +24,9 @@ namespace :bench do
   task :all do
     Rake::Task['test'].invoke
     puts
-    Rake::Task['run_profiler'].invoke
+    Rake::Task['bench:profiler'].invoke
     puts
-    Rake::Task['run_bench'].invoke
+    Rake::Task['bench:run'].invoke
   end
 
 end

data/bench/bench_runner.rb

@@ -191,8 +191,8 @@ class UndiesBenchRunner
 
   SIZES = [
     # [:small    , "~500 nodes"],
-    # [:large    , "~5000 nodes"],
-    [:verylarge, "~50000 nodes"]
+    [:large    , "~5000 nodes"],
+    # [:verylarge, "~50000 nodes"]
   ]
 
 

data/lib/undies/api.rb

@@ -86,23 +86,25 @@ module Undies
     alias_method :__element,  :__open_element
     alias_method :__tag,      :__open_element
 
-    def __closed_element(name, *args, &build)
+    def __closed_element(name, *args)
       @_undies_io.
         current.
-        element_node(ElementNode.new(@_undies_io, Element::Closed.new(name, *args, &build))).
+        element_node(ElementNode.new(
+          @_undies_io, Element::Closed.new(name, *args)
+        )).
         element
     end
     alias_method :__closed_tag, :__closed_element
 
-    SELF_CLOSING_TAGS.each do |tag|
+    OPEN_TAGS.each do |tag|
       define_method("_#{tag}") do |*args, &build|
-        __closed_element(tag, *args, &build)
+        __open_element(tag, *args, &build)
       end
     end
 
-    OPEN_TAGS.each do |tag|
-      define_method("_#{tag}") do |*args, &build|
-        __open_element(tag, *args, &build)
+    SELF_CLOSING_TAGS.each do |tag|
+      define_method("_#{tag}") do |*args|
+        __closed_element(tag, *args)
       end
     end
 

data/lib/undies/version.rb

@@ -1,3 +1,3 @@
 module Undies
-  VERSION = "3.0.0.rc.1"
+  VERSION = "3.0.0.rc.2"
 end

data/test/element_node_test.rb

@@ -11,7 +11,7 @@ class Undies::ElementNode
     before do
       # io test with :pp 1 so we can test newline insertion
       # io test with level 1 so we can test element start tag writing
-      @io = Undies::IO.new(@out = "", :pp => 1, :level => 1)
+      @io = Undies::IO.new(@out = "", :pp => 1, :level => 2)
       @e  = Undies::Element.open(:div, "hi")
       @en = Undies::ElementNode.new(@io, @e)
     end
@@ -146,20 +146,22 @@ class Undies::ElementNode
 
     should "write out the start tag with IO#newline when an element is given" do
       subject.element_node(@en1)
-      assert_equal "<div>#{@io.newline}", @out
+      assert_equal "#{@io.line_indent(-1)}<div>#{@io.newline}", @out
     end
 
     should "write out any cached content and cache new markup when given" do
       subject.element_node @en1
       subject.element_node @en2
-      assert_equal "<div>#{@io.newline}#{@io.line_indent}<strong>blah</strong>#{@io.newline}", @out
+      assert_equal "#{@io.line_indent(-1)}<div>#{@io.newline}#{@io.line_indent}<strong>blah</strong>#{@io.newline}", @out
       assert_equal @en2, subject.cached
     end
 
     should "write out the end tag with IO#newline indented when popped" do
       subject.element_node(@en1)
+      expected = "#{@io.line_indent(-1)}<div>#{@io.newline}#{@io.line_indent}<strong>blah</strong>#{@io.newline}#{@io.line_indent(-1)}</div>#{@io.newline}"
       subject.pop
-      assert_equal "<div>#{@io.newline} <strong>blah</strong>#{@io.newline}</div>#{@io.newline}", @out
+
+      assert_equal expected, @out
     end
 
   end
@@ -174,13 +176,14 @@ class Undies::ElementNode
 
     should "write out the start tag with IO#newline when a partial is given" do
       subject.partial("partial markup")
-      assert_equal "<div>#{@io.newline}", @out
+      assert_equal "#{@io.line_indent(-1)}<div>#{@io.newline}", @out
     end
 
     should "write out the end tag with IO#newline indented when a partial is given" do
       subject.partial("  partial markup\n")
+      expected = "#{@io.line_indent(-1)}<div>#{@io.newline}#{@io.line_indent}partial markup#{@io.newline}#{@io.line_indent(-1)}</div>#{@io.newline}"
       subject.pop
-      assert_equal "<div>#{@io.newline}  partial markup\n</div>#{@io.newline}", @out
+      assert_equal expected, @out
     end
 
   end
@@ -192,7 +195,7 @@ class Undies::ElementNode
       subject.attrs(:test => 'value')
       subject.element_node(@en1)
 
-      assert_equal "<div test=\"value\">#{@io.newline}", @out
+      assert_equal "#{@io.line_indent(-1)}<div test=\"value\">#{@io.newline}", @out
     end
 
     should "not effect the start tag once child elements have been written" do
@@ -200,7 +203,7 @@ class Undies::ElementNode
       subject.element_node(@en1)
       subject.attrs(:another => 'val')
 
-      assert_equal "<div test=\"value\">#{@io.newline}", @out
+      assert_equal "#{@io.line_indent(-1)}<div test=\"value\">#{@io.newline}", @out
     end
 
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: undies
 version: !ruby/object:Gem::Version 
-  hash: 15424119
+  hash: 15424113
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - rc
-  - 1
-  version: 3.0.0.rc.1
+  - 2
+  version: 3.0.0.rc.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-11 00:00:00 Z
+date: 2012-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development