sinatra_more 0.1.10 → 0.2.0

data/README.rdoc

@@ -1,5 +1,27 @@
 = sinatra_more
 
+== Preface
+
+This gem has been designed to work with Sinatra (http://www.sinatrarb.com).
+Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.
+The canonical example of how to create an entire simple web application with Sinatra is something like:
+
+  # myapp.rb
+  require 'rubygems'
+  require 'sinatra'
+  get '/' do
+    'Hello world!'
+  end
+  
+and then to run the application:
+
+  $ ruby myapp.rb
+  
+The extreme simplicity of the framework is quite refreshing. I have been using Sinatra a great deal
+for recent projects. First for small and simple json and xml web services and then even
+for more complex full-featured applications. This gem represents my attempt to make it as fun and easy
+as possible to code increasingly advanced view-heavy web applications in Sinatra.
+
 == Introduction
 
 Note: This library is still experimental and may not be ready for production just yet. 
@@ -7,8 +29,8 @@ That being said the gem is being actively used on a number of sinatra projects.
 In addition, the gem has fairly solid test coverage ensuring that everything works as expected.
 
 This will be a plugin which expands sinatra's capabilities in a variety of ways. 
-Note that as much as possible, all helpers have been created to work with haml, erb, and erubis. 
-This gem is intended to be template-agnostic in providing helpers as much as possible.
+Note that all extensions have been created to work with haml, erb, and erubis. 
+This gem is intended to be template-agnostic in providing helpers wherever possible.
 
 Let me expand briefly on what I want to accomplish with this gem. I love sinatra but if I want to use it
 for any non-trivial application I very quickly miss a lot of the extra tools provided by rails.
@@ -139,6 +161,12 @@ methods should be very familiar to anyone who has used rails view helpers.
 * <tt>password_field_tag(name, options={})</tt>
   * Constructs a password field input from the given options
   * <tt>password_field_tag :password, :class => 'long'</tt>
+* <tt>check_box_tag(name, options={})</tt>
+  * Constructs a checkbox input from the given options
+  * <tt>check_box_tag :remember_me, :checked => true</tt>
+* <tt>radio_button_tag(name, options={})</tt>
+  * Constructs a radio button input from the given options
+  * <tt>radio_button_tag :gender, :value => 'male'</tt>
 * <tt>file_field_tag(name, options={})</tt>
   * Constructs a file field input from the given options
   * <tt>file_field_tag :photo, :class => 'long'</tt>
@@ -157,6 +185,8 @@ A form_tag might look like:
       %p
         = label_tag :password, :class => 'first'
         = password_field_tag :password, :value => params[:password]
+      %p
+        = check_box_tag :confirm_delete
     - field_set_tag(:class => 'buttons') do
       = submit_tag "Remove"
     
@@ -164,6 +194,8 @@ A form_tag might look like:
 
 * <tt>form_for(object, url, settings={}, &block)</tt>
   * Constructs a form using given or default form_builder
+  * Supports form methods 'put' and 'delete' through hidden field
+  * Defaults to StandardFormBuilder but you can easily create your own!
   * <tt>form_for(@user, '/register', :id => 'register') { |f| ...field-elements... }</tt>
 
 The following are fields provided by AbstractFormBuilder that can be used within a form_for:
@@ -175,6 +207,11 @@ The following are fields provided by AbstractFormBuilder that can be used within
   * <tt>f.label :name, :class => 'long'</tt>
 * <tt>text_field(field, options={})</tt>
   * <tt>f.text_field :username, :class => 'long'</tt>
+* <tt>check_box(field, options={})</tt>
+  * Uses hidden field to provide a 'unchecked' value for field
+  * <tt>f.check_box :remember_me, :uncheck_value => 'false'</tt>
+* <tt>radio_button(field, options={})</tt>
+  * <tt>f.radio_button :gender, :value => 'male'</tt>
 * <tt>hidden_field(field, options={})</tt>
   * <tt>f.hidden_field :session_id, :class => 'hidden'</tt>
 * <tt>text_area(field, options={})</tt>
@@ -199,6 +236,9 @@ A form_for using these basic fields might look like:
     %p
       = f.label :password
       = f.password_field :password
+    %p
+      = f.label :is_admin, :caption => "Admin User?"
+      = f.check_box :is_admin
     %p
       = f.submit "Create", :class => 'button'
   
@@ -232,6 +272,32 @@ and would generate this html:
     <p><input type="submit" value="Create" class="button"></p>
   </form>
 
+You can also easily build your own FormBuilder which allows for customized fields:
+
+  class MyCustomFormBuilder < AbstractFormBuilder
+    # Here we have access to a number of useful variables
+    #
+    #   * template  (use this to invoke any helpers)(ex. template.hidden_field_tag(...))
+    #   * object    (the record for this form) (ex. object.valid?)
+    #   * object_name (object's underscored type) (ex. object_name => 'admin_user')
+    #
+    # We also have access to self.field_types => [:text_field, :text_area, ...]
+    # In addition, we have access to all the existing field tag helpers (text_field, hidden_field, file_field, ...)
+  end
+
+Once a custom builder is defined, any call to form_for can use the new builder:
+
+  - form_for @user, '/register', :builder => 'MyCustomFormBuilder', :id => 'register' do |f|
+    ...fields here...
+
+The form builder can even be made into the default builder when form_for is invoked:
+
+  # anywhere in the sinatra application
+  set :default_builder, 'MyCustomFormBuilder'
+
+And there you have it, a fairly complete form builder solution for sinatra. 
+I hope to create or merge in an even better 'default' form_builder in the near future.
+
 ==== Format Helpers
 
 * <tt>escape_html</tt> (alias <tt>h</tt> and <tt>h!</tt>)
@@ -264,6 +330,36 @@ such as partials (with support for :collection) into the templating system.
   * <tt>partial 'photo/_item', :object => @photo, :locals => { :foo => 'bar' }</tt>
   * <tt>partial 'photo/_item', :collection => @photos</tt>
 
+Using render plugin helpers is extremely simple. If you want to render an erb template in your view path:
+
+  erb_template 'path/to/my/template'
+  
+or using haml templates works just as well:
+
+  haml_template 'path/to/haml/template'
+  
+There is also a method which renders the first view matching the path and removes the need to define an engine:
+
+  render_template 'path/to/any/template'
+  
+It is worth noting these are mostly for convenience. When I had more complex view files in sinatra, I got tired of writing:
+
+  haml :"the/path/to/file"
+  erb "/path/to/file".to_sym
+  
+Finally, we have the all-important partials support for rendering mini-templates onto a page:
+
+  partial 'photo/_item', :object => @photo, :locals => { :foo => 'bar' }
+  partial 'photo/_item', :collection => @photos
+  
+This works as you would expect and also supports the collection counter inside the partial <tt>item_counter</tt>
+
+  # /views/photo/_item.haml
+  # Access to collection counter with <partial_name>_counter i.e item_counter
+  # Access the object with the partial_name i.e item
+  
+And that concludes the render plugin for now but I am open to adding more methods as time progresses.
+
 === WardenPlugin
 
 This component provides out-of-the-box support for Warden authentication. With this
@@ -285,11 +381,18 @@ provided to make interacting with warden dead simple.
   * Forces a user to return to a fail path unless they are authorized
   * Used to require a user be authenticated before routing to an action
   * <tt>must_be_authorized!('/login')</tt>
+  
+I am aware of other sinatra/warden extensions which work very similarly to the system I outlined here. 
+Most notably is the sinatra_warden plugin by Justin Smestad (http://github.com/jsmestad/sinatra_warden)
+Eventually I plan to vendor that gem or just remove support for this piece of my plugin completely. 
+
+If anybody has any thoughts on this, please let me know. There is something convenient to me about having
+access to a plug-and-play warden solution directly from this gem.
 
 == 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 sbfaulkner for the sinatra-helpers code that I browsed through many times while starting this library.
 
 == Contributors
 

data/TODO

@@ -5,12 +5,18 @@
   * 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) }
-* Add support for missing formhelpers/fields (check_box, radio_button, ...)
+* Add support for fields_for tag in formbuilder
+* Add support for missing formhelpers/fields (radio_button_tag, select_tag)
+* Add support for missing formbuilder fields (radio_button, select, and standard_form_builder methods i.e check_box_group)
 * Look into creating sinatra generators using rubigen (http://github.com/drnic/rubigen)
   * http://github.com/quirkey/sinatra-gen
+  * http://github.com/monkrb/monk
 * Look into adding any missing helpers from:
+  * http://github.com/brianjlandau/nice-n-easy
+  * http://github.com/brianjlandau/nice-n-easy/blob/master/lib/sinatra/nice_easy_helpers.rb
   * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/links.rb
   * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/forms.rb
+  * http://github.com/twilson63/sinatra-formhelpers/blob/master/lib/sinatra/formhelpers.rb
 
 = COMPLETED
 

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.2.0

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

@@ -43,7 +43,23 @@ class AbstractFormBuilder
     @template.password_field_tag field_name(field), options
   end
 
-  # f.file_field(:photo, :class => 'avatar')
+  # f.check_box :remember_me, :value => 'true', :uncheck_value => '0'
+  def check_box(field, options={})
+    unchecked_value = options.delete(:uncheck_value) || '0'
+    options.reverse_merge!(:id => field_id(field))
+    options.merge!(:checked => true) if values_matches_field?(field, options[:value])
+    html = @template.check_box_tag field_name(field), options
+    html << hidden_field(field, :value => unchecked_value, :id => nil)
+  end
+
+  # f.radio_button :gender, :value => 'male'
+  def radio_button(field, options={})
+    options.reverse_merge!(:id => field_id(field, options[:value]))
+    options.merge!(:checked => true) if values_matches_field?(field, options[:value])
+    @template.radio_button_tag field_name(field), options
+  end
+
+  # f.file_field :photo, :class => 'avatar'
   def file_field(field, options={})
     options.reverse_merge!(:id => field_id(field))
     @template.file_field_tag field_name(field), options
@@ -58,17 +74,21 @@ class AbstractFormBuilder
 
   # Returns the known field types for a formbuilder
   def self.field_types
-    [:text_field, :text_area, :password_field, :file_field, :hidden_field]
+    [:text_field, :text_area, :password_field, :file_field, :hidden_field, :check_box]
   end
 
-  private
-
   # Returns the object's models name
   #   => user_assignment
   def object_name
     object.class.to_s.underscore
   end
 
+  # Returns true if the value matches the value in the field
+  # field_has_value?(:gender, 'male')
+  def values_matches_field?(field, value)
+    value.present? && field_value(field).to_s == value.to_s
+  end
+
   # Returns the value for the object's field
   # field_value(:username) => "Joey"
   def field_value(field)
@@ -83,7 +103,8 @@ class AbstractFormBuilder
 
   # Returns the id for the given field
   # field_id(:username) => "user_username"
-  def field_id(field)
-    "#{object_name}_#{field}"
+  # field_id(:gender, :male) => "user_gender_male"
+  def field_id(field, value=nil)
+    value.blank? ? "#{object_name}_#{field}" : "#{object_name}_#{field}_#{value}"
   end
 end

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -82,6 +82,20 @@ module SinatraMore
       input_tag(:password, options)
     end
 
+    # Constructs a check_box from the given options
+    # check_box_tag :remember_me, :value => 'Yes'
+    def check_box_tag(name, options={})
+      options.reverse_merge!(:name => name, :value => '1')
+      input_tag(:checkbox, options)
+    end
+
+    # Constructs a radio_button from the given options
+    # radio_button_tag :remember_me, :value => 'true'
+    def radio_button_tag(name, options={})
+      options.reverse_merge!(:name => name)
+      input_tag(:radio, options)
+    end
+
     # Constructs a file field input from the given options
     # file_field_tag :photo, :class => 'long'
     def file_field_tag(name, options={})

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -4,6 +4,7 @@ module SinatraMore
     # input_tag :text, :class => "test"
     def input_tag(type, options = {})
       options.reverse_merge!(:type => type)
+      [:checked, :disabled].each { |attr| options[attr] = attr.to_s if options[attr]  }
       tag(:input, options)
     end
 

data/lib/sinatra_more/support_lite.rb

@@ -1,10 +1,10 @@
 # This is for adding specific methods that are required by sinatra_more if activesupport isn't required
 
-unless String.new.respond_to?(:titleize)
+unless String.method_defined?(:titleize)
   require 'active_support/inflector'
 end
 
-unless Hash.new.respond_to?(:reverse_merge!)
+unless Hash.method_defined?(:reverse_merge!)
   module HashExtensions
     def reverse_merge(other_hash)
       other_hash.merge(self)
@@ -15,7 +15,7 @@ unless Hash.new.respond_to?(:reverse_merge!)
   end
 end
 
-unless Hash.new.respond_to?(:symbolize_keys!)
+unless Hash.method_defined?(:symbolize_keys!)
   module HashExtensions
     def symbolize_keys
       inject({}) do |options, (key, value)|
@@ -29,7 +29,7 @@ unless Hash.new.respond_to?(:symbolize_keys!)
   end
 end
 
-unless Array.new.respond_to?(:extract_options!)
+unless Array.method_defined?(:extract_options!)
   module ArrayExtensions
     def extract_options!
       last.is_a?(::Hash) ? pop : {}

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.1.10"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-10-28}
   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 = [

data/test/active_support_helpers.rb

@@ -1,4 +1,4 @@
-unless 5.respond_to?(:days)
+unless Fixnum.method_defined?(:days)
   require 'active_support/core_ext/object/misc'
   require 'active_support/core_ext/date'
   require 'active_support/core_ext/time'

data/test/fixtures/markup_app/app.rb

@@ -44,6 +44,8 @@ end
 class MarkupUser
   def errors; Errors.new; end
   def session_id; 45; end
+  def gender; 'male'; end
+  def remember_me; '1'; end
 end
 
 class Errors < Array

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

@@ -21,6 +21,14 @@
     <%= f.label :about, :caption => "About Me" %>
     <%= f.text_area :about, :class => 'user-about'  %> 
   </p>
+  <p>
+    <%= f.label :gender, :caption => "Your gender:" %>
+    <%= f.radio_button :gender, :value => 'male' %>
+    <%= f.radio_button :gender, :value => 'female' %>
+  </p>
+  <p>
+    <%= f.check_box :remember_me, :value => '1' %>
+  </p>
   <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
 <% end %>
 

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

@@ -16,6 +16,12 @@
   %p
     = f.label :about, :caption => "About Me"
     = f.text_area :about, :class => 'user-about'  
+  %p
+    = f.label :gender, :caption => "Your gender:"
+    = f.radio_button :gender, :value => 'male'
+    = f.radio_button :gender, :value => 'female'
+  %p
+    = f.check_box :remember_me, :value => "1"
   %p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
 

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

@@ -6,6 +6,10 @@
     <%= text_field_tag :username %>
     <%= label_tag :password %>
     <%= password_field_tag :password %>
+    <%= check_box_tag :remember_me %>
+    <%= label_tag :gender %>
+    <%= radio_button_tag :gender, :value => 'male' %>
+    <%= radio_button_tag :gender, :value => 'female' %>
     <%= submit_tag %>
   <% end %>
 <% end %>
@@ -30,6 +34,14 @@
      <%= label_tag :photo, :class => 'photo' %>
      <%= file_field_tag :photo, :class => 'upload' %>
     </p>
+    <p>
+      <%= label_tag :gender, :class => 'gender' %>
+      <%= radio_button_tag :gender, :value => 'male', :checked => true %>
+      <%= radio_button_tag :remember_me, :value => 'female' %>
+    <p>
+    <p>
+      <%= check_box_tag :remember_me, :value => '1', :checked => true %>
+    <p>
   <% end %>
   <% field_set_tag(:class => 'buttons') do %>
     <%= submit_tag "Login" %>

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

@@ -6,6 +6,10 @@
     = text_field_tag :username
     = label_tag :password
     = password_field_tag :password
+    = label_tag :gender
+    = radio_button_tag :gender, :value => 'male'
+    = radio_button_tag :gender, :value => 'female'
+    = check_box_tag :remember_me
     = submit_tag
 
 - form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do
@@ -21,8 +25,14 @@
     %p
       = label_tag :about, :class => 'about', :caption => "About Me"
       = text_area_tag :about, :class => 'large'
+    %p
+      = label_tag :gender, :class => 'gender'
+      = radio_button_tag :gender, :value => 'male', :checked => true
+      = radio_button_tag :gender, :value => 'female'
     %p
       = label_tag :photo, :class => 'photo'
       = file_field_tag :photo, :class => 'upload'
+    %p
+      = check_box_tag :remember_me, :value => "1", :checked => true
   - field_set_tag(:class => 'buttons') do
     = submit_tag "Login"

data/test/helper.rb

@@ -35,6 +35,16 @@ class Test::Unit::TestCase
     raise "Please specify a block!" if html.blank?
     assert matcher.matches?(html), matcher.failure_message
   end
+
+  # assert_has_no_tag, tag(:h1, :content => "yellow") { "<h1>green</h1>" }
+  # In this case, block is the html to evaluate
+  def assert_has_no_tag(name, attributes = {}, &block)
+    html = block && block.call
+    attributes.merge!(:count => 0)
+    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_form_builder.rb

@@ -157,6 +157,84 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #check_box method' do
+    should "display correct checkbox html" do
+      actual_html = standard_builder.check_box(:confirm_destroy, :class => 'large')
+      assert_has_tag('input.large[type=checkbox]', :id => 'user_confirm_destroy', :name => 'user[confirm_destroy]') { actual_html }
+      assert_has_tag('input[type=hidden]', :name => 'user[confirm_destroy]', :value => '0') { actual_html }
+    end
+
+    should "display correct checkbox html when checked" do
+      actual_html = standard_builder.check_box(:confirm_destroy, :checked => true)
+      assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[confirm_destroy]') { actual_html }
+    end
+
+    should "display correct checkbox html as checked when object value matches" do
+      @user.stubs(:show_favorites => '1')
+      actual_html = standard_builder.check_box(:show_favorites, :value => '1')
+      assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]') { actual_html }
+    end
+
+    should "display correct checkbox html as unchecked when object value doesn't match" do
+      @user.stubs(:show_favories => '0')
+      actual_html = standard_builder.check_box(:show_favorites, :value => 'female')
+      assert_has_no_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
+    end
+
+    should "display correct unchecked hidden field when specified" do
+      actual_html = standard_builder.check_box(:show_favorites, :value => 'female', :uncheck_value => 'false')
+      assert_has_tag('input[type=hidden]', :name => 'user[show_favorites]', :value => 'false') { actual_html }
+    end
+
+    should "display correct checkbox in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
+    end
+
+    should "display correct checkbox in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
+    end
+  end
+
+  context 'for #radio_button method' do
+    should "display correct radio button html" do
+      actual_html = standard_builder.radio_button(:gender, :value => 'male', :class => 'large')
+      assert_has_tag('input.large[type=radio]', :id => 'user_gender_male', :name => 'user[gender]', :value => 'male') { actual_html }
+    end
+
+    should "display correct radio button html when checked" do
+      actual_html = standard_builder.radio_button(:gender, :checked => true)
+      assert_has_tag('input[type=radio]', :checked => 'checked', :name => 'user[gender]') { actual_html }
+    end
+
+    should "display correct radio button html as checked when object value matches" do
+      @user.stubs(:gender => 'male')
+      actual_html = standard_builder.radio_button(:gender, :value => 'male')
+      assert_has_tag('input[type=radio]', :checked => 'checked', :name => 'user[gender]') { actual_html }
+    end
+
+    should "display correct radio button html as unchecked when object value doesn't match" do
+      @user.stubs(:gender => 'male')
+      actual_html = standard_builder.radio_button(:gender, :value => 'female')
+      assert_has_no_tag('input[type=radio]', :checked => 'checked') { actual_html }
+    end
+
+    should "display correct radio button in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
+      assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
+      assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
+    end
+
+    should "display correct radio button in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
+      assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
+      assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
+    end
+  end
+
   context 'for #text_area method' do
     should "display correct text_area html" do
       actual_html = standard_builder.text_area(:about, :class => 'large')

data/test/markup_plugin/test_form_helpers.rb

@@ -113,32 +113,36 @@ class TestFormHelpers < Test::Unit::TestCase
 
     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', :count => 3
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
+      assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     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', :count => 5
       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'
+      assert_have_selector 'form.advanced-form label.gender', :content => "Gender"   , :for => 'gender'
     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', :count => 3
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
+      assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     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', :count => 5
       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'
+      assert_have_selector 'form.advanced-form label.gender', :content => "Gender"   , :for => 'gender'
     end
   end
 
@@ -233,6 +237,58 @@ class TestFormHelpers < Test::Unit::TestCase
     end
   end
 
+  context "for #check_box_tag method" do
+    should "display check_box tag in ruby" do
+      actual_html = check_box_tag("clear_session")
+      assert_has_tag(:input, :type => 'checkbox', :value => '1', :name => 'clear_session') { actual_html }
+    end
+
+    should "display check_box tag in ruby with extended attributes" do
+      actual_html = check_box_tag("clear_session", :disabled => true, :checked => true)
+      assert_has_tag(:input, :type => 'checkbox', :disabled => 'disabled', :checked => 'checked') { actual_html }
+    end
+
+    should "display check_box tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=checkbox]', :count => 1
+      assert_have_selector 'form.advanced-form input[type=checkbox]', :value => "1", :checked => 'checked'
+    end
+
+    should "display check_box tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=checkbox]', :count => 1
+      assert_have_selector 'form.advanced-form input[type=checkbox]', :value => "1", :checked => 'checked'
+    end
+  end
+
+  context "for #radio_button_tag method" do
+    should "display radio_button tag in ruby" do
+      actual_html = radio_button_tag("gender", :value => 'male')
+      assert_has_tag(:input, :type => 'radio', :value => 'male', :name => 'gender') { actual_html }
+    end
+
+    should "display radio_button tag in ruby with extended attributes" do
+      actual_html = radio_button_tag("gender", :disabled => true, :checked => true)
+      assert_has_tag(:input, :type => 'radio', :disabled => 'disabled', :checked => 'checked') { actual_html }
+    end
+
+    should "display radio_button tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=radio]', :count => 1, :value => 'male'
+      assert_have_selector 'form.simple-form input[type=radio]', :count => 1, :value => 'female'
+      assert_have_selector 'form.advanced-form input[type=radio]', :value => "male", :checked => 'checked'
+      assert_have_selector 'form.advanced-form input[type=radio]', :value => "female"
+    end
+
+    should "display radio_button tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=radio]', :count => 1, :value => 'male'
+      assert_have_selector 'form.simple-form input[type=radio]', :count => 1, :value => 'female'
+      assert_have_selector 'form.advanced-form input[type=radio]', :value => "male", :checked => 'checked'
+      assert_have_selector 'form.advanced-form input[type=radio]', :value => "female"
+    end
+  end
+
   context 'for #submit_tag method' do
     should "display submit tag in ruby" do
       actual_html = submit_tag("Update", :class => 'success')
@@ -251,4 +307,5 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.advanced-form input[type=submit]', :count => 1, :value => "Login"
     end
   end
+
 end

data/test/markup_plugin/test_tag_helpers.rb

@@ -56,6 +56,14 @@ class TestTagHelpers < Test::Unit::TestCase
       actual_html = input_tag(:text, :class => "first", :id => 'texter')
       assert_has_tag('input.first#texter[type=text]') { actual_html }
     end
+    should "support checked attribute by using 'checked' if true" do
+      actual_html = input_tag(:checkbox, :checked => true)
+      assert_has_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
+    end
+    should "support disabled attribute by using 'disabled' if true" do
+      actual_html = input_tag(:checkbox, :disabled => true)
+      assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html }
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency