garterbelt 0.0.9 → 0.1.0

data/TODO

@@ -3,15 +3,16 @@ increase performance ~10%
 anonymous views
 
 view
-  class level view required defaults to [] not nil
-  join on widgets?
-  pass block to render method so you can yield!
   better error messaging when rendering buffer, which line in content is causing the problem?
-  script and style tags auto escape
+  join on widgets?
+  caching of full views
+
+  partial
+    --
   
-partial
-  pass the block content to partial instances too
-  partial passes down params from parent view
+renderers
+  switch from erb to direct escaping of text
+    make quotes not escape
 
 page
   embed_js, embed_css file content, string content
@@ -19,10 +20,8 @@ page
 
 
 name changes (for less name collision):
-  options to initialization_options
-  curator to _curator
-  look at other names for possible issues
-
+  --
 
+-----------------------------------------
 # CoverGirl
 rails style helpers

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/garterbelt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{garterbelt}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-04-19}
   s.description = %q{Garterbelt is a Ruby HTML/XML markup framework inspired by Erector and Markaby. Garterbelt maps html tags to methods allowing the intuitive construction of HTML pages using nothing but Ruby. And because it is all Ruby all the time, views benefit from the dryness of inheritance, modules and all the meta magic that Ruby can imagine. Stockings not included.}
   s.email = %q{baccigalupi@gmail.com}
   s.extra_rdoc_files = [

data/lib/renderers/content_rendering.rb

@@ -17,18 +17,18 @@ module Garterbelt
       end
 
       def head
-        view.level += 1
+        view._level += 1
       end
 
       def foot
-        view.level -= 1
+        view._level -= 1
       end
 
       def render_content
         if content.is_a?(Proc)
           content.call
         else
-          view.buffer << Text.new(:view => view, :content => content) if content
+          view._buffer << Text.new(:view => view, :content => content) if content
         end
         view.render_buffer
       end

data/lib/renderers/renderer.rb

@@ -16,7 +16,7 @@ module Garterbelt
     end
     
     def level 
-      view.level
+      view._level
     end
     
     def style

data/lib/renderers/text.rb

@@ -5,7 +5,7 @@ module Garterbelt
     def initialize(opts)
       super
       self.content = opts[:content] || ''
-      self.escape = view.escape
+      self.escape = view._escape
     end
     
     def raise_with_block_content

data/lib/view.rb

@@ -1,25 +1,23 @@
 module Garterbelt
   class View
-    # include RuPol::Swimsuit
-    
-    attr_accessor :output, :buffer, :level, :escape, :block, :options, :render_style
-    attr_reader :curator
+    attr_accessor :output, :_buffer, :_level, :_escape, :block, :initialization_options, :render_style
+    attr_reader :_curator
     
     def initialize(opts={}, &block)
-      self.options =  opts
-      self.buffer = []
-      self.level =  options.delete(:level) || 0
-      self.render_style = options.delete(:style) || :pretty
+      self.initialization_options =  opts
+      self._buffer = []
+      self._level =  initialization_options.delete(:_level) || 0
+      self.render_style = initialization_options.delete(:style) || :pretty
       self.output = ""
-      self.escape = true
+      self._escape = true
       self.block = block if block_given?
       
-      self.curator = options.delete(:curator) || self
+      self._curator = initialization_options.delete(:_curator) || self
       
       params = self.class.default_variables.merge(opts)
       keys = params.keys
       
-      unless ((self.class.required || []) - keys).empty?
+      unless (self.class.required - keys).empty?
         raise ArgumentError, "#{(self.class.required - keys).inspect} required as an initialization option"
       end
       
@@ -33,24 +31,29 @@ module Garterbelt
       end
     end
     
-    def curator=(parent_view)
-      @curator = parent_view
+    def _curator=(parent_view)
+      @_curator = parent_view
       if parent_view != self
-        self.buffer = parent_view.buffer
-        self.level = parent_view.level
+        self._buffer = parent_view._buffer
+        self._level = parent_view._level
         self.output = parent_view.output
-        self.escape = parent_view.escape
+        self._escape = parent_view._escape
         self.render_style = parent_view.render_style
       end
     end
     
     def curated?
-      curator === self
+      _curator === self
     end
     
     # VARIABLE ACCESS -----------------------------
     class << self
-      attr_accessor :required, :selective_require
+      attr_writer :required
+      attr_accessor :selective_require
+    end
+    
+    def self.required
+      @required ||= []
     end
     
     def self.add_accessor key
@@ -73,7 +76,7 @@ module Garterbelt
     end
     
     def self.super_required
-      superclass? ? superclass.required || [] : []
+      superclass? ? superclass.required : []
     end 
     
     def self.default_variables
@@ -87,7 +90,7 @@ module Garterbelt
       end 
       
       args = super_required + args  
-      self.required = args.uniq
+      self.required += args.uniq
       build_accessors
       required
     end
@@ -111,7 +114,7 @@ module Garterbelt
     # TAG HELPERS -----------------------
     
     def add_to_buffer(renderer)
-      buffer << renderer
+      _buffer << renderer
       renderer
     end
     
@@ -129,10 +132,10 @@ module Garterbelt
     end
     
     def non_escape_tag(*args, &block)
-      if escape
-        curator.escape = false
+      if _escape
+        _curator._escape = false
         t = block_given? ? tag(*args, &block) : tag(*args)
-        curator.escape = true
+        _curator._escape = true
         t
       else
         block_given? ? tag(*args, &block) : tag(*args)
@@ -140,16 +143,16 @@ module Garterbelt
     end
     
     def text(content)
-      add_to_buffer Text.new(:view => curator, :content => content)
+      add_to_buffer Text.new(:view => _curator, :content => content)
     end
     
     alias :h :text
     
     def raw_text(content)
-      if escape
-        curator.escape = false
+      if _escape
+        _curator._escape = false
         t = text(content)
-        curator.escape = true
+        _curator._escape = true
         t
       else
         text(content)
@@ -159,11 +162,11 @@ module Garterbelt
     alias :rawtext :raw_text
     
     def comment_tag(content)
-      add_to_buffer Comment.new(:view => curator, :content => content)
+      add_to_buffer Comment.new(:view => _curator, :content => content)
     end
     
     def doctype(type=:transitional)
-      add_to_buffer Doctype.new(:view => curator, :type => type)
+      add_to_buffer Doctype.new(:view => _curator, :type => type)
     end
     
     def xml(opts={})
@@ -172,7 +175,7 @@ module Garterbelt
     end
     
     def parse_tag_arguments(type, args)
-      opts = {:type => type, :view => curator}
+      opts = {:type => type, :view => _curator}
       if args.size == 2
         opts[:content] = args.shift
         opts[:attributes] = args.first
@@ -198,8 +201,8 @@ module Garterbelt
       'noframes', 'noscript', 
       'object', 'ol', 'optgroup', 'option', 'p', 'param', 
       'q', 's',
-      'samp', 'script', 'select', 'small', 'span',
-      'strong', 'style', 'sub', 'sup',
+      'samp', 'select', 'small', 'span',
+      'strong', 'sub', 'sup',
       'table', 'tbody', 'td', 'textarea', 'tfoot', 
       'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var'
     ]
@@ -211,7 +214,7 @@ module Garterbelt
       RUBY
     end
     
-    NON_ESCAPE_TAGS = ['code', 'pre']
+    NON_ESCAPE_TAGS = ['code', 'pre', 'script', 'style']
     NON_ESCAPE_TAGS.each do |type|
       class_eval <<-RUBY
         def #{type}(*args, &block)
@@ -270,18 +273,23 @@ module Garterbelt
     
     def render(*args)
       if args.first.is_a?(Hash)
-        options = args.shift
-        content_method = options[:method]
+        initialization_options = args.shift
+        content_method = initialization_options[:method]
       else
         content_method = args.shift
-        options = args.shift || {}
+        initialization_options = args.shift || {}
       end
       
       content_method ||= self.class.default_content_method
-      self.render_style = options[:style] || self.class.default_render_style
+      self.render_style = initialization_options[:style] || self.class.default_render_style
       
       self.output = "" if curated?
-      send(content_method)
+      
+      if block
+        send(content_method, &block)
+      else
+        send(content_method)
+      end
       
       render_buffer
       output
@@ -302,8 +310,8 @@ module Garterbelt
     end
     
     def render_buffer
-      array = buffer.dup
-      buffer.clear
+      array = _buffer.dup
+      _buffer.clear
       array.each do |item|
         if item.respond_to?(:render)
           item.render
@@ -321,18 +329,25 @@ module Garterbelt
     end
     
     def partial(*args, &block)
-      if (klass = args.first).is_a?(Class)
+      view = if (klass = args.first).is_a?(Class)
         args.shift
-        view = if block
-          klass.new(*args, &block)
+        partial_opts = args.shift || {}
+        available_opts = self.class.default_variables.merge(initialization_options)
+        opts = if klass.selective_require
+          klass.required.each do |key|
+            partial_opts[key] ||= available_opts[key]
+          end
+          partial_opts
         else
-          klass.new(*args)
+          available_opts.merge(partial_opts)
         end
+        klass.new(opts)
       else
-        view = args.first
+        args.first
       end
-      view.curator = curator
-      self.buffer << view
+      view.block = block if block
+      view._curator = _curator
+      self._buffer << view
       view
     end
     
@@ -375,7 +390,7 @@ module Garterbelt
     end
     
     def cache(key, opts={}, &block)
-      opts = opts.merge(:key => cache_key(key), :view => curator)
+      opts = opts.merge(:key => cache_key(key), :view => _curator)
       add_to_buffer Cache.new(opts, &block)
     end
   end

data/spec/integration/templates/form.rb

@@ -17,7 +17,7 @@ class FormView < Garterbelt::View
   end
   
   def form_options
-    options.merge(:method => legal_method)
+    initialization_options.merge(:method => legal_method)
   end
   
   def legal_method

data/spec/page_spec.rb

@@ -63,7 +63,7 @@ describe Garterbelt::Page do
     
     before do
       @view = MockView.new
-      @view.level = 0
+      @view._level = 0
       @output = BasicPage.new.render
     end
     

data/spec/performance/profiling.rb

@@ -14,8 +14,8 @@ require 'ruby-prof'
 # Profile the code
 @view = Garterbelt::View.new
 @tag = Garterbelt::ContentTag.new(:type => :p, :view => @view) do
-  @view.buffer << Garterbelt::ContentTag.new(:type => :span, :view => @view, :content => 'spanning')
-  @view.buffer << Garterbelt::Text.new(:content => ' so much time here', :view => @view)
+  @view._buffer << Garterbelt::ContentTag.new(:type => :span, :view => @view, :content => 'spanning')
+  @view._buffer << Garterbelt::Text.new(:content => ' so much time here', :view => @view)
 end
 
 result = RubyProf.profile do

data/spec/renderers/closed_tag_spec.rb

@@ -96,7 +96,7 @@ describe Garterbelt::ClosedTag do
       )
     end
     
-    it 'indent corresponding to the view level' do
+    it 'indent corresponding to the view _level' do
       @tag.indent.should == "    "
       @tag.stub(:level).and_return(1)
       @tag.indent.should == "  "

data/spec/renderers/content_tag_spec.rb

@@ -171,13 +171,13 @@ describe Garterbelt::ContentTag do
           before do
             @b = Garterbelt::ClosedTag.new(:view => @view, :type => :hr, :attributes => {:class => :linear})
             @tag.id(:foo) do
-              @view.buffer << @b
+              @view._buffer << @b
             end
           end
           
           it 'should add the tag to the buffer' do
             @tag.render
-            @view.buffer.should include @b
+            @view._buffer.should include @b
           end
           
           it 'calls render buffer on the view' do

data/spec/renderers/text_spec.rb

@@ -44,7 +44,7 @@ describe Garterbelt::Text do
       
       it 'does not escape if the view is set to not escape' do
         str = "<a href='/foo.com'>Foo it!</a>"
-        @view.escape = false
+        @view._escape = false
         text = Garterbelt::Text.new(:view => @view, :content => str)
         text.render.should include str
       end

data/spec/support/mock_view.rb

@@ -1,11 +1,11 @@
 class MockView
-  attr_accessor :output, :buffer, :level, :escape, :cache_store, :render_style
+  attr_accessor :output, :_buffer, :_level, :_escape, :cache_store, :render_style
   
   def initialize
-    self.buffer = []
+    self._buffer = []
     self.output = ""
-    self.level ||= 2
-    self.escape = true
+    self._level ||= 2
+    self._escape = true
     self.render_style = :pretty
     self.cache_store = Moneta::Memory.new
   end

data/spec/view/view_basics_spec.rb

@@ -15,10 +15,10 @@ describe Garterbelt::View do
 
   describe 'attributes' do
     it 'has a tag buffer' do
-      @view.buffer.should == []
+      @view._buffer.should == []
       @tag = Garterbelt::ContentTag.new(:view => @view, :type => :hr)
-      @view.buffer << @tag
-      @view.buffer.should == [@tag]
+      @view._buffer << @tag
+      @view._buffer.should == [@tag]
     end
     
     describe 'output' do
@@ -26,30 +26,30 @@ describe Garterbelt::View do
         @view.output.should == ""
       end
     
-      it 'its output is that of the curator if the curator is not self' do
-        BasicView.new(:curator => @view).output.should === @view.output
+      it 'its output is that of the _curator if the _curator is not self' do
+        BasicView.new(:_curator => @view).output.should === @view.output
       end
     end
 
-    describe 'escape' do
-      it 'has escape set to true by default' do
-        @view.escape.should == true
+    describe '_escape' do
+      it 'has _escape set to true by default' do
+        @view._escape.should == true
       end
       
       it 'can be set' do
-        @view.escape = false
-        @view.escape.should == false
-        BasicView.new(:escape => false).escape.should == false
+        @view._escape = false
+        @view._escape.should == false
+        BasicView.new(:_escape => false)._escape.should == false
       end
     end
     
-    describe 'level' do
+    describe '_level' do
       it 'is 0 by default' do
-        @view.level.should == 0
+        @view._level.should == 0
       end
       
       it 'can be set via initialization' do
-        BasicView.new(:level => 42).level.should == 42
+        BasicView.new(:_level => 42)._level.should == 42
       end
     end
     
@@ -60,9 +60,9 @@ describe Garterbelt::View do
       view.block.is_a?(Proc).should be_true
     end
     
-    it 'saves the options' do
+    it 'saves the initialization options' do
       view = BasicView.new(:foo => 'foo', :bar => 'bar')
-      view.options.should == {:foo => 'foo', :bar => 'bar'}
+      view.initialization_options.should == {:foo => 'foo', :bar => 'bar'}
     end
     
     it 'render_style defaults to :pretty' do
@@ -70,48 +70,48 @@ describe Garterbelt::View do
       view.render_style.should == :pretty
     end 
     
-    describe 'setting the curator: view responsible for displaying the rendered content' do
+    describe 'setting the _curator: view responsible for displaying the rendered content' do
       before do
-        @view.level = 42
+        @view._level = 42
         @view.output = "foo"
-        @view.buffer = ["bar"]
-        @view.escape = false
+        @view._buffer = ["bar"]
+        @view._escape = false
         @view.render_style = :text
-        @child = BasicView.new(:curator => @view)
+        @child = BasicView.new(:_curator => @view)
       end
       
       it 'is self by default' do
-        @view.curator.should == @view
+        @view._curator.should == @view
       end
       
       it 'can be set' do
-        @view.curator = BasicView.new
-        @view.curator.should_not == @view
+        @view._curator = BasicView.new
+        @view._curator.should_not == @view
       end
       
       it 'can be intialized in' do
-        BasicView.new(:curator => @view).curator.should == @view
+        BasicView.new(:_curator => @view)._curator.should == @view
       end
       
       describe 'resets other attributes' do
-        it 'sets the output to the curator\'s' do
+        it 'sets the output to the _curator\'s' do
           @child.output.should === @view.output
         end
         
-        it 'sets the level to the curator\'s' do
-          @child.level.should == @view.level
-          @child.level.should == 42
+        it 'sets the _level to the _curator\'s' do
+          @child._level.should == @view._level
+          @child._level.should == 42
         end
         
-        it 'sets the buffer to the curator\'s' do
-          @child.buffer.should === @view.buffer
+        it 'sets the buffer to the _curator\'s' do
+          @child._buffer.should === @view._buffer
         end
         
-        it 'sets the escape to the curator\'s' do
-          @child.escape.should == @view.escape
+        it 'sets the _escape to the _curator\'s' do
+          @child._escape.should == @view._escape
         end
         
-        it 'sets the render_style to the curator\'s' do
+        it 'sets the render_style to the _curator\'s' do
           @child.render_style.should == @view.render_style
         end
       end

data/spec/view/view_caching_spec.rb

@@ -124,7 +124,7 @@ describe Garterbelt::View, "Caching" do
       @view.cache("foo_you") do
         puts "bar"
       end
-      cache = @view.buffer.last
+      cache = @view._buffer.last
       cache.is_a?(Garterbelt::Cache).should be_true
       cache.key.should == 'cached_foo_you'
     end
@@ -133,7 +133,7 @@ describe Garterbelt::View, "Caching" do
       @view.cache("my_key", :expires_in => 24*3600) do
         puts "foo"
       end
-      cache = @view.buffer.last
+      cache = @view._buffer.last
       cache.expires_in.should == 24*3600
     end
   end

data/spec/view/view_partial_spec.rb

@@ -5,8 +5,8 @@ describe Garterbelt::View, 'Partials' do
     before do
       @view = Garterbelt::View.new
       @view.output = "Foo You!\n"
-      @view.level = 3
-      @view.buffer = ['foo', 'bar']
+      @view._level = 3
+      @view._buffer = ['foo', 'bar']
     end
     
     describe 'with an instance' do
@@ -14,14 +14,21 @@ describe Garterbelt::View, 'Partials' do
         @child_instance = Garterbelt::View.new
       end
       
-      it 'sets the curator of the instance to the current view' do
-        @child_instance.should_receive(:curator=).with(@view)
+      it 'sets the _curator of the instance to the current view' do
+        @child_instance.should_receive(:_curator=).with(@view)
         @view.partial(@child_instance)
       end
       
-      it 'adds the instance to the curator view buffer' do
+      it 'adds the instance to the _curator view buffer' do
         @view.partial(@child_instance)
-        @view.buffer.should include @child_instance
+        @view._buffer.should include @child_instance
+      end
+      
+      it 'passes down the block' do
+        @view.partial(@child_instance) do
+          puts {'partial to the block'}
+        end
+        @view._buffer.last.block.is_a?(Proc).should be_true
       end
     end
     
@@ -41,20 +48,20 @@ describe Garterbelt::View, 'Partials' do
       
       it 'adds the instance to the buffer' do
         @view.partial(PartedOut, :x => '!= y?')
-        partial = @view.buffer.last
+        partial = @view._buffer.last
         partial.is_a?(PartedOut).should be_true
       end
       
       
-      it 'has the curator as the current view' do
+      it 'has the _curator as the current view' do
         @view.partial(PartedOut, :x => 'what about z?')
-        partial = @view.buffer.last
-        partial.curator.should == @view
+        partial = @view._buffer.last
+        partial._curator.should == @view
       end
       
       it 'has the correct initalization options' do
         @view.partial(PartedOut, :x => '= foo')
-        partial = @view.buffer.last
+        partial = @view._buffer.last
         partial.x.should == '= foo'
       end
       
@@ -62,9 +69,53 @@ describe Garterbelt::View, 'Partials' do
         @view.partial(PartedOut, :x => 'not x') do
           puts { 'maybe x; i don\'t know '}
         end
-        partial = @view.buffer.last
+        partial = @view._buffer.last
         partial.block.is_a?(Proc).should be_true
       end
+      
+      describe 'passing down arguments' do
+        class Containment < Garterbelt::View
+          needs :x => 'find me'
+          def content
+            partial PartedOut
+          end
+        end
+        
+        it 'works with defaults' do
+          view = Containment.new
+          view.content
+          
+          parted = view._buffer.last
+          parted.is_a?(PartedOut).should be_true
+          parted.x.should == 'find me'
+        end
+        
+        it 'should recieved initailialized options' do
+          view = Containment.new(:x => 'newer x')
+          view.content
+          
+          parted = view._buffer.last
+          parted.x.should == 'newer x'
+        end
+        
+        it 'should pass all the initialization options along' do
+          view = Containment.new(:y => 'two dimensions, yo!')
+          view.content
+          
+          parted = view._buffer.last
+          parted.y.should == 'two dimensions, yo!'
+        end
+        
+        it 'only passes required arguments if partial is selective' do
+          PartedOut.selective_require = true
+          view = Containment.new(:z => 'two dimensions, again')
+          view.content
+          
+          parted = view._buffer.last
+          parted.x.should == 'find me'
+          parted.should_not respond_to :z
+        end
+      end
     end
   end
 end

data/spec/view/view_render_spec.rb

@@ -72,13 +72,13 @@ describe Garterbelt::View do
       end
       
       it 'will clear the buffer' do
-        @view.buffer = [:foo]
+        @view._buffer = [:foo]
         @view.render_buffer
-        @view.buffer.should == []
+        @view._buffer.should == []
       end
       
       it 'will call render on each tag in the buffer' do
-        @view.buffer << @hr << @input << @img
+        @view._buffer << @hr << @input << @img
         @hr.should_receive(:render)
         @input.should_receive(:render)
         @img.should_receive(:render)
@@ -87,7 +87,7 @@ describe Garterbelt::View do
       end
       
       it 'will add non renderable items to the output as strings' do
-        @view.buffer << "foo " << :bar
+        @view._buffer << "foo " << :bar
         @view.render_buffer
         @view.output.should include 'foo bar'
       end
@@ -95,20 +95,20 @@ describe Garterbelt::View do
   
     describe 'tag nesting' do
       it 'should render correctly at one layer deep' do
-        @view.buffer << Garterbelt::ClosedTag.new(:type => :hr, :view => @view)
+        @view._buffer << Garterbelt::ClosedTag.new(:type => :hr, :view => @view)
         @view.render.should == "<hr>\n"
       end
       
       describe 'second level' do
         before do
-          @view.buffer << Garterbelt::ContentTag.new(:type => :p, :view => @view) do
-            @view.buffer << Garterbelt::ClosedTag.new(:type => :hr, :view => @view)
+          @view._buffer << Garterbelt::ContentTag.new(:type => :p, :view => @view) do
+            @view._buffer << Garterbelt::ClosedTag.new(:type => :hr, :view => @view)
           end
           @view.render
         end
         
         it 'should leave an empty buffer' do
-          @view.buffer.should be_empty
+          @view._buffer.should be_empty
         end
         
         it 'should include the content' do
@@ -122,12 +122,12 @@ describe Garterbelt::View do
       
       describe 'multi level' do
         before do
-          @view.buffer << Garterbelt::ContentTag.new(:type => :form, :view => @view) do
-            @view.buffer << Garterbelt::ContentTag.new(:type => :fieldset, :view => @view) do
-              @view.buffer << Garterbelt::ContentTag.new(:type => :label, :view => @view, :attributes => {:for => 'email'}) do
-                @view.buffer << Garterbelt::ClosedTag.new(:type => :input, :view => @view, :attributes => {:name => 'email', :type => 'text'})
+          @view._buffer << Garterbelt::ContentTag.new(:type => :form, :view => @view) do
+            @view._buffer << Garterbelt::ContentTag.new(:type => :fieldset, :view => @view) do
+              @view._buffer << Garterbelt::ContentTag.new(:type => :label, :view => @view, :attributes => {:for => 'email'}) do
+                @view._buffer << Garterbelt::ClosedTag.new(:type => :input, :view => @view, :attributes => {:name => 'email', :type => 'text'})
               end
-              @view.buffer << Garterbelt::ContentTag.new(:type => :input, :view => @view, :attributes => {:type => 'submit', :value => 'Login or whatever'})
+              @view._buffer << Garterbelt::ContentTag.new(:type => :input, :view => @view, :attributes => {:type => 'submit', :value => 'Login or whatever'})
             end
           end
           @view.render
@@ -186,10 +186,26 @@ describe Garterbelt::View do
     describe 'block initalized content' do
       it 'has a #render_block method that renders that content' do
         @view = BasicView.new do
-          @view.buffer << Garterbelt::ContentTag.new(:type => :p, :view => @view, :content => 'Block level p tag')
+          @view._buffer << Garterbelt::ContentTag.new(:type => :p, :view => @view, :content => 'Block level p tag')
         end
         @view.render_block.should include "Block level p tag"
       end
+      
+      it 'passes the block to the content method' do
+        class PassItOn < Garterbelt::View
+          def content
+            p do
+              yield
+            end
+          end
+        end
+        
+        @view = PassItOn.new do
+          @view._buffer << Garterbelt::ContentTag.new(:type => :span, :view => @view, :content => 'spanning it up!')
+        end
+        
+        @view.render.should include "spanning it up!"
+      end
     end
   end
 
@@ -208,12 +224,12 @@ describe Garterbelt::View do
       
       it 'adds it to the buffer' do
         tag = @view.tag(:p, "content", {:class => 'classy'})
-         @view.buffer.should include tag
+         @view._buffer.should include tag
       end
       
       it 'works with block content' do
         tag = @view.tag(:p, "content", {:class => 'classy'}) do
-          @view.buffer << "foo"
+          @view._buffer << "foo"
         end
         tag.content.is_a?(Proc).should be_true
       end
@@ -233,7 +249,7 @@ describe Garterbelt::View do
       
       it 'adds it to the buffer' do
         tag = @view.closed_tag(:hr, :class => 'linear')
-        @view.buffer.should include tag
+        @view._buffer.should include tag
       end
     end
   
@@ -244,15 +260,15 @@ describe Garterbelt::View do
       end
       
       it 'sets and resets the escape when escape is originally set to true' do
-        @view.should_receive(:escape=).with(false).ordered
+        @view.should_receive(:_escape=).with(false).ordered
         @view.should_receive(:tag).ordered
-        @view.should_receive(:escape=).with(true).ordered
+        @view.should_receive(:_escape=).with(true).ordered
         @view.non_escape_tag(:pre, "<div>content</div>", {:class => 'classy'})
       end
       
       it 'does not set the escape when set to false' do
-        @view.escape = false
-        @view.should_not_receive(:escape=)
+        @view._escape = false
+        @view.should_not_receive(:_escape=)
         @view.non_escape_tag(:pre, "<div>content</div>", {:class => 'classy'})
       end
     end
@@ -272,7 +288,7 @@ describe Garterbelt::View do
       
       it 'adds the Text object to the buffer' do
         @view.text("content")
-        text = @view.buffer.last
+        text = @view._buffer.last
         text.is_a?(Garterbelt::Text).should be_true
         text.content.should == 'content'
       end
@@ -285,15 +301,15 @@ describe Garterbelt::View do
       end
       
       it 'sets escape before and after for a view that is set to escape' do
-        @view.should_receive(:escape=).with(false).ordered
+        @view.should_receive(:_escape=).with(false).ordered
         @view.should_receive(:text).and_return('text')
-        @view.should_receive(:escape=).with(true).ordered
+        @view.should_receive(:_escape=).with(true).ordered
         @view.raw_text("<div>foo</div>")
       end
       
       it 'does not set escape if the view is not escaping' do
-        @view.escape = false
-        @view.should_not_receive(:escape=)
+        @view._escape = false
+        @view.should_not_receive(:_escape=)
         @view.raw_text("<div>foo</div>")
       end
     end
@@ -352,7 +368,7 @@ describe Garterbelt::View do
         
         it 'puts it on the buffer' do
           comment = @view.comment_tag("new comment now")
-          @view.buffer.last.should == comment
+          @view._buffer.last.should == comment
         end
       end
     
@@ -363,7 +379,7 @@ describe Garterbelt::View do
         
         it 'puts it on the buffer' do
           doctype = @view.doctype
-          @view.buffer.last.should == doctype
+          @view._buffer.last.should == doctype
         end
       end
     
@@ -371,7 +387,7 @@ describe Garterbelt::View do
         it 'adds an xml to the buffer' do
           xml = @view.xml
           xml.is_a?(Garterbelt::Xml).should be_true
-          @view.buffer.last.should == xml
+          @view._buffer.last.should == xml
         end
         
         it 'makes a closed tag with default options' do

data/spec/view/view_variables_spec.rb

@@ -18,6 +18,10 @@ describe Garterbelt::View, 'Variables' do
   end 
   
   describe 'class level requirements' do
+    it 'is an empty array by default' do
+      Garterbelt::View.required.should == []
+    end
+    
     it 'the class should store a list of required variables' do 
       NeedyView.required.should == [:x, :y]
       SelectiveView.required.should == [:x, :y] 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: garterbelt
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency