undies 2.2.0 → 2.2.1

data/test/output_test.rb

@@ -3,6 +3,8 @@ require "assert"
 require 'stringio'
 require 'undies/node'
 require 'undies/element'
+require 'undies/node_stack'
+require 'test/fixtures/write_thing'
 
 require "undies/output"
 
@@ -16,39 +18,23 @@ class Undies::Output
     end
     subject { @output }
 
-    should have_readers :io, :options, :pp, :node_buffer
-    should have_accessor :pp_use_indent
-    should have_instance_methods :options=, :<<, :pp_level
-    should have_instance_methods :node, :flush
+    should have_readers :io, :pp
+    should have_writer :options
+    should have_accessor :pp_level
+    should have_instance_method :write
 
     should "know its stream" do
       assert_same @io, subject.io
     end
 
-    # TODO: switch to call it a node buffer
-    should "have an empty node buffer" do
-      assert_kind_of Undies::NodeBuffer, subject.node_buffer
-      assert_equal 0, subject.node_buffer.size
-    end
-
     should "default to no pretty printing" do
-      assert_nil subject.pp
+      assert_equal 0, subject.pp
     end
 
     should "default to pretty printing level 0" do
       assert_equal 0, subject.pp_level
     end
 
-    should "stream data" do
-      subject << "some data"
-      assert_equal @out, "some data"
-    end
-
-    should "not stream nil data" do
-      subject << nil
-      assert_equal @out, ""
-    end
-
   end
 
   class PrettyPrintTests < BasicTests
@@ -66,62 +52,16 @@ class Undies::Output
     end
 
     should "pretty print stream data" do
-      subject << "some data"
-      assert_equal "\nsome data", @out
+      subject.write(WriteThing.new, :hi, 0)
+      assert_equal "hi", @out
 
       subject.pp_level +=1
-      subject << "indented data"
-      assert_equal "\nsome data\n  indented data", @out
+      subject.write(WriteThing.new, :hello, 0)
+      assert_equal "hi\n  hello", @out
 
       subject.pp_level -= 1
-      subject << "more data"
-      assert_equal "\nsome data\n  indented data\nmore data", @out
-    end
-
-    should "pretty print nodes" do
-      subject.node(Undies::Node.new("lala")); subject.flush
-      assert_equal "\nlala", @out
-    end
-
-    should "pretty print at a given level if directed to" do
-      subject.options = {:pp => 2, :pp_level => 2}
-      subject.node(Undies::Node.new("lala")); subject.flush
-      assert_equal "\n    lala", @out
-    end
-
-    should "pretty print elements with no content" do
-      subject.node(Undies::Element.new("span")); subject.flush
-      assert_equal "\n<span />", @out
-    end
-
-    should "keep node content on the same line" do
-      subject.node(Undies::Element.new("div") {
-        subject.node Undies::Node.new("hi")
-        subject.node Undies::Node.new("there")
-      })
-      subject.node(Undies::Element.new("div") {
-        subject.node Undies::Node.new("")
-        subject.node Undies::Node.new("hi")
-        subject.node Undies::Node.new("again")
-      })
-      subject.flush
-
-      assert_equal "\n<div>hithere</div>\n<div>hiagain</div>", @out
-    end
-
-  end
-
-
-  class NodeHandlingTests < BasicTests
-
-    should "create and append nodes" do
-      subject.node Undies::Node.new "hey!"
-      assert_equal 1, subject.node_buffer.size
-    end
-
-    should "create and append elements" do
-      subject.node Undies::Element.new(:div)
-      assert_equal 1, subject.node_buffer.size
+      subject.write(WriteThing.new, :hithere, 0)
+      assert_equal "hi\n  hellohithere", @out
     end
 
   end

data/test/template_builder_render_test.rb

@@ -0,0 +1,32 @@
+require "assert"
+require "stringio"
+require 'undies/node_stack'
+
+require "undies/template"
+
+class Undies::Template
+
+  class BuilderRenderTests < Assert::Context
+    desc 'a template rendered using the builder approach'
+    before do
+      @src = Undies::Source.new(Proc.new {})
+      @output = Undies::Output.new(@outstream = StringIO.new(@out = ""))
+      @t = Undies::Template.new(@src, {}, @output)
+    end
+    subject { @t }
+
+    should "maintain scope throughout the build blocks" do
+      templ = Undies::Template.new(@output)
+      templ._div {
+        templ._div {
+          templ.__ self.object_id
+        }
+      }
+      templ.__flush
+
+      assert_equal "<div><div>#{self.object_id}</div></div>", @out
+    end
+
+  end
+
+end

data/test/template_source_render_test.rb

@@ -0,0 +1,115 @@
+require "assert"
+require "stringio"
+require 'undies/node_stack'
+
+require "undies/template"
+
+class Undies::Template
+
+
+
+  class SourceRenderTests < Assert::Context
+    desc 'a template rendered using a source object'
+    before do
+      @src = Undies::Source.new(Proc.new {})
+      @output = Undies::Output.new(@outstream = StringIO.new(@out = ""))
+      @t = Undies::Template.new(@src, {}, @output)
+    end
+    subject { @t }
+
+    should "maintain the template's scope throughout the build blocks" do
+      templ = Undies::Template.new(Undies::Source.new do
+        _div {
+          _div {
+            __ self.object_id
+          }
+        }
+      end, {}, @output)
+      assert_equal "<div><div>#{templ.object_id}</div></div>", @out
+    end
+
+  end
+
+
+
+  class LayoutTests < SourceRenderTests
+    setup do
+      @expected_output = "<html><head></head><body><div>Hi</div></body></html>"
+
+      @layout_proc = Proc.new do
+        _html {
+          _head {}
+          _body {
+            __yield
+          }
+        }
+      end
+      @layout_file = File.expand_path "test/templates/layout.html.rb"
+
+      @content_proc = Proc.new do
+        _div { _ "Hi" }
+      end
+      @content_file = File.expand_path "test/templates/content.html.rb"
+
+      @cp_lp_source = Undies::Source.new(:layout => @layout_proc, &@content_proc)
+      @cp_lf_source = Undies::Source.new(:layout => @layout_file, &@content_proc)
+      @cf_lp_source = Undies::Source.new(@content_file, :layout => @layout_proc)
+      @cf_lf_source = Undies::Source.new(@content_file, :layout => @layout_file)
+    end
+
+    should "generate markup given proc content in a proc layout" do
+      Undies::Template.new(@cp_lp_source, {}, @output)
+      assert_equal @expected_output, @out
+    end
+
+    should "generate markup given proc content in a layout file" do
+      Undies::Template.new(@cp_lf_source, {}, @output)
+      assert_equal @expected_output, @out
+    end
+
+    should "generate markup given a content file in a proc layout" do
+      Undies::Template.new(@cf_lp_source, {}, @output)
+      assert_equal @expected_output, @out
+    end
+
+    should "generate markup given a content file in a layout file" do
+      Undies::Template.new(@cf_lf_source, {}, @output)
+      assert_equal @expected_output, @out
+    end
+
+  end
+
+
+
+  class PartialTests < SourceRenderTests
+    desc "using partials"
+
+    before do
+      @output = Undies::Output.new(@outstream, :pp => 2)
+      @source = Undies::Source.new(Proc.new do
+        partial_source = Undies::Source.new(Proc.new do
+          _div { _ thing }
+        end)
+
+        _div {
+          _ thing
+          __partial partial_source, {:thing => 1234}
+
+          _div {
+            __partial "some markup string here"
+          }
+        }
+      end)
+      @data = {:thing => 'abcd'}
+    end
+
+    should "render the partial source with its own scope/data" do
+      Undies::Template.new(@source, @data, @output)
+      assert_equal "<div>abcd\n  <div>1234</div>\n  <div>\n    some markup string here\n  </div>\n</div>", @out
+    end
+
+  end
+
+
+
+end

data/test/template_test.rb

@@ -1,61 +1,33 @@
 require "assert"
-
 require "stringio"
+require 'undies/node_stack'
+
 require "undies/template"
 
 class Undies::Template
 
+
+
   class BasicTests < Assert::Context
     desc 'a template'
     before do
       @src = Undies::Source.new(Proc.new {})
-      @outstream = StringIO.new(@out = "")
-      @output = Undies::Output.new(@outstream)
-
+      @output = Undies::Output.new(@outstream = StringIO.new(@out = ""))
       @t = Undies::Template.new(@src, {}, @output)
     end
     subject { @t }
 
-    should have_class_method :output, :flush, :escape_html
+    should have_class_method :source_stack, :node_stack, :flush, :escape_html
     should have_instance_methods :to_s, :element, :tag
-    should have_instance_methods :_, :__, :___
+    should have_instance_methods :_, :__
     should have_instance_methods :__yield, :__partial
+    should have_instance_methods :__push, :__pop, :__flush
+    should have_instance_methods :__attrs
 
-    should "provide access to its output object via a class method" do
-      assert_same @output, Undies::Template.output(@t)
-    end
-
-    should "maintain the template's scope throughout content blocks" do
-      templ = Undies::Template.new(Undies::Source.new do
-        _div {
-          _div {
-            __ self.object_id
-          }
-        }
-      end, {}, @output)
-      assert_equal "<div><div>#{templ.object_id}</div></div>", @out
+    should "know it's node stack" do
+      assert_kind_of Undies::NodeStack, subject.class.node_stack(subject)
     end
 
-    should "generate pretty printed markup" do
-      file = 'test/templates/test.html.rb'
-      output = Undies::Output.new(@outstream, :pp => 2)
-      Undies::Template.new(Undies::Source.new(File.expand_path(file)), {}, output)
-      assert_equal(
-        %{
-<html>
-  <head></head>
-  <body>
-    <div>Hi</div>
-  </body>
-</html>},
-        @out
-      )
-    end
-
-  end
-
-  class TemplateCreationTests < BasicTests
-
     should "complain if creating a template with no Output obj" do
       assert_raises ArgumentError do
         Undies::Template.new(@src, {})
@@ -77,6 +49,8 @@ class Undies::Template
 
   end
 
+
+
   class NodeTests < BasicTests
     desc "with text data"
     before do
@@ -84,56 +58,45 @@ class Undies::Template
     end
 
     should "add the text escaped using the '_' method" do
-      Undies::Template.new(Undies::Source.new do
-        _ data
-      end, {:data => @data}, @output)
+      subject._ @data
+      subject.__flush
+
       assert_equal subject.class.escape_html(@data), @out
     end
 
     should "add the text un-escaped using the '__' method" do
-      Undies::Template.new(Undies::Source.new do
-        __ data
-      end, {:data => @data}, @output)
-      assert_equal @data, @out
-    end
+      subject.__ @data
+      subject.__flush
 
-    should "add the text un-escaped with force pretty printing using the '___' method" do
-      output = Undies::Output.new(@outstream, :pp => 2)
-      Undies::Template.new(Undies::Source.new do
-        _div {
-          __ "not-pp"
-          ___ "pp"
-          __ "not-pp-but-anyway"
-        }
-      end, {}, output)
-
-      assert_equal "\n<div>not-pp\n  pp\n  not-pp-but-anyway\n</div>", @out
+      assert_equal @data, @out
     end
 
     should "add empty string nodes using '__' and '_' methods with no args" do
-      Undies::Template.new(Undies::Source.new do
-        _
-        __
-      end, {:data => @data}, @output)
+      subject._
+      subject.__
+      subject.__flush
+
       assert_equal "", @out
     end
 
   end
 
+
+
   class ElementTests < BasicTests
     desc "using the 'element' helper"
 
     should "stream element output" do
-      Undies::Template.new(Undies::Source.new do
-        element(:br)
-      end, {}, @output)
+      subject.element(:br)
+      subject.__flush
+
       assert_equal "<br />", @out
     end
 
     should "alias it with 'tag'" do
-      Undies::Template.new(Undies::Source.new do
-        tag(:br)
-      end, {}, @output)
+      subject.tag(:br)
+      subject.__flush
+
       assert_equal "<br />", @out
     end
 
@@ -142,9 +105,9 @@ class Undies::Template
     end
 
     should "respond to underscore-prefix methods as element methods" do
-      Undies::Template.new(Undies::Source.new do
-        _br
-      end, {}, @output)
+      subject._br
+      subject.__flush
+
       assert_equal "<br />", @out
     end
 
@@ -157,12 +120,76 @@ class Undies::Template
 
   end
 
+
+
+  class BuildAttrsTests < BasicTests
+
+    should "modify attributes during a build using the __attrs method" do
+      subject.element(:div)
+      subject.__push
+      subject.__attrs :class => 'test'
+      subject.__pop
+      subject.__flush
+
+      assert_equal "<div class=\"test\"></div>", @out
+    end
+
+    should "should merge __attrs values with existing attrs" do
+      subject.element(:div).test
+      subject.__push
+      subject.__attrs :id => 'this'
+      subject.__pop
+      subject.__flush
+
+      assert_equal "<div class=\"test\" id=\"this\"></div>", @out
+    end
+
+    should "should merge __attrs class values by appending to the existing" do
+      subject.element(:div).test
+      subject.__push
+      subject.__attrs :class => 'this'
+      subject.__pop
+      subject.__flush
+
+      assert_equal "<div class=\"this\"></div>", @out
+    end
+
+    should "ignore __attrs values once content has been added" do
+      subject.element(:div)
+      subject.__push
+      subject.__attrs :class => 'this'
+      subject._ "hi there"
+      subject._ "friend"
+      subject.__attrs :title => 'missedtheboat'
+      subject.__pop
+      subject.__flush
+
+      assert_equal "<div class=\"this\">hi therefriend</div>", @out
+    end
+
+    should "ignore __attrs values once child elements have been added" do
+      subject.element(:div)
+      subject.__push
+      subject.__attrs :class => 'this'
+      subject._p
+      subject.__push
+      subject._ "hi there"
+      subject.__pop
+      subject._p { subject._ "friend" }
+      subject.__attrs :title => 'missedtheboat'
+      subject.__pop
+      subject.__flush
+
+      assert_equal "<div class=\"this\"><p>hi there</p><p>friend</p></div>", @out
+    end
+
+  end
+
+
+
   class LocalDataTests < BasicTests
 
     should "only accept the data if it is a Hash" do
-      assert_raises ArgumentError do
-        Undies::Template.new(Undies::Source.new(Proc.new {}), "some data")
-      end
       assert_respond_to(
         :some,
         Undies::Template.new(Undies::Source.new(Proc.new {}), {:some => 'data'}, @output)
@@ -180,124 +207,79 @@ class Undies::Template
       assert_equal "data", templ.some
     end
 
-    should "be able to access its locals in the template definition" do
-      src = Undies::Source.new do
-        _div {
-          _div { _ name }
-        }
-      end
-      Undies::Template.new(src, {:name => "awesome"}, @output)
-      assert_equal "<div><div>awesome</div></div>", @out
-    end
-
   end
 
-  class LayoutTests < BasicTests
-    setup do
-      @expected_output = "<html><head></head><body><div>Hi</div></body></html>"
-
-      @layout_proc = Proc.new do
-        _html {
-          _head {}
-          _body {
-            __yield
-          }
-        }
-      end
-      @layout_file = File.expand_path "test/templates/layout.html.rb"
-
-      @content_proc = Proc.new do
-        _div { _ "Hi" }
-      end
-      @content_file = File.expand_path "test/templates/content.html.rb"
 
-      @cp_lp_source = Undies::Source.new(:layout => @layout_proc, &@content_proc)
-      @cp_lf_source = Undies::Source.new(:layout => @layout_file, &@content_proc)
-      @cf_lp_source = Undies::Source.new(@content_file, :layout => @layout_proc)
-      @cf_lf_source = Undies::Source.new(@content_file, :layout => @layout_file)
-    end
 
-    should "generate markup given proc content in a proc layout" do
-      Undies::Template.new(@cp_lp_source, {}, @output)
-      assert_equal @expected_output, @out
-    end
+  class StreamTests < BasicTests
+    desc "that is streaming"
 
-    should "generate markup given proc content in a layout file" do
-      Undies::Template.new(@cp_lf_source, {}, @output)
-      assert_equal @expected_output, @out
+    before do
+      outstream = StringIO.new(@output = "")
+      @template = Undies::Template.new(Undies::Output.new(outstream))
     end
 
-    should "generate markup given a content file in a proc layout" do
-      Undies::Template.new(@cf_lp_source, {}, @output)
-      assert_equal @expected_output, @out
-    end
+    should "not stream full content until Undies#flush called on the template" do
+      @template._div { @template._ "Added post-init" }
+      @expected_output = "<div>Added post-init</div>"
 
-    should "generate markup given a content file in a layout file" do
-      Undies::Template.new(@cf_lf_source, {}, @output)
-      assert_equal @expected_output, @out
+      assert_equal "", @output
+      Undies::Template.flush(@template)
+      assert_equal @expected_output, @output
     end
 
-  end
+    should "should write to the stream as its being constructed" do
+      @template._div.good.thing!(:type => "something")
+      @template.__push
+      @template._p { @template._ 'hi' }
+      @template.__flush
 
-  class PartialTests < BasicTests
-    desc "using partials"
+      @expected_output = "<div class=\"good\" id=\"thing\" type=\"something\"><p>hi</p>"
+      assert_equal @expected_output, @output
 
-    before do
-      @source = Undies::Source.new(Proc.new do
-        partial_source = Undies::Source.new(Proc.new do
-          _div { _ thing }
-        end)
-
-        _div {
-          _ thing
-          __partial partial_source, {:thing => 1234}
-        }
-      end)
-      @data = {:thing => 'abcd'}
-    end
+      @template._p { @template._ "action" }
+      @template.__pop
+      @template.__flush
 
-    should "render the partial source with its own scope/data" do
-      Undies::Template.new(@source, @data, @output)
-      assert_equal "<div>abcd<div>1234</div></div>", @out
+      @expected_output = "<div class=\"good\" id=\"thing\" type=\"something\"><p>hi</p><p>action</p></div>"
+      assert_equal @expected_output, @output
     end
 
   end
 
-  class StreamTests < BasicTests
-    desc "that is streaming"
 
-    before do
-      outstream = StringIO.new(@output = "")
-      src = Undies::Source.new do
-        _div.good.thing!(:type => "something") {
-          __ "action"
-        }
-      end
-      @expected_output = "<div class=\"good\" id=\"thing\" type=\"something\">action</div>"
 
-      @template = Undies::Template.new(src, {}, Undies::Output.new(outstream))
-    end
+  class PrettyPrintTests < BasicTests
 
-    should "should write to the stream as its being constructed" do
-      assert_equal @expected_output, @output
+    should "generate pretty printed markup" do
+      output = Undies::Output.new(@outstream, :pp => 2)
+      templ = Undies::Template.new(output)
+
+      templ._html
+      templ.__push
+      templ._head {}
+      templ._body
+      templ.__push
+      templ._div { templ._ "Hi" }
+      # templ.__push
+      # templ._ "Hi"
+      # templ.__pop
+      templ.__pop
+      templ.__pop
+      templ.__flush
+
+      assert_equal(
+        %{<html>
+  <head></head>
+  <body>
+    <div>Hi</div>
+  </body>
+</html>}, @out )
     end
 
   end
 
-  class FlushTests < StreamTests
-    desc "and adds content post-init"
-    before do
-      @expected_post_output = "<div>Added post-init</div>"
-      @template._div { @template._ "Added post-init" }
-    end
 
-    should "not stream full content until Undies#flush called on the template" do
-      assert_equal @expected_output, @output
-      Undies::Template.flush(@template)
-      assert_equal @expected_output + @expected_post_output, @output
-
-    end
-  end
 
 end
 

data/undies.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("bundler", ["~> 1.0"])
   s.add_development_dependency("assert", ["~> 0.7.3"])
+  s.add_development_dependency("whysoslow", ["~> 0.0"])
 
 end