sinatra_more 0.1.5 → 0.1.6

data/README.rdoc

@@ -152,7 +152,7 @@ A form_tag might look like:
         = text_field_tag :username, :value => params[:username]
       %p
         = label_tag :password, :class => 'first'
-        = text_field_tag :password, :value => params[:password]
+        = password_field_tag :password, :value => params[:password]
     - field_set_tag(:class => 'buttons') do
       = submit_tag "Login"
     
@@ -280,10 +280,10 @@ provided to make interacting with warden dead simple.
 
 == Acknowledgements
 
- * Thanks to keldredd for the sinatra_helpers code that helped me to create erb capture and concat methods.
- * Thanks to sbfaulkner for the sinatra-helpers code that I looked while starting this library.
+* Thanks to keldredd for the sinatra_helpers code that helped me to create erb capture and concat methods.
+* Thanks to sbfaulkner for the sinatra-helpers code that I looked while starting this library.
 
-== Contributers
+== Contributors
 
 * Nathan Esquenazi - Project creator and code maintainer
 * Arthur Chiu      - Forming the idea and various code contributions

data/TODO

@@ -1,9 +1,13 @@
 = UNFINISHED
 
 * Become total warden solution (basically just require warden gem installed, do everything else)
+  * Look into removing overlapping methods and simply leverage sinatra_warden
+  * Take advantage of shared strategies: http://github.com/hassox/warden_strategies/tree/master/lib/
   * Make warden password strategy support a callback which explains what to do with username, password
   * WardenPlugin.authenticate_callback { |username, password| User.authenticate(username, password) }
 * Remove dependency on activesupport! and enumerate dependencies in rakefile
+* Add support for missing formhelpers/fields (check_box, radio_button, ...)
+* Add support for forms with method => put, delete using hidden field
 * Look into creating sinatra generators using rubigen (http://github.com/drnic/rubigen)
   * http://github.com/quirkey/sinatra-gen
 * Look into adding any missing helpers from:

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -3,7 +3,8 @@ module SinatraMore
     # Constructs a form for object using given or default form_builder
     # form_for @user, '/register', :id => 'register' do |f| ... end
     def form_for(object, url, settings={}, &block)
-      configured_builder = settings[:builder] || self.options.default_builder || 'StandardFormBuilder'
+      default_builder = self.respond_to?(:options) && self.options.default_builder
+      configured_builder = settings[:builder] || default_builder || 'StandardFormBuilder'
       configured_builder = configured_builder.constantize if configured_builder.is_a?(String)
       settings.reverse_merge!(:method => 'post', :action => url)
       settings[:enctype] = "multipart/form-data" if settings.delete(:multipart)
@@ -35,12 +36,10 @@ module SinatraMore
       return "" if record.blank? or record.errors.none?
       options.reverse_merge!(:header_message => "The #{record.class.to_s.downcase} could not be saved!")
       error_messages = record.errors.full_messages
-      content_block_tag(:div, :class => 'field-errors', :concat => false) do
-        html = content_tag(:p, options.delete(:header_message))
-        html << content_block_tag(:ul, :class => 'field-errors', :concat => false) do
-          error_messages.collect { |er| content_tag(:li, er) }.join("\n")
-        end
-      end
+      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')
     end
 
     # Constructs a label tag from the given options
@@ -87,7 +86,7 @@ module SinatraMore
 
     # Constructs a submit button from the given options
     # submit_tag "Create", :class => 'success'
-    def submit_tag(caption, options={})
+    def submit_tag(caption="Submit", options={})
       options.reverse_merge!(:value => caption)
       input_tag(:submit, options)
     end

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -16,8 +16,10 @@ module SinatraMore
     def concat_content(text="")
       if self.respond_to?(:is_haml?) && is_haml?
         haml_concat(text)
-      else
-        @_out_buf << text
+      elsif @_out_buf
+        erb_concat(text)
+      else # theres no place to concat
+        text
       end
     end
     
@@ -29,6 +31,7 @@ module SinatraMore
     end
     
     protected
+  
 
     # Used to capture the html from a block of erb code
     # capture_erb(&block) => '...html...'
@@ -36,6 +39,12 @@ module SinatraMore
       erb_with_output_buffer { 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?
+    end
+    
     # Used to determine if a block is called from ERB.
     # NOTE: This doesn't actually work yet because the variable __in_erb_template 
     # hasn't been defined in ERB. We need to find a way to fix this.

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -25,7 +25,6 @@ module SinatraMore
     # tag(:p, :content => "hello", :class => 'large')
     def tag(name, options={})
       content = options.delete(:content)
-      options = options.sort { |a, b| a.to_s <=> b.to_s }
       html_attrs = options.collect { |a, v| v.blank? ? nil : "#{a}=\"#{v}\"" }.compact.join(" ")
       base_tag = (html_attrs.present? ? "<#{name} #{html_attrs}" : "<#{name}")
       base_tag << (content ? ">#{content}</#{name}>" : " />")

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-10-26}
+  s.date = %q{2009-10-27}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -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_tag.erb",
+     "test/fixtures/markup_app/views/form_tag.haml",
      "test/fixtures/markup_app/views/link_to.erb",
      "test/fixtures/markup_app/views/link_to.haml",
      "test/fixtures/render_app/app.rb",

data/test/fixtures/markup_app/app.rb

@@ -9,7 +9,12 @@ class MarkupDemo < Sinatra::Base
   configure do
     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
@@ -20,22 +25,22 @@ class MarkupDemo < Sinatra::Base
     def show(kind, template)
       eval("#{kind.to_s} #{template.to_sym.inspect}")
     end
-    
+
     def captured_content(&block)
       content_html = capture_html(&block)
       "<p>#{content_html}</p>"
     end
-    
+
     def concat_in_p(content_html)
       concat_content "<p>#{content_html}</p>"
     end
-    
+
     def ruby_not_template_block
       determine_block_is_template('ruby') do
         content_tag(:span, "This not a template block")
       end
     end
-    
+
     def determine_block_is_template(name, &block)
       if block_given?
         concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
@@ -44,4 +49,20 @@ class MarkupDemo < Sinatra::Base
       end
     end
   end
+
+  class User
+    def errors
+      Errors.new
+    end
+  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_tag.erb

@@ -0,0 +1,35 @@
+<% form_tag '/simple', :class => 'simple-form' do %>
+  <%= error_messages_for(nil) %>
+  <% field_set_tag do %>
+    <%= label_tag :username %>
+    <%= text_field_tag :username %>
+    <%= label_tag :password %>
+    <%= password_field_tag :password %>
+    <%= submit_tag %>
+  <% end %>
+<% end %>
+
+<% form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do %>
+  <%= error_messages_for @user, :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" %>
+      <%= text_field_tag :username, :value => params[:username], :id => 'the_username' %>
+    </p>
+    <p>
+      <%= label_tag :password, :class => 'first' %> 
+      <%= password_field_tag :password, :value => params[:password] %>
+    </p>
+    <p>
+      <%= label_tag :about, :class => 'about', :caption => "About Me" %>
+      <%= text_area_tag :about, :class => 'large' %>
+    </p>
+    <p>
+     <%= label_tag :photo, :class => 'photo' %>
+     <%= file_field_tag :photo, :class => 'upload' %>
+    </p>
+  <% end %>
+  <% field_set_tag(:class => 'buttons') do %>
+    <%= submit_tag "Login" %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,26 @@
+- form_tag '/simple', :class => 'simple-form' do
+  = error_messages_for nil
+  - field_set_tag do
+    = label_tag :username
+    = text_field_tag :username
+    = label_tag :password
+    = password_field_tag :password
+    = 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!"
+  - field_set_tag "Advanced", :class => 'advanced-field-set' do
+    %p
+      = label_tag :username, :class => 'first', :caption => "Nickname"
+      = text_field_tag :username, :value => params[:username], :id => 'the_username'
+    %p
+      = label_tag :password, :class => 'first'
+      = password_field_tag :password, :value => params[:password]
+    %p
+      = label_tag :about, :class => 'about', :caption => "About Me"
+      = text_area_tag :about, :class => 'large'
+    %p
+      = label_tag :photo, :class => 'photo'
+      = file_field_tag :photo, :class => 'upload'
+  - field_set_tag(:class => 'buttons') do
+    = submit_tag "Login"

data/test/helper.rb

@@ -19,12 +19,21 @@ class Test::Unit::TestCase
   Webrat.configure do |config|
     config.mode = :rack
   end
-  
+
   def stop_time_for_test
     time = Time.now
     Time.stubs(:now).returns(time)
     return time
   end
+
+  # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
+  # In this case, block is the html to evaluate
+  def assert_has_tag(name, attributes = {}, &block)
+    html = block && block.call
+    matcher = HaveSelector.new(name, attributes)
+    raise "Please specify a block!" if html.blank?
+    assert matcher.matches?(html), matcher.failure_message
+  end
 end
 
 module Webrat

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -14,28 +14,25 @@ class TestAssetTagHelpers < Test::Unit::TestCase
 
   context 'for #flash_tag method' do
     should "display flash with no given attributes" do
-      assert_equal '<div class="flash">Demo notice</div>', flash_tag(:notice)
+      assert_has_tag('div.flash', :content => "Demo notice") { flash_tag(:notice) }
     end
     should "display flash with given attributes" do
-      flash_expected = '<div class="notice" id="notice-area">Demo notice</div>'
-      assert_equal flash_expected, flash_tag(:notice, :class => 'notice', :id => 'notice-area')
+      actual_html = flash_tag(:notice, :class => 'notice', :id => 'notice-area')
+      assert_has_tag('div.notice#notice-area', :content => "Demo notice") { actual_html }
     end
   end
 
   context 'for #link_to method' do
     should "display link element with no given attributes" do
-      assert_equal '<a href="/register">Sign up</a>', link_to('Sign up', '/register')
+      assert_has_tag('a', :content => "Sign up", :href => '/register') { link_to('Sign up', '/register') }
     end
     should "display link element with given attributes" do
-      link_expected = '<a class="first" href="/register" id="linky">Sign up</a>'
-      assert_equal link_expected, link_to('Sign up', '/register', :class => 'first', :id => 'linky')
+      actual_html = link_to('Sign up', '/register', :class => 'first', :id => 'linky')
+      assert_has_tag('a#linky.first', :content => "Sign up", :href => '/register') { actual_html }
     end
     should "display link element with ruby block" do
-      link_expected = '<a class="first" href="/register" id="binky">Sign up</a>'
-      actual_link = link_to('/register', :class => 'first', :id => 'binky') do
-        "Sign up"
-      end
-      assert_equal link_expected, actual_link
+      actual_link = link_to('/register', :class => 'first', :id => 'binky') { "Sign up" }
+      assert_has_tag('a#binky.first', :content => "Sign up", :href => '/register') { actual_link }
     end
     should "display link block element in haml" do
       visit '/haml/link_to'
@@ -52,43 +49,45 @@ class TestAssetTagHelpers < Test::Unit::TestCase
 
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
-      assert_equal '<img src="/absolute/pic.gif" />', image_tag('/absolute/pic.gif')
+      assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
     should "display image tag relative link with options" do
-      assert_equal '<img class="photo" src="/images/relative/pic.gif" />', image_tag('relative/pic.gif', :class => 'photo')
+      assert_has_tag('img.photo', :src => "/images/relative/pic.gif") { image_tag('relative/pic.gif', :class => 'photo') }
     end
-    should "display image tag relative link with incorrect space" do
-      assert_equal '<img class="photo" src="/images/relative/pic.gif" />', image_tag(' relative/ pic.gif  ', :class => 'photo')
+    should "display image tag relative link with incorrect spacing" do
+      assert_has_tag('img.photo', :src => "/images/relative/pic.gif") { image_tag(' relative/ pic.gif  ', :class => 'photo') }
     end
   end
 
   context 'for #stylesheet_link_tag method' do
     should "display stylesheet link item" do
       time = stop_time_for_test
-      expected_style = %Q[<link href="/stylesheets/style.css?#{time.to_i}" media="screen" rel="stylesheet" type="text/css" />]
-      assert_equal expected_style, stylesheet_link_tag('style')
+      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { stylesheet_link_tag('style') }
     end
     should "display stylesheet link items" do
       time = stop_time_for_test
-      expected_style =  %Q[<link href="/stylesheets/style.css?#{time.to_i}" media="screen" rel="stylesheet" type="text/css" />\n]
-      expected_style << %Q[<link href="/stylesheets/layout.css?#{time.to_i}" media="screen" rel="stylesheet" type="text/css" />\n]
-      expected_style << %Q[<link href="http://google.com/style.css" media="screen" rel="stylesheet" type="text/css" />]
-      assert_equal expected_style, stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
+      actual_html = stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
+      assert_has_tag('link', :media => "screen", :rel => "stylesheet", :type => "text/css", :count => 3) { actual_html }
+      assert_has_tag('link', :href => "/stylesheets/style.css?#{time.to_i}") { actual_html }
+      assert_has_tag('link', :href => "/stylesheets/layout.css?#{time.to_i}") { actual_html }
+      assert_has_tag('link', :href => "http://google.com/style.css") { actual_html }
     end
   end
 
   context 'for #javascript_include_tag method' do
     should "display javascript item" do
       time = stop_time_for_test
-      expected_include = %Q[<script src="/javascripts/application.js?#{time.to_i}" type="text/javascript"></script>]
-      assert_equal expected_include, javascript_include_tag('application')
+      actual_html = javascript_include_tag('application')
+      assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
     should "display javascript items" do
       time = stop_time_for_test
-      expected_include = %Q[<script src="/javascripts/application.js?#{time.to_i}" type="text/javascript"></script>\n]
-      expected_include << %Q[<script src="/javascripts/base.js?#{time.to_i}" type="text/javascript"></script>\n]
-      expected_include << %Q[<script src="http://google.com/lib.js" type="text/javascript"></script>]
-      assert_equal expected_include, javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
+      actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
+      assert_has_tag('script', :type => "text/javascript", :count => 3) { actual_html }
+      assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}") { actual_html }
+      assert_has_tag('script', :src => "/javascripts/base.js?#{time.to_i}") { actual_html }
+      assert_has_tag('script', :src => "http://google.com/lib.js") { actual_html }
     end
   end
 end

data/test/markup_plugin/test_form_builder.rb

@@ -2,9 +2,69 @@ require 'helper'
 require 'fixtures/markup_app/app'
 
 class TestFormBuilder < Test::Unit::TestCase
+  include SinatraMore::FormHelpers
+
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
 
-  # TODO Test the form builder methods
+  context 'for #form_for method' do
+    should "display correct form html" do
+      user = stub()
+      actual_html = form_for(user, '/register', :id => 'register') { "Demo" }
+      assert_has_tag('form', :action => '/register', :id => 'register', :content => "Demo") { actual_html }
+    end
+  end
+
+  # ===========================
+  # AbstractFormBuilder
+  # ===========================
+
+  context 'for #error_messages method' do
+
+  end
+
+  context 'for #text_field method' do
+
+  end
+
+  context 'for #text_area method' do
+
+  end
+
+  context 'for #password_field method' do
+
+  end
+
+  context 'for #file_field method' do
+
+  end
+
+  context 'for #submit method' do
+
+  end
+
+  # ===========================
+  # StandardFormBuilder
+  # ===========================
+
+  context 'for #text_field_block method' do
+
+  end
+
+  context 'for #text_area_block method' do
+
+  end
+
+  context 'for #password_field_block method' do
+
+  end
+
+  context 'for #file_field_block method' do
+
+  end
+
+  context 'for #submit_block method' do
+
+  end
 end

data/test/markup_plugin/test_form_helpers.rb

@@ -2,9 +2,216 @@ require 'helper'
 require 'fixtures/markup_app/app'
 
 class TestFormHelpers < Test::Unit::TestCase
+  include SinatraMore::FormHelpers
+
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
 
-  # Test the form helper methods
+  context 'for #form_tag method' do
+    should "display correct forms in ruby" do
+      actual_html = form_tag('/register', :class => 'test', :action => "hello") { "Demo" }
+      assert_has_tag(:form, :class => "test") { actual_html }
+    end
+    
+    should "display correct inputs in ruby for form_tag" do
+      actual_html = form_tag('/register', :class => 'test', :action => "hello") { text_field_tag(:username) }
+      assert_has_tag('form input', :type => 'text', :name => "username") { actual_html }
+    end
+
+    should "display correct forms in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form', :action => '/simple'
+      assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
+    end
+
+    should "display correct forms in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form', :action => '/simple'
+      assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
+    end
+  end
+
+  context 'for #field_set_tag method' do
+    should "display correct field_sets in ruby" do
+      actual_html = field_set_tag("Basic", :class => 'basic') { "Demo" }
+      assert_has_tag(:fieldset, :class => 'basic') { actual_html }
+      assert_has_tag('fieldset legend', :content => "Basic") { actual_html }
+    end
+
+    should "display correct field_sets in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form fieldset', :count => 1
+      assert_have_no_selector 'form.simple-form fieldset legend'
+      assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
+      assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
+    end
+
+    should "display correct field_sets in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form fieldset', :count => 1
+      assert_have_no_selector 'form.simple-form fieldset legend'
+      assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
+      assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
+    end
+  end
+
+  context 'for #error_messages_for method' do
+    should "display correct error messages list in ruby" do
+      user = stub(:class => "User", :errors => stub(:full_messages => ["1", "2"], :none? => false), :blank? => false)
+      actual_html = error_messages_for(user)
+      assert_has_tag('div.field-errors') { actual_html }
+      assert_has_tag('div.field-errors p', :content => "The user could not be saved") { actual_html }
+      assert_has_tag('div.field-errors ul.errors-list') { actual_html }
+      assert_has_tag('div.field-errors ul.errors-list li', :count => 2) { actual_html }
+    end
+
+    should "display correct error messages list in erb" do
+      visit '/erb/form_tag'
+      assert_have_no_selector 'form.simple-form .field-errors'
+      assert_have_selector 'form.advanced-form .field-errors'
+      assert_have_selector 'form.advanced-form .field-errors p', :content => "There are problems with saving user!"
+      assert_have_selector 'form.advanced-form .field-errors ul.errors-list'
+      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :count => 3
+      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :content => "This is a second fake error"
+    end
+
+    should "display correct error messages list in haml" do
+      visit '/haml/form_tag'
+      assert_have_no_selector 'form.simple-form .field-errors'
+      assert_have_selector 'form.advanced-form .field-errors'
+      assert_have_selector 'form.advanced-form .field-errors p', :content => "There are problems with saving user!"
+      assert_have_selector 'form.advanced-form .field-errors ul.errors-list'
+      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :count => 3
+      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :content => "This is a second fake error"
+    end
+  end
+
+  context 'for #label_tag method' do
+    should "display label tag in ruby" do
+      actual_html = label_tag(:username, :class => 'long-label', :caption => "Nickname")
+      assert_has_tag(:label, :for => 'username', :class => 'long-label', :content => "Nickname: ") { actual_html }
+    end
+
+    should "display label tag in erb for simple form" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form label', :count => 2
+      assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
+      assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
+    end
+    should "display label tag in erb for advanced form" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.advanced-form label', :count => 4
+      assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
+      assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
+      assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
+      assert_have_selector 'form.advanced-form label.photo', :content => "Photo"   , :for => 'photo'
+    end
+
+    should "display label tag in haml for simple form" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form label', :count => 2
+      assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
+      assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
+    end
+    should "display label tag in haml for advanced form" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.advanced-form label', :count => 4
+      assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
+      assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
+      assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
+      assert_have_selector 'form.advanced-form label.photo', :content => "Photo"   , :for => 'photo'
+    end
+  end
+
+  context 'for #text_field_tag method' do
+    should "display text field in ruby" do
+      actual_html = text_field_tag(:username, :class => 'long')
+      assert_has_tag(:input, :type => 'text', :class => "long", :name => 'username') { actual_html }
+    end
+
+    should "display text field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
+      assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
+    end
+
+    should "display text field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
+      assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
+    end
+  end
+
+  context 'for #text_area_tag method' do
+    should "display text area in ruby" do
+      actual_html = text_area_tag(:about, :class => 'long')
+      assert_has_tag(:textarea, :class => "long", :name => 'about') { actual_html }
+    end
+
+    should "display text area in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.advanced-form textarea', :count => 1, :name => 'about', :class => 'large'
+    end
+
+    should "display text area in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.advanced-form textarea', :count => 1, :name => 'about', :class => 'large'
+    end
+  end
+
+  context 'for #password_field_tag method' do
+    should "display password field in ruby" do
+      actual_html = password_field_tag(:password, :class => 'long')
+      assert_has_tag(:input, :type => 'password', :class => "long", :name => 'password') { actual_html }
+    end
+
+    should "display password field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=password]', :count => 1, :name => 'password'
+      assert_have_selector 'form.advanced-form input[type=password]', :count => 1, :name => 'password'
+    end
+
+    should "display password field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=password]', :count => 1, :name => 'password'
+      assert_have_selector 'form.advanced-form input[type=password]', :count => 1, :name => 'password'
+    end
+  end
+
+  context 'for #file_field_tag method' do
+    should "display file field in ruby" do
+      actual_html = file_field_tag(:photo, :class => 'photo')
+      assert_has_tag(:input, :type => 'file', :class => "photo", :name => 'photo') { actual_html }
+    end
+
+    should "display file field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.advanced-form input[type=file]', :count => 1, :name => 'photo', :class => 'upload'
+    end
+
+    should "display file field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.advanced-form input[type=file]', :count => 1, :name => 'photo', :class => 'upload'
+    end
+  end
+
+  context 'for #submit_tag method' do
+    should "display submit tag in ruby" do
+      actual_html = submit_tag("Update", :class => 'success')
+      assert_has_tag(:input, :type => 'submit', :class => "success", :value => 'Update') { actual_html }
+    end
+
+    should "display submit tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=submit]', :count => 1, :value => "Submit"
+      assert_have_selector 'form.advanced-form input[type=submit]', :count => 1, :value => "Login"
+    end
+
+    should "display submit tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=submit]', :count => 1, :value => "Submit"
+      assert_have_selector 'form.advanced-form input[type=submit]', :count => 1, :value => "Login"
+    end
+  end
 end

data/test/markup_plugin/test_tag_helpers.rb

@@ -8,25 +8,29 @@ class TestTagHelpers < Test::Unit::TestCase
 
   context 'for #tag method' do
     should("support tags with no content no attributes") do
-      assert_equal '<br />', tag(:br)
+      assert_has_tag(:br) { tag(:br) }
     end
     should("support tags with no content with attributes") do
-      assert_equal '<br class="yellow" style="clear:both" />', tag(:br, :style => 'clear:both', :class => 'yellow')
+      actual_html = tag(:br, :style => 'clear:both', :class => 'yellow') 
+      assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html }
     end
     should "support tags with content no attributes" do
-      assert_equal '<p>Demo String</p>', tag(:p, :content => "Demo String")
+      assert_has_tag(:p, :content => "Demo String") { tag(:p, :content => "Demo String") }
     end
     should "support tags with content and attributes" do
-      assert_equal '<p class="large" id="intro">Demo</p>', tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
+      actual_html = tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
+      assert_has_tag('p#intro.large', :content => "Demo") { actual_html }
     end
   end
 
   context 'for #content_tag method' do
     should "support tags with content as parameter" do
-      assert_equal '<p class="large" id="intro">Demo</p>', content_tag(:p, "Demo", :class => 'large', :id => 'intro')
+      actual_html = content_tag(:p, "Demo", :class => 'large', :id => 'thing')
+      assert_has_tag('p.large#thing', :content => "Demo") { actual_html }
     end
     should "support tags with content as block" do
-      assert_equal '<p class="large" id="intro">Demo</p>', content_tag(:p, :class => 'large', :id => 'intro') { "Demo" }
+      actual_html = content_tag(:p, :class => 'large', :id => 'star') { "Demo" }
+      assert_has_tag('p.large#star', :content => "Demo") { actual_html }
     end
     should "support tags with erb" do
       visit '/erb/content_tag'
@@ -47,10 +51,11 @@ class TestTagHelpers < Test::Unit::TestCase
 
   context 'for #input_tag method' do
     should "support field with type" do
-      assert_equal '<input type="text" />', input_tag(:text)
+      assert_has_tag('input[type=text]') { input_tag(:text) }
     end
     should "support field with type and options" do
-      assert_equal '<input class="first" id="texter" type="text" />', input_tag(:text, :class => "first", :id => 'texter')
+      actual_html = input_tag(:text, :class => "first", :id => 'texter')
+      assert_has_tag('input.first#texter[type=text]') { actual_html }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -07:00
+date: 2009-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -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_tag.erb
+- test/fixtures/markup_app/views/form_tag.haml
 - test/fixtures/markup_app/views/link_to.erb
 - test/fixtures/markup_app/views/link_to.haml
 - test/fixtures/render_app/app.rb