garterbelt 0.0.4 → 0.0.5

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-gem 'ru_pol', '0.1.2'
 gem 'activesupport', ">=2.3.8"
 gem 'moneta', '>=0.6.0'
 

data/Gemfile.lock

@@ -20,7 +20,6 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ru_pol (0.1.2)
     yard (0.6.5)
 
 PLATFORMS
@@ -34,5 +33,4 @@ DEPENDENCIES
   moneta (>= 0.6.0)
   rcov
   rspec (~> 2.3.0)
-  ru_pol (= 0.1.2)
   yard (~> 0.6.0)

data/Rakefile

@@ -23,7 +23,6 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency 'hashie', '~>1.0'
   gem.add_development_dependency 'rbench'
   
-  gem.add_runtime_dependency 'ru_pol', '>=0.1.2'
   gem.add_runtime_dependency 'activesupport', '>=2.3.8'
   gem.add_runtime_dependency 'moneta', '>=0.6.0'
 end

data/TODO

@@ -1,6 +1,5 @@
-Page
-
-- partial passes down params from parent view
-- partial receives a block
+increase performance ~10%
+partial passes down params from parent view
+anonymous view
 
 Rails Helpers

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/garterbelt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{garterbelt}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-04-13}
   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 = [
@@ -42,23 +42,27 @@ Gem::Specification.new do |s|
     "lib/stocking.rb",
     "lib/support/string.rb",
     "lib/view.rb",
-    "spec/benchmark/templates/erector.rb",
-    "spec/benchmark/templates/garterbelt.rb",
-    "spec/benchmark/vs_erector.rb",
     "spec/garterbelt_spec.rb",
     "spec/integration/expectations/general_view.html",
     "spec/integration/expectations/variables/view_with_user_and_params.html",
     "spec/integration/expectations/variables/view_with_user_email.html",
     "spec/integration/expectations/view_partial_nest.html",
+    "spec/integration/expectations/view_with_forms.html",
     "spec/integration/expectations/view_with_tags.html",
+    "spec/integration/templates/form.rb",
     "spec/integration/templates/view_partial_nest.rb",
     "spec/integration/templates/view_with_cache.rb",
+    "spec/integration/templates/view_with_forms.rb",
     "spec/integration/templates/view_with_partial.rb",
     "spec/integration/templates/view_with_partial_2.rb",
     "spec/integration/templates/view_with_tags.rb",
     "spec/integration/templates/view_with_vars.rb",
     "spec/integration/view_spec.rb",
     "spec/page_spec.rb",
+    "spec/performance/profiling.rb",
+    "spec/performance/templates/erector.rb",
+    "spec/performance/templates/garterbelt.rb",
+    "spec/performance/vs_erector.rb",
     "spec/renderers/cache_spec.rb",
     "spec/renderers/closed_tag_spec.rb",
     "spec/renderers/comment_spec.rb",
@@ -81,18 +85,21 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Garterbelt is a Ruby HTML/XML markup framework. It is san DSL. Just all Ruby, all the time.}
   s.test_files = [
-    "spec/benchmark/templates/erector.rb",
-    "spec/benchmark/templates/garterbelt.rb",
-    "spec/benchmark/vs_erector.rb",
     "spec/garterbelt_spec.rb",
+    "spec/integration/templates/form.rb",
     "spec/integration/templates/view_partial_nest.rb",
     "spec/integration/templates/view_with_cache.rb",
+    "spec/integration/templates/view_with_forms.rb",
     "spec/integration/templates/view_with_partial.rb",
     "spec/integration/templates/view_with_partial_2.rb",
     "spec/integration/templates/view_with_tags.rb",
     "spec/integration/templates/view_with_vars.rb",
     "spec/integration/view_spec.rb",
     "spec/page_spec.rb",
+    "spec/performance/profiling.rb",
+    "spec/performance/templates/erector.rb",
+    "spec/performance/templates/garterbelt.rb",
+    "spec/performance/vs_erector.rb",
     "spec/renderers/cache_spec.rb",
     "spec/renderers/closed_tag_spec.rb",
     "spec/renderers/comment_spec.rb",
@@ -115,7 +122,6 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ru_pol>, ["= 0.1.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])
       s.add_runtime_dependency(%q<moneta>, [">= 0.6.0"])
       s.add_development_dependency(%q<hashie>, ["~> 1.0"])
@@ -126,11 +132,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<hashie>, ["~> 1.0"])
       s.add_development_dependency(%q<rbench>, [">= 0"])
-      s.add_runtime_dependency(%q<ru_pol>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])
       s.add_runtime_dependency(%q<moneta>, [">= 0.6.0"])
     else
-      s.add_dependency(%q<ru_pol>, ["= 0.1.2"])
       s.add_dependency(%q<activesupport>, [">= 2.3.8"])
       s.add_dependency(%q<moneta>, [">= 0.6.0"])
       s.add_dependency(%q<hashie>, ["~> 1.0"])
@@ -141,12 +145,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<hashie>, ["~> 1.0"])
       s.add_dependency(%q<rbench>, [">= 0"])
-      s.add_dependency(%q<ru_pol>, [">= 0.1.2"])
       s.add_dependency(%q<activesupport>, [">= 2.3.8"])
       s.add_dependency(%q<moneta>, [">= 0.6.0"])
     end
   else
-    s.add_dependency(%q<ru_pol>, ["= 0.1.2"])
     s.add_dependency(%q<activesupport>, [">= 2.3.8"])
     s.add_dependency(%q<moneta>, [">= 0.6.0"])
     s.add_dependency(%q<hashie>, ["~> 1.0"])
@@ -157,7 +159,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<hashie>, ["~> 1.0"])
     s.add_dependency(%q<rbench>, [">= 0"])
-    s.add_dependency(%q<ru_pol>, [">= 0.1.2"])
     s.add_dependency(%q<activesupport>, [">= 2.3.8"])
     s.add_dependency(%q<moneta>, [">= 0.6.0"])
   end

data/lib/garterbelt.rb

@@ -3,7 +3,6 @@ stocking_dir =  File.dirname(__FILE__)
 require 'active_support/core_ext/string/output_safety'
 require stocking_dir + '/support/string'
 
-require 'ru_pol'
 require 'moneta'
 require 'moneta/memory'
  

data/lib/renderers/closed_tag.rb

@@ -1,8 +1,5 @@
 module Garterbelt
   class ClosedTag < Renderer
-    include RuPol::Swimsuit
-    max_pool_size 10000
-    
     attr_accessor :type, :attributes, :css_class
     
     def initialize(opts)

data/lib/renderers/comment.rb

@@ -1,7 +1,5 @@
 module Garterbelt
   class Comment < Text
-    max_pool_size 1000
-    
     def initialize(opts)
       super
     end

data/lib/renderers/doctype.rb

@@ -1,7 +1,5 @@
 module Garterbelt
   class Doctype < ClosedTag
-    max_pool_size 1000
-    
     ATTRIBUTES = {
       :transitional => "html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"",
       :strict => 'html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"',

data/lib/renderers/renderer.rb

@@ -1,8 +1,5 @@
 module Garterbelt
   class Renderer
-    include RuPol::Swimsuit
-    max_pool_size 10000
-    
     attr_accessor :view
     
     def initialize(opts)

data/lib/renderers/xml.rb

@@ -1,7 +1,5 @@
 module Garterbelt
   class Xml < ClosedTag
-    max_pool_size 1000
-    
     def template
       "#{indent}<?xml #{rendered_attributes} ?>\n"
     end

data/lib/view.rb

@@ -1,17 +1,19 @@
 module Garterbelt
   class View
-    include RuPol::Swimsuit
+    # include RuPol::Swimsuit
     
-    attr_accessor :output, :buffer, :level, :escape
+    attr_accessor :output, :buffer, :level, :escape, :block, :options
     attr_reader :curator
     
-    def initialize(opts={})
+    def initialize(opts={}, &block)
+      self.options =  opts
       self.buffer = []
-      self.level =  (opts.delete(:level) || 0)
+      self.level =  (options.delete(:level) || 0)
       self.output = ""
       self.escape = true
+      self.block = block if block_given?
       
-      self.curator = opts.delete(:curator) || self
+      self.curator = options.delete(:curator) || self
       
       params = self.class.default_variables.merge(opts)
       keys = params.keys
@@ -25,8 +27,8 @@ module Garterbelt
       end
       
       params.each do |key, value|
-        self.class.add_accssor(key) unless respond_to?(key)
-        send("#{key}=", value)
+        self.class.add_accessor(key) unless respond_to?(key)
+        instance_variable_set "@#{key}", value
       end
     end
     
@@ -49,10 +51,10 @@ module Garterbelt
       attr_accessor :required, :selective_require
     end
     
-    def self.add_accssor key
+    def self.add_accessor key
       key = key.to_s
       return if accessories.include?(key)
-      if instance_methods.include?(key)
+      if (instance_methods - Object.instance_methods).include?(key)
         raise ArgumentError, ":#{key} cannot be a required variable because it maps to an existing method"
       end
       
@@ -100,7 +102,7 @@ module Garterbelt
     
     def self.build_accessors
       required.each do |m|
-        add_accssor m
+        add_accessor m
       end
     end
     
@@ -112,7 +114,12 @@ module Garterbelt
     end
     
     def tag(type, *args, &block)
-      add_to_buffer ContentTag.new(parse_tag_arguments(type, args), &block)
+      t = if block_given?
+        ContentTag.new(parse_tag_arguments(type, args), &block)
+      else
+        ContentTag.new(parse_tag_arguments(type, args))
+      end
+      add_to_buffer t
     end
     
     def closed_tag(type, *args)
@@ -122,11 +129,11 @@ module Garterbelt
     def non_escape_tag(*args, &block)
       if escape
         curator.escape = false
-        t = tag(*args, &block)
+        t = block_given? ? tag(*args, &block) : tag(*args)
         curator.escape = true
         t
       else
-        tag(*args, &block)
+        block_given? ? tag(*args, &block) : tag(*args)
       end
     end
     
@@ -149,7 +156,7 @@ module Garterbelt
     alias :raw :raw_text
     alias :rawtext :raw_text
     
-    def comment(content)
+    def comment_tag(content)
       add_to_buffer Comment.new(:view => curator, :content => content)
     end
     
@@ -197,7 +204,7 @@ module Garterbelt
     CONTENT_TAGS.each do |type|
       class_eval <<-RUBY
         def #{type}(*args, &block)
-          tag(:#{type}, *args, &block)
+          block_given? ? tag(:#{type}, *args, &block) : tag(:#{type}, *args)
         end
       RUBY
     end
@@ -206,7 +213,7 @@ module Garterbelt
     NON_ESCAPE_TAGS.each do |type|
       class_eval <<-RUBY
         def #{type}(*args, &block)
-          non_escape_tag(:#{type}, *args, &block)
+          block_given? ? non_escape_tag(:#{type}, *args, &block) : non_escape_tag(:#{type}, *args)
         end
       RUBY
     end
@@ -230,7 +237,7 @@ module Garterbelt
     end
     
     def page_title(*args, &block)
-      tag(:title, *args, &block)
+      block_given? ? tag(:title, *args, &block) : tag(:title, *args)
     end
     
     def stylesheet_link(path)
@@ -258,6 +265,13 @@ module Garterbelt
       output
     end
     
+    def render_block
+      return output unless block
+      block.call
+      render_buffer
+      output
+    end
+    
     alias :to_s :render
     alias :to_html :render
     
@@ -267,25 +281,27 @@ module Garterbelt
       array.each do |item|
         if item.respond_to?(:render)
           item.render
-          item.recycle
         else
           output << item.to_s
         end
       end
     end
     
-    def self.render(opts={})
-      content_method = opts[:method]
-      view = new
+    def self.render(opts={}, &block)
+      content_method = opts.delete(:method)
+      view = block_given? ? new(opts, &block) : new(opts)
       output = content_method ? view.render(content_method) : view.render
-      view.recycle
       output
     end
     
     def partial(*args, &block)
       if (klass = args.first).is_a?(Class)
         args.shift
-        view = klass.new(*args)
+        view = if block
+          klass.new(*args, &block)
+        else
+          klass.new(*args)
+        end
       else
         view = args.first
       end

data/spec/garterbelt_spec.rb

@@ -16,20 +16,6 @@ describe Garterbelt do
       end
     end
     
-    describe '#cache=' do
-      it 'creates a Moneta cache' do
-        
-      end
-      
-      describe 'options' do
-        it 'creates a memory Moneta cache correctly'
-        it 'creates a file system Moneta cache'
-        it 'creates alternative types as requested'
-      end
-      it 'sets the default key when not provided a argument'
-      it 'sets other keys when not '
-    end
-    
     describe '#cache' do
       it 'returns the :default if no arugment is received' do
         Garterbelt.cache.should == Garterbelt.cache_hash[:default]

data/spec/integration/expectations/view_with_forms.html

@@ -0,0 +1,29 @@
+<div class="servey">
+  <form action="/form/fu" method="get">
+    <label>
+      <h4>
+        Are you fu?
+      </h4>
+      <input name="fu" type="radio" value="yes">
+      Yes!
+      <input name="fu" type="radio" value="no">
+      no :(
+    </label>
+    <input type="submit" value="Answer the Fu Master">
+  </form>
+  <form class="update" action="/user/info" method="post">
+    <input name="_method" type="hidden" value="put">
+    <h4>
+      Provide us with updated information
+    </h4>
+    <label>
+      Name: 
+      <input name="name" type="text">
+    </label>
+    <label>
+      Email: 
+      <input name="email" type="text">
+    </label>
+    <input type="submit" value="Update">
+  </form>
+</div>

data/spec/integration/templates/form.rb

@@ -0,0 +1,30 @@
+class FormView < Garterbelt::View
+  requires :method => :get
+  
+  def initialize(options, &block)
+    super
+    self.method = method.to_s.downcase
+  end
+  
+  def content
+    form form_options do
+      if legal_method != method
+        input :type => 'hidden', :name => "_method", :value => method
+      end  
+        
+      block.call if block
+    end
+  end
+  
+  def form_options
+    options.merge(:method => legal_method)
+  end
+  
+  def legal_method
+    if ['get', 'post'].include?( method )
+      method
+    else
+      'post'
+    end 
+  end
+end

data/spec/integration/templates/view_with_forms.rb

@@ -0,0 +1,31 @@
+class ViewWithForms < Garterbelt::View
+  def content
+    div :class => 'servey' do
+      partial FormView, :action => '/form/fu' do
+        label do
+          h4 "Are you fu?"
+          input :type => 'radio', :name => 'fu', :value => 'yes'
+          text 'Yes!'
+          input :type => 'radio', :name => 'fu', :value => 'no'
+          text 'no :('
+        end
+        
+        input :type => 'submit', :value => "Answer the Fu Master"
+      end
+      
+      partial FormView, :action => '/user/info', :method => 'put', :class => 'update' do
+        h4 "Provide us with updated information"
+        label do
+          text "Name: "
+          input :type => 'text', :name => 'name'
+        end
+        
+        label do
+          text "Email: "
+          input :type => 'text', :name => 'email'
+        end
+        input :type => 'submit', :value => 'Update'
+      end 
+    end
+  end
+end

data/spec/integration/view_spec.rb

@@ -53,5 +53,9 @@ describe Garterbelt::View, "Integration" do
     it 'nests deeply' do
       MyPagelet.new(:user => @user).render.should == file('view_partial_nest')
     end
+    
+    it 'works with passed blocks' do
+      ViewWithForms.new.render.should == file('view_with_forms')
+    end
   end
 end

data/spec/performance/profiling.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require "rbench"
+require 'hashie'
+
+require File.dirname(__FILE__) + "/../../lib/garterbelt"
+require File.dirname(__FILE__) + '/templates/garterbelt'
+
+TIMES = 10_000
+
+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)
+end
+
+result = RubyProf.profile do
+  TIMES.times do
+    @tag.render
+  end
+end
+
+# Print a graph profile to text
+printer = RubyProf::GraphPrinter.new(result)
+printer.print(STDOUT, 0)

data/spec/{benchmark → performance}/templates/erector.rb

@@ -11,21 +11,21 @@ class ErectorTemplate < Erector::Widget
       
       body :class => self.class.to_s.underscore do
         div :id => :wrapper, :class => 'line' do
-          if flash
+          if @flash
             div :id => 'flash', :class => 'inner' do
-              text flash
+              text @flash
             end
           end
           
-          dl :class => ['inner', 'user_info'] do
-            dt 'username'
-            dd user.username
+          dl :class => ['inner', '@user_info'] do
+            dt '@username'
+            dd @user.username
             
             dt 'email'
-            dd user.email
+            dd @user.email
             
             dt 'name'
-            dd user.name
+            dd @user.name
             
             dt 'number of assigned tasks'
             dd rand(20)

data/spec/{benchmark → performance}/templates/garterbelt.rb

@@ -4,9 +4,9 @@ class GarterbeltTemplate < Garterbelt::View
   def content
     html do
       head do
-        title "Benchmarking Templates"
-        link :rel => 'stylesheet', :href => '/stylesheet/application.css'
-        link :rel => 'stylesheet', :href => '/stylesheet/ie.css'
+        page_title "Benchmarking Templates"
+        _link :rel => 'stylesheet', :href => '/stylesheet/application.css'
+        _link :rel => 'stylesheet', :href => '/stylesheet/ie.css'
       end
       
       body :class => self.class.to_s.underscore do

data/spec/performance/vs_erector.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require "rbench"
+require 'hashie'
+
+require 'erector'
+require File.dirname(__FILE__) + "/../../lib/garterbelt"
+
+require File.dirname(__FILE__) + '/templates/garterbelt'
+require File.dirname(__FILE__) + '/templates/erector'
+
+TIMES = 10_000
+
+RBench.run(TIMES) do
+  column :garterbelt
+  column :erector
+  
+  user = Hashie::Mash.new(:username => 'baccigalupi', :email => 'baccigalupi@example.com', :name => 'Kane Baccigalupi')
+  
+  report "Simple Page Initializing" do
+    garterbelt { GarterbeltTemplate.new(:user => user) }
+    erector { ErectorTemplate.new(:user => user) }
+  end
+  
+  report "Simple Page Rendering" do
+    garterbelt { GarterbeltTemplate.new(:user => user).render }
+    erector { ErectorTemplate.new(:user => user).to_html }
+  end
+  
+  report "Simple Page, class level rendering" do
+    garterbelt { GarterbeltTemplate.render(:user => user) }
+    erector { ErectorTemplate.new(:user => user).to_html }
+  end
+end
+
+# 4/13/2011, version 0.0.4, Removing RuPol from the lib, totally a flacid chick :(
+# more work on performance later
+#                                            GARTERBELT | ERECTOR |
+# -----------------------------------------------------------------
+# Simple Page Initializing                        0.178 |   0.173 | 2.8% slower
+# Simple Page Rendering                           7.132 |   6.601 | 7.4% slower
+
+# 4/13/2011, version 0.0.4, Oops none of the benchmarks were rendering, just initializing
+# and the performance sucks
+# 10_000
+#                                           GARTERBELT | ERECTOR |
+# -----------------------------------------------------------------
+# Simple Page Initializing                        0.200 |   0.176 | 12% slower
+# Simple Page Rendering                          24.488 |   6.815 | 72% slower
+# Simple Page, class level rendering             24.594 |   6.775 | 72% slower
+
+
+# 4/13/2011, version 0.0.4, performance regression
+# 100_000
+#                              GARTERBELT | ERECTOR |
+# ----------------------------------------------------
+# Simple Page Initialization              2.139 |   1.958 | 9.2% slower
+# Simple Page Initialization              1.956 |   1.928 | 1.4% slower # removing opts.dup in view initialize
+# Simple Page Initialization              1.595 |   1.929 | 17.2% faster # not passing the block in partial (feature withdrawal, not viable)
+# Simple Page Initialization              1.663 |   1.914 | 13% faster # conditional passing of block in partial
+# Simple Page Initialization              1.629 |   1.891 | 13.8% # conditional passing of block in other view methods
+
+# 4/11/2011, version 0.0.1
+# GARTERBELT = pooling at standard 1000 instances
+# GARTERBELT_2 = pooling at 10% of sample time
+
+# 10_000 times
+#                                   GARTERBELT | ERECTOR |
+# ---------------------------------------------------------------------
+# Simple Page Initialization                 0.164 |   0.205 |    20% faster
+
+# 100_000 times
+#                                   GARTERBELT | GARTERBELT_2 | ERECTOR |
+# ---------------------------------------------------------------------
+# Simple Page Initialization                 1.857 | 1.828 | 1.932 |    3.8-5.3%/ faster
+
+# 200_000 times
+#                                   GARTERBELT | GARTERBELT_2 | ERECTOR |
+# ---------------------------------------------------------------------
+# Simple Page Initialization                 3.743 | 3.660 | 3.846 |    2.7-4.8% faster
+
+# 500_000 times
+#                                   GARTERBELT | GARTERBELT_2 | ERECTOR |
+# ---------------------------------------------------------------------
+# Simple Page Initialization                 9.420 | 9.422 | 9.637 |    2.3-2.2% faster
+
+
+
+

data/spec/renderers/closed_tag_spec.rb

@@ -34,16 +34,6 @@ describe Garterbelt::ClosedTag do
     end
   end
   
-  describe 'pooling' do
-    it 'include RuPol::Swimsuit' do
-      ClosedTag.ancestors.should include(RuPol::Swimsuit)
-    end
-    
-    it 'has a really large max_pool_size' do
-      ClosedTag._pool.max_size.should == 10000
-    end
-  end
-  
   describe 'method chaining' do
     before do
       @tag = ClosedTag.new(:type => :input, :view => @view)

data/spec/renderers/comment_spec.rb

@@ -22,10 +22,6 @@ describe Garterbelt::Comment do
         ArgumentError, ":content option required for Garterbelt::Comment initialization" 
       )
     end
-    
-    it 'has a smaller pool size' do
-      Garterbelt::Comment._pool.max_size.should == 1000
-    end
   end
   
   describe 'render' do

data/spec/renderers/content_tag_spec.rb

@@ -26,10 +26,6 @@ describe Garterbelt::ContentTag do
         @output << "This is block content"
       end.content.class.should == Proc
     end
-    
-    it 'inherits a really large max_pool_size' do
-      ContentTag._pool.max_size.should == 10000
-    end
   end
   
   describe 'chaining' do

data/spec/renderers/doctype_spec.rb

@@ -9,10 +9,6 @@ describe Garterbelt::Doctype do
     it 'is decends from ClosedTag' do
       Garterbelt::Doctype.ancestors.should include Garterbelt::ClosedTag
     end
-    
-    it 'has a smaller pool size' do
-      Garterbelt::Doctype._pool.max_size.should == 1000
-    end
   end
   
   describe 'render' do

data/spec/renderers/text_spec.rb

@@ -22,10 +22,6 @@ describe Garterbelt::Text do
         ArgumentError, ":content option required for Garterbelt::Text initialization" 
       )
     end
-    
-    it 'inherits its pool size' do
-      Garterbelt::Text._pool.max_size.should == 10000
-    end
   end
   
   describe 'render' do

data/spec/view/view_basics_spec.rb

@@ -13,12 +13,6 @@ describe Garterbelt::View do
     @view = BasicView.new
   end
 
-  describe 'pooling' do
-    it 'includes the swimsuit' do
-      BasicView.ancestors.should include( RuPol::Swimsuit )
-    end
-  end
-
   describe 'attributes' do
     it 'has a tag buffer' do
       @view.buffer.should == []
@@ -59,6 +53,18 @@ describe Garterbelt::View do
       end
     end
     
+    it 'can be initailzed with a block' do
+      view = BasicView.new do
+        Garterbelt::Tag.new(:type => :p, :content => 'Initalization block content', :view => view)
+      end
+      view.block.is_a?(Proc).should be_true
+    end
+    
+    it 'can save the options' do
+      view = BasicView.new(:foo => 'foo', :bar => 'bar')
+      view.options.should == {:foo => 'foo', :bar => 'bar'}
+    end
+    
     describe 'setting the curator: view responsible for displaying the rendered content' do
       before do
         @view.level = 42

data/spec/view/view_partial_spec.rb

@@ -54,10 +54,17 @@ describe Garterbelt::View, 'Partials' do
       
       it 'has the correct initalization options' do
         @view.partial(PartedOut, :x => '= foo')
-        partial = @view
+        partial = @view.buffer.last
+        partial.x.should == '= foo'
       end
       
-      it 'passes along the block, wait do views take blocks right now?'
+      it 'passes along the block' do
+        @view.partial(PartedOut, :x => 'not x') do
+          puts { 'maybe x; i don\'t know '}
+        end
+        partial = @view.buffer.last
+        partial.block.is_a?(Proc).should be_true
+      end
     end
   end
 end

data/spec/view/view_render_spec.rb

@@ -58,19 +58,6 @@ describe Garterbelt::View do
         @view.render_buffer
       end
       
-      it 'should recycle the tags' do
-        @view.buffer << @hr << @input << @img
-        @hr.stub(:render)
-        @input.stub(:render)
-        @img.stub(:render)
-        
-        @hr.should_receive(:recycle)
-        @input.should_receive(:recycle)
-        @img.should_receive(:recycle)
-        
-        @view.render_buffer
-      end
-      
       it 'will add non renderable items to the output as strings' do
         @view.buffer << "foo " << :bar
         @view.render_buffer
@@ -143,7 +130,6 @@ describe Garterbelt::View do
     describe 'class method' do
       before do
         @rendered = @view.render
-        @view.stub(:recycle)
       end
       
       it 'makes a new view' do
@@ -163,20 +149,23 @@ describe Garterbelt::View do
         BasicView.render :method => :alt_content
       end
       
-      it 'recycles the view' do
-        BasicView.stub(:new).and_return(@view)
-        @view.should_receive(:recycle)
-        BasicView.render
-      end
-      
       it 'returns the output' do
         BasicView.stub(:new).and_return(@view)
         BasicView.render.should == @rendered
       end
     end
+
+    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')
+        end
+        @view.render_block.should include "Block level p tag"
+      end
+    end
   end
 
-  describe 'tag helpers' do
+  describe 'renderers' do
     describe '#tag' do
       it 'makes a new tag' do
         Garterbelt::ContentTag.should_receive(:new).with(
@@ -330,11 +319,11 @@ describe Garterbelt::View do
     
       describe 'comment' do
         it 'makes a comment object' do
-          @view.comment('This is a comment.').is_a?(Garterbelt::Comment).should be_true
+          @view.comment_tag('This is a comment.').is_a?(Garterbelt::Comment).should be_true
         end
         
         it 'puts it on the buffer' do
-          comment = @view.comment("new comment now")
+          comment = @view.comment_tag("new comment now")
           @view.buffer.last.should == comment
         end
       end

data/spec/view/view_variables_spec.rb

@@ -104,12 +104,22 @@ describe Garterbelt::View, 'Variables' do
         end
       end
 
-      it 'raises on compile if the required variables map to existing methods' do
-        lambda {
-          class Failer < Garterbelt::View
-            requires :p
-          end
-        }.should raise_error(ArgumentError, ":p cannot be a required variable because it maps to an existing method")
+      describe 'allowed accessors' do
+        it 'raises on compile if the required variables map to existing view methods' do
+          lambda {
+            class Failer < Garterbelt::View
+              requires :p
+            end
+          }.should raise_error(ArgumentError, ":p cannot be a required variable because it maps to an existing method")
+        end
+      
+        it 'does not raise an error when overriding Object instance methods' do
+          lambda {
+            class Doer < Garterbelt::View
+              requires :tap
+            end
+          }.should_not raise_error
+        end
       end
     end    
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: garterbelt
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,27 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -07:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
-  type: :runtime
-  name: ru_pol
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,9 +33,9 @@ dependencies:
   type: :runtime
   name: activesupport
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,9 +49,9 @@ dependencies:
   type: :runtime
   name: moneta
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,9 +64,9 @@ dependencies:
   type: :development
   name: hashie
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,9 +80,9 @@ dependencies:
   type: :development
   name: rspec
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,9 +96,9 @@ dependencies:
   type: :development
   name: yard
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,9 +112,9 @@ dependencies:
   type: :development
   name: bundler
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,9 +128,9 @@ dependencies:
   type: :development
   name: jeweler
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,9 +142,9 @@ dependencies:
   type: :development
   name: rcov
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -173,9 +157,9 @@ dependencies:
   type: :development
   name: hashie
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,25 +171,9 @@ dependencies:
   type: :development
   name: rbench
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
-  type: :runtime
-  name: ru_pol
-  prerelease: false
-  version_requirements: *id012
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -219,9 +187,9 @@ dependencies:
   type: :runtime
   name: activesupport
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -235,7 +203,7 @@ dependencies:
   type: :runtime
   name: moneta
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id012
 description: 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.
 email: baccigalupi@gmail.com
 executables: []
@@ -271,23 +239,27 @@ files:
 - lib/stocking.rb
 - lib/support/string.rb
 - lib/view.rb
-- spec/benchmark/templates/erector.rb
-- spec/benchmark/templates/garterbelt.rb
-- spec/benchmark/vs_erector.rb
 - spec/garterbelt_spec.rb
 - spec/integration/expectations/general_view.html
 - spec/integration/expectations/variables/view_with_user_and_params.html
 - spec/integration/expectations/variables/view_with_user_email.html
 - spec/integration/expectations/view_partial_nest.html
+- spec/integration/expectations/view_with_forms.html
 - spec/integration/expectations/view_with_tags.html
+- spec/integration/templates/form.rb
 - spec/integration/templates/view_partial_nest.rb
 - spec/integration/templates/view_with_cache.rb
+- spec/integration/templates/view_with_forms.rb
 - spec/integration/templates/view_with_partial.rb
 - spec/integration/templates/view_with_partial_2.rb
 - spec/integration/templates/view_with_tags.rb
 - spec/integration/templates/view_with_vars.rb
 - spec/integration/view_spec.rb
 - spec/page_spec.rb
+- spec/performance/profiling.rb
+- spec/performance/templates/erector.rb
+- spec/performance/templates/garterbelt.rb
+- spec/performance/vs_erector.rb
 - spec/renderers/cache_spec.rb
 - spec/renderers/closed_tag_spec.rb
 - spec/renderers/comment_spec.rb
@@ -338,18 +310,21 @@ signing_key:
 specification_version: 3
 summary: Garterbelt is a Ruby HTML/XML markup framework. It is san DSL. Just all Ruby, all the time.
 test_files: 
-- spec/benchmark/templates/erector.rb
-- spec/benchmark/templates/garterbelt.rb
-- spec/benchmark/vs_erector.rb
 - spec/garterbelt_spec.rb
+- spec/integration/templates/form.rb
 - spec/integration/templates/view_partial_nest.rb
 - spec/integration/templates/view_with_cache.rb
+- spec/integration/templates/view_with_forms.rb
 - spec/integration/templates/view_with_partial.rb
 - spec/integration/templates/view_with_partial_2.rb
 - spec/integration/templates/view_with_tags.rb
 - spec/integration/templates/view_with_vars.rb
 - spec/integration/view_spec.rb
 - spec/page_spec.rb
+- spec/performance/profiling.rb
+- spec/performance/templates/erector.rb
+- spec/performance/templates/garterbelt.rb
+- spec/performance/vs_erector.rb
 - spec/renderers/cache_spec.rb
 - spec/renderers/closed_tag_spec.rb
 - spec/renderers/comment_spec.rb

data/spec/benchmark/vs_erector.rb

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require "rbench"
-require 'hashie'
-
-require 'erector'
-require File.dirname(__FILE__) + "/../../lib/garterbelt"
-
-require File.dirname(__FILE__) + '/templates/stocking'
-require File.dirname(__FILE__) + '/templates/erector'
-
-TIMES = 500_000
-
-RBench.run(TIMES) do
-  LoungeTemplate.max_pool_size TIMES/10
-  column :garterbelt
-  column :erector
-  
-  report "Simple Page Rendering" do
-    user = Hashie::Mash.new(:username => 'baccigalupi', :email => 'baccigalupi@example.com', :name => 'Kane Baccigalupi')
-    erector { ErectorTemplate.new(:user => user) }
-    garterbelt { GarterbeltTemplate.new(:user => user) }
-  end
-end
-
-# 4/11/2011, version 0.0.1, standard pooling
-# GARTERBELT = pooling at standard 1000 instances
-# GARTERBELT_2 = pooling at 10% of sample time
-
-# 10_000 times
-#                                   GARTERBELT | ERECTOR |
-# ---------------------------------------------------------------------
-# Simple Page Rendering                 0.164 |   0.205 |    20% faster
-
-# 100_000 times
-#                                   GARTERBELT | GARTERBELT_2 | ERECTOR |
-# ---------------------------------------------------------------------
-# Simple Page Rendering                 1.857 | 1.828 | 1.932 |    3.8-5.3%/ faster
-
-# 200_000 times
-#                                   GARTERBELT | GARTERBELT_2 | ERECTOR |
-# ---------------------------------------------------------------------
-# Simple Page Rendering                 3.743 | 3.660 | 3.846 |    2.7-4.8% faster
-
-# 500_000 times
-#                                   GARTERBELT | GARTERBELT_2 | ERECTOR |
-# ---------------------------------------------------------------------
-# Simple Page Rendering                 9.420 | 9.422 | 9.637 |    2.3-2.2% faster
-
-
-
-