formatted_form 1.1.0 → 2.0.0

data/test/form_builder_test.rb

@@ -0,0 +1,391 @@
+require 'test_helper'
+
+# `raise output_buffer.inspect` if you want to peek inside generated html
+class FormBuilderTest < ActionView::TestCase
+  
+  # -- Form -----------------------------------------------------------------
+  def test_form
+    with_formatted_form_for(@user, :url => ''){|f|}
+    assert_select "form[class='formatted']"
+  end
+  
+  def test_form_with_type_inline
+    with_formatted_form_for(@user, :url => '', :type => :inline){|f|}
+    assert_select "form[class='formatted form-inline']"
+  end
+    
+  def test_form_with_type_horizontal
+    with_formatted_form_for(@user, :url => '', :type => :horizontal){|f|}
+    assert_select "form[class='formatted form-horizontal']"
+  end
+  
+  def test_form_with_type_search
+    with_formatted_form_for(@user, :url => '', :type => :search){|f|}
+    assert_select "form[class='formatted form-search']"
+  end
+  
+  def test_form_overriding_existing_class
+    with_formatted_form_for(@user, :url => '', :type => :inline, :html => {:class => 'custom'}){|f|}
+    assert_select "form[class='custom form-inline']"
+  end
+  
+  def test_form_with_type_derived_from_class
+    with_formatted_form_for(@user, :url => '', :type => :inline, :html => {:class => 'form-horizontal'}){|f|}
+    assert_select "form[class='form-horizontal']"
+  end
+  
+  # -- Text Field -----------------------------------------------------------
+  def test_text_field
+    with_text_field :name
+    assert_select "div[class='control-group cg-name']" do
+      assert_select "label[for='user_name']", 'Name'
+      assert_select "div[class='controls']" do
+        assert_select "input[type='text'][id='user_name'][name='user[name]']"
+      end
+    end
+  end
+  
+  def test_text_field_prepend_append
+    with_text_field :twitter, :prepend => '@', :append => '!'
+    assert_select "div[class='control-group cg-twitter']" do
+      assert_select "label[for='user_twitter']", 'Twitter'
+      assert_select "div[class='controls']" do
+        assert_select "div[class='input-prepend input-append']" do
+          assert_select "span[class='add-on']", '@'
+          assert_select "input[type='text'][id='user_twitter'][name='user[twitter]']"
+          assert_select "span[class='add-on']", '!'
+        end
+      end
+    end
+  end
+  
+  def test_text_field_prepend_append_html
+    with_text_field :twitter, :prepend_html => '<b>b</b>', :append_html => '<i>i</i>'
+    assert_select "div[class='control-group cg-twitter']" do
+      assert_select "label[for='user_twitter']", 'Twitter'
+      assert_select "div[class='controls']" do
+        assert_select "div[class='input-prepend input-append']" do
+          assert_select "i", 'i'
+          assert_select "input[type='text'][id='user_twitter'][name='user[twitter]']"
+          assert_select "b", 'b'
+        end
+      end
+    end
+  end
+  
+  def test_text_field_with_help_block
+    with_text_field :name, :help_block => 'Help'
+    assert_select "div[class='control-group cg-name']" do
+      assert_select "div[class='controls']" do
+        assert_select "input[type='text'][id='user_name'][name='user[name]']"
+        assert_select "span[class='help-block']", 'Help'
+      end
+    end
+  end
+  
+  def test_text_field_with_errors
+    assert @user.invalid?
+    with_text_field :name
+    assert_select "div[class='control-group cg-name error']" do
+      assert_select "div[class='controls']" do
+        assert_select "input[type='text'][id='user_name'][name='user[name]']"
+        assert_select "span[class='help-inline']", "can&#x27;t be blank"
+      end
+    end
+  end
+  
+  def test_text_field_with_blank_label
+    with_text_field :name, :label => ''
+    assert_select "label[for='user_name']", 0
+    
+    with_text_field :name, :label => false
+    assert_select "label[for='user_name']", 0
+  end
+  
+  def test_text_field_for_inline_form
+    with_formatted_form_for(@user, :url => '', :type => :inline){|f| f.text_field :name }
+    assert_select "div[class='control-group cg-name']", 0
+    assert_select "input[type='text'][id='user_name'][name='user[name]']"
+  end
+  
+  def test_text_field_with_no_builder
+    with_text_field :name, :builder => false
+    assert_select "div[class='control-group cg-name']", 0
+    assert_select "label[for='user_name']", 0
+  end
+  
+  # -- Radio Button ---------------------------------------------------------
+  def test_radio_button
+    with_radio_button :role, 'admin'
+    assert_select "div[class='control-group cg-role']" do
+      assert_select "div[class='control-label']" do
+        assert_select "label[for='user_role']", 'Role'
+      end
+      assert_select "div[class='controls']" do
+        assert_select "input[type='radio'][id='user_role_admin'][name='user[role]'][value='admin']"
+      end
+    end
+  end
+  
+  def test_radio_button_with_custom_label
+    with_radio_button :role, 'admin', :label => 'Access'
+    assert_select "div[class='control-label']" do
+      assert_select "label[for='user_role']", 'Access'
+    end
+  end
+  
+  def test_radio_button_with_choices_array
+    with_radio_button :role, ['admin', 'regular']
+    assert_select "div[class='controls']" do
+      assert_select "label[class='radio']", 'admin' do
+        assert_select "input[type='radio'][id='user_role_admin'][name='user[role]'][value='admin']"
+      end
+      assert_select "label[class='radio']", 'regular' do
+        assert_select "input[type='radio'][id='user_role_regular'][name='user[role]'][value='regular']"
+      end
+    end
+  end
+  
+  def test_radio_button_with_choices_tuples
+    with_radio_button :role, [['Admin', 1], ['Regular', 2]]
+    assert_select "label[class='radio']", 'Admin' do
+      assert_select "input[type='radio'][id='user_role_1'][name='user[role]'][value='1']"
+    end
+    assert_select "label[class='radio']", 'Regular' do
+      assert_select "input[type='radio'][id='user_role_2'][name='user[role]'][value='2']"
+    end
+  end
+  
+  def test_radio_button_inline
+    with_radio_button :role, ['admin', 'regular'], :class => 'inline'
+    assert_select "label[class='radio inline']", 'admin' do
+      assert_select "input[type='radio'][id='user_role_admin'][name='user[role]'][value='admin']"
+    end
+  end
+  
+  # -- Check Boxes ----------------------------------------------------------
+  def test_check_box
+    with_check_box :colors, {}, 'yes', 'no'
+    assert_select "div[class='control-group cg-colors']" do
+      assert_select "div[class='control-label']" do 
+        assert_select "label[for='user_colors']", 'Colors'
+      end
+      assert_select "div[class='controls']" do
+        assert_select "input[type='hidden'][name='user[colors]'][value='no']"
+        assert_select "input[type='checkbox'][id='user_colors'][name='user[colors]'][value='yes']"
+      end
+    end
+  end
+  
+  def test_check_box_custom_label
+    with_check_box :colors, :label => 'Kolors'
+    assert_select "div[class='control-label']" do
+      assert_select "label[for='user_colors']", 'Kolors'
+    end
+  end
+  
+  def test_check_box_with_choices_array
+    with_check_box :colors, {}, ['red', 'green']
+    assert_select "div[class='controls']" do
+      assert_select "label[class='checkbox']", 'red' do
+        assert_select "input[type='checkbox'][id='user_colors_red'][name='user[colors][]'][value='red']"
+      end
+      assert_select "label[class='checkbox']", 'green' do
+        assert_select "input[type='checkbox'][id='user_colors_green'][name='user[colors][]'][value='green']"
+      end
+    end
+  end
+  
+  def test_check_box_with_choices_and_labels
+    with_check_box :colors, {}, [['Red', 'r'], ['Green', 'g']]
+    assert_select "div[class='controls']" do
+      assert_select "label[class='checkbox']", 'Red' do
+        assert_select "input[type='checkbox'][id='user_colors_r'][name='user[colors][]'][value='r']"
+      end
+      assert_select "label[class='checkbox']", 'Green' do
+        assert_select "input[type='checkbox'][id='user_colors_g'][name='user[colors][]'][value='g']"
+      end
+    end
+  end
+  
+  def test_check_box_inline
+    with_check_box :colors, {:class => 'inline'}, ['red', 'green']
+    assert_select "label[class='checkbox inline']" do
+      assert_select "input[type='checkbox'][id='user_colors_red'][name='user[colors][]']"
+    end
+  end
+  
+  # -- Element --------------------------------------------------------------
+  def test_element
+    with_element 'Label', 'Content'
+    assert_select "div[class='control-group']" do
+      assert_select "label[class='control-label']", 'Label'
+      assert_select "div[class='controls']", 'Content'
+    end
+  end
+  
+  def test_element_with_block
+    with_element 'Label' do
+      'Content'
+    end
+    assert_select "div[class='control-group']" do
+      assert_select "label[class='control-label']", 'Label'
+      assert_select "div[class='controls']", 'Content'
+    end
+  end
+  
+  def test_element_with_no_label
+    with_element do
+      'Content'
+    end
+    assert_select "label[class='control-label']", 0
+    assert_select "div[class='controls']", 'Content'
+  end
+  
+  # -- Submit ---------------------------------------------------------------
+  def test_submit
+    with_submit
+    assert_select "input[name=commit][value='Create User'][class='btn btn-primary']"
+  end
+  
+  def test_submit_with_label
+    with_submit 'Create'
+    assert_select "input[name='commit'][value='Create']"
+  end
+  
+  def test_submit_with_css_class
+    with_submit :class => 'btn-danger'
+    assert_select "input[name=commit][class='btn-danger btn']"
+  end
+  
+  # -- Others ---------------------------------------------------------------
+  def test_select_field
+    with_select :name, ['Bob']
+    assert_select "div[class='controls']" do
+      assert_select "select[id='user_name'][name='user[name]']" do
+        assert_select "option[value='Bob']", 'Bob'
+      end
+    end
+  end
+  
+  def test_password_field
+    with_password_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='password'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_email_field
+    with_email_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='email'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_telephone_field
+    with_telephone_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='tel'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_number_field
+    with_number_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='number'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_text_area
+    with_text_area :name
+    assert_select "div[class='controls']" do
+      assert_select "textarea[id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_file_field
+    with_file_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='file'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_range_field
+    with_range_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='range'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_search_field
+    with_search_field :name
+    assert_select "div[class='controls']" do
+      assert_select "input[type='search'][id='user_name'][name='user[name]']"
+    end
+  end
+  
+  def test_datetime_select
+    with_datetime_select :timestamp
+    assert_select "div[class='controls']" do
+      assert_select "select[id='user_timestamp_1i'][name='user[timestamp(1i)]']"
+      assert_select "select[id='user_timestamp_2i'][name='user[timestamp(2i)]']"
+      assert_select "select[id='user_timestamp_3i'][name='user[timestamp(3i)]']"
+      assert_select "select[id='user_timestamp_4i'][name='user[timestamp(4i)]']"
+      assert_select "select[id='user_timestamp_5i'][name='user[timestamp(5i)]']"
+    end
+  end
+  
+  def test_date_select
+    with_date_select :timestamp
+    assert_select "div[class='controls']" do
+      assert_select "select[id='user_timestamp_1i'][name='user[timestamp(1i)]']"
+      assert_select "select[id='user_timestamp_2i'][name='user[timestamp(2i)]']"
+      assert_select "select[id='user_timestamp_3i'][name='user[timestamp(3i)]']"
+    end
+  end
+  
+  def test_time_select
+    with_time_select :timestamp
+    assert_select "div[class='controls']" do
+      assert_select "input[type='hidden'][id='user_timestamp_1i'][name='user[timestamp(1i)]']"
+      assert_select "input[type='hidden'][id='user_timestamp_2i'][name='user[timestamp(2i)]']"
+      assert_select "input[type='hidden'][id='user_timestamp_3i'][name='user[timestamp(3i)]']"
+      assert_select "select[id='user_timestamp_4i'][name='user[timestamp(4i)]']"
+      assert_select "select[id='user_timestamp_5i'][name='user[timestamp(5i)]']"
+    end
+  end
+  
+  def test_time_zone_select
+    with_time_zone_select :timestamp
+    assert_select "div[class='controls']" do
+      assert_select "select[id='user_timestamp'][name='user[timestamp]']"
+    end
+  end
+  
+  # -- Conditional content tag ----------------------------------------------
+  def test_content_tag_if_true
+    concat content_tag_if(true, :div, 'test', :class => 'test')
+    assert_equal "<div class=\"test\">test</div>", output_buffer
+  end
+  
+  def test_content_tag_if_false
+    concat content_tag_if(false, :div, 'test', :class => 'test')
+    assert_equal 'test', output_buffer
+  end
+  
+  def test_content_tag_if_with_block_if_true
+    concat(content_tag_if(true, :div, :class => 'test'){ 'test' })
+    assert_equal "<div class=\"test\">test</div>", output_buffer
+  end
+  
+  def test_content_tag_if_with_block_if_false
+    concat(content_tag_if(false, :div, :class => 'test'){ 'test' })
+    assert_equal 'test', output_buffer
+  end
+  
+  def test_content_tag_unless
+    concat content_tag_unless(false, :div, 'test', :class => 'test')
+    assert_equal "<div class=\"test\">test</div>", output_buffer
+  end
+  
+end

data/test/test_helper.rb

@@ -0,0 +1,47 @@
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+class User
+  extend ActiveModel::Naming
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  
+  attr_accessor :id, :name, :twitter, :role, :colors, :timestamp
+  
+  validates :name, :presence => true
+  
+  def persisted?
+    false
+  end
+end
+
+class ActionView::TestCase
+  include FormattedForm::ViewHelper
+  
+  setup :load_user
+  
+  def load_user
+    @user = User.new
+  end
+  
+  def with_formatted_form_for(*args, &block)
+    concat formatted_form_for(*args, &block)
+  end
+  
+  # Helper method to handle things like `with_text_field`, `with_submit`, etc
+  def method_missing(method_name, *args, &block)
+    if method_name =~ /^with_(\w+)/
+      with_formatted_form_for(@user, :url => ''){ |f| f.send($1, *args, &block) }
+    else
+      super(method_name, *args, &block)
+    end
+  end
+end

metadata

@@ -1,48 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: formatted_form
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
 - Jack Neto
+- Oleg Khabarov
+- The Working Group Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000 -04:00
-default_executable: 
-dependencies: []
+date: 2012-12-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
-email: jack@theworkinggroup.ca
+email: jack@twg.ca
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
+- LICENSE
 - README.md
 files:
-- LICENSE.txt
+- Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
-- app/views/formatted_form/_check_box.html.haml
-- app/views/formatted_form/_default_field.html.haml
-- app/views/formatted_form/_radio_button.html.haml
-- app/views/formatted_form/_submit.html.haml
-- app/views/twitter_bootstrap/_check_box.html.haml
-- app/views/twitter_bootstrap/_default_field.html.haml
-- app/views/twitter_bootstrap/_radio_button.html.haml
-- app/views/twitter_bootstrap/_submit.html.haml
+- app/assets/javascripts/formatted_form.js
+- app/assets/stylesheets/formatted_form.css
+- app/views/formatted_form/_check_box.html.erb
+- app/views/formatted_form/_date_select.html.erb
+- app/views/formatted_form/_datetime_select.html.erb
+- app/views/formatted_form/_element.html.erb
+- app/views/formatted_form/_email_field.html.erb
+- app/views/formatted_form/_file_field.html.erb
+- app/views/formatted_form/_number_field.html.erb
+- app/views/formatted_form/_password_field.html.erb
+- app/views/formatted_form/_phone_field.html.erb
+- app/views/formatted_form/_radio_button.html.erb
+- app/views/formatted_form/_range_field.html.erb
+- app/views/formatted_form/_search_field.html.erb
+- app/views/formatted_form/_select.html.erb
+- app/views/formatted_form/_submit.html.erb
+- app/views/formatted_form/_telephone_field.html.erb
+- app/views/formatted_form/_text_area.html.erb
+- app/views/formatted_form/_text_field.html.erb
+- app/views/formatted_form/_time_select.html.erb
+- app/views/formatted_form/_time_zone_select.html.erb
+- app/views/formatted_form/templates/_choices.html.erb
+- app/views/formatted_form/templates/_field.html.erb
 - formatted_form.gemspec
 - lib/formatted_form.rb
-- lib/formatted_form/builder.rb
-- lib/formatted_form/configuration.rb
 - lib/formatted_form/engine.rb
-- lib/formatted_form/helper.rb
-- lib/generators/formatted_form/javascripts/javascripts_generator.rb
-- lib/generators/formatted_form/stylesheets/stylesheets_generator.rb
-- templates/javascripts/formatted_form.js
-- templates/stylesheets/formatted_form.sass
-has_rdoc: true
+- lib/formatted_form/form_builder.rb
+- lib/formatted_form/view_helper.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/mailers/.gitkeep
+- test/dummy/app/models/.gitkeep
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/lib/assets/.gitkeep
+- test/dummy/log/.gitkeep
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
+- test/form_builder_test.rb
+- test/test_helper.rb
 homepage: http://github.com/twg/formatted_form
 licenses:
 - MIT
@@ -56,6 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4409253828031207642
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -64,8 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A Rails form builder to simplify your forms
+summary: A Rails form builder that generates Twitter Bootstrap markup and helps keep
+  your code clean
 test_files: []

data/app/views/formatted_form/_check_box.html.haml

@@ -1,14 +0,0 @@
-.form_element{:class => "#{field_name}"}
-
-  .value
-    = field
-    = builder.label(method, label_text)
-    
-    - if required
-      %span.required *
-
-    - if error_messages.present?
-      .errors= error_messages
-
-    - if description.present?
-      .description= description

data/app/views/formatted_form/_default_field.html.haml

@@ -1,17 +0,0 @@
-.form_element{:class => "#{field_name}"}
-  .label
-    = builder.label(method, label_text)
-    - if required
-      %span.required *
-
-  .value
-    = before_text
-    = field
-    = after_text
-    
-    - if description.present?
-      .description= description
-      
-    - if error_messages.present?
-      .errors= error_messages
-    

data/app/views/formatted_form/_radio_button.html.haml

@@ -1,17 +0,0 @@
-.form_element{:class => "#{field_name}"}
-  .label
-    = label_text
-    - if required
-      %span.required *
-
-  .value
-    - choices.each do |choice|
-      .option
-        = choice[:field]
-        %label{:for => choice[:label_for]}= choice[:label]
-
-    - if error_messages.present?
-      .errors= error_messages
-
-    - if description.present?
-      .description= description

data/app/views/formatted_form/_submit.html.haml

@@ -1,3 +0,0 @@
-.form_element{:class => "#{field_name}"}
-  = field
-  = after_text

data/app/views/twitter_bootstrap/_check_box.html.haml

@@ -1,18 +0,0 @@
-.clearfix{:class => ('error' if error_messages.present?)}
-
-  .input
-    %ul.inputs-list
-      %li
-        %label
-          = field
-          %span
-            = label_text
-            - if required
-              %span.required *
-            
-        - if error_messages.present?
-          %span.help-inline= error_messages
-        - if description.present?
-          %span.help-block= description
-      
-