garterbelt 0.0.7 → 0.0.8

data/TODO

@@ -1,11 +1,28 @@
 increase performance ~10%
-partial passes down params from parent view
+
 anonymous views
 
-rails style helpers
+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
+  
+partial
+  pass the block content to partial instances too
+  partial passes down params from parent view
+
+page
+  embed_js, embed_css file content, string content
+  make content method = page_content, so that downstream views can just use content as their main method
+
 
-render styles
-  - pretty: current and default
-  - compact: argument content in the tags, not new line
-  - minified: no new lines or indenting
-  - text only: no tags, appropriate new lines according to tag type
+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.7
+0.0.8

data/garterbelt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{garterbelt}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-04-13}
+  s.date = %q{2011-04-18}
   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 = [
@@ -44,12 +44,16 @@ Gem::Specification.new do |s|
     "lib/view.rb",
     "spec/garterbelt_spec.rb",
     "spec/integration/expectations/general_view.html",
+    "spec/integration/expectations/render_styles/compact.html",
+    "spec/integration/expectations/render_styles/minified.html",
+    "spec/integration/expectations/render_styles/text.html",
     "spec/integration/expectations/unescaping_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/integration_spec.rb",
     "spec/integration/templates/form.rb",
     "spec/integration/templates/unescaping_view.rb",
     "spec/integration/templates/view_partial_nest.rb",
@@ -59,7 +63,6 @@ Gem::Specification.new do |s|
     "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",
@@ -72,6 +75,7 @@ Gem::Specification.new do |s|
     "spec/renderers/doctype_spec.rb",
     "spec/renderers/text_spec.rb",
     "spec/spec_helper.rb",
+    "spec/string_spec.rb",
     "spec/support/mock_view.rb",
     "spec/support/puters.rb",
     "spec/view/view_basics_spec.rb",
@@ -88,6 +92,7 @@ Gem::Specification.new do |s|
   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/garterbelt_spec.rb",
+    "spec/integration/integration_spec.rb",
     "spec/integration/templates/form.rb",
     "spec/integration/templates/unescaping_view.rb",
     "spec/integration/templates/view_partial_nest.rb",
@@ -97,7 +102,6 @@ Gem::Specification.new do |s|
     "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",
@@ -110,6 +114,7 @@ Gem::Specification.new do |s|
     "spec/renderers/doctype_spec.rb",
     "spec/renderers/text_spec.rb",
     "spec/spec_helper.rb",
+    "spec/string_spec.rb",
     "spec/support/mock_view.rb",
     "spec/support/puters.rb",
     "spec/view/view_basics_spec.rb",

data/lib/renderers/closed_tag.rb

@@ -45,7 +45,11 @@ module Garterbelt
     end
     
     def template
-      "#{indent}<#{type}#{rendered_attributes}>\n"
+      if style == :text 
+        type == :br ? "\n" : ""
+      else 
+        "#{indent}<#{type}#{rendered_attributes}>#{line_end}"
+      end
     end
     
     def render

data/lib/renderers/comment.rb

@@ -4,9 +4,13 @@ module Garterbelt
       super
     end
     
+    def template
+      view.render_style == :text ? "" : "#{indent}<!-- #{content} -->#{line_end}"
+    end
+    
     def render
       raise_with_block_content
-      output << "#{indent}<!-- #{content} -->\n"
+      output << template
     end
   end
 end

data/lib/renderers/content_tag.rb

@@ -23,14 +23,26 @@ module Garterbelt
       self
     end
     
+    def head_template
+      style == :text ? '' : "#{indent}<#{type}#{rendered_attributes}>#{line_end}"
+    end
+    
     def head
-      self.output << "#{indent}<#{type}#{rendered_attributes}>\n"
+      self.output << head_template
       super
     end
     
+    def foot_template
+      if style == :text 
+        [:p, :ul, :ol, :li].include?(type) ? "\n" : '' 
+      else
+        "#{indent}</#{type}>#{line_end}"
+      end
+    end
+    
     def foot
       super
-      self.output << "#{indent}</#{type}>\n"
+      self.output << foot_template
     end
   end
 end

data/lib/renderers/renderer.rb

@@ -19,8 +19,16 @@ module Garterbelt
       view.level
     end
     
+    def style
+      view.render_style
+    end
+    
     def indent
-      ' '*level*2
+      style == :minified ? "" : ' '*level*2
+    end
+    
+    def line_end
+      style == :minified ?  "" : "\n"
     end
     
     def render

data/lib/renderers/text.rb

@@ -4,8 +4,7 @@ module Garterbelt
     
     def initialize(opts)
       super
-      raise ArgumentError, ":content option required for #{self.class} initialization" unless opts[:content]
-      self.content = opts[:content]
+      self.content = opts[:content] || ''
       self.escape = view.escape
     end
     
@@ -15,11 +14,23 @@ module Garterbelt
     
     def render
       raise_with_block_content
-      output << "#{indent}#{escaped_content}\n"
+      str = template
+      output << str
+      str
     end
     
-    def escaped_content
-      escape ? ERB::Util.h(content) : content
+    def line_end
+      [:pretty, :text].include?(style) ? "\n" : ''
+    end
+    
+    def template
+      str = escape ? ERB::Util.h(content) : content
+      
+      if style == :pretty 
+        "#{str.wrap(Garterbelt.wrap_length, :indent => indent)}#{line_end}" 
+      else 
+        "#{str}#{line_end}"
+      end
     end
   end
 end

data/lib/stocking.rb

@@ -8,4 +8,12 @@ module Garterbelt
     raise "Cache #{store.inspect} has not yet been configured" unless c
     c
   end
+  
+  class << self
+    attr_writer :wrap_length
+  end
+  
+  def self.wrap_length
+    @wrap_length || 80
+  end
 end

data/lib/support/string.rb

@@ -1,3 +1,29 @@
+class String
+  def wrap(limit = 50, opts={})
+    strip!
+    indent = opts[:indent] || ''
+    return indent << self if size + indent.size <= limit || !include?(' ')
+    
+    words = self.split(/\s/)
+    lines = [[indent]]
+    char_count = indent.size
+    words.each do |word|
+      word_size = word.size + 1
+      if (word_size + char_count <= limit) || lines.last.size == 1
+        char_count += word_size
+        lines.last << word
+      else
+        char_count = word_size + indent.size
+        lines << [indent, word]
+      end
+    end
+    lines.map do |line| 
+      indent = line.shift
+      indent + line.join(' ')
+    end.join("\n")
+  end
+end
+
 unless String.instance_methods.include?('underscore')
   begin
     # being selective if activesupport 3.0.x 

data/lib/view.rb

@@ -2,13 +2,14 @@ module Garterbelt
   class View
     # include RuPol::Swimsuit
     
-    attr_accessor :output, :buffer, :level, :escape, :block, :options
+    attr_accessor :output, :buffer, :level, :escape, :block, :options, :render_style
     attr_reader :curator
     
     def initialize(opts={}, &block)
       self.options =  opts
       self.buffer = []
-      self.level =  (options.delete(:level) || 0)
+      self.level =  options.delete(:level) || 0
+      self.render_style = options.delete(:style) || :pretty
       self.output = ""
       self.escape = true
       self.block = block if block_given?
@@ -39,6 +40,7 @@ module Garterbelt
         self.level = parent_view.level
         self.output = parent_view.output
         self.escape = parent_view.escape
+        self.render_style = parent_view.render_style
       end
     end
     
@@ -254,13 +256,33 @@ module Garterbelt
       raise NotImplementedError, "Implement #content in #{self.class}!"
     end
     
-    def render(content_method = :content)
-      self.output = "" if curated?
-      if content_method == :content
-        content
+    class << self
+      attr_writer :default_render_style, :default_content_method
+    end
+    
+    def self.default_render_style
+      @default_render_style ||= :pretty
+    end
+    
+    def self.default_content_method
+      @default_content_method ||= :content
+    end
+    
+    def render(*args)
+      if args.first.is_a?(Hash)
+        options = args.shift
+        content_method = options[:method]
       else
-        send(content_method)
+        content_method = args.shift
+        options = args.shift || {}
       end
+      
+      content_method ||= self.class.default_content_method
+      self.render_style = options[:style] || self.class.default_render_style
+      
+      self.output = "" if curated?
+      send(content_method)
+      
       render_buffer
       output
     end

data/spec/garterbelt_spec.rb

@@ -1,6 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Garterbelt do
+  describe 'wrap length' do
+    after :all do
+      Garterbelt.wrap_length = 80
+    end
+    
+    it 'is 80 by default' do
+      Garterbelt.wrap_length.should == 80
+    end
+    
+    it 'can be customized' do
+      Garterbelt.wrap_length = 50
+      Garterbelt.wrap_length.should == 50
+    end
+  end
+  
   describe 'cache module level methods' do
     describe '#cache_hash' do
       it 'creates a default hash when accessed the first time' do

data/spec/integration/expectations/render_styles/compact.html

@@ -0,0 +1,15 @@
+<div class="line">
+  <div class="unit size1of2">
+    <h4>Login</h4>
+    <form class="inner" action="/login">
+      <label class="input">Username or Email
+        <input name="login" type="text">
+      </label>
+      <label class="input">Password
+        <input name="password" type="password">
+      </label>
+      <hr class="light">
+      <input type="submit" value="Login">
+    </form>
+  </div>
+</div>

data/spec/integration/expectations/render_styles/minified.html

@@ -0,0 +1 @@
+<div class="line"><div class="unit size1of2"><h4>Login</h4><form class="inner" action="/login"><label class="input">Username or Email<input name="login" type="text"></label><label class="input">Password<input name="password" type="password"></label><hr class="light"><input type="submit" value="Login"></form></div></div>

data/spec/integration/expectations/render_styles/text.html

@@ -0,0 +1,3 @@
+Login
+Username or Email
+Password

data/spec/integration/expectations/unescaping_view.html

@@ -1,3 +1,2 @@
-You should check out my rad new site:<br>
-<a class="user_generated_link" href="http://foo.com">http://foo.com</a><br>
-It will blow your mind!
+You should check out my rad new site:<br> <a class="user_generated_link"
+href="http://foo.com">http://foo.com</a><br> It will blow your mind!

data/spec/integration/expectations/view_with_forms.html

@@ -17,11 +17,11 @@
       Provide us with updated information
     </h4>
     <label>
-      Name: 
+      Name:
       <input name="name" type="text">
     </label>
     <label>
-      Email: 
+      Email:
       <input name="email" type="text">
     </label>
     <input type="submit" value="Update">

data/spec/integration/{view_spec.rb → integration_spec.rb}

@@ -65,4 +65,14 @@ describe Garterbelt::View, "Integration" do
       ViewWithForms.new.render.should == file('view_with_forms')
     end
   end
+  
+  describe 'render styles' do
+    it 'does minified' do
+      ViewWithContentTags.new.render(:style => :minified).should == file("render_styles/minified")
+    end
+    
+    it 'does text only' do
+      ViewWithContentTags.new.render(:style => :text).should == file("render_styles/text")
+    end
+  end
 end

data/spec/integration/templates/view_with_forms.rb

@@ -16,12 +16,12 @@ class ViewWithForms < Garterbelt::View
       partial FormView, :action => '/user/info', :method => 'put', :class => 'update' do
         h4 "Provide us with updated information"
         label do
-          text "Name: "
+          text "Name:"
           input :type => 'text', :name => 'name'
         end
         
         label do
-          text "Email: "
+          text "Email:"
           input :type => 'text', :name => 'email'
         end
         input :type => 'submit', :value => 'Update'

data/spec/renderers/closed_tag_spec.rb

@@ -4,8 +4,7 @@ describe Garterbelt::ClosedTag do
   ClosedTag = Garterbelt::ClosedTag unless defined?(ClosedTag)
   
   before do
-    @output = ''
-    @view = mock(:output => @output, :level => 2)
+    @view = MockView.new
   end
   
   describe 'initialize' do
@@ -79,7 +78,7 @@ describe Garterbelt::ClosedTag do
     end
     
     it 'uses its output' do
-      @tag.output.should == @output
+      @tag.output.should == @view.output
     end
     
     it 'uses its level' do
@@ -133,7 +132,7 @@ describe Garterbelt::ClosedTag do
       end
     end
     
-    describe 'integration' do
+    describe 'integration (:pretty style)' do
       before do
         @str = @tag.render
       end
@@ -155,7 +154,38 @@ describe Garterbelt::ClosedTag do
       end
       
       it 'adds the string to the output' do
-        @output.should include @str
+        @view.output.should include @str
+      end
+    end
+    
+    describe 'styles' do
+      before do
+        @tag = ClosedTag.new(:type => :input, :view => @view)
+        @view.render_style = :pretty
+        @pretty = @tag.render
+      end
+      
+      describe ':minified' do
+        before do
+          @view.render_style = :minified
+          @min = @tag.render
+        end
+        
+        it 'does not end in a line break' do
+          @min.should_not match  /\n$/
+        end
+        
+        it 'does not have any indentation' do
+          @pretty.should match /^\s{4}</
+          @min.should_not match /^\s{4}</
+        end
+      end
+      
+      describe ':text' do
+        it 'is an empty string' do
+          @view.render_style = :text
+          @tag.render.should == ''
+        end
       end
     end
   end

data/spec/renderers/comment_spec.rb

@@ -16,12 +16,6 @@ describe Garterbelt::Comment do
       comment.content = "foo"
       comment.content.should == "foo"
     end
-    
-    it 'raises an error when initializing without content' do
-      lambda{ Garterbelt::Comment.new(:view => @view) }.should raise_error( 
-        ArgumentError, ":content option required for Garterbelt::Comment initialization" 
-      )
-    end
   end
   
   describe 'render' do
@@ -30,35 +24,69 @@ describe Garterbelt::Comment do
       @comment = Garterbelt::Comment.new(:view => @view, :content => 'Render me')
     end
     
-    it 'raises an error with block content' do
-      @comment.content = lambda { puts "foo" }
-      lambda{ @comment.render }.should raise_error(ArgumentError, "Garterbelt::Comment does not take block content")
-    end
+    describe 'basics' do
+      it 'raises an error with block content' do
+        @comment.content = lambda { puts "foo" }
+        lambda{ @comment.render }.should raise_error(ArgumentError, "Garterbelt::Comment does not take block content")
+      end
     
-    it 'it adds the content to the output' do
-      @comment.render
-      @view.output.should include "Render me"
-    end
+      it 'it adds the content to the output' do
+        @comment.render
+        @view.output.should include "Render me"
+      end
     
-    it 'builds the right header tag' do
-      @comment.render
-      @view.output.should match /<!-- Render me/
-    end
+      it 'builds the right header tag' do
+        @comment.render
+        @view.output.should match /<!-- Render me/
+      end
     
-    it 'builds the right footer tag' do
-      @comment.render
-      @view.output.should match /Render me -->/
-    end
+      it 'builds the right footer tag' do
+        @comment.render
+        @view.output.should match /Render me -->/
+      end
+    
+      it 'indents to the view level' do
+        @comment.render
+        @view.output.should match /^\W{4}<!-- Render me/
+      end
     
-    it 'indents to the view level' do
-      @comment.render
-      @view.output.should match /^\W{4}<!-- Render me/
+      it 'does not escape the content' do
+        @comment.content = "<div>foo</div>"
+        @comment.render
+        @view.output.should include "<div>foo</div>"
+      end
     end
     
-    it 'does not escape the content' do
-      @comment.content = "<div>foo</div>"
-      @comment.render
-      @view.output.should include "<div>foo</div>"
+    describe 'styles' do
+      before do
+        @tag = Garterbelt::Comment.new(:view => @view, :content => 'foo')
+        @view.render_style = :pretty
+        @pretty = @tag.render
+        @view.output = ''
+      end
+      
+      describe ':minified' do
+        before do
+          @view.render_style = :minified
+          @min = @tag.render
+        end
+        
+        it 'does not end in a line break' do
+          @min.should_not match  /\n$/
+        end
+        
+        it 'does not have any indentation' do
+          @pretty.should match /^\s{4}</
+          @min.should_not match /^\s{4}</
+        end
+      end
+      
+      describe ':text' do
+        it 'is an empty string' do
+          @view.render_style = :text
+          @tag.render.should == ''
+        end
+      end
     end
   end
 end

data/spec/renderers/content_tag_spec.rb

@@ -80,6 +80,51 @@ describe Garterbelt::ContentTag do
       end
     end
     
+    describe 'styles' do
+      before do
+        @tag.content = "My string content"
+        @view.render_style = :pretty
+        @view.output = ''
+      end
+      
+      describe ':minified' do
+        before do
+          @view.render_style = :minified
+          @min = @tag.render
+        end
+        
+        it 'does not end in a line break' do
+          @min.should_not match  /\n$/
+        end
+        
+        it 'does not have any indentation' do
+          @min.should_not match /^\s{4}</
+        end
+      end
+      
+      describe ':text' do
+        before do
+          @view.render_style = :text
+        end
+        
+        it 'has no tags' do
+          @tag.render.should_not match /<[^>]>*/
+        end
+        
+        [:p, :ul, :ol, :li].each do |type|
+          it ":#{type} includes a line break" do
+            @tag.type = type
+            @tag.render.should match /\n/
+          end
+        end
+        
+        it 'has no line breaks othewise' do
+          @tag.type = :div
+          @tag.render.should_not match /\n/
+        end
+      end
+    end
+    
     describe 'content' do
       describe 'none' do
         it 'works' do

data/spec/renderers/text_spec.rb

@@ -16,12 +16,6 @@ describe Garterbelt::Text do
       text.content = "foo"
       text.content.should == "foo"
     end
-    
-    it 'raises an error when initializing without content' do
-      lambda{ Garterbelt::Text.new(:view => @view) }.should raise_error( 
-        ArgumentError, ":content option required for Garterbelt::Text initialization" 
-      )
-    end
   end
   
   describe 'render' do
@@ -40,11 +34,6 @@ describe Garterbelt::Text do
       @view.output.should include "Render me"
     end
     
-    it 'indents to the view level' do
-      @text.render
-      @view.output.should match /^\W{4}Render me\n$/
-    end
-    
     describe 'escaping' do
       it 'escapes if view is set to escape' do
         str = "<a href='/foo.com'>Foo it!</a>"
@@ -60,5 +49,62 @@ describe Garterbelt::Text do
         text.render.should include str
       end
     end
+    
+    describe 'styles' do
+      before do
+        @str = "123456789 "*40 # 100 char long
+        @tag = Garterbelt::Text.new(:content =>  @str, :view => @view)
+        @view.render_style = :pretty
+        @pretty = @tag.render
+      end
+      
+      describe ':pretty' do
+        it 'indents to the view level' do
+          rendered = @tag.render
+          @view.output.should include rendered
+        end
+        
+        it 'wraps' do
+          @tag = Garterbelt::Text.new(:content => "12345678 "*15, :view => @view) 
+          matcher = "12345678 "*7 + "12345678"
+          @tag.render.should match /^    #{matcher}\n/ 
+        end
+        
+        it 'ends in a line break' do
+          @tag.render.should match  /\n\z/
+        end
+      end
+      
+      describe ':minified' do
+        before do
+          @view.render_style = :minified
+          @minified = @tag.render
+        end
+        
+        it 'does not have any line break(s)' do
+          @minified.should_not match  /\n/
+        end
+        
+        it 'does not have any indentation' do
+          @pretty.should match /^\s{4}1/
+          @minified.should_not match /^\s{4}a1/
+        end
+      end
+      
+      describe ':text' do
+        before do
+          @view.render_style = :text
+          @text = @tag.render
+        end
+        
+        it 'should end in a line break' do
+          @text.should match /\n\z/
+        end
+        
+        it 'should not wrap' do
+          @text.should_not match /\n1/
+        end
+      end
+    end
   end
 end

data/spec/string_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe String, 'extension' do
+  describe '#wrap(limit, opts)' do
+    describe 'limiting' do
+      it 'does not require arguments' do
+        lambda {''.wrap}.should_not raise_error
+      end
+    
+      it 'doesn\'t break a string without spaces' do
+        breakless = "123"*50
+        breakless.wrap.should == breakless
+      end
+    
+      it 'defaults to 50 characters if not given a limit' do
+        space_at_five = '1234 '*70
+        space_at_five.wrap.should match /^#{'1234 '*9}1234\n/
+      end
+    
+      it 'takes an alternate limit' do
+        space_at_five = '1234 '*70
+        space_at_five.wrap(100).should match /^#{'1234 '*19}1234\n/
+      end
+    
+      it 'does not break in the middle of a word' do
+        '1234567 foo'.wrap(5).should == "1234567\nfoo"
+      end
+    
+      it 'does nothing in a string that is shorter than the limit' do
+        '12345'.wrap.should == '12345'
+      end
+    end
+    
+    describe 'indent option' do
+      it 'appends it to the front of each line' do
+        space_at_five = '1234 '*5
+        space_at_five.wrap(10, :indent => ' '*5).split(' '*5).size.should == 6
+      end
+      
+      it 'takes the indent into account when choosing a break point' do
+        space_at_five = '1234 '*70
+        str = "     1234 1234 1234 1234 1234 1234 1234 1234 1234"
+        space_at_five.wrap(50, :indent => ' '*5).should match /^#{str}\n/
+      end
+      
+      it 'adds the indent to returned strings even if not wrapping' do
+        'string'.wrap(10, :indent => '   ').should == '   string'
+      end
+    end
+  end
+end

data/spec/support/mock_view.rb

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

data/spec/view/view_basics_spec.rb

@@ -60,17 +60,23 @@ describe Garterbelt::View do
       view.block.is_a?(Proc).should be_true
     end
     
-    it 'can save the options' do
+    it 'saves the options' do
       view = BasicView.new(:foo => 'foo', :bar => 'bar')
       view.options.should == {:foo => 'foo', :bar => 'bar'}
     end
     
+    it 'render_style defaults to :pretty' do
+      view = BasicView.new
+      view.render_style.should == :pretty
+    end 
+    
     describe 'setting the curator: view responsible for displaying the rendered content' do
       before do
         @view.level = 42
         @view.output = "foo"
         @view.buffer = ["bar"]
         @view.escape = false
+        @view.render_style = :text
         @child = BasicView.new(:curator => @view)
       end
       
@@ -104,6 +110,10 @@ describe Garterbelt::View do
         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
+          @child.render_style.should == @view.render_style
+        end
       end
     end
     

data/spec/view/view_render_spec.rb

@@ -20,6 +20,34 @@ describe Garterbelt::View do
       @view.output.should_not include 'Foo the magic output!'
     end
     
+    describe 'argument parsing' do
+      describe 'render method' do
+        it 'finds in as the first argument' do
+          @view.should_receive(:bar)
+          @view.render(:bar)
+        end
+        
+        it 'finds it in the options' do
+          @view.should_receive(:baz)
+          @view.render :method => :baz
+        end
+      end
+      
+      describe ':style option' do
+        it 'is found in options as the second argument' do
+          @view.stub(:foo)
+          @view.render(:foo, {:style => :minified})
+          @view.render_style.should == :minified
+        end
+      
+        it 'is found when options are the first argument' do
+          @view.stub(:content)
+          @view.render(:style => :text)
+          @view.render_style.should == :text
+        end
+      end
+    end
+    
     describe 'methods' do
       it 'renders the :content method by default' do
         @view.should_receive(:content)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: garterbelt
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -241,12 +241,16 @@ files:
 - lib/view.rb
 - spec/garterbelt_spec.rb
 - spec/integration/expectations/general_view.html
+- spec/integration/expectations/render_styles/compact.html
+- spec/integration/expectations/render_styles/minified.html
+- spec/integration/expectations/render_styles/text.html
 - spec/integration/expectations/unescaping_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/integration_spec.rb
 - spec/integration/templates/form.rb
 - spec/integration/templates/unescaping_view.rb
 - spec/integration/templates/view_partial_nest.rb
@@ -256,7 +260,6 @@ files:
 - 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
@@ -269,6 +272,7 @@ files:
 - spec/renderers/doctype_spec.rb
 - spec/renderers/text_spec.rb
 - spec/spec_helper.rb
+- spec/string_spec.rb
 - spec/support/mock_view.rb
 - spec/support/puters.rb
 - spec/view/view_basics_spec.rb
@@ -313,6 +317,7 @@ 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/garterbelt_spec.rb
+- spec/integration/integration_spec.rb
 - spec/integration/templates/form.rb
 - spec/integration/templates/unescaping_view.rb
 - spec/integration/templates/view_partial_nest.rb
@@ -322,7 +327,6 @@ test_files:
 - 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
@@ -335,6 +339,7 @@ test_files:
 - spec/renderers/doctype_spec.rb
 - spec/renderers/text_spec.rb
 - spec/spec_helper.rb
+- spec/string_spec.rb
 - spec/support/mock_view.rb
 - spec/support/puters.rb
 - spec/view/view_basics_spec.rb