garterbelt 0.1.0 → 0.1.1

data/CHANGELOG

@@ -0,0 +1,2 @@
+= Version 0.1.1
+  * Bug fix: textarea tags should not have pretty formatting, because white space ends up in the text area

data/TODO

@@ -13,6 +13,7 @@ view
 renderers
   switch from erb to direct escaping of text
     make quotes not escape
+  handle funky chars, html entities, re-escaping  
 
 page
   embed_js, embed_css file content, string content

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/garterbelt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{garterbelt}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-20}
   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 = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -43,6 +44,7 @@ Gem::Specification.new do |s|
     "lib/support/string.rb",
     "lib/view.rb",
     "spec/garterbelt_spec.rb",
+    "spec/integration/expectations/form_with_textarea.html",
     "spec/integration/expectations/general_view.html",
     "spec/integration/expectations/render_styles/compact.html",
     "spec/integration/expectations/render_styles/minified.html",
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     "spec/integration/expectations/view_with_tags.html",
     "spec/integration/integration_spec.rb",
     "spec/integration/templates/form.rb",
+    "spec/integration/templates/form_with_textarea.rb",
     "spec/integration/templates/pretty_with_embeds.rb",
     "spec/integration/templates/unescaping_view.rb",
     "spec/integration/templates/view_partial_nest.rb",
@@ -69,6 +72,7 @@ Gem::Specification.new do |s|
     "spec/performance/profiling.rb",
     "spec/performance/templates/erector.rb",
     "spec/performance/templates/garterbelt.rb",
+    "spec/performance/templates/ham.haml",
     "spec/performance/vs_erector.rb",
     "spec/renderers/cache_spec.rb",
     "spec/renderers/closed_tag_spec.rb",
@@ -80,6 +84,7 @@ Gem::Specification.new do |s|
     "spec/string_spec.rb",
     "spec/support/mock_view.rb",
     "spec/support/puters.rb",
+    "spec/view/anonymous_view_spec.rb",
     "spec/view/view_basics_spec.rb",
     "spec/view/view_caching_spec.rb",
     "spec/view/view_partial_spec.rb",
@@ -96,6 +101,7 @@ Gem::Specification.new do |s|
     "spec/garterbelt_spec.rb",
     "spec/integration/integration_spec.rb",
     "spec/integration/templates/form.rb",
+    "spec/integration/templates/form_with_textarea.rb",
     "spec/integration/templates/pretty_with_embeds.rb",
     "spec/integration/templates/unescaping_view.rb",
     "spec/integration/templates/view_partial_nest.rb",
@@ -120,6 +126,7 @@ Gem::Specification.new do |s|
     "spec/string_spec.rb",
     "spec/support/mock_view.rb",
     "spec/support/puters.rb",
+    "spec/view/anonymous_view_spec.rb",
     "spec/view/view_basics_spec.rb",
     "spec/view/view_caching_spec.rb",
     "spec/view/view_partial_spec.rb",

data/lib/renderers/comment.rb

@@ -5,7 +5,7 @@ module Garterbelt
     end
     
     def template
-      view.render_style == :text ? "" : "#{indent}<!-- #{content} -->#{line_end}"
+      style == :text ? "" : "#{indent}<!-- #{content} -->#{line_end}"
     end
     
     def render

data/lib/renderers/content_rendering.rb

@@ -2,7 +2,7 @@ module Garterbelt
   module ContentRendering
     def self.included(base)
       base.class_eval <<-RUBY
-        attr_accessor :content
+        attr_accessor :content, :view_escape, :view_style
         
         include InstanceMethods
       RUBY
@@ -17,10 +17,17 @@ module Garterbelt
       end
 
       def head
+        self.view_style = view.render_style
+        self.view_escape = view._escape
+        
+        view.render_style = style
+        view._escape = escape
         view._level += 1
       end
 
       def foot
+        view.render_style = view_style
+        view._escape = view_escape
         view._level -= 1
       end
 

data/lib/renderers/content_tag.rb

@@ -24,7 +24,12 @@ module Garterbelt
     end
     
     def head_template
-      style == :text ? '' : "#{indent}<#{type}#{rendered_attributes}>#{line_end}"
+      if style == :text 
+        ''
+      else 
+        head_end = style == :compact ? '' : line_end
+        "#{indent}<#{type}#{rendered_attributes}>#{head_end}"
+      end
     end
     
     def head
@@ -36,7 +41,8 @@ module Garterbelt
       if style == :text 
         [:p, :ul, :ol, :li].include?(type) ? "\n" : '' 
       else
-        "#{indent}</#{type}>#{line_end}"
+        foot_dent = style == :compact ? '' : indent
+        "#{foot_dent}</#{type}>#{line_end}"
       end
     end
     

data/lib/renderers/renderer.rb

@@ -1,9 +1,12 @@
 module Garterbelt
   class Renderer
-    attr_accessor :view
+    attr_accessor :view, :escape
+    attr_writer :style
     
     def initialize(opts)
       self.view = opts[:view] || raise(ArgumentError, ":view required in initialization options")
+      self.style = opts.delete(:render_style)
+      self.escape = view._escape
     end
     
     # Rendering -----------------------------------------------
@@ -20,7 +23,7 @@ module Garterbelt
     end
     
     def style
-      view.render_style
+      @style ||= view.render_style
     end
     
     def indent

data/lib/renderers/text.rb

@@ -1,11 +1,10 @@
 module Garterbelt
   class Text < Renderer
-    attr_accessor :content, :escape
+    attr_accessor :content
     
     def initialize(opts)
       super
       self.content = opts[:content] || ''
-      self.escape = view._escape
     end
     
     def raise_with_block_content
@@ -31,6 +30,10 @@ module Garterbelt
       end
     end
     
+    def line_end
+      style == :compact ? '' : super
+    end
+    
     def template
       "#{escaped_content}#{line_end}"
     end

data/lib/view.rb

@@ -142,6 +142,17 @@ module Garterbelt
       end
     end
     
+    def compact_tag(type, *args, &block)
+      args << {} unless args.last.is_a?(Hash)
+      args.last[:render_style] = :compact
+        
+      if block_given?
+        tag(type, *args, &block)
+      else
+        tag(type, *args)
+      end
+    end
+    
     def text(content)
       add_to_buffer Text.new(:view => _curator, :content => content)
     end
@@ -186,6 +197,7 @@ module Garterbelt
           opts[:content] = args.first
         end
       end
+      opts[:render_style] = opts[:attributes].delete(:render_style) if opts[:attributes] && opts[:attributes][:render_style]
       opts
     end
     
@@ -203,7 +215,7 @@ module Garterbelt
       'q', 's',
       'samp', 'select', 'small', 'span',
       'strong', 'sub', 'sup',
-      'table', 'tbody', 'td', 'textarea', 'tfoot', 
+      'table', 'tbody', 'td', 'tfoot', 
       'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var'
     ]
     CONTENT_TAGS.each do |type|
@@ -241,6 +253,15 @@ module Garterbelt
       RUBY
     end
     
+    MINIFIED_TAGS = ['textarea']
+    MINIFIED_TAGS.each do |type|
+      class_eval <<-RUBY
+        def #{type}(*args, &block)
+          block_given? ? compact_tag(:#{type}, *args, &block) : compact_tag(:#{type}, *args)
+        end
+      RUBY
+    end
+    
     def page_title(*args, &block)
       block_given? ? tag(:title, *args, &block) : tag(:title, *args)
     end

data/spec/integration/expectations/form_with_textarea.html

@@ -0,0 +1,3 @@
+<form class="texty" action="/go/textarea" method="get">
+  <textarea name="my_text_area">foo</textarea>
+</form>

data/spec/integration/integration_spec.rb

@@ -16,6 +16,10 @@ describe Garterbelt::View, "Integration" do
     UnescapingView.new(:format_text => format_text).render.should == file('unescaping_view')
   end
   
+  it 'deals with textarea correctly' do
+    FormWithTextarea.new.render.should == file('form_with_textarea')
+  end
+  
   describe 'variables' do
     it 'calls methods on passed objects' do
       user =  Hashie::Mash.new(:email => 'foo@example.com')

data/spec/integration/templates/form_with_textarea.rb

@@ -0,0 +1,9 @@
+class FormWithTextarea < Garterbelt::View
+  def content
+    partial FormView, :class => 'texty', :action => '/go/textarea' do
+      textarea :name => 'my_text_area' do
+        text 'foo'
+      end
+    end
+  end
+end

data/spec/performance/templates/ham.haml

@@ -0,0 +1,23 @@
+%html
+  %head
+    %title Benchmarking Templates
+    %link{"rel" => "stylesheet", :href => "/stylesheet/application.css"}
+    %link{"rel" => "stylesheet", :href => "/stylesheet/ie.css"}
+  %body.not_applicable
+    #wrapper.line
+      - if flash
+        #flash.inner
+          = flash
+      %dl{'class' => 'inner user_info'}
+        %dt username
+        %dd
+          = user.username
+        %dt email
+        %dd
+          = user.email
+        %dt name
+        %dd
+          = user.name
+        %dt number of assigned tasks
+        %dd
+          = rand(20)

data/spec/performance/vs_erector.rb

@@ -5,27 +5,37 @@ require "rbench"
 require 'hashie'
 
 require 'erector'
+require 'haml'
+
 require File.dirname(__FILE__) + "/../../lib/garterbelt"
 
 require File.dirname(__FILE__) + '/templates/garterbelt'
 require File.dirname(__FILE__) + '/templates/erector'
+haml =  File.read(File.dirname(__FILE__) + '/templates/ham.haml')
 
-TIMES = 500_000
+TIMES = 10_000
 
 RBench.run(TIMES) do
   column :garterbelt
   column :erector
+  column :haml
   
   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) }
+    haml { Haml::Engine.new( haml ) }
   end
   
+  object = Object.new
+  object.instance_variable_set "@user", user
+  object.instance_variable_set "@flash", nil
+  
   report "Simple Page Rendering" do
     garterbelt { GarterbeltTemplate.new(:user => user).render }
     erector { ErectorTemplate.new(:user => user).to_html }
+    haml { Haml::Engine.new( haml ).to_html(object, {:user => user, :flash => nil} ) }
   end
 end
 

data/spec/renderers/closed_tag_spec.rb

@@ -167,7 +167,7 @@ describe Garterbelt::ClosedTag do
       
       describe ':minified' do
         before do
-          @view.render_style = :minified
+          @tag.style = :minified
           @min = @tag.render
         end
         
@@ -183,7 +183,7 @@ describe Garterbelt::ClosedTag do
       
       describe ':text' do
         it 'is an empty string' do
-          @view.render_style = :text
+          @tag.style = :text
           @tag.render.should == ''
         end
       end

data/spec/renderers/comment_spec.rb

@@ -67,7 +67,7 @@ describe Garterbelt::Comment do
       
       describe ':minified' do
         before do
-          @view.render_style = :minified
+          @tag.style = :minified
           @min = @tag.render
         end
         
@@ -83,7 +83,7 @@ describe Garterbelt::Comment do
       
       describe ':text' do
         it 'is an empty string' do
-          @view.render_style = :text
+          @tag.style = :text
           @tag.render.should == ''
         end
       end

data/spec/renderers/content_tag_spec.rb

@@ -123,6 +123,43 @@ describe Garterbelt::ContentTag do
           @tag.render.should_not match /\n/
         end
       end
+    
+      describe ':compact' do
+        describe 'with block content' do
+          it 'is just like pretty' do
+            @tag.content = lambda { 'foo' }
+            @tag.style = :pretty
+            pretty = @tag.render
+            @tag.style = :compact
+            @tag.render.should == pretty
+          end
+        end
+        
+        describe 'with string content' do
+          before do
+            @tag.content = "stringy"
+            @tag.style = :compact
+            @compact = @tag.render
+          end
+          
+          it 'head tag does not end in a break' do
+            @compact.should match /<p[^>]*>/
+            @compact.should_not match /<p[^>]*>\n/
+          end
+          
+          it 'tail tag does not have any indentation' do
+            @compact.should_not match />\s{1,50}<\/p>/
+          end
+        end
+      end
+    
+      describe 'on initialization' do
+        it 'uses the value passed in over the view render style' do
+          @view.render_style = :pretty
+          tag = ContentTag.new(@params.merge(:render_style => :minified, :content => 'my great content'))
+          tag.style.should == :minified
+        end
+      end
     end
     
     describe 'content' do

data/spec/renderers/text_spec.rb

@@ -77,7 +77,7 @@ describe Garterbelt::Text do
       
       describe ':minified' do
         before do
-          @view.render_style = :minified
+          @tag.style = :minified
           @minified = @tag.render
         end
         
@@ -93,7 +93,7 @@ describe Garterbelt::Text do
       
       describe ':text' do
         before do
-          @view.render_style = :text
+          @tag.style = :text
           @text = @tag.render
         end
         
@@ -105,6 +105,18 @@ describe Garterbelt::Text do
           @text.should_not match /\n1/
         end
       end
+      
+      describe 'compact' do
+        before do
+          @tag.style = :compact
+          @compact = @tag.render
+        end
+        
+        it 'is just the string' do
+          @compact.should == @str
+        end
+      end
+      
     end
   end
 end

data/spec/view/view_render_spec.rb

@@ -273,6 +273,30 @@ describe Garterbelt::View do
       end
     end
     
+    describe '#compact_tag' do
+      it 'should call #tag' do
+        @view.should_receive(:tag)
+        @view.compact_tag(:textarea, "", {:class => 'classy'})
+      end
+      
+      it 'passes in the :render_style option with :minified to tag' do
+        @view.should_receive(:tag).with(:textarea, "", {:render_style => :compact})
+        @view.compact_tag(:textarea, "")
+      end
+      
+      it 'passes in the :render_style option with :minified when not receiving content arguments' do
+        @view.should_receive(:tag).with(:textarea, {:render_style => :compact, :class => :foo})
+        @view.compact_tag(:textarea, :class => :foo)
+      end
+      
+      it 'content tag should be created with the correct attributes' do
+        @view.compact_tag(:textarea, :class => 'foo')
+        tag = @view._buffer.last
+        tag.style.should == :compact
+        tag.attributes.keys.should_not include :render_style
+      end
+    end
+    
     describe '#text' do
       it 'makes a new Text' do
         Garterbelt::Text.should_receive(:new).and_return('some content')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: garterbelt
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -07:00
+date: 2011-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -217,6 +217,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -240,6 +241,7 @@ files:
 - lib/support/string.rb
 - lib/view.rb
 - spec/garterbelt_spec.rb
+- spec/integration/expectations/form_with_textarea.html
 - spec/integration/expectations/general_view.html
 - spec/integration/expectations/render_styles/compact.html
 - spec/integration/expectations/render_styles/minified.html
@@ -253,6 +255,7 @@ files:
 - spec/integration/expectations/view_with_tags.html
 - spec/integration/integration_spec.rb
 - spec/integration/templates/form.rb
+- spec/integration/templates/form_with_textarea.rb
 - spec/integration/templates/pretty_with_embeds.rb
 - spec/integration/templates/unescaping_view.rb
 - spec/integration/templates/view_partial_nest.rb
@@ -266,6 +269,7 @@ files:
 - spec/performance/profiling.rb
 - spec/performance/templates/erector.rb
 - spec/performance/templates/garterbelt.rb
+- spec/performance/templates/ham.haml
 - spec/performance/vs_erector.rb
 - spec/renderers/cache_spec.rb
 - spec/renderers/closed_tag_spec.rb
@@ -277,6 +281,7 @@ files:
 - spec/string_spec.rb
 - spec/support/mock_view.rb
 - spec/support/puters.rb
+- spec/view/anonymous_view_spec.rb
 - spec/view/view_basics_spec.rb
 - spec/view/view_caching_spec.rb
 - spec/view/view_partial_spec.rb
@@ -321,6 +326,7 @@ test_files:
 - spec/garterbelt_spec.rb
 - spec/integration/integration_spec.rb
 - spec/integration/templates/form.rb
+- spec/integration/templates/form_with_textarea.rb
 - spec/integration/templates/pretty_with_embeds.rb
 - spec/integration/templates/unescaping_view.rb
 - spec/integration/templates/view_partial_nest.rb
@@ -345,6 +351,7 @@ test_files:
 - spec/string_spec.rb
 - spec/support/mock_view.rb
 - spec/support/puters.rb
+- spec/view/anonymous_view_spec.rb
 - spec/view/view_basics_spec.rb
 - spec/view/view_caching_spec.rb
 - spec/view/view_partial_spec.rb