sinatra_more 0.1.6 → 0.1.7

data/README.rdoc

@@ -185,7 +185,7 @@ A form_for using these basic fields might look like:
   - form_for @user, '/register', :id => 'register' do |f|
     = f.error_messages
     %p
-      = f.label :username
+      = f.label :username, :caption => "Nickname"
       = f.text_field :username
     %p
       = f.label :email
@@ -194,7 +194,7 @@ A form_for using these basic fields might look like:
       = f.label :password
       = f.password_field :password
     %p
-      = f.submit "Create"
+      = f.submit "Create", :class => 'button'
   
 There is also a StandardFormBuilder which builds on the abstract fields that can be used within a form_for:
 
@@ -213,17 +213,17 @@ A form_for using these standard fields might look like:
 
   - form_for @user, '/register', :id => 'register' do |f|
     = f.error_messages
-    = f.text_field_block :username
+    = f.text_field_block :name, :caption => "Full name"
     = f.text_field_block :email
     = f.password_field_block :password
-    = f.submit_block "Create"
+    = f.submit_block "Create", :class => 'button'
 
 and would generate this html:
 
   <form id="register" action="/register" method="post">
-    <p><label for="user_name">Name: </label><input type="text" id="user_name" name="user[name]"></p>
+    <p><label for="user_name">Full name: </label><input type="text" id="user_name" name="user[name]"></p>
     ...omitted...
-    <p><input type="submit" value="Create"></p>
+    <p><input type="submit" value="Create" class="button"></p>
   </form>
 
 ==== Format Helpers

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb

@@ -44,7 +44,7 @@ class AbstractFormBuilder
   end
   
   # f.submit "Update", :class => 'large'
-  def submit(caption, options={})
+  def submit(caption="Submit", options={})
     @template.submit_tag caption, options
   end
   

data/lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb

@@ -8,18 +8,16 @@ class StandardFormBuilder < AbstractFormBuilder
     class_eval <<-EOF
     def #{field_type}_block(field, options={}, label_options={})
       label_options.reverse_merge!(:caption => options.delete(:caption)) if options[:caption]
-      @template.content_block_tag(:p) do
-        html =  label(field, label_options)
-        html << #{field_type}(field, options)
-      end
+      field_html = label(field, label_options)
+      field_html << #{field_type}(field, options)
+      @template.content_tag(:p, field_html)
     end
     EOF
   end
 
   # submit_block("Update")
   def submit_block(caption, options={})
-    @template.content_block_tag(:p) do
-      @template.submit_tag(caption, options)
-    end
+    submit_html = @template.submit_tag(caption, options)
+    @template.content_tag(:p, submit_html)
   end
 end

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -38,8 +38,8 @@ module SinatraMore
       error_messages = record.errors.full_messages
       error_items = error_messages.collect { |er| content_tag(:li, er) }.join("\n")
       error_html = content_tag(:p, options.delete(:header_message))
-      error_html << content_block_tag(:ul, error_items, :class => 'errors-list')
-      content_block_tag(:div, error_html, :class => 'field-errors')
+      error_html << content_tag(:ul, error_items, :class => 'errors-list')
+      content_tag(:div, error_html, :class => 'field-errors')
     end
 
     # Constructs a label tag from the given options

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -5,9 +5,11 @@ module SinatraMore
     def capture_html(*args, &block)
       if self.respond_to?(:is_haml?) && is_haml?
          block_is_haml?(block) ? capture_haml(*args, &block) : block.call
-      else
+      elsif has_erb_buffer?
         result_text = capture_erb(*args, &block)
-        result_text.present? ? result_text : block.call
+        result_text.present? ? result_text : (block_given? && block.call(*args))
+      else # theres no template to capture, invoke the block directly
+        block.call(*args)
       end
     end
     
@@ -16,9 +18,9 @@ module SinatraMore
     def concat_content(text="")
       if self.respond_to?(:is_haml?) && is_haml?
         haml_concat(text)
-      elsif @_out_buf
+      elsif has_erb_buffer?
         erb_concat(text)
-      else # theres no place to concat
+      else # theres no template to concat, return the text directly
         text
       end
     end
@@ -32,17 +34,22 @@ module SinatraMore
     
     protected
   
-
     # Used to capture the html from a block of erb code
     # capture_erb(&block) => '...html...'
     def capture_erb(*args, &block)
-      erb_with_output_buffer { block.call(*args) }
+      erb_with_output_buffer { block_given? && block.call(*args) }
     end
     
     # Concats directly to an erb template
     # erb_concat("Direct to buffer")
     def erb_concat(text)
-      @_out_buf << text unless @_out_buf.nil?
+      @_out_buf << text if has_erb_buffer?
+    end
+    
+    # Returns true if an erb buffer is detected
+    # has_erb_buffer? => true
+    def has_erb_buffer?
+      !@_out_buf.nil?
     end
     
     # Used to determine if a block is called from ERB.

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -18,7 +18,6 @@ module SinatraMore
       tag_result = tag(name, options.merge(:content => tag_html))
       block_is_template?(block) ? concat_content(tag_result) : tag_result
     end
-    alias content_block_tag content_tag
 
     # Creates an html tag with the given name and options
     # tag(:br, :style => 'clear:both')

data/lib/sinatra_more/markup_plugin.rb

@@ -5,6 +5,7 @@ Dir[File.dirname(__FILE__) + '/markup_plugin/*.rb'].each {|file| load file }
 module SinatraMore
   module MarkupPlugin
     def self.registered(app)
+      app.set :default_builder, 'StandardFormBuilder'
       app.helpers OutputHelpers
       app.helpers TagHelpers
       app.helpers AssetTagHelpers

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
      "test/fixtures/markup_app/views/capture_concat.haml",
      "test/fixtures/markup_app/views/content_tag.erb",
      "test/fixtures/markup_app/views/content_tag.haml",
+     "test/fixtures/markup_app/views/form_for.erb",
+     "test/fixtures/markup_app/views/form_for.haml",
      "test/fixtures/markup_app/views/form_tag.erb",
      "test/fixtures/markup_app/views/form_tag.haml",
      "test/fixtures/markup_app/views/link_to.erb",

data/test/fixtures/markup_app/app.rb

@@ -10,11 +10,6 @@ class MarkupDemo < Sinatra::Base
     set :root, File.dirname(__FILE__)
   end
 
-  get '/:engine/form_tag' do
-    @user = User.new
-    show(params[:engine], 'form_tag')
-  end
-
   get '/:engine/:file' do
     show(params[:engine], params[:file].to_sym)
   end
@@ -49,20 +44,15 @@ class MarkupDemo < Sinatra::Base
       end
     end
   end
+end
 
-  class User
-    def errors
-      Errors.new
-    end
-  end
-
-  class Errors < Array
-    def initialize
-      self << [:fake, :second, :third]
-    end
+class MarkupUser
+  def errors; Errors.new; end
+end
 
-    def full_messages
-      ["This is a fake error", "This is a second fake error", "This is a third fake error"]
-    end
+class Errors < Array
+  def initialize; self << [:fake, :second, :third]; end
+  def full_messages
+    ["This is a fake error", "This is a second fake error", "This is a third fake error"]
   end
-end
+end

data/test/fixtures/markup_app/views/form_for.erb

@@ -0,0 +1,33 @@
+<% form_for MarkupUser.new, '/demo', :id => 'demo' do |f| %>
+  <%= f.error_messages(:header_message => "custom MarkupUser cannot be saved!") %>
+  <p>
+    <%= f.label :username, :caption => "Login", :class => 'user-label' %>
+    <%= f.text_field :username, :class => 'user-text', :value => "John" %>
+  </p>
+  <p>
+    <%= f.label :email, :caption => "Email", :class => 'user-email' %>
+    <%= f.text_field :email %>
+  </p>
+  <p>
+    <%= f.label :password %>
+    <%= f.password_field :password, :class => 'user-password', :value => "secret" %>
+  </p>
+  <p>
+    <%= f.label :photo %>
+    <%= f.file_field :photo, :class => 'user-photo' %>
+  </p>
+  <p>
+    <%= f.label :about, :caption => "About Me" %>
+    <%= f.text_area :about, :class => 'user-about'  %> 
+  </p>
+  <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
+<% end %>
+
+<% form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f| %>
+  <%= f.error_messages :header_message => "custom MarkupUser cannot be saved!" %>
+  <%= f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname', :class => 'label' } %>
+  <%= f.password_field_block :code, { :class => 'input' } %>
+  <%= f.text_area_block :about, { :class => 'textarea' } %>
+  <%= f.file_field_block :photo, { :class => 'upload' } %>
+  <%= f.submit_block "Create", { :class => 'button', :class => 'button' } %>
+<% end %>

data/test/fixtures/markup_app/views/form_for.haml

@@ -0,0 +1,27 @@
+- form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
+  = f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
+  %p
+    = f.label :username, :caption => "Login", :class => 'user-label'
+    = f.text_field :username, :class => 'user-text', :value => "John"
+  %p
+    = f.label :email, :caption => "Email", :class => 'user-email'
+    = f.text_field :email
+  %p
+    = f.label :password
+    = f.password_field :password, :class => 'user-password', :value => "secret"
+  %p
+    = f.label :photo
+    = f.file_field :photo, :class => 'user-photo'
+  %p
+    = f.label :about, :caption => "About Me"
+    = f.text_area :about, :class => 'user-about'  
+  %p
+    = f.submit "Create", :class => 'success', :id => 'demo-button'
+
+- form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
+  = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
+  = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname', :class => 'label' }
+  = f.password_field_block :code, { :class => 'input' }
+  = f.text_area_block :about, { :class => 'textarea' }
+  = f.file_field_block :photo, { :class => 'upload' }
+  = f.submit_block "Create", { :class => 'button' }

data/test/fixtures/markup_app/views/form_tag.erb

@@ -10,7 +10,7 @@
 <% end %>
 
 <% form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do %>
-  <%= error_messages_for @user, :header_message => "There are problems with saving user!" %>
+  <%= error_messages_for MarkupUser.new, :header_message => "There are problems with saving user!" %>
   <% field_set_tag "Advanced", :class => 'advanced-field-set' do %>
     <p>
       <%= label_tag :username, :class => 'first', :caption => "Nickname" %>

data/test/fixtures/markup_app/views/form_tag.haml

@@ -8,7 +8,7 @@
     = submit_tag
 
 - form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do
-  = error_messages_for @user, :header_message => "There are problems with saving user!"
+  = error_messages_for MarkupUser.new, :header_message => "There are problems with saving user!"
   - field_set_tag "Advanced", :class => 'advanced-field-set' do
     %p
       = label_tag :username, :class => 'first', :caption => "Nickname"

data/test/markup_plugin/test_form_builder.rb

@@ -8,12 +8,47 @@ class TestFormBuilder < Test::Unit::TestCase
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
 
+  def setup
+    @user = stub(:errors => stub(:full_messages => ["1", "2"], :none? => false), :class => 'User', :first_name => "Joe")
+    @user_none = stub(:errors => stub(:none? => true), :class => 'User')
+  end
+
+  def standard_builder(object=@user)
+    StandardFormBuilder.new(self, object)
+  end
+
   context 'for #form_for method' do
     should "display correct form html" do
-      user = stub()
-      actual_html = form_for(user, '/register', :id => 'register') { "Demo" }
+      actual_html = form_for(@user, '/register', :id => 'register') { "Demo" }
       assert_has_tag('form', :action => '/register', :id => 'register', :content => "Demo") { actual_html }
     end
+
+    should "display correct form html with multipart" do
+      actual_html = form_for(@user, '/register', :multipart => true) { "Demo" }
+      assert_has_tag('form', :action => '/register', :enctype => "multipart/form-data") { actual_html }
+    end
+
+    should "support changing form builder type" do
+      form_html = lambda { form_for(@user, '/register', :builder => "AbstractFormBuilder") { |f| f.text_field_block(:name) } }
+      assert_raise(NoMethodError) { form_html.call }
+    end
+
+    should "support using default standard builder" do
+      actual_html = form_for(@user, '/register') { |f| f.text_field_block(:name) }
+      assert_has_tag('form p input[type=text]') { actual_html }
+    end
+
+    should "display correct form in haml" do
+      visit '/haml/form_for'
+      assert_have_selector :form, :action => '/demo', :id => 'demo'
+      assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
+    end
+
+    should "display correct form in erb" do
+      visit '/erb/form_for'
+      assert_have_selector :form, :action => '/demo', :id => 'demo'
+      assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
+    end
   end
 
   # ===========================
@@ -21,27 +56,154 @@ class TestFormBuilder < Test::Unit::TestCase
   # ===========================
 
   context 'for #error_messages method' do
+    should "display correct form html with no record" do
+      actual_html = standard_builder(@user_none).error_messages(:header_message => "Demo form cannot be saved")
+      assert actual_html.blank?
+    end
+
+    should "display correct form html with valid record" do
+      actual_html = standard_builder.error_messages(:header_message => "Demo form cannot be saved")
+      assert_has_tag('div.field-errors p', :content => "Demo form cannot be saved") { actual_html }
+      assert_has_tag('div.field-errors ul.errors-list li', :content => "1") { actual_html }
+      assert_has_tag('div.field-errors ul.errors-list li', :content => "2") { actual_html }
+    end
 
+    should "display correct form in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo div.field-errors p', :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo div.field-errors ul.errors-list li', :content => "This is a fake error"
+      assert_have_selector '#demo2 div.field-errors p', :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo2 div.field-errors ul.errors-list li', :content => "This is a fake error"
+    end
+
+    should "display correct form in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo div.field-errors p', :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo div.field-errors ul.errors-list li', :content => "This is a fake error"
+      assert_have_selector '#demo2 div.field-errors p', :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo2 div.field-errors ul.errors-list li', :content => "This is a fake error"
+    end
+  end
+
+  context 'for #label method' do
+    should "display correct label html" do
+      actual_html = standard_builder.label(:first_name, :class => 'large', :caption => "F. Name")
+      assert_has_tag('label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ") { actual_html }
+    end
+
+    should "display correct label in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
+      assert_have_selector '#demo label', :content => "About Me: "
+      assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
+    end
+
+    should "display correct label in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
+      assert_have_selector '#demo label', :content => "About Me: "
+      assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
+    end
   end
 
   context 'for #text_field method' do
+    should "display correct text field html" do
+      actual_html = standard_builder.text_field(:first_name, :class => 'large')
+      assert_has_tag('input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]') { actual_html }
+    end
+
+    should "display correct text field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
+      assert_have_selector '#demo2 input', :class => 'input', :name => 'markup_user[username]'
+    end
 
+    should "display correct text field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
+      assert_have_selector '#demo2 input', :class => 'input', :name => 'markup_user[username]'
+    end
   end
 
   context 'for #text_area method' do
+    should "display correct text_area html" do
+      actual_html = standard_builder.text_area(:about, :class => 'large')
+      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
+    end
+
+    should "display correct text_area in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+      assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+    end
 
+    should "display correct text_area in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+      assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+    end
   end
 
   context 'for #password_field method' do
+    should "display correct password_field html" do
+      actual_html = standard_builder.password_field(:code, :class => 'large')
+      assert_has_tag('input.large[type=password]', :id => 'user_code', :name => 'user[code]') { actual_html }
+    end
+
+    should "display correct password_field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
+      assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
+    end
 
+    should "display correct password_field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
+      assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
+    end
   end
 
   context 'for #file_field method' do
+    should "display correct file_field html" do
+      actual_html = standard_builder.file_field(:photo, :class => 'large')
+      assert_has_tag('input.large[type=file]', :id => 'user_photo', :name => 'user[photo]') { actual_html }
+    end
 
+    should "display correct file_field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo  input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+      assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+    end
+
+    should "display correct file_field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo  input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+      assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+    end
   end
 
   context 'for #submit method' do
+    should "display correct submit button html with no options" do
+      actual_html = standard_builder.submit
+      assert_has_tag('input[type=submit]', :value => "Submit") { actual_html }
+    end
 
+    should "display correct submit button html" do
+      actual_html = standard_builder.submit("Commit", :class => 'large')
+      assert_has_tag('input.large[type=submit]', :value => "Commit") { actual_html }
+    end
+
+    should "display correct submit button in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
+      assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
+    end
+
+    should "display correct submit button in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
+      assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
+    end
   end
 
   # ===========================
@@ -49,22 +211,99 @@ class TestFormBuilder < Test::Unit::TestCase
   # ===========================
 
   context 'for #text_field_block method' do
+    should "display correct text field block html" do
+      actual_html = standard_builder.text_field_block(:first_name, :class => 'large', :caption => "FName")
+      assert_has_tag('p label', :for => 'user_first_name', :content => "FName: ") { actual_html }
+      assert_has_tag('p input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]') { actual_html }
+    end
+
+    should "display correct text field block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
+      assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
+    end
 
+    should "display correct text field block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
+      assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
+    end
   end
 
   context 'for #text_area_block method' do
+    should "display correct text area block html" do
+      actual_html = standard_builder.text_area_block(:about, :class => 'large', :caption => "About Me")
+      assert_has_tag('p label', :for => 'user_about', :content => "About Me: ") { actual_html }
+      assert_has_tag('p textarea', :id => 'user_about', :name => 'user[about]') { actual_html }
+    end
 
+    should "display correct text area block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
+      assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
+    end
+
+    should "display correct text area block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
+      assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
+    end
   end
 
   context 'for #password_field_block method' do
+    should "display correct password field block html" do
+      actual_html = standard_builder.password_field_block(:keycode, :class => 'large', :caption => "Code")
+      assert_has_tag('p label', :for => 'user_keycode', :content => "Code: ") { actual_html }
+      assert_has_tag('p input.large[type=password]', :id => 'user_keycode', :name => 'user[keycode]') { actual_html }
+    end
+
+    should "display correct password field block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
+      assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
+    end
 
+    should "display correct password field block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
+      assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
+    end
   end
 
   context 'for #file_field_block method' do
+    should "display correct file field block html" do
+      actual_html = standard_builder.file_field_block(:photo, :class => 'large', :caption => "Photo")
+      assert_has_tag('p label', :for => 'user_photo', :content => "Photo: ") { actual_html }
+      assert_has_tag('p input.large[type=file]', :id => 'user_photo', :name => 'user[photo]') { actual_html }
+    end
+
+    should "display correct file field block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
+      assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+    end
 
+    should "display correct file field block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
+      assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+    end
   end
 
   context 'for #submit_block method' do
+    should "display correct submit block html" do
+      actual_html = standard_builder.submit_block("Update", :class => 'large')
+      assert_has_tag('p input.large[type=submit]', :value => 'Update') { actual_html }
+    end
+
+    should "display correct submit block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
+    end
 
+    should "display correct submit block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -128,6 +128,8 @@ files:
 - test/fixtures/markup_app/views/capture_concat.haml
 - test/fixtures/markup_app/views/content_tag.erb
 - test/fixtures/markup_app/views/content_tag.haml
+- test/fixtures/markup_app/views/form_for.erb
+- test/fixtures/markup_app/views/form_for.haml
 - test/fixtures/markup_app/views/form_tag.erb
 - test/fixtures/markup_app/views/form_tag.haml
 - test/fixtures/markup_app/views/link_to.erb