undies 2.2.1 → 3.0.0.rc.1

data/test/template_source_render_test.rb

@@ -1,7 +1,4 @@
 require "assert"
-require "stringio"
-require 'undies/node_stack'
-
 require "undies/template"
 
 class Undies::Template
@@ -12,19 +9,17 @@ class Undies::Template
     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)
+      @io = Undies::IO.new(@out = "")
+      @t = Undies::Template.new(@src, {}, @io)
     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
-          }
+          _div self.object_id
         }
-      end, {}, @output)
+      end, {}, @io)
       assert_equal "<div><div>#{templ.object_id}</div></div>", @out
     end
 
@@ -47,7 +42,7 @@ class Undies::Template
       @layout_file = File.expand_path "test/templates/layout.html.rb"
 
       @content_proc = Proc.new do
-        _div { _ "Hi" }
+        _div "Hi"
       end
       @content_file = File.expand_path "test/templates/content.html.rb"
 
@@ -58,22 +53,22 @@ class Undies::Template
     end
 
     should "generate markup given proc content in a proc layout" do
-      Undies::Template.new(@cp_lp_source, {}, @output)
+      Undies::Template.new(@cp_lp_source, {}, @io)
       assert_equal @expected_output, @out
     end
 
     should "generate markup given proc content in a layout file" do
-      Undies::Template.new(@cp_lf_source, {}, @output)
+      Undies::Template.new(@cp_lf_source, {}, @io)
       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)
+      Undies::Template.new(@cf_lp_source, {}, @io)
       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)
+      Undies::Template.new(@cf_lf_source, {}, @io)
       assert_equal @expected_output, @out
     end
 
@@ -85,27 +80,28 @@ class Undies::Template
     desc "using partials"
 
     before do
-      @output = Undies::Output.new(@outstream, :pp => 2)
+      @io = Undies::IO.new(@out = "", :pp => 2)
       @source = Undies::Source.new(Proc.new do
         partial_source = Undies::Source.new(Proc.new do
-          _div { _ thing }
+          _p @thing
         end)
 
         _div {
-          _ thing
+          _span @thing
           __partial partial_source, {:thing => 1234}
 
           _div {
-            __partial "some markup string here"
+            __partial "    <p>some markup string here</p>\n"
           }
+
         }
       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
+      Undies::Template.new(@source, @data, @io)
+      assert_equal "<div>\n  <span>abcd</span>\n  <p>1234</p>\n  <div>\n    <p>some markup string here</p>\n  </div>\n</div>\n", @out
     end
 
   end

data/test/template_test.rb

@@ -1,7 +1,4 @@
 require "assert"
-require "stringio"
-require 'undies/node_stack'
-
 require "undies/template"
 
 class Undies::Template
@@ -12,23 +9,27 @@ class Undies::Template
     desc 'a template'
     before do
       @src = Undies::Source.new(Proc.new {})
-      @output = Undies::Output.new(@outstream = StringIO.new(@out = ""))
-      @t = Undies::Template.new(@src, {}, @output)
+      @io = Undies::IO.new(@out = "")
+      @t = Undies::Template.new(@src, {}, @io)
     end
     subject { @t }
 
-    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_class_methods    :flush, :escape_html
     should have_instance_methods :__yield, :__partial
     should have_instance_methods :__push, :__pop, :__flush
     should have_instance_methods :__attrs
 
-    should "know it's node stack" do
-      assert_kind_of Undies::NodeStack, subject.class.node_stack(subject)
-    end
+    # capture api
+    should have_instance_methods :raw, :element, :tag
+    should have_instance_methods :open_element, :open_tag
+    should have_instance_methods :closed_element, :closed_tag
+
+    # streaming api
+    should have_instance_methods :_, :__element, :__tag
+    should have_instance_methods :__open_element, :__open_tag
+    should have_instance_methods :__closed_element, :__closed_tag
 
-    should "complain if creating a template with no Output obj" do
+    should "complain if creating a template with no IO obj" do
       assert_raises ArgumentError do
         Undies::Template.new(@src, {})
       end
@@ -36,22 +37,45 @@ class Undies::Template
 
     should "default the data to an empty hash if none provided" do
       assert_nothing_raised do
-        Undies::Template.new(@src, @output)
+        Undies::Template.new(@src, @io)
       end
     end
 
     should "default the source to an empty Proc source if none provided" do
       assert_nothing_raised do
-        Undies::Template.new(@output)
+        Undies::Template.new(@io)
       end
       assert_equal "", @out
     end
 
+    should "push a root node onto its IO" do
+      assert_kind_of Undies::RootNode, @io.current
+    end
+
   end
 
 
 
-  class NodeTests < BasicTests
+  class PlainTextTests < BasicTests
+    before do
+      @data = "stuff & <em>more stuff</em>"
+    end
+
+    should have_instance_methods :raw
+
+    should "add the text un-escaped using the 'raw' method" do
+      assert_equal @data, subject.raw(@data)
+    end
+
+    should "escape the text using the Template#escape_html method" do
+      assert_equal "stuff &amp; &lt;em&gt;more stuff&lt;&#x2F;em&gt;", Undies::Template.escape_html(@data)
+    end
+
+  end
+
+
+
+  class PlainTextTests < BasicTests
     desc "with text data"
     before do
       @data = "stuff & <em>more stuff</em>"
@@ -64,40 +88,52 @@ class Undies::Template
       assert_equal subject.class.escape_html(@data), @out
     end
 
-    should "add the text un-escaped using the '__' method" do
-      subject.__ @data
-      subject.__flush
+  end
+
 
-      assert_equal @data, @out
+
+  class CapturedElementTests < BasicTests
+    desc "using the captured element api methods"
+
+    should "capture `element` output as Raw output" do
+      assert_kind_of Undies::Raw, subject.closed_element(:br)
     end
 
-    should "add empty string nodes using '__' and '_' methods with no args" do
-      subject._
-      subject.__
-      subject.__flush
+    should "capture `element` output correctly" do
+      assert_equal "<br />", subject.closed_element(:br).to_s
+    end
 
-      assert_equal "", @out
+    should "capture with `tag` method versions" do
+      assert_equal "<span></span>", subject.open_tag(:span).to_s
+    end
+
+    should "capture and escape data approptiately" do
+      elem = subject.open_element(:span, *[
+        "stuff & <em>more stuff</em>",
+        subject.strong(subject.i('ITALICS!!'), ' (here)')
+      ])
+      assert_equal "<span>stuff &amp; &lt;em&gt;more stuff&lt;&#x2F;em&gt;<strong><i>ITALICS!!</i> (here)</strong></span>", elem.to_s
     end
 
   end
 
 
 
-  class ElementTests < BasicTests
-    desc "using the 'element' helper"
+  class StreamedElementTests < BasicTests
+    desc "using the streamed element api methods"
 
-    should "stream element output" do
-      subject.element(:br)
+    should "stream `element` output" do
+      subject.__closed_element(:br)
       subject.__flush
 
       assert_equal "<br />", @out
     end
 
-    should "alias it with 'tag'" do
-      subject.tag(:br)
+    should "alias it with `tag` versions" do
+      subject.__open_tag(:span)
       subject.__flush
 
-      assert_equal "<br />", @out
+      assert_equal "<span></span>", @out
     end
 
     should "respond to underscore-prefix methods" do
@@ -111,13 +147,6 @@ class Undies::Template
       assert_equal "<br />", @out
     end
 
-    should "not respond to element methods without an underscore-prefix" do
-      assert !subject.respond_to?(:div)
-      assert_raises NoMethodError do
-        subject.div
-      end
-    end
-
   end
 
 
@@ -125,7 +154,7 @@ class Undies::Template
   class BuildAttrsTests < BasicTests
 
     should "modify attributes during a build using the __attrs method" do
-      subject.element(:div)
+      subject.__element(:div)
       subject.__push
       subject.__attrs :class => 'test'
       subject.__pop
@@ -135,7 +164,7 @@ class Undies::Template
     end
 
     should "should merge __attrs values with existing attrs" do
-      subject.element(:div).test
+      subject.__element(:div).test
       subject.__push
       subject.__attrs :id => 'this'
       subject.__pop
@@ -145,7 +174,7 @@ class Undies::Template
     end
 
     should "should merge __attrs class values by appending to the existing" do
-      subject.element(:div).test
+      subject.__element(:div).test
       subject.__push
       subject.__attrs :class => 'this'
       subject.__pop
@@ -154,13 +183,10 @@ class Undies::Template
       assert_equal "<div class=\"this\"></div>", @out
     end
 
-    should "ignore __attrs values once content has been added" do
-      subject.element(:div)
+    should "add __attrs even though content has been added" do
+      subject.__element(:div, 'hi there', 'friend')
       subject.__push
       subject.__attrs :class => 'this'
-      subject._ "hi there"
-      subject._ "friend"
-      subject.__attrs :title => 'missedtheboat'
       subject.__pop
       subject.__flush
 
@@ -168,14 +194,11 @@ class Undies::Template
     end
 
     should "ignore __attrs values once child elements have been added" do
-      subject.element(:div)
+      subject.__element(:div)
       subject.__push
       subject.__attrs :class => 'this'
-      subject._p
-      subject.__push
-      subject._ "hi there"
-      subject.__pop
-      subject._p { subject._ "friend" }
+      subject._p 'hi there'
+      subject._p 'friend'
       subject.__attrs :title => 'missedtheboat'
       subject.__pop
       subject.__flush
@@ -189,22 +212,9 @@ class Undies::Template
 
   class LocalDataTests < BasicTests
 
-    should "only accept the data if it is a Hash" do
-      assert_respond_to(
-        :some,
-        Undies::Template.new(Undies::Source.new(Proc.new {}), {:some => 'data'}, @output)
-      )
-    end
-
-    should "complain if trying to set locals that conflict with public methods" do
-      assert_raises ArgumentError do
-        Undies::Template.new(Undies::Source.new(Proc.new {}), {:_ => "yay!"})
-      end
-    end
-
-    should "respond to each locals key with its value" do
-      templ = Undies::Template.new(Undies::Source.new(Proc.new {}), {:some => 'data'}, @output)
-      assert_equal "data", templ.some
+    should "accept a hash of data and apply them to the template scope as instance variables" do
+      t = Undies::Template.new(Undies::Source.new(Proc.new {}), {:some => 'data'}, @io)
+      assert_equal 'data', t.instance_variable_get("@some")
     end
 
   end
@@ -215,13 +225,12 @@ class Undies::Template
     desc "that is streaming"
 
     before do
-      outstream = StringIO.new(@output = "")
-      @template = Undies::Template.new(Undies::Output.new(outstream))
+      @template = Undies::Template.new(Undies::IO.new(@output = ""))
     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>"
+      @template._div "Added"
+      @expected_output = "<div>Added</div>"
 
       assert_equal "", @output
       Undies::Template.flush(@template)
@@ -231,13 +240,13 @@ class Undies::Template
     should "should write to the stream as its being constructed" do
       @template._div.good.thing!(:type => "something")
       @template.__push
-      @template._p { @template._ 'hi' }
+      @template._p 'hi'
       @template.__flush
 
       @expected_output = "<div class=\"good\" id=\"thing\" type=\"something\"><p>hi</p>"
       assert_equal @expected_output, @output
 
-      @template._p { @template._ "action" }
+      @template._p "action"
       @template.__pop
       @template.__flush
 
@@ -252,7 +261,7 @@ class Undies::Template
   class PrettyPrintTests < BasicTests
 
     should "generate pretty printed markup" do
-      output = Undies::Output.new(@outstream, :pp => 2)
+      output = Undies::IO.new(@out = "", :pp => 2)
       templ = Undies::Template.new(output)
 
       templ._html
@@ -260,10 +269,7 @@ class Undies::Template
       templ._head {}
       templ._body
       templ.__push
-      templ._div { templ._ "Hi" }
-      # templ.__push
-      # templ._ "Hi"
-      # templ.__pop
+      templ._div "Hi"
       templ.__pop
       templ.__pop
       templ.__flush
@@ -274,7 +280,8 @@ class Undies::Template
   <body>
     <div>Hi</div>
   </body>
-</html>}, @out )
+</html>
+}, @out )
     end
 
   end

data/test/templates/content.html.rb

@@ -1 +1 @@
-_div { _ "Hi" }
+_div "Hi"

data/test/templates/test.html.rb

@@ -1,6 +1,6 @@
 _html {
   _head {}
   _body {
-    _div { _ "Hi" }
+    _div "Hi"
   }
 }

data/undies.gemspec

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: undies
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 15424119
+  prerelease: 6
   segments: 
-  - 2
-  - 2
+  - 3
+  - 0
+  - 0
+  - rc
   - 1
-  version: 2.2.1
+  version: 3.0.0.rc.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -51,6 +53,21 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  name: assert-view
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,7 +78,7 @@ dependencies:
         - 0
         version: "0.0"
   name: whysoslow
-  version_requirements: *id003
+  version_requirements: *id004
   prerelease: false
 description: A pure-Ruby DSL for streaming templated HTML, XML, or plain text. Named for its gratuitous use of the underscore.
 email: 
@@ -74,39 +91,46 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- ARCH.md
 - Gemfile
 - Gemfile.lock
-- README.rdoc
+- LICENSE
+- README.md
 - Rakefile
 - bench/bench
 - bench/bench_runner.rb
 - bench/large.html.erb
+- bench/large.html.haml
 - bench/large.html.rb
 - bench/procs.rb
 - bench/profiler
 - bench/profiler_runner.rb
 - bench/small.html.erb
+- bench/small.html.haml
 - bench/small.html.rb
 - bench/verylarge.html.erb
+- bench/verylarge.html.haml
 - bench/verylarge.html.rb
 - lib/undies.rb
+- lib/undies/api.rb
 - lib/undies/element.rb
-- lib/undies/named_source.rb
-- lib/undies/node.rb
-- lib/undies/node_stack.rb
-- lib/undies/output.rb
+- lib/undies/element_node.rb
+- lib/undies/io.rb
+- lib/undies/root_node.rb
 - lib/undies/source.rb
-- lib/undies/source_stack.rb
 - lib/undies/template.rb
 - lib/undies/version.rb
+- test/element_closed_test.rb
+- test/element_node_test.rb
+- test/element_open_test.rb
 - test/element_test.rb
 - test/fixtures/write_thing.rb
 - test/helper.rb
+- test/io_test.rb
 - test/irb.rb
 - test/named_source_test.rb
-- test/node_stack_test.rb
-- test/node_test.rb
-- test/output_test.rb
+- test/raw_test.rb
+- test/root_node_test.rb
 - test/source_stack_test.rb
 - test/source_test.rb
 - test/template_builder_render_test.rb
@@ -137,12 +161,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -151,14 +177,17 @@ signing_key:
 specification_version: 3
 summary: A pure-Ruby DSL for streaming templated HTML, XML, or plain text. Named for its gratuitous use of the underscore.
 test_files: 
+- test/element_closed_test.rb
+- test/element_node_test.rb
+- test/element_open_test.rb
 - test/element_test.rb
 - test/fixtures/write_thing.rb
 - test/helper.rb
+- test/io_test.rb
 - test/irb.rb
 - test/named_source_test.rb
-- test/node_stack_test.rb
-- test/node_test.rb
-- test/output_test.rb
+- test/raw_test.rb
+- test/root_node_test.rb
 - test/source_stack_test.rb
 - test/source_test.rb
 - test/template_builder_render_test.rb