forme 1.12.0 → 2.0.0

data/spec/erubi_capture_helper.rb

@@ -0,0 +1,202 @@
+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 'hidden_tags' do
+    erb "<%= form([:foo, :bar], {:action=>'/baz'}, :hidden_tags=>[{'a'=>'b'}]) %>"
+  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)
@@ -631,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
 
@@ -645,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
@@ -805,41 +815,45 @@ 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
+  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
 
-  it "should handle hash" do
+describe "Forme::Form :hidden_tags option " do
+  silence_warnings "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
+  silence_warnings "should handle array" do
     Forme.form({}, :hidden_tags=>[["a ", "b"]]).to_s.must_equal '<form>a b</form>'
   end
 
-  it "should handle string" do
+  silence_warnings "should handle string" do
     Forme.form({}, :hidden_tags=>["a "]).to_s.must_equal '<form>a </form>'
   end
 
-  it "should handle proc return hash" do
+  silence_warnings "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>'
+  silence_warnings "should handle proc return hash when from takes a block" do
+    Forme.form({}, :hidden_tags=>[lambda{|tag| {:a=>'b'}}]){}.to_s.must_equal '<form><input name="a" type="hidden" value="b"/></form>'
+  end
+
+  silence_warnings "should handle proc return tag" do
+    Forme.form({:method=>'post'}, :hidden_tags=>[lambda{|tag| tag.tag(tag.attr[:method])}]).to_s.must_equal '<form method="post"><post></post></form>'
   end
 
-  it "should raise error for unhandled object" do
+  silence_warnings "should raise error for unhandled object" do
     proc{Forme.form({}, :hidden_tags=>[Object.new])}.must_raise Forme::Error
   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
@@ -1056,6 +1070,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,7 +1,6 @@
-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'
 
@@ -9,23 +8,22 @@ begin
     require 'active_pack/gem_version'
   rescue LoadError
   end
-  require 'forme/rails'
+  require_relative '../lib/forme/rails'
 
   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'
-    ActiveSupport::MessageEncryptor.send :prepend, Module.new {
-      def initialize(secret, *signature_key_or_options)
-        secret = secret[0, 32]
-        super
-      end
-    }
+    def (ActiveSupport::MessageEncryptor).new(secret, *signature_key_or_options)
+      obj = allocate
+      obj.send(:initialize, secret[0, 32], *signature_key_or_options)
+      obj
+    end
   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|
+      %w'index inputs_block inputs_block_wrapper nest nest_sep nest_inputs nest_seq hash legend combined hidden_tags noblock noblock_post safe_buffer'.each do |action|
         get action, :controller=>'forme', :action=>action
       end
     end
@@ -194,6 +192,10 @@ END
 END
   end
 
+  def hidden_tags
+    render :inline => "<%= forme([:foo, :bar], {:action=>'/baz'}, :hidden_tags=>[{'a'=>'b'}]) %>"
+  end
+
   def noblock
     render :inline => "<%= forme([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') %>"
   end
@@ -265,6 +267,10 @@ describe "Forme Rails integration" 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
 
+  silence_warnings "#form should support :hidden_tags option" do
+    sin_get('/hidden_tags').must_equal '<form action="/baz"><input name="a" type="hidden" value="b"/></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

data/spec/roda_integration_spec.rb

@@ -1,8 +1,7 @@
-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 File.join(File.dirname(File.expand_path(__FILE__)), 'erb_helper.rb')
+require_relative 'spec_helper'
+require_relative 'sequel_helper'
+require_relative 'erb_helper'
 
-require 'rubygems'
 begin
   require 'roda'
   require 'tilt'
@@ -17,34 +16,42 @@ rescue LoadError
   rescue LoadError
     require 'tilt/erb'
   end
-end
-
-class FormeRodaTest < Roda
-  opts[:check_dynamic_arity] = opts[:check_arity] = :warn
-  
-  if defined?(Roda::RodaVersionNumber) && Roda::RodaVersionNumber >= 30100
-    require 'roda/session_middleware'
-    opts[:sessions_convert_symbols] = true
-    use RodaSessionMiddleware, :secret=>SecureRandom.random_bytes(64), :key=>'rack.session'
-  else
-    use Rack::Session::Cookie, :secret => "__a_very_long_string__"
-  end
-
-  def erb(s, opts={})
-    render(opts.merge(:inline=>s))
+else
+  begin
+    require 'erubi/capture_end'
+    require_relative 'erubi_capture_helper'
+  rescue LoadError
   end
+end
 
-  route do |r|
-    r.get 'use_request_specific_token', :use do |use|
-      render :inline=>"[#{Base64.strict_encode64(send(:csrf_secret))}]<%= form({:method=>:post}, {:use_request_specific_token=>#{use == '1'}}) %>"
+def FormeRodaTest(block=ERB_BLOCK)
+  Class.new(Roda) do
+    opts[:check_dynamic_arity] = opts[:check_arity] = :warn
+    
+    if defined?(Roda::RodaVersionNumber) && Roda::RodaVersionNumber >= 30100
+      require 'roda/session_middleware'
+      opts[:sessions_convert_symbols] = true
+      use RodaSessionMiddleware, :secret=>SecureRandom.random_bytes(64), :key=>'rack.session'
+    else
+      use Rack::Session::Cookie, :secret => "__a_very_long_string__"
     end
-    r.get 'hidden_tags' do |use|
-      render :inline=>"<%= form({:method=>:post}, {:hidden_tags=>[{:foo=>'bar'}]}) %>"
+
+    def erb(s, opts={})
+      render(opts.merge(:inline=>s))
     end
-    r.get 'csrf', :use do |use|
-      render :inline=>"<%= form({:method=>:post}, {:csrf=>#{use == '1'}}) %>"
+
+    route do |r|
+      r.get 'use_request_specific_token', :use do |use|
+        render :inline=>"[#{Base64.strict_encode64(send(:csrf_secret))}]<%= form({:method=>:post}, {:use_request_specific_token=>#{use == '1'}}) %>"
+      end
+      r.get 'hidden_tags2' do |use|
+        render :inline=>"<%= form({:method=>:post}, {:hidden_tags=>[{:foo=>'bar'}]}) %>"
+      end
+      r.get 'csrf', :use do |use|
+        render :inline=>"<%= form({:method=>:post}, {:csrf=>#{use == '1'}}) %>"
+      end
+      instance_exec(r, &block)
     end
-    instance_exec(r, &ERB_BLOCK)
   end
 end
 
@@ -54,7 +61,7 @@ rescue LoadError
   warn "unable to load rack/csrf, skipping roda csrf plugin spec"
 else
 describe "Forme Roda ERB integration with roda forme and csrf plugins" do
-  app = FormeRodaCSRFTest = Class.new(FormeRodaTest)
+  app = FormeRodaCSRFTest = FormeRodaTest()
   app.plugin :csrf
   app.plugin :forme
   
@@ -68,64 +75,89 @@ describe "Forme Roda ERB integration with roda forme and csrf plugins" do
 end
 end
 
+module FormeRouteCsrfSpecs
+  extend Minitest::Spec::DSL
+  include FormeErbSpecs
+
+  it "should have a valid CSRF tag" do
+    output = sin_get('/use_request_specific_token/1')
+    output =~ /\[([^\]]+)\].*?value=\"([^\"]+)\"/
+    secret = $1
+    token = $2
+    app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/1', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal true
+    app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/2', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal false
+  end
+
+  it "should handle the :use_request_specific_token => true option" do
+    output = sin_get('/use_request_specific_token/1')
+    output =~ /\[([^\]]+)\].*?value=\"([^\"]+)\"/
+    secret = $1
+    token = $2
+    app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/1', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal true
+    app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/2', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal false
+  end
+
+  it "should handle the :use_request_specific_token => false option" do
+    output = sin_get('/use_request_specific_token/0')
+    output =~ /\[([^\]]+)\].*?value=\"([^\"]+)\"/
+    secret = $1
+    token = $2
+    app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/0', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal(plugin_opts.empty? ? false : true)
+  end
+
+  silence_warnings "should include :hidden_tags option" do
+    sin_get('/hidden_tags2').must_include 'name="foo" type="hidden" value="bar"'
+  end
+
+  it "should handle the :csrf option" do
+    sin_get('/csrf/1').must_include '<input name="_csrf" type="hidden" value="'
+    sin_get('/csrf/0').wont_include '<input name="_csrf" type="hidden" value="'
+  end
+end
+
 begin
   require 'roda/plugins/route_csrf'
+  require 'roda/plugins/capture_erb'
+  require 'roda/plugins/inject_erb'
 rescue LoadError
-  warn "unable to load roda/plugins/route_csrf, skipping forme_route_csrf plugin spec"
+  warn "unable to load necessary Roda plugins, skipping forme_erubi_capture plugin spec"
 else
+describe "Forme Roda Erubi::CaptureEnd integration with roda forme_route_csrf" do
+  app = FormeRodaTest(ERUBI_CAPTURE_BLOCK)
+  app.plugin :forme_erubi_capture
+  app.plugin :render, :engine_opts=>{'erb'=>{:engine_class=>Erubi::CaptureEndEngine}}
+
+  define_method(:app){app}
+  define_method(:plugin_opts){{}}
+  define_method(:sin_get) do |path|
+    s = String.new
+    app.call(@rack.merge('PATH_INFO'=>path))[2].each{|str| s << str}
+    s.gsub(/\s+/, ' ').strip
+  end
+
+  include FormeRouteCsrfSpecs
+end if defined?(ERUBI_CAPTURE_BLOCK)
+
 [{}, {:require_request_specific_tokens=>false}].each do |plugin_opts|
   describe "Forme Roda ERB integration with roda forme_route_csrf and route_csrf plugin with #{plugin_opts}" do
-    app = Class.new(FormeRodaTest)
+    app = FormeRodaTest()
     app.plugin :forme_route_csrf
     app.plugin :route_csrf, plugin_opts
 
+    define_method(:app){app}
+    define_method(:plugin_opts){plugin_opts}
     define_method(:sin_get) do |path|
       s = String.new
       app.call(@rack.merge('PATH_INFO'=>path))[2].each{|str| s << str}
       s.gsub(/\s+/, ' ').strip
     end
 
-    include FormeErbSpecs
-
-    it "should handle the :hidden_tags option" do
-      output = sin_get('/use_request_specific_token/1')
-      output =~ /\[([^\]]+)\].*?value=\"([^\"]+)\"/
-      secret = $1
-      token = $2
-      app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/1', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal true
-      app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/2', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal false
-    end
-
-    it "should handle the :use_request_specific_token => true option" do
-      output = sin_get('/use_request_specific_token/1')
-      output =~ /\[([^\]]+)\].*?value=\"([^\"]+)\"/
-      secret = $1
-      token = $2
-      app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/1', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal true
-      app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/2', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal false
-    end
-
-    it "should handle the :use_request_specific_token => false option" do
-      output = sin_get('/use_request_specific_token/0')
-      output =~ /\[([^\]]+)\].*?value=\"([^\"]+)\"/
-      secret = $1
-      token = $2
-      app.new({'SCRIPT_NAME'=>'', 'PATH_INFO'=>'/use_request_specific_token/0', 'REQUEST_METHOD'=>'POST', 'rack.session'=>{'_roda_csrf_secret'=>secret}, 'rack.input'=>StringIO.new}).valid_csrf?(:token=>token).must_equal(plugin_opts.empty? ? false : true)
-    end
-
-    it "should handle the :hidden_tags option" do
-      sin_get('/hidden_tags').must_include 'name="foo" type="hidden" value="bar"'
-    end
-
-    it "should handle the :csrf option" do
-      sin_get('/csrf/1').must_include '<input name="_csrf" type="hidden" value="'
-      sin_get('/csrf/0').wont_include '<input name="_csrf" type="hidden" value="'
-    end
+    include FormeRouteCsrfSpecs
   end
 
   describe "Forme Roda ERB Sequel integration with roda forme_set plugin and route_csrf plugin with #{plugin_opts}" do
     before do
-      @app = Class.new(FormeRodaTest)
+      @app = FormeRodaTest()
       @app.plugin :route_csrf, plugin_opts
       @app.plugin(:forme_set, :secret=>'1'*64)
 
@@ -153,7 +185,11 @@ else
       
       @app.route do |r|
         r.get do
-          form(*env[:args], &env[:block]).to_s
+          if @block = env[:block]
+            render(:inline=>'<% form(*env[:args]) do |f| %><%= @block.call(f) %><% end %>')
+          else
+            form(*env[:args])
+          end
         end
         r.post do
           r.params.replace(env[:params])
@@ -173,6 +209,25 @@ else
       end
       meth == :forme_parse ? ret : h
     end
+    
+    it "should have subform work correctly" do
+      @app.route do |r|
+        @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
+
+      body = @app.call('REQUEST_METHOD'=>'GET')[2].join.gsub("\n", ' ').gsub(/  +/, ' ').chomp(' ')
+      body.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 <table><caption>Foo</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="2"/><tr><td class="string"><input id="album_artist_attributes_name" maxlength="255" name="album[artist_attributes][name]" type="text" value="A"/></td></tr></tbody></table> 2 <input type="submit" value="Sub"/></form>3'
+    end
 
     it "#forme_set should include HMAC values if form includes inputs for obj" do
       h = forme_set(@ab, :name=>'Foo')

data/spec/sequel_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sequel'
 
 db_url = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'

data/spec/sequel_i18n_helper.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_helper.rb')
+require_relative 'sequel_helper'
 
 gem 'i18n', '>= 0.7.0'
 require 'i18n'

data/spec/sequel_i18n_plugin_spec.rb

@@ -1,8 +1,8 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 begin
   raise LoadError if defined?(JRUBY_VERSION) && /\A9\.2\./.match(JRUBY_VERSION)
-  require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_i18n_helper.rb')
+  require_relative 'sequel_i18n_helper'
 rescue LoadError
   warn "unable to load i18n, skipping i18n Sequel plugin spec"
 else