forme 1.11.0 → 2.1.0

data/spec/bs3_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
-require 'forme/bs3'
+require_relative 'spec_helper'
+require_relative '../lib/forme/bs3'
 
 describe "Forme Bootstrap3 (BS3) forms" do
   def sel(opts, s)
@@ -99,6 +99,18 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
   end
 
+  it "should consider form's :errors hash based on the :key option" do
+    @f.opts[:errors] = { 'foo' => 'must be present' }
+    @f.input(:text, :key=>"foo").to_s.must_equal "<div class=\"form-group has-error\"><input aria-describedby=\"foo_error_message\" aria-invalid=\"true\" class=\"form-control\" id=\"foo\" name=\"foo\" type=\"text\"/><span class=\"help-block with-errors\">must be present</span></div>"
+  end
+
+  it "should consider form's :errors hash based on the :key option when using namespaces" do
+    @f.opts[:errors] = { 'bar' => { 'foo' => 'must be present' } }
+    @f.with_opts(:namespace=>['bar']) do
+      @f.input(:text, :key=>"foo").to_s.must_equal "<div class=\"form-group has-error\"><input aria-describedby=\"bar_foo_error_message\" aria-invalid=\"true\" class=\"form-control\" id=\"bar_foo\" name=\"bar[foo]\" type=\"text\"/><span class=\"help-block with-errors\">must be present</span></div>"
+    end
+  end
+
   it "should support a with_obj method that changes the object and namespace for the given block" do
     @f.with_obj([:a, :c], 'bar') do
       @f.input(:first).to_s.must_equal '<div class="form-group"><input class="form-control" id="bar_first" name="bar[first]" type="text" value="a"/></div>'
@@ -481,19 +493,19 @@ describe "Forme Bootstrap3 (BS3) forms" do
   end
 
   it "should automatically note the input has errors if :error option is used" do
-    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo').to_s.must_equal '<div class="form-group has-error"><input class="form-control" type="text" value="foo"/><span class="help-block with-errors">Bad Stuff!</span></div>'
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo').to_s.must_equal '<div class="form-group has-error"><input aria-invalid="true" class="form-control" type="text" value="foo"/><span class="help-block with-errors">Bad Stuff!</span></div>'
   end
 
   it "should add an error message after the label" do
-    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :label=>"Foo").to_s.must_equal '<div class="form-group has-error"><label>Foo</label> <input class="form-control" type="text" value="foo"/><span class="help-block with-errors">Bad Stuff!</span></div>'
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :label=>"Foo").to_s.must_equal '<div class="form-group has-error"><label>Foo</label> <input aria-invalid="true" class="form-control" type="text" value="foo"/><span class="help-block with-errors">Bad Stuff!</span></div>'
   end
 
   it "should add to existing :class option if :error option is used" do
-    @f.input(:text, :error=>'Bad Stuff!', :class=>'bar', :value=>'foo').to_s.must_equal '<div class="form-group has-error"><input class="form-control bar" type="text" value="foo"/><span class="help-block with-errors">Bad Stuff!</span></div>'
+    @f.input(:text, :error=>'Bad Stuff!', :class=>'bar', :value=>'foo').to_s.must_equal '<div class="form-group has-error"><input aria-invalid="true" class="form-control bar" type="text" value="foo"/><span class="help-block with-errors">Bad Stuff!</span></div>'
   end
 
   it "should respect :error_attr option for setting the attributes for the error message span" do
-    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :error_attr=>{:class=>'foo'}).to_s.must_equal '<div class="form-group has-error"><input class="form-control" type="text" value="foo"/><span class="foo help-block with-errors">Bad Stuff!</span></div>'
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :error_attr=>{:class=>'foo'}).to_s.must_equal '<div class="form-group has-error"><input aria-invalid="true" class="form-control" type="text" value="foo"/><span class="foo help-block with-errors">Bad Stuff!</span></div>'
   end
 
   it "#open should return an opening tag" do
@@ -527,12 +539,12 @@ describe "Forme Bootstrap3 (BS3) forms" do
   end
 
   it "#tag should accept children as procs" do
-    @f.tag(:div, {:class=>"foo"}, lambda{|t| t.form.tag(:input, :class=>t.attr[:class])}).to_s.must_equal '<div class="foo"><input class="form-control foo" type="text"/></div>'
+    @f.tag(:div, {:class=>"foo"}, lambda{|t| t.tag(:input, :class=>t.attr[:class])}).to_s.must_equal '<div class="foo"><input class="form-control foo" type="text"/></div>'
   end
 
   it "#tag should accept children as methods" do
     o = Object.new
-    def o.foo(t) t.form.tag(:input, :class=>t.attr[:class]) end
+    def o.foo(t) t.tag(:input, :class=>t.attr[:class]) end
     @f.tag(:div, {:class=>"foo"}, o.method(:foo)).to_s.must_equal '<div class="foo"><input class="form-control foo" type="text"/></div>'
   end
 
@@ -624,7 +636,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
   end
 
   it "inputs should have helper displayed inside wrapper, after error" do
-    @f.input(:text, :help=>"List type of foo", :error=>'bad', :wrapper=>:li).to_s.must_equal '<li class="has-error"><input class="form-control" type="text"/><span class="help-block with-errors">bad</span><span class="helper">List type of foo</span></li>'
+    @f.input(:text, :help=>"List type of foo", :error=>'bad', :wrapper=>:li).to_s.must_equal '<li class="has-error"><input aria-invalid="true" class="form-control" type="text"/><span class="help-block with-errors">bad</span><span class="helper">List type of foo</span></li>'
   end
 
   it "inputs should accept a :formatter option to use a custom formatter" do
@@ -661,7 +673,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
   end
 
   it "inputs should accept a :error_handler option to use a custom error_handler" do
-    @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.must_equal '<div class="form-group"><textarea class="form-control" id="foo"></textarea>!!! bar</div>'
+    @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.must_equal '<div class="form-group"><textarea aria-describedby="foo_error_message" aria-invalid="true" class="form-control" id="foo"></textarea>!!! bar</div>'
   end
 
   it "#inputs should accept a :inputs_wrapper option to use a custom inputs_wrapper" do
@@ -679,7 +691,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
   end
 
   it "inputs should accept a :error_handler=>nil option to not use an error_handler" do
-    @f.input(:textarea, :error_handler=>nil, :error=>'bar', :id=>:foo).to_s.must_equal '<div class="form-group"><textarea class="form-control" id="foo"></textarea></div>'
+    @f.input(:textarea, :error_handler=>nil, :error=>'bar', :id=>:foo).to_s.must_equal '<div class="form-group"><textarea aria-invalid="true" class="form-control" id="foo"></textarea></div>'
   end
 
   it "#inputs should accept a :inputs_wrapper=>nil option to not use an inputs_wrapper" do

data/spec/erb_helper.rb

@@ -1,3 +1,5 @@
+require_relative 'shared_erb_specs'
+
 ERB_BLOCK = lambda do |r|
   r.get '' do
     erb <<END
@@ -65,6 +67,29 @@ END
 END
   end
 
+  r.get 'nest_seq_simple' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    @nest = <<END
+  n1
+  <% f.subform(:artist) do %>
+    n2
+    <%= f.input(:name2) %>
+    n3
+  <% end %>
+  n4
+END
+    erb <<END
+0
+<% form(@album, :action=>'/baz') do |f| %>
+  1
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
   r.get 'nest_seq' do
     @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
     @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
@@ -92,6 +117,50 @@ END
 END
   end
 
+  r.get 'grid-block' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    erb <<END
+0
+<% form(@album, {:action=>'/baz'}, :button=>'Sub') do |f| %>
+  1
+  <% f.subform(:artist, :inputs=>[:name], :legend=>'Foo', :grid=>true, :labels=>%w'Name') do %>
+    2
+  <% end %>
+  3
+<% end %>
+4
+END
+  end
+
+  r.get 'grid-noblock' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    erb <<END
+0
+<% form(@album, {:action=>'/baz'}, :button=>'Sub') do |f| %>
+  1
+  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo', :grid=>true, :labels=>%w'Name') %>
+  2
+<% end %>
+3
+END
+  end
+
+  r.get 'grid-noblock-multiple' do
+    @artist = Artist.load(:name=>'A', :id=>2)
+    @artist.associations[:albums] = [Album.load(:name=>'N', :copies_sold=>2, :id=>1)]
+    erb <<END
+0
+<% form(@artist, {:action=>'/baz'}, :button=>'Sub') do |f| %>
+  1
+  <%= f.subform(:albums, :inputs=>[:name, :copies_sold], :legend=>'Foo', :grid=>true, :labels=>%w'Name Copies') %>
+  2
+<% end %>
+3
+END
+  end
+
   r.get 'hash' do
     erb "<% form({:action=>'/baz'}, :obj=>[:foo]) do |f| %> <%= f.input(:first) %> <% end %>"
   end
@@ -127,61 +196,3 @@ END
     erb "<%= form(:action=>'/baz') %>"
   end
 end
-
-module FormeErbSpecs
-  extend Minitest::Spec::DSL
-
-  before do
-    o = Object.new
-    def o.puts(*) end
-    @rack = {'rack.input'=>'', 'REQUEST_METHOD'=>'GET', 'rack.errors'=>o, 'SCRIPT_NAME'=>''}
-  end
-
-  it "#form should add start and end tags and yield Forme::Form instance" do
-    sin_get('/').must_equal '<form action="/baz"> <p>FBB</p> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> <input type="submit" value="Save"/> </form>'
-  end
-
-  it "#form should have inputs work with a block" do
-    sin_get('/inputs_block').must_equal '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend> <input id="last" name="last" type="text" value="bar"/> </fieldset></form>'
-  end
-
-  it "#form should have inputs with fieldset_ol wrapper work with block" do
-    sin_get('/inputs_block_wrapper').must_equal '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend><ol> <input id="last" name="last" type="text" value="bar"/> </ol></fieldset></form>'
-  end
-
-  it "#form should add start and end tags and yield Forme::Form instance" do
-    sin_get('/nest').must_equal '<form action="/baz"> <p>FBB</p> <div> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> </div> </form>'
-  end
-
-  it "#form should correctly handle situation where multiple templates are used with same form object" do
-    sin_get('/nest_sep').must_equal '0 <form action="/baz"> 1 <p>FBB</p> 2 n1 <div> n2 <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> n3 </div> n4 <fieldset class="inputs"><legend>Foo</legend><input id="first" name="first" type="text" value="foo"/><input id="last" name="last" type="text" value="bar"/></fieldset> n5 3 </form>4'
-  end
-
-  it "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
-    sin_get('/nest_seq').sub(%r{<input name="_csrf" type="hidden" value="([^"]+)"/>}, '<input name="_csrf" type="hidden" value="csrf"/>').must_equal '0 <form action="/baz" class="forme album" method="post"><input name="_csrf" type="hidden" value="csrf"/> 1 <input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Foo</legend><label>Name: <input id="album_artist_attributes_name" maxlength="255" name="album[artist_attributes][name]" type="text" value="A"/></label></fieldset> 2 n1 <input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Artist</legend> n2 <label>Name2: <input id="album_artist_attributes_name2" name="album[artist_attributes][name2]" type="text" value="A2"/></label> n3 </fieldset> n4 <input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Bar</legend><label>Name3: <input id="album_artist_attributes_name3" name="album[artist_attributes][name3]" type="text" value="A3"/></label></fieldset> n5 3 </form>4'
-  end
-
-  it "#form should accept two hashes instead of requiring obj as first argument" do
-    sin_get('/hash').must_equal '<form action="/baz"> <input id="first" name="first" type="text" value="foo"/> </form>'
-  end
-
-  it "#form should deal with emitted code" do
-    sin_get('/legend').must_equal '<form action="/baz"> <p>FBB</p> <fieldset class="inputs"><legend>Foo</legend><input id="first" name="first" type="text" value="foo"/><input id="last" name="last" type="text" value="bar"/></fieldset> <p>FBB2</p> </form>'
-  end
-
-  it "#form should work with :inputs, :button, and :legend options" do
-    sin_get('/combined').must_equal '<form action="/baz"><fieldset class="inputs"><legend>123</legend><input id="first" name="first" type="text" value="foo"/></fieldset> <p>FBB</p> <input id="last" name="last" type="text" value="bar"/> <input type="submit" value="xyz"/></form>'
-  end
-
-  it "#form should work without a block" do
-    sin_get('/noblock').must_equal '<form action="/baz"><fieldset class="inputs"><legend>123</legend><input id="first" name="first" type="text" value="foo"/></fieldset><input type="submit" value="xyz"/></form>'
-  end
-
-  it "#form should work without a block and still have hidden tags emitted" do
-    sin_get('/noblock_post').sub(%r{<input name=\"_csrf\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"_csrf\" type=\"hidden\" value=\"csrf\"/>").must_equal '<form method="post"><input name="_csrf" type="hidden" value="csrf"/><input type="submit" value="xyz"/></form>'
-  end
-
-  it "#form with an empty form should work" do
-    sin_get('/noblock_empty').must_equal '<form action="/baz"></form>'
-  end
-end

data/spec/erubi_capture_helper.rb

@@ -0,0 +1,198 @@
+require_relative 'shared_erb_specs'
+
+ERUBI_CAPTURE_BLOCK = lambda do |r|
+  r.get '' do
+    erb <<END
+<%|= form([:foo, :bar], :action=>'/baz') do |f| %>
+  <p>FBB</p>
+  <%= f.input(:first) %>
+  <%= f.input(:last) %>
+  <%= f.button('Save') %>
+<%| end %>
+END
+  end
+
+  r.get 'inputs_block' do
+    erb <<END
+<%|= form([:foo, :bar], :action=>'/baz') do |f| %><%|= f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <%| end %><%| end %>
+END
+  end
+
+  r.get 'inputs_block_wrapper' do
+    erb <<END
+<%|= form([:foo, :bar], {:action=>'/baz'}, :inputs_wrapper=>:fieldset_ol) do |f| %><%|= f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <%| end %><%| end %>
+END
+  end
+
+  r.get 'nest' do
+    erb <<END
+<%|= form([:foo, :bar], :action=>'/baz') do |f| %>
+  <%= f.tag(:p, {}, 'FBB') %>
+  <%|= f.tag(:div) do %>
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+  <%| end %>
+
+<%| end %>
+END
+  end
+
+  r.get 'nest_sep' do
+    @nest = <<END
+  n1
+  <%|= f.tag(:div) do %>
+    n2
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+    n3
+  <%| end %>
+  n4
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  n5
+END
+    erb <<END
+0
+<%|= form([:foo, :bar], :action=>'/baz') do |f| %>
+  1
+  <%= f.tag(:p, {}, 'FBB') %>
+  2
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<%| end %>
+4
+END
+  end
+
+  r.get 'nest_seq_simple' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    @nest = <<END
+  n1
+  <%|= f.subform(:artist) do %>
+    n2
+    <%= f.input(:name2) %>
+    n3
+  <%| end %>
+  n4
+END
+    erb <<END
+0
+<%|= form(@album, :action=>'/baz') do |f| %>
+  1
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<%| end %>
+4
+END
+  end
+
+  r.get 'nest_seq' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    @nest = <<END
+  n1
+  <%|= f.subform(:artist) do %>
+    n2
+    <%= f.input(:name2) %>
+    n3
+  <%| end %>
+  n4
+  <%= f.subform(:artist, :inputs=>[:name3], :legend=>'Bar') %>
+  n5
+END
+    erb <<END
+0
+<%|= form(@album, :action=>'/baz') do |f| %>
+  1
+  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo') %>
+  2
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<%| end %>
+4
+END
+  end
+
+  r.get 'grid-block' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    erb <<END
+0
+<%|= form(@album, {:action=>'/baz'}, :button=>'Sub') do |f| %>
+  1
+  <%|= f.subform(:artist, :inputs=>[:name], :legend=>'Foo', :grid=>true, :labels=>%w'Name') do %>
+    2
+  <%| end %>
+  3
+<%| end %>
+4
+END
+  end
+
+  r.get 'grid-noblock' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    erb <<END
+0
+<%|= form(@album, {:action=>'/baz'}, :button=>'Sub') do |f| %>
+  1
+  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo', :grid=>true, :labels=>%w'Name') %>
+  2
+<%| end %>
+3
+END
+  end
+
+  r.get 'grid-noblock-multiple' do
+    @artist = Artist.load(:name=>'A', :id=>2)
+    @artist.associations[:albums] = [Album.load(:name=>'N', :copies_sold=>2, :id=>1)]
+    erb <<END
+0
+<%|= form(@artist, {:action=>'/baz'}, :button=>'Sub') do |f| %>
+  1
+  <%= f.subform(:albums, :inputs=>[:name, :copies_sold], :legend=>'Foo', :grid=>true, :labels=>%w'Name Copies') %>
+  2
+<%| end %>
+3
+END
+  end
+
+  r.get 'hash' do
+    erb "<%|= form({:action=>'/baz'}, :obj=>[:foo]) do |f| %> <%= f.input(:first) %> <%| end %>"
+  end
+
+  r.get 'legend' do
+    erb <<END
+<%|= form([:foo, :bar], :action=>'/baz') do |f| %>
+  <p>FBB</p>
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  <p>FBB2</p>
+<%| end %>
+END
+  end
+
+  r.get 'combined' do
+    erb <<END
+<%|= form([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') do |f| %>
+  <p>FBB</p>
+  <%= f.input(:last) %>
+<%| end %>
+END
+  end
+
+  r.get 'noblock' do
+    erb "<%= form([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') %>"
+  end
+
+  r.get 'noblock_post' do
+    erb "<%= form({:method=>:post}, :button=>'xyz') %>"
+  end
+
+  r.get 'noblock_empty' do
+    erb "<%= form(:action=>'/baz') %>"
+  end
+end

data/spec/forme_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 describe "Forme plain forms" do
   def sel(opts, s)
@@ -317,6 +317,10 @@ describe "Forme plain forms" do
     @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :select_options=>{:year=>1970..2020}).to_s.must_equal %{<select id="bar" name="foo[year]">#{sel(1970..2020, 2011)}</select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>}
   end
 
+  it "should support :select_options with both values and text for dates when :as=>:select is given" do
+    @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :select_options=>{:year=>[[2011, 'A'], [2012, 'B']]}).to_s.must_equal %{<select id="bar" name="foo[year]"><option selected="selected" value="2011">A</option><option value="2012">B</option></select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>}
+  end
+
   it "should have explicit labeler and trtd wrapper work with multiple select boxes for dates" do
     @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :wrapper=>:trtd, :labeler=>:explicit, :label=>'Baz').to_s.must_equal %{<tr><td><label class="label-before" for="bar">Baz</label></td><td><select id="bar" name="foo[year]">#{sel(1900..2050, 2011)}</select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select></td></tr>}
   end
@@ -627,13 +631,19 @@ describe "Forme plain forms" do
     @f.tag(:textarea, {:name=>:foo}, :bar).to_s.must_equal '<textarea name="foo">bar</textarea>'
   end
 
+  it "#tag should accept a block" do
+    @f.tag(:div){@f.tag(:textarea)}.to_s.must_equal '<div><textarea></textarea></div>'
+    @f.tag(:div, :name=>'a'){@f.tag(:textarea)}.to_s.must_equal '<div name="a"><textarea></textarea></div>'
+    @f.tag(:div, {:name=>'a'}, ["text"]){@f.tag(:textarea)}.to_s.must_equal '<div name="a">text<textarea></textarea></div>'
+  end
+
   it "#tag should accept children as procs" do
-    @f.tag(:div, {:class=>"foo"}, lambda{|t| t.form.tag(:input, :class=>t.attr[:class])}).to_s.must_equal '<div class="foo"><input class="foo"/></div>'
+    @f.tag(:div, {:class=>"foo"}, lambda{|t| t.tag(:input, :class=>t.attr[:class])}).to_s.must_equal '<div class="foo"><input class="foo"/></div>'
   end
 
   it "#tag should accept children as methods" do
     o = Object.new
-    def o.foo(t) t.form.tag(:input, :class=>t.attr[:class]) end
+    def o.foo(t) t.tag(:input, :class=>t.attr[:class]) end
     @f.tag(:div, {:class=>"foo"}, o.method(:foo)).to_s.must_equal '<div class="foo"><input class="foo"/></div>'
   end
 
@@ -641,6 +651,10 @@ describe "Forme plain forms" do
     @f.inputs([:textarea, :text]).to_s.must_equal '<fieldset class="inputs"><textarea></textarea><input type="text"/></fieldset>'
   end
 
+  it "should have an #inputs method for multiple inputs wrapped in a fieldset when using an empty block" do
+    @f.inputs([:textarea, :text]){}.to_s.must_equal '<fieldset class="inputs"><textarea></textarea><input type="text"/></fieldset>'
+  end
+
   it "should have default #inputs method accept an :attr option" do
     @f.inputs([:textarea, :text], :legend=>'Inputs', :attr=>{:class=>'foo', :bar=>'baz'}).to_s.must_equal '<fieldset bar="baz" class="foo inputs"><legend>Inputs</legend><textarea></textarea><input type="text"/></fieldset>'
   end
@@ -801,41 +815,15 @@ describe "Forme plain forms" do
     proc{@f.input(:textarea, :wrapper=>Object.new).to_s}.must_raise(Forme::Error)
     proc{@f.input(:textarea, :formatter=>nil).to_s}.must_raise(Forme::Error)
   end
-end
-
-describe "Forme::Form :hidden_tags option " do
-  before do
-    @f = Forme::Form.new
-  end
-
-  it "should handle hash" do
-    Forme.form({}, :hidden_tags=>[{:a=>'b'}]).to_s.must_equal '<form><input name="a" type="hidden" value="b"/></form>'
-  end
-
-  it "should handle array" do
-    Forme.form({}, :hidden_tags=>[["a ", "b"]]).to_s.must_equal '<form>a b</form>'
-  end
-
-  it "should handle string" do
-    Forme.form({}, :hidden_tags=>["a "]).to_s.must_equal '<form>a </form>'
-  end
-
-  it "should handle proc return hash" do
-    Forme.form({}, :hidden_tags=>[lambda{|tag| {:a=>'b'}}]).to_s.must_equal '<form><input name="a" type="hidden" value="b"/></form>'
-  end
-
-  it "should handle proc return tag" do
-    Forme.form({:method=>'post'}, :hidden_tags=>[lambda{|tag| tag.form._tag(tag.attr[:method])}]).to_s.must_equal '<form method="post"><post></post></form>'
-  end
 
-  it "should raise error for unhandled object" do
-    proc{Forme.form({}, :hidden_tags=>[Object.new])}.must_raise Forme::Error
+  it "should handle :before and :after hook options" do
+    Forme.form({}, :before=>lambda{|f| f.tag(:input, :type=>:hidden, :name=>:a, :value=>'b')}, :after=>lambda{|f| f.tag(:input, :type=>:hidden, :name=>:c, :value=>'d')}){|f| f.tag(:input)}.to_s.must_equal '<form><input name="a" type="hidden" value="b"/><input/><input name="c" type="hidden" value="d"/></form>'
   end
 end
 
 describe "Forme custom" do
   it "formatters can be specified as a proc" do
-    Forme::Form.new(:formatter=>proc{|i| i.form._tag(:textarea, i.opts[:name]=>:name)}).input(:text, :name=>'foo').to_s.must_equal '<textarea foo="name"></textarea>'
+    Forme::Form.new(:formatter=>proc{|i| i.tag(:textarea, i.opts[:name]=>:name)}).input(:text, :name=>'foo').to_s.must_equal '<textarea foo="name"></textarea>'
   end
 
   it "serializers can be specified as a proc" do
@@ -1052,6 +1040,7 @@ describe "Forme built-in custom" do
     Forme::Form.new(:serializer=>:text).button().to_s.must_equal ""
     Forme::Form.new(:serializer=>:text).inputs([[:textarea, {:label=>"Foo", :value=>"Bar"}]], :legend=>'Baz').to_s.must_equal "Baz\n---\nFoo: Bar\n\n"
     Forme::Form.new(:serializer=>:text).tag(:p){|f| f.input(:textarea, :label=>"Foo", :value=>"Bar")}.to_s.must_equal "Foo: Bar\n\n"
+    Forme::Form.new(:serializer=>:text).tag(:p, {}, ['a']).to_s.must_equal "a"
   end
 end
 

data/spec/rails_integration_spec.rb

@@ -1,34 +1,48 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
-require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_helper.rb')
+require_relative 'spec_helper'
+require_relative 'sequel_helper'
 
-require 'rubygems'
 begin
-require 'action_controller/railtie'
-rescue LoadError
-  warn "unable to load rails, skipping rails spec"
-else
-begin
-  require 'active_pack/gem_version'
-rescue LoadError
-end
-require 'forme/rails'
+  require 'action_controller/railtie'
+
+  begin
+    require 'active_pack/gem_version'
+  rescue LoadError
+  end
+  require_relative '../lib/forme/rails'
 
-class FormeRails < Rails::Application
-  routes.append do
-    %w'index inputs_block inputs_block_wrapper nest nest_sep nest_inputs nest_seq hash legend combined noblock noblock_post safe_buffer'.each do |action|
-      get action, :controller=>'forme', :action=>action
+  if Rails.respond_to?(:version) && Rails.version.start_with?('4')
+    # Work around issue in backported openssl environments where
+    # secret is 64 bytes intead of 32 bytes
+    require 'active_support/message_encryptor'
+    def (ActiveSupport::MessageEncryptor).new(secret, *signature_key_or_options)
+      obj = allocate
+      obj.send(:initialize, secret[0, 32], *signature_key_or_options)
+      obj
     end
   end
-  config.active_support.deprecation = :stderr
-  config.middleware.delete(ActionDispatch::HostAuthorization) if defined?(ActionDispatch::HostAuthorization)
-  config.middleware.delete(ActionDispatch::ShowExceptions)
-  config.middleware.delete(Rack::Lock)
-  config.secret_key_base = 'foo'*15
-  config.secret_token = 'secret token'*15 if Rails.respond_to?(:version) && Rails.version < '5.2' 
-  config.eager_load = true
-  initialize!
-end
 
+  class FormeRails < Rails::Application
+    routes.append do
+      %w'index inputs_block inputs_block_wrapper nest nest_sep nest_inputs nest_seq hash legend combined noblock noblock_post safe_buffer'.each do |action|
+        get action, :controller=>'forme', :action=>action
+      end
+    end
+    config.active_support.deprecation = :stderr
+    config.middleware.delete(ActionDispatch::HostAuthorization) if defined?(ActionDispatch::HostAuthorization)
+    config.middleware.delete(ActionDispatch::ShowExceptions)
+    config.middleware.delete(Rack::Lock)
+    config.secret_key_base = 'foo'*15
+    config.secret_token = 'secret token'*15 if Rails.respond_to?(:version) && Rails.version < '5.2' 
+    config.eager_load = true
+    begin
+      initialize!
+    rescue NoMethodError
+      raise LoadError
+    end
+  end
+rescue LoadError
+  warn "unable to load or setup rails, skipping rails spec"
+else
 class FormeController < ActionController::Base
   helper Forme::Rails::ERB