undies 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    undies (1.1.0)
+    undies (1.2.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/undies/element.rb

@@ -5,27 +5,30 @@ require 'undies/element_stack'
 module Undies
   class Element < Node
 
-    attr_reader :name, :attrs
-    attr_accessor :nodes
+    attr_reader :___name, :___attrs
+    attr_accessor :___nodes
 
     def initialize(stack, name, attrs={}, &block)
       if !stack.kind_of?(ElementStack)
         raise ArgumentError, "stack must be an Undies::ElementStack"
       end
-      super(@nodes = NodeList.new)
+      if !attrs.kind_of?(::Hash)
+        raise ArgumentError, "#{name.inspect} attrs must be provided as a Hash."
+      end
+      super(@___nodes = NodeList.new)
       @stack = stack
-      @name = name.to_s
-      @attrs = attrs
       @content_writes = 0
-      self.content = block
+      @___name = name.to_s
+      @___attrs = attrs
+      self.___content = block
     end
 
     def start_tag
-      "<#{@name}#{html_attrs(@attrs)}" + (@content_writes > 0 ? ">" : " />")
+      "<#{@___name}#{html_attrs(@___attrs)}" + (@content_writes > 0 ? ">" : " />")
     end
 
     def end_tag
-      @content_writes > 0 ? "</#{@name}>" : nil
+      @content_writes > 0 ? "</#{@___name}>" : nil
     end
 
     # CSS proxy methods ============================================
@@ -52,19 +55,19 @@ module Undies
     # ==============================================================
 
     def ==(other)
-      other.name == self.name &&
-      other.attrs == self.attrs &&
-      other.nodes == self.nodes
+      other.___name  == self.___name  &&
+      other.___attrs == self.___attrs &&
+      other.___nodes == self.___nodes
     end
 
     def to_str(*args)
       "Undies::Element:#{self.object_id} " +
-      "@name=#{@name.inspect}, @attrs=#{@attrs.inspect}, @nodes=#{@nodes.inspect}"
+      "@name=#{self.___name.inspect}, @attrs=#{self.___attrs.inspect}, @nodes=#{self.___nodes.inspect}"
     end
     alias_method :inspect, :to_str
 
     def to_ary(*args)
-      @nodes
+      self.___nodes
     end
 
     protected
@@ -85,20 +88,20 @@ module Undies
     private
 
     def proxy_id_attr(value, attrs={}, &block)
-      @attrs.merge!(:id => value)
-      @attrs.merge!(attrs)
-      self.content = block
+      self.___attrs.merge!(:id => value)
+      self.___attrs.merge!(attrs)
+      self.___content = block
       self
     end
 
     def proxy_class_attr(value, attrs={}, &block)
-      @attrs[:class] = [@attrs[:class], value].compact.join(' ')
-      @attrs.merge!(attrs)
-      self.content = block
+      self.___attrs[:class] = [self.___attrs[:class], value].compact.join(' ')
+      self.___attrs.merge!(attrs)
+      self.___content = block
       self
     end
 
-    def content=(block)
+    def ___content=(block)
       if block
         @content_writes += 1
         @stack.push(self)

data/lib/undies/node.rb

@@ -1,10 +1,10 @@
 module Undies
   class Node
 
-    attr_reader :content
+    attr_reader :___content
 
     def initialize(content)
-      @content = content
+      @___content = content
     end
 
     def start_tag
@@ -17,7 +17,7 @@ module Undies
 
     def to_s(pp_level=0, pp_indent=nil)
       [ self.start_tag,
-        self.content,
+        self.___content,
         self.end_tag
       ].compact.collect do |item|
         pretty_print(item, pp_level, pp_indent)
@@ -35,4 +35,4 @@ module Undies
     end
 
   end
-end
+end

data/lib/undies/node_list.rb

@@ -1,6 +1,12 @@
 require "undies/node"
 
 module Undies
+
+  # a node list is an ordered collection of node data
+  # * the Template class builds one as the template source is evaluated
+  # * a list may contains nodes and/or other node lists
+  # * serialize a list using 'to_s' using optional pretty printing args
+  # * any pretty printing args are used to render the individual nodes/lists
   class NodeList < ::Array
 
     def initialize(*args)
@@ -14,8 +20,8 @@ module Undies
     end
 
     def <<(item)
-      unless item.kind_of?(Node)
-        raise ArgumentError, 'you can only append nodes to a NodeList'
+      unless item.kind_of?(Node) || item.kind_of?(NodeList)
+        raise ArgumentError, 'you can only append nodes or other node lists to a NodeList'
       end
       super
     end
@@ -25,4 +31,5 @@ module Undies
     end
 
   end
+
 end

data/lib/undies/partial.rb

@@ -2,10 +2,10 @@ require 'undies/partial_data'
 require 'undies/template'
 
 module Undies
-  class Partial < Template
+  module PartialTemplate
 
     def initialize(path, *args)
-      locals = PartialData.new(path)
+      locals = PartialLocals.new(path)
       locals.values, io, locals.object = self.___partial_args(*args)
       super(path, io, locals)
     end

data/lib/undies/partial_data.rb

@@ -1,5 +1,5 @@
 module Undies
-  class PartialData < ::Hash
+  class PartialLocals < ::Hash
 
     attr_reader :path, :name
 
@@ -29,4 +29,4 @@ module Undies
     end
 
   end
-end
+end

data/lib/undies/source.rb

@@ -24,4 +24,4 @@ module Undies
     end
 
   end
-end
+end

data/lib/undies/template.rb

@@ -5,22 +5,20 @@ require 'undies/element'
 module Undies
   class Template
 
-    attr_accessor :nodes
+    # prefixing with a triple underscore to not pollut metaclass locals scope
+
+    attr_accessor :___nodes
 
     def initialize(*args, &block)
-      self.___locals, self.___io, source = self.___template_args(args, block)
+      self.___nodes = NodeList.new
+      targs = self.___template_args(args.compact, block)
+      self.___locals, self.___io, self.___layout, self.___markup = targs
       self.___stack = ElementStack.new(self, self.___io)
-      self.nodes = NodeList.new
-
-      if (source).file?
-        instance_eval(source.data, source.source, 1)
-      else
-        instance_eval(&source.data)
-      end
+      self.___compile { self.___render(self.___markup) if self.___layout }
     end
 
     def to_s(pp_indent=nil)
-      self.nodes.collect{|n| n.to_s(0, pp_indent)}.join
+      self.___nodes.to_s(0, pp_indent)
     end
 
     # Add a text node (data escaped) to the nodes of the current node
@@ -84,6 +82,18 @@ module Undies
     # prefixing non-public methods with a triple underscore to not pollute
     # metaclass locals scope
 
+    def ___compile
+      self.___render(self.___layout || self.___markup)
+    end
+
+    def ___render(source)
+      if source.file?
+        instance_eval(source.data, source.source, 1)
+      else
+        instance_eval(&source.data)
+      end
+    end
+
     def ___locals=(data)
       if !data.kind_of?(::Hash)
         raise ArgumentError
@@ -99,7 +109,7 @@ module Undies
     end
 
     def ___add(node)
-      self.___stack.last.nodes.append(node)
+      self.___stack.last.___nodes.append(node)
     end
 
     def ___stack
@@ -120,10 +130,31 @@ module Undies
       @io = value
     end
 
+    def ___layout
+      @layout
+    end
+
+    def ___layout=(value)
+      if value && !(value.kind_of?(Source) && value.file?)
+        raise ArgumentError, "layout must be a file source"
+      end
+      @layout = value
+    end
+
+    def ___markup
+      @markup
+    end
+
+    def ___markup=(value)
+      raise ArgumentError if value && !value.kind_of?(Source)
+      @markup = value
+    end
+
     def ___template_args(args, block)
       [ args.last.kind_of?(::Hash) ? args.pop : {},
         self.___is_a_stream?(args.last) ? args.pop : nil,
-        Source.new(block || args.first.to_s)
+        self.___layout_arg?(args, block) ? Source.new(args.pop) : nil,
+        Source.new(args.first || block)
       ]
     end
 
@@ -136,6 +167,16 @@ module Undies
       !thing.kind_of?(::String) && thing.respond_to?(:<<)
     end
 
+    def ___layout_arg?(args, block)
+      if args.size >= 2
+        true
+      elsif args.size <= 0
+        false
+      else # args.size == 1
+        !block.nil?
+      end
+    end
+
     private
 
     # you can't define locals that conflict with the template's public methods

data/lib/undies/version.rb

@@ -1,3 +1,3 @@
 module Undies
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/undies.rb

@@ -1,4 +1,5 @@
 require 'undies/template'
+require 'undies/partial'
 
 module Undies
 
@@ -9,4 +10,4 @@ module Undies
   #   end
   # end
 
-end
+end

data/test/element_test.rb

@@ -14,23 +14,23 @@ class Undies::Element
     context 'an element'
     before { @e = Undies::Element.new(Undies::ElementStack.new, :div) }
     subject { @e }
-    should have_readers :name, :attrs
-    should have_accessor :nodes
+    should have_readers :___name, :___attrs
+    should have_accessor :___nodes
 
     should "be a Node" do
       assert_kind_of Undies::Node, subject
     end
 
     should "store it's name as a string" do
-      assert_equal "div", subject.name
+      assert_equal "div", subject.___name
     end
 
     should "have a NodeList as its nodes" do
-      assert_kind_of Undies::NodeList, subject.nodes
+      assert_kind_of Undies::NodeList, subject.___nodes
     end
 
     should "have its nodes be its content" do
-      assert_equal subject.nodes.object_id, subject.content.object_id
+      assert_equal subject.___nodes.object_id, subject.___content.object_id
     end
 
     should "have an element stack as its stack" do
@@ -54,7 +54,7 @@ class Undies::Element
     subject { @e }
 
     should "have no nodes" do
-      assert_equal([], subject.nodes)
+      assert_equal([], subject.___nodes)
     end
 
   end
@@ -119,7 +119,7 @@ class Undies::Element
     should "proxy id attr with methods ending in '!'" do
       assert_equal({
         :id => 'thing1'
-      }, subject.thing1!.attrs)
+      }, subject.thing1!.___attrs)
     end
 
     should "nest elements from proxy id call" do
@@ -132,19 +132,19 @@ class Undies::Element
     should "proxy id attr with last method call ending in '!'" do
       assert_equal({
         :id => 'thing2'
-      }, subject.thing1!.thing2!.attrs)
+      }, subject.thing1!.thing2!.___attrs)
     end
 
     should "set id attr to explicit if called last " do
       assert_equal({
         :id => 'thing3'
-      }, subject.thing1!.thing2!(:id => 'thing3').attrs)
+      }, subject.thing1!.thing2!(:id => 'thing3').___attrs)
     end
 
     should "set id attr to proxy if called last" do
       assert_equal({
         :id => 'thing1'
-      }, subject.thing2!(:id => 'thing3').thing1!.attrs)
+      }, subject.thing2!(:id => 'thing3').thing1!.___attrs)
     end
 
     should "respond to any other method as a class proxy" do
@@ -154,7 +154,7 @@ class Undies::Element
     should "proxy single html class attr" do
       assert_equal({
         :class => 'thing'
-      }, subject.thing.attrs)
+      }, subject.thing.___attrs)
     end
 
     should "nest elements from proxy class call" do
@@ -167,19 +167,19 @@ class Undies::Element
     should "proxy multi html class attrs" do
       assert_equal({
         :class => 'list thing awesome'
-      }, subject.list.thing.awesome.attrs)
+      }, subject.list.thing.awesome.___attrs)
     end
 
     should "set class attr with explicit if called last " do
       assert_equal({
         :class => 'list'
-      }, subject.thing.awesome(:class => "list").attrs)
+      }, subject.thing.awesome(:class => "list").___attrs)
     end
 
     should "update class attr with proxy if called last" do
       assert_equal({
         :class => 'list is good'
-      }, subject.thing.awesome(:class => "list is").good.attrs)
+      }, subject.thing.awesome(:class => "list is").good.___attrs)
     end
 
     should "proxy mixed class and id selector attrs" do
@@ -189,7 +189,7 @@ class Undies::Element
       }, subject.thing1!.awesome({
         :class => "list is",
         :id => "thing2"
-      }).good.thing3!.attrs)
+      }).good.thing3!.___attrs)
     end
 
   end

data/test/fixtures/partial_template.rb

@@ -0,0 +1,6 @@
+require 'undies/template'
+require 'undies/partial'
+
+class TestPartial < Undies::Template
+  include Undies::PartialTemplate
+end

data/test/helper.rb

@@ -1,2 +1,2 @@
 # this file is automatically required in when you require 'test_belt'
-# put test helpers here
+# put test helpers here

data/test/node_list_test.rb

@@ -4,7 +4,7 @@ require "undies/node"
 
 class Undies::NodeList
 
-  class BasicTest < Test::Unit::TestCase
+  class BasicTests < Test::Unit::TestCase
     include TestBelt
 
     context 'a node list'
@@ -29,18 +29,39 @@ class Undies::NodeList
       end
       assert_nothing_raised do
         subject.append(Undies::Node.new('hey!'))
+        subject.append(Undies::NodeList.new)
         subject << Undies::Node.new('hey!')
       end
     end
 
+  end
+
+  class NodeHandlingTests < BasicTests
+    setup do
+      @hey = Undies::Node.new "hey!"
+      @you = Undies::Node.new " you..."
+      @there = Undies::Node.new " there."
+      @node_list = Undies::NodeList.new
+      @node_list.append(@you)
+      @node_list.append(@there)
+    end
+
     should "append nodes with the 'append' method" do
-      subject.append(Undies::Node.new "hey!")
+      subject.append(@hey)
       assert_equal 1, subject.size
     end
 
     should "return the node when appending" do
-      node = Undies::Node.new "hey!"
-      assert_equal node.object_id, subject.append(node).object_id
+      assert_equal @hey.object_id, subject.append(@hey).object_id
+    end
+
+    should "serialize to a string" do
+      assert_equal " you... there.", @node_list.to_s
+
+      to_serialize = Undies::NodeList.new
+      to_serialize.append(@hey)
+      to_serialize.append(@node_list)
+      assert_equal "hey! you... there.", to_serialize.to_s
     end
 
   end

data/test/node_test.rb

@@ -9,10 +9,10 @@ class Undies::Node
     context 'a node'
     subject { Undies::Node.new("a text node here") }
     should have_instance_method :to_s, :start_tag, :end_tag
-    should have_reader :content
+    should have_reader :___content
 
     should "know it's content" do
-      assert_equal "a text node here", subject.content.to_s
+      assert_equal "a text node here", subject.___content.to_s
     end
 
     should "know how to serialize itself" do

data/test/partial_data_test.rb

@@ -1,13 +1,13 @@
 require "test_belt"
 require "undies/partial_data"
 
-class Undies::PartialData
+class Undies::PartialLocals
 
   class BasicTest < Test::Unit::TestCase
     include TestBelt
 
     context 'partial data'
-    subject { Undies::PartialData.new 'test/templates/index.html.rb' }
+    subject { Undies::PartialLocals.new 'test/templates/index.html.rb' }
     should have_readers :path, :name
 
     should "be a kind of Hash" do
@@ -16,7 +16,7 @@ class Undies::PartialData
 
     should "complain if now path given" do
       assert_raises ArgumentError do
-        Undies::PartialData.new
+        Undies::PartialLocals.new
       end
     end
 
@@ -25,17 +25,17 @@ class Undies::PartialData
   class NameTest < BasicTest
 
     should "know its name given a file" do
-      data = Undies::PartialData.new('test/templates/current.html.rb')
+      data = Undies::PartialLocals.new('test/templates/current.html.rb')
       assert_equal 'current', data.name
     end
 
     should "know its name given a file name with a leading char" do
-      data = Undies::PartialData.new('test/templates/_partial.html.rb')
+      data = Undies::PartialLocals.new('test/templates/_partial.html.rb')
       assert_equal 'partial', data.name
     end
 
     should "know its name given a file name with multiple leading chars" do
-      data = Undies::PartialData.new('test/templates/__partial.html.rb')
+      data = Undies::PartialLocals.new('test/templates/__partial.html.rb')
       assert_equal 'partial', data.name
     end
 
@@ -45,7 +45,7 @@ class Undies::PartialData
     before do
       @path = 'test/templates/index.html.rb'
     end
-    subject { Undies::PartialData.new(@path) }
+    subject { Undies::PartialLocals.new(@path) }
 
     should "not have any values by default" do
       assert_equal({}, subject)

data/test/partial_test.rb

@@ -1,9 +1,9 @@
 require "test_belt"
 
 require "stringio"
-require "undies/partial"
+require "test/fixtures/partial_template"
 
-class Undies::Partial
+class Undies::PartialTests
 
   class BasicTest < Test::Unit::TestCase
     include TestBelt
@@ -11,7 +11,7 @@ class Undies::Partial
     context 'partial'
     before do
       @path = 'test/templates/test.html.rb'
-      @p = Undies::Partial.new @path
+      @p = TestPartial.new @path
     end
     subject { @p }
 
@@ -21,7 +21,7 @@ class Undies::Partial
 
     should "complain if no path given" do
       assert_raises ArgumentError do
-        Undies::Partial.new
+        TestPartial.new
       end
     end
 
@@ -33,12 +33,12 @@ class Undies::Partial
     end
 
     should "know its data" do
-      partial = Undies::Partial.new(@path, :name => 'A Name')
+      partial = TestPartial.new(@path, :name => 'A Name')
       assert_equal("A Name", partial.name)
     end
 
     should "know its object" do
-      partial = Undies::Partial.new(@path, "thing")
+      partial = TestPartial.new(@path, "thing")
       assert_equal("thing", partial.index)
     end
 
@@ -54,8 +54,8 @@ class Undies::Partial
 
 
     should "should write to the stream as its being constructed" do
-      Undies::Partial.new @path, @outstream
-      assert_equal "<html><head></head><body><div class=\"file\">FILE!!</div></body></html>", @output
+      TestPartial.new @path, @outstream
+      assert_equal "<html><head></head><body><div>Hi</div></body></html>", @output
     end
 
   end

data/test/source_test.rb

@@ -19,7 +19,7 @@ class Undies::Source
 
     should "complain if no block given and file does not exist" do
       assert_raises ArgumentError do
-        Undies::Template.new "noexist.html.rb"
+        Undies::Source.new "noexist.html.rb"
       end
     end
 

data/test/template_test.rb

@@ -12,16 +12,44 @@ class Undies::Template
     subject { Undies::Template.new {} }
     should have_instance_method :to_s, :escape_html
     should have_instance_methods :_, :__, :element, :tag
-    should have_accessor :nodes
+    should have_accessor :___nodes
 
     should "have a NodeList as its nodes" do
-      assert_kind_of Undies::NodeList, subject.nodes
+      assert_kind_of Undies::NodeList, subject.___nodes
     end
 
     should "have no io stream by default" do
       assert_nil subject.send(:___io)
     end
 
+    should "maintain the template's scope throughout content blocks" do
+      templ = Undies::Template.new do
+        _div {
+          _div {
+            __ self.object_id
+          }
+        }
+      end
+      assert_equal "<div><div>#{templ.object_id}</div></div>", templ.to_s
+    end
+
+    should "generate pretty printed markup" do
+      file = 'test/templates/test.html.rb'
+      assert_equal(
+        %{<html>
+  <head>
+  </head>
+  <body>
+    <div>
+      Hi
+    </div>
+  </body>
+</html>
+},
+        Undies::Template.new(File.expand_path(file)).to_s(2)
+      )
+    end
+
   end
 
 
@@ -39,9 +67,9 @@ class Undies::Template
 
     should "also add the node using the '__' and '_' methods" do
       subject.__(@data)
-      assert_equal 1, subject.nodes.size
+      assert_equal 1, subject.___nodes.size
       subject._(@data)
-      assert_equal 2, subject.nodes.size
+      assert_equal 2, subject.___nodes.size
     end
 
     should "add the text un-escaped using the '__' method" do
@@ -74,8 +102,8 @@ class Undies::Template
 
     should "add a new Element object" do
       subject.element(:br)
-      assert_equal 1, subject.nodes.size
-      assert_equal Undies::Element.new(Undies::ElementStack.new, :br), subject.nodes.first
+      assert_equal 1, subject.___nodes.size
+      assert_equal Undies::Element.new(Undies::ElementStack.new, :br), subject.___nodes.first
     end
 
     should "respond to underscore-prefix methods" do
@@ -100,10 +128,10 @@ class Undies::Template
   class LocalsTest < BasicTest
 
     should "only accept the data if it is a Hash" do
-      assert_raises NoMethodError do
+      assert_raises ArgumentError do
         (Undies::Template.new("some_data") {}).some
       end
-      assert_raises NoMethodError do
+      assert_raises ArgumentError do
         (Undies::Template.new('test/templates/test.html.rb', "some_data")).some
       end
       assert_respond_to(
@@ -127,72 +155,100 @@ class Undies::Template
       assert_equal "data", templ.some
     end
 
+    should "be able to access its locals in the template definition" do
+      templ = Undies::Template.new(:name => "awesome") do
+        _div {
+          _div { _ name }
+        }
+      end
+      assert_equal "<div><div>awesome</div></div>", templ.to_s
+    end
+
   end
 
 
 
   class DefinitionTest < BasicTest
-
-    should "maintain the template's scope throughout content blocks" do
-      templ = Undies::Template.new do
-        _div {
-          _div {
-            __ self.object_id
+    setup do
+      @expected_output = "<html><head></head><body><div>Hi</div></body></html>"
+      @proc = Proc.new do
+        _html {
+          _head {}
+          _body {
+            _div { _ "Hi" }
           }
         }
       end
-      assert_equal "<div><div>#{templ.object_id}</div></div>", templ.to_s
+      @content_proc = Proc.new do
+        _div { _ "Hi" }
+      end
+      @layout_proc = Proc.new do
+        _html { _head {}; _body { yield if block_given? } }
+      end
+      @layout_file = File.expand_path "test/templates/layout.html.rb"
+      @content_file = File.expand_path "test/templates/content.html.rb"
+      @test_content_file = File.expand_path "test/templates/test.html.rb"
     end
 
-    should "be able to access its locals in the template definition" do
-      templ = Undies::Template.new(:name => "awesome") do
-        _div {
-          _div { _ name }
-        }
+    should "generate markup given the content in a passed block" do
+      template = Undies::Template.new(&@proc)
+      assert_equal @expected_output, template.to_s
+    end
+
+    should "complain if given a proc both as the first arg and passed as a block" do
+      assert_raises ArgumentError do
+        Undies::Template.new(@proc) do
+          _div { _ "Should not render b/c argument error" }
+        end
       end
-      assert_equal "<div><div>awesome</div></div>", templ.to_s
     end
 
-    should "generate markup given a block" do
-      assert_equal(
-        "<html><head></head><body><div class=\"loud element\" id=\"header\">YEA!!</div></body></html>",
-        Undies::Template.new do
-          _html {
-            _head {}
-            _body {
-              _div.header!.loud.element {
-                __ "YEA!!"
-              }
-            }
-          }
-        end.to_s
-      )
+    should "generate markup given the content in a file, even if passed a block" do
+      template_no_block = Undies::Template.new(@test_content_file)
+      template_w_block = Undies::Template.new(@test_content_file) do
+        _div { _ "Should not render b/c template prefers a file" }
+      end
+      assert_equal @expected_output, template_no_block.to_s
+      assert_equal @expected_output, template_w_block.to_s
     end
 
-    should "generate markup given a file" do
-      file = 'test/templates/test.html.rb'
-      assert_equal(
-        "<html><head></head><body><div class=\"file\">FILE!!</div></body></html>",
-        Undies::Template.new(File.expand_path(file)).to_s
-      )
+    should "generate markup given the layout in a file and the content in a passed block" do
+      template = Undies::Template.new(@layout_file) do
+        _div { _ "Hi" }
+      end
+      assert_equal @expected_output, template.to_s
     end
 
-    should "generate pretty printed markup" do
-      file = 'test/templates/test.html.rb'
-      assert_equal(
-        %{<html>
-  <head>
-  </head>
-  <body>
-    <div class="file">
-      FILE!!
-    </div>
-  </body>
-</html>
-},
-        Undies::Template.new(File.expand_path(file)).to_s(2)
-      )
+    should "generate markup given the layout in a Proc and the content in a Proc as first arg" do
+      template = Undies::Template.new(@content_proc, @layout_file)
+      assert_equal @expected_output, template.to_s
+    end
+
+    should "generate markup given the layout in a file and the content in a file" do
+      template = Undies::Template.new(@content_file, @layout_file)
+      assert_equal @expected_output, template.to_s
     end
+
+    should "complain if given the layout in a Proc and the content in a passed block" do
+      assert_raises ArgumentError do
+        Undies::Template.new(@layout_proc) do
+          _div { _ "Hi" }
+        end
+      end
+    end
+
+    should "complain given the layout in a Proc and the content in a Proc as first arg" do
+      assert_raises ArgumentError do
+        Undies::Template.new(@content_proc, @layout_proc)
+      end
+    end
+
+    should "complain given the layout in a Proc and the content in a file" do
+      assert_raises ArgumentError do
+        Undies::Template.new(@content_file, @layout_proc)
+      end
+    end
+
   end
 
 

data/test/templates/content.html.rb

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

data/test/templates/layout.html.rb

@@ -0,0 +1,6 @@
+_html {
+  _head {}
+  _body {
+    yield
+  }
+}

data/test/templates/test.html.rb

@@ -1,8 +1,6 @@
 _html {
   _head {}
   _body {
-    _div.file {
-      __ "FILE!!"
-    }
+    _div { _ "Hi" }
   }
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: undies
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -74,6 +74,7 @@ files:
 - lib/undies/version.rb
 - test/element_stack_test.rb
 - test/element_test.rb
+- test/fixtures/partial_template.rb
 - test/helper.rb
 - test/irb.rb
 - test/node_list_test.rb
@@ -82,7 +83,9 @@ files:
 - test/partial_test.rb
 - test/source_test.rb
 - test/template_test.rb
+- test/templates/content.html.rb
 - test/templates/index.html.rb
+- test/templates/layout.html.rb
 - test/templates/test.html.rb
 - undies.gemspec
 homepage: http://github.com/kelredd/undies
@@ -121,6 +124,7 @@ summary: A pure-Ruby HTML and plain text templating DSL.
 test_files: 
 - test/element_stack_test.rb
 - test/element_test.rb
+- test/fixtures/partial_template.rb
 - test/helper.rb
 - test/irb.rb
 - test/node_list_test.rb
@@ -129,5 +133,7 @@ test_files:
 - test/partial_test.rb
 - test/source_test.rb
 - test/template_test.rb
+- test/templates/content.html.rb
 - test/templates/index.html.rb
+- test/templates/layout.html.rb
 - test/templates/test.html.rb