formatted_form 2.0.4 → 2.1.0

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,27 @@
+class User
+  
+  include ActiveModel::Validations
+  
+  attr_accessor :name, :bio, :gender, :single, :colors, 
+                :is_awesome, :is_terrible, :income, :extra, :exception
+  
+  def to_key
+    nil
+  end
+  
+  def persisted?
+    false
+  end
+  
+end
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  
+  def test
+    @user = User.new
+    @user.errors.add(:exception, 'terrible error')
+    @user.errors.add(:is_terrible, 'not checked')
+  end
+  
 end

data/test/dummy/app/views/application/test.html.erb

@@ -0,0 +1,98 @@
+<h3> Vertical (default) </h3>
+<pre>
+&lt;%= formatted_form_for @user, :url =&gt; '' do |form| %&gt;
+  &lt;%= form.text_field   :name, :help_block =&gt; 'Help Block' %&gt;
+  &lt;%= form.text_area    :bio, :rows =&gt; 3 %&gt;
+  &lt;%= form.select       :gender, ['male', 'female'] %&gt;
+  &lt;%= form.radio_button :single, ['yes', 'no'] %&gt;
+  &lt;%= form.check_box    :colors, {:inline =&gt; true}, ['red', 'green'] %&gt;
+  &lt;%= form.check_box    :is_awesome %&gt;
+  &lt;%= form.check_box    :is_terrible %&gt;
+  &lt;%= form.text_field   :exception %&gt;
+  &lt;%= form.text_field   :income, :prepend =&gt; '$', :append =&gt; '.00' %&gt;
+  &lt;%= form.text_field   :extra, 
+    :prepend_html =&gt; '&lt;button class="btn"&gt;Action&lt;/button&gt;',
+    :append_html  =&gt; '&lt;button class="btn"&gt;Action&lt;/button&gt;'
+  %&gt;
+  &lt;%= form.submit :class =&gt; 'btn' %&gt;
+&lt;% end %&gt;
+</pre>
+
+<%= formatted_form_for @user, :url => '' do |form| %>
+  <%= form.text_field   :name, :help_block => 'Help Block' %>
+  <%= form.text_area    :bio, :rows => 3 %>
+  <%= form.select       :gender, ['male', 'female'] %>
+  <%= form.radio_button :single, ['yes', 'no'] %>
+  <%= form.check_box    :colors, {:inline => true}, ['red', 'green'] %>
+  <%= form.check_box    :is_awesome %>
+  <%= form.check_box    :is_terrible %>
+  <%= form.text_field   :exception %>
+  <%= form.text_field   :income, :prepend => '$', :append => '.00' %>
+  <%= form.text_field   :extra, 
+    :prepend_html => '<button class="btn">Action</button>',
+    :append_html  => '<button class="btn">Action</button>'
+  %>
+  <%= form.submit :class => 'btn' %>
+<% end %>
+
+<h3> Horizontal </h3>
+<pre>
+  &lt;%= formatted_form_for :user, :type => :horizontal do |form| %&gt;
+    # ... same as above
+    &lt;div class="form-actions"&gt;
+      &lt;%= form.submit :class =&gt; 'btn' %&gt;
+    &lt;/div&gt;
+  &lt;% end %&gt;
+</pre>
+
+<%= formatted_form_for @user, :url => '', :type => :horizontal do |form| %>
+  <%= form.text_field   :name, :help_block => 'Help Block' %>
+  <%= form.text_area    :bio, :rows => 3 %>
+  <%= form.select       :gender, ['male', 'female'] %>
+  <%= form.radio_button :single, ['yes', 'no'] %>
+  <%= form.check_box    :colors, {:inline => true}, ['red', 'green'] %>
+  <%= form.check_box    :is_awesome %>
+  <%= form.check_box    :is_terrible %>
+  <%= form.text_field   :exception %>
+  <%= form.text_field   :income, :prepend => '$', :append => '.00' %>
+  <%= form.text_field   :extra, 
+    :prepend_html => '<button class="btn">Action</button>',
+    :append_html  => '<button class="btn">Action</button>'
+  %>
+  <div class="form-actions">
+    <%= form.submit :class => 'btn' %>
+  </div>
+<% end %>
+
+<h3> Inline </h3>
+<pre>
+  &lt;%= formatted_form_for @user, :url =&gt; '', :type =&gt; :inline do |form| %&gt;
+    &lt;%= form.text_field   :name, :label =&gt; false, :placeholder =&gt; 'Name' %&gt;
+    &lt;%= form.select       :gender, ['male', 'female'] %&gt;
+    &lt;%= form.check_box    :colors, {}, ['red', 'green'] %&gt;
+    &lt;%= form.submit :class =&gt; 'btn' %&gt;
+  &lt;% end %&gt;
+</pre>
+<%= formatted_form_for @user, :url => '', :type => :inline do |form| %>
+  <%= form.text_field   :name, :label => false, :placeholder => 'Name' %>
+  <%= form.select       :gender, ['male', 'female'] %>
+  <%= form.check_box    :colors, {}, ['red', 'green'] %>
+  <%= form.submit :class => 'btn' %>
+<% end %>
+
+<h3>Search</h3>
+<pre>
+  &lt;%= formatted_form_for @user, :url =&gt; '', :type =&gt; :search do |form| %&gt;
+    &lt;%= form.text_field   :name %&gt;
+    &lt;%= form.text_field   :name, :label =&gt; false, :placeholder =&gt; 'Search by Name',
+      :prepend      =&gt; '@',
+      :append_html  =&gt; '&lt;button type="submit" class="btn"&gt;Search&lt;/button&gt;' %&gt;
+  &lt;% end %&gt;
+</pre>
+
+<%= formatted_form_for @user, :url => '', :type => :search do |form| %>
+  <%= form.text_field   :name %>
+  <%= form.text_field   :name, :label => false, :placeholder => 'Search by Name',
+    :prepend      => '@',
+    :append_html  => '<button type="submit" class="btn">Search</button>' %>
+<% end %>

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <title>FormattedForm Demo</title>
+  <%= stylesheet_link_tag    "application", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-
-<%= yield %>
+  
+<div class="container">
+  <%= yield %>
+</div>
 
 </body>
 </html>

data/test/dummy/config/routes.rb

@@ -1,4 +1,7 @@
 Dummy::Application.routes.draw do
+  
+  root :to => 'application#test'
+  
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/test/form_builder_test.rb

@@ -37,7 +37,7 @@ class FormBuilderTest < ActionView::TestCase
   # -- Text Field -----------------------------------------------------------
   def test_text_field
     with_text_field :name
-    assert_select "div[class='control-group cg-name']" do
+    assert_select "div[class='control-group']" 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]']"
@@ -47,7 +47,7 @@ class FormBuilderTest < ActionView::TestCase
   
   def test_text_field_prepend_append
     with_text_field :twitter, :prepend => '@', :append => '!'
-    assert_select "div[class='control-group cg-twitter']" do
+    assert_select "div[class='control-group']" do
       assert_select "label[for='user_twitter']", 'Twitter'
       assert_select "div[class='controls']" do
         assert_select "div[class='input-prepend input-append']" do
@@ -61,7 +61,7 @@ class FormBuilderTest < ActionView::TestCase
   
   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 "div[class='control-group']" do
       assert_select "label[for='user_twitter']", 'Twitter'
       assert_select "div[class='controls']" do
         assert_select "div[class='input-prepend input-append']" do
@@ -75,7 +75,7 @@ class FormBuilderTest < ActionView::TestCase
   
   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='control-group']" 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'
@@ -83,13 +83,23 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
   
+  def test_text_field_with_help_inline
+    with_text_field :name, :help_inline => 'Help'
+    assert_select "div[class='control-group']" do
+      assert_select "div[class='controls']" do
+        assert_select "input[type='text'][id='user_name'][name='user[name]']"
+        assert_select "span[class='help-inline']", '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='control-group 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"
+        assert_select "span[class='help-block']", "can&#x27;t be blank"
       end
     end
   end
@@ -104,47 +114,36 @@ class FormBuilderTest < ActionView::TestCase
   
   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 "div[class='control-group']", 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 "div[class='control-group']", 0
     assert_select "label[for='user_name']", 0
     assert_select "input[builder='false']", 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
+    with_radio_button :role, ['admin', 'regular']
+    assert_select "div[class='control-group']" do
+      assert_select "div[class='control-label']", 'Role'
       assert_select "div[class='controls']" do
-        assert_select "input[type='radio'][id='user_role_admin'][name='user[role]'][value='admin']"
+        assert_select "label" do
+          assert_select "input[type='radio'][id='user_role_admin'][name='user[role]'][value='admin']"
+        end
+        assert_select "label" do
+          assert_select "input[type='radio'][id='user_role_regular'][name='user[role]'][value='regular']"
+        end
       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
+    with_radio_button :role, ['admin', 'regular'], :label => 'Access'
+    assert_select "div[class='control-label']", 'Access'
   end
   
   def test_radio_button_with_choices_tuples
@@ -158,7 +157,7 @@ class FormBuilderTest < ActionView::TestCase
   end
   
   def test_radio_button_inline
-    with_radio_button :role, ['admin', 'regular'], :class => 'inline'
+    with_radio_button :role, ['admin', 'regular'], :inline => true
     assert_select "label[class='radio inline']", 'admin' do
       assert_select "input[type='radio'][id='user_role_admin'][name='user[role]'][value='admin']"
     end
@@ -167,22 +166,19 @@ class FormBuilderTest < ActionView::TestCase
   # -- 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='control-group']" do
       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']"
+        assert_select "label[class='checkbox']" do
+          assert_select "input[type='checkbox'][id='user_colors'][name='user[colors]'][value='yes']"
+        end
       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
+    assert_select "label", 'Kolors'
   end
   
   def test_check_box_with_choices_array
@@ -210,7 +206,7 @@ class FormBuilderTest < ActionView::TestCase
   end
   
   def test_check_box_inline
-    with_check_box :colors, {:class => 'inline'}, ['red', 'green']
+    with_check_box :colors, {:inline => true}, ['red', 'green']
     assert_select "label[class='checkbox inline']" do
       assert_select "input[type='checkbox'][id='user_colors_red'][name='user[colors][]']"
     end
@@ -253,7 +249,7 @@ class FormBuilderTest < ActionView::TestCase
   # -- Submit ---------------------------------------------------------------
   def test_submit
     with_submit
-    assert_select "input[name=commit][value='Create User'][class='btn btn-primary']"
+    assert_select "input[name=commit][value='Create User']"
   end
   
   def test_submit_with_label
@@ -261,11 +257,6 @@ class FormBuilderTest < ActionView::TestCase
     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']
@@ -370,30 +361,4 @@ class FormBuilderTest < ActionView::TestCase
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatted_form
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,7 +80,12 @@ files:
 - 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/_choices_block.html.erb
+- app/views/formatted_form/templates/_choices_inline.html.erb
 - app/views/formatted_form/templates/_field.html.erb
+- app/views/formatted_form/templates/_field_block.html.erb
+- app/views/formatted_form/templates/_field_inline.html.erb
+- app/views/formatted_form/templates/_label.html.erb
 - formatted_form.gemspec
 - lib/formatted_form.rb
 - lib/formatted_form/engine.rb
@@ -90,10 +95,12 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/bootstrap.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/application/test.html.erb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -134,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1628412368511617234
+      hash: -2131357332028730939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: