forme 1.11.0 → 2.1.0

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,39 @@ 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 '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 +58,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 +72,85 @@ 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
+
+  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)
 
@@ -149,11 +174,15 @@ else
       forme_set_block = orig_hash.delete(:forme_set_block)
       orig_hash.each{|k,v| hash[k.to_s] = v}
       album = @ab
-      ret, form, data, hmac = nil
+      ret, _, data, hmac = nil
       
       @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 +202,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 <input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="2"/><table><caption>Foo</caption><thead><tr><th>Name</th></tr></thead><tbody><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')
@@ -274,7 +322,7 @@ else
       obj.must_be_same_as @ab
       version.must_be_nil
 
-      h3 = forme_set(@ab, {:name=>'Bar', :forme_set_block=>forme_set_block}, {}, :form_version=>2){|f| f.input(:name)}
+      forme_set(@ab, {:name=>'Bar', :forme_set_block=>forme_set_block}, {}, :form_version=>2){|f| f.input(:name)}
       obj.must_be_same_as @ab
       name.must_equal 'Bar'
       version.must_equal 2

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

data/spec/sequel_plugin_spec.rb

@@ -1,5 +1,5 @@
-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'
 
 describe "Forme Sequel::Model forms" do
   before do
@@ -9,6 +9,15 @@ describe "Forme Sequel::Model forms" do
     @c = Forme::Form.new(@ac)
   end
   
+  it "should handle Forme::Form subclasses" do
+    c = Class.new(Forme::Form) do
+      def form(*)
+        super{|f| f.tag(:input, :type=>:hidden, :name=>'a', :value=>'b')}
+      end
+    end
+    c.new(@ab).form.to_s.must_equal '<form class="forme album" method="post"><input name="a" type="hidden" value="b"/></form>'
+  end
+
   it "should add appropriate attributes by default" do
     @b.form.to_s.must_equal '<form class="forme album" method="post"></form>'
   end
@@ -331,6 +340,11 @@ describe "Forme Sequel::Model forms" do
     @b.input(:foo, :type=>:phone).to_s.must_equal '<label>Foo: <input id="album_foo" name="album[foo]" type="phone" value="bar"/></label>'
   end
 
+  it "should not override an explicit :error setting" do
+    @ab.errors.add(:name, 'tis not valid')
+    @b.input(:name, :error=>nil).to_s.must_equal '<label>Name: <input id="album_name" maxlength="255" name="album[name]" type="text" value="b"/></label>'
+  end
+  
   it "should correctly show an error message if there is one" do
     @ab.errors.add(:name, 'tis not valid')
     @b.input(:name).to_s.must_equal '<label>Name: <input aria-describedby="album_name_error_message" aria-invalid="true" class="error" id="album_name" maxlength="255" name="album[name]" type="text" value="b"/></label><span class="error_message" id="album_name_error_message">tis not valid</span>'
@@ -400,19 +414,19 @@ describe "Forme Sequel::Model forms" do
   end
   
   it "should use allow nested forms with one_to_many associations" do
-    Forme.form(@ab){|f| f.subform(:tracks){f.input(:name)}}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></form>'
+    Forme.form(@ab){|f| f.subform(:tracks){f.input(:name)}}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></form>'
   end
   
   it "should support :obj option for *_to_many associations" do
-    Forme.form(@ab){|f| f.subform(:tracks, :obj=>[Track.new(:name=>'x'), Track.load(:id=>5, :name=>'y')]){f.input(:name)}}.to_s.must_equal '<form class="forme album" method="post"><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="x"/></label></fieldset><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="5"/><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="y"/></label></fieldset></form>'
+    Forme.form(@ab){|f| f.subform(:tracks, :obj=>[Track.new(:name=>'x'), Track.load(:id=>5, :name=>'y')]){f.input(:name)}}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="5"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="x"/></label></fieldset><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="y"/></label></fieldset></form>'
   end
   
   it "should auto number legends when using subform with inputs for *_to_many associations" do
-    Forme.form(@ab){|f| f.subform(:tracks, :inputs=>[:name])}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></form>'
+    Forme.form(@ab){|f| f.subform(:tracks, :inputs=>[:name])}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></form>'
   end
   
   it "should support callable :legend option when using subform with inputs for *_to_many associations" do
-    Forme.form(@ab){|f| f.subform(:tracks, :inputs=>[:name], :legend=>proc{|o, i| "Track #{i} (#{o.name})"})}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Track 0 (m)</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track 1 (n)</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></form>'
+    Forme.form(@ab){|f| f.subform(:tracks, :inputs=>[:name], :legend=>proc{|o, i| "Track #{i} (#{o.name})"})}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/><input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track 0 (m)</legend><label>Name: <input id="album_tracks_attributes_0_name" maxlength="255" name="album[tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><fieldset class="inputs"><legend>Track 1 (n)</legend><label>Name: <input id="album_tracks_attributes_1_name" maxlength="255" name="album[tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></form>'
   end
   
   it "should not add hidden primary key field for nested forms with one_to_many associations with new objects" do
@@ -421,7 +435,7 @@ describe "Forme Sequel::Model forms" do
   end
   
   it "should use allow nested forms with many_to_many associations" do
-    Forme.form(@ab){|f| f.subform(:tags){f.input(:name)}}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tags_attributes_0_id" name="album[tags_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Tag #1</legend><label>Name: <input id="album_tags_attributes_0_name" maxlength="255" name="album[tags_attributes][0][name]" type="text" value="s"/></label></fieldset><input id="album_tags_attributes_1_id" name="album[tags_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Tag #2</legend><label>Name: <input id="album_tags_attributes_1_name" maxlength="255" name="album[tags_attributes][1][name]" type="text" value="t"/></label></fieldset></form>'
+    Forme.form(@ab){|f| f.subform(:tags){f.input(:name)}}.to_s.must_equal '<form class="forme album" method="post"><input id="album_tags_attributes_0_id" name="album[tags_attributes][0][id]" type="hidden" value="1"/><input id="album_tags_attributes_1_id" name="album[tags_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Tag #1</legend><label>Name: <input id="album_tags_attributes_0_name" maxlength="255" name="album[tags_attributes][0][name]" type="text" value="s"/></label></fieldset><fieldset class="inputs"><legend>Tag #2</legend><label>Name: <input id="album_tags_attributes_1_name" maxlength="255" name="album[tags_attributes][1][name]" type="text" value="t"/></label></fieldset></form>'
   end
   
   it "should not add hidden primary key field for nested forms with many_to_many associations with new objects" do
@@ -430,29 +444,32 @@ describe "Forme Sequel::Model forms" do
   end
 
   it "should handle multiple nested levels" do
-    Forme.form(Artist[1]){|f| f.subform(:albums){f.input(:name); f.subform(:tracks){f.input(:name)}}}.to_s.to_s.must_equal '<form class="forme artist" method="post"><input id="artist_albums_attributes_0_id" name="artist[albums_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Album #1</legend><label>Name: <input id="artist_albums_attributes_0_name" maxlength="255" name="artist[albums_attributes][0][name]" type="text" value="b"/></label><input id="artist_albums_attributes_0_tracks_attributes_0_id" name="artist[albums_attributes][0][tracks_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="artist_albums_attributes_0_tracks_attributes_0_name" maxlength="255" name="artist[albums_attributes][0][tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><input id="artist_albums_attributes_0_tracks_attributes_1_id" name="artist[albums_attributes][0][tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="artist_albums_attributes_0_tracks_attributes_1_name" maxlength="255" name="artist[albums_attributes][0][tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></fieldset></form>'
+    Forme.form(Artist[1]){|f| f.subform(:albums){f.input(:name); f.subform(:tracks){f.input(:name)}}}.to_s.to_s.must_equal '<form class="forme artist" method="post"><input id="artist_albums_attributes_0_id" name="artist[albums_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Album #1</legend><label>Name: <input id="artist_albums_attributes_0_name" maxlength="255" name="artist[albums_attributes][0][name]" type="text" value="b"/></label><input id="artist_albums_attributes_0_tracks_attributes_0_id" name="artist[albums_attributes][0][tracks_attributes][0][id]" type="hidden" value="1"/><input id="artist_albums_attributes_0_tracks_attributes_1_id" name="artist[albums_attributes][0][tracks_attributes][1][id]" type="hidden" value="2"/><fieldset class="inputs"><legend>Track #1</legend><label>Name: <input id="artist_albums_attributes_0_tracks_attributes_0_name" maxlength="255" name="artist[albums_attributes][0][tracks_attributes][0][name]" type="text" value="m"/></label></fieldset><fieldset class="inputs"><legend>Track #2</legend><label>Name: <input id="artist_albums_attributes_0_tracks_attributes_1_name" maxlength="255" name="artist[albums_attributes][0][tracks_attributes][1][name]" type="text" value="n"/></label></fieldset></fieldset></form>'
   end
 
   it "should have #subform :grid option create a grid" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><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></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true)}.to_s.must_equal '<form class="forme album" method="post"><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><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></form>'
   end
   
   it "should have #subform :grid option respect :inputs_opts option to pass options to inputs" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :inputs_opts=>{:attr=>{:class=>'foo'}})}.to_s.must_equal '<form class="forme album" method="post"><table class="foo"><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><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></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :inputs_opts=>{:attr=>{:class=>'foo'}})}.to_s.must_equal '<form class="forme album" method="post"><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><table class="foo"><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><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></form>'
   end
   
   it "should have #subform :grid option handle :legend and :labels options" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>'Foo', :labels=>%w'Bar')}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Foo</caption><thead><tr><th>Bar</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><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></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>'Foo', :labels=>%w'Bar')}.to_s.must_equal '<form class="forme album" method="post"><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><table><caption>Foo</caption><thead><tr><th>Bar</th></tr></thead><tbody><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></form>'
   end
   
   it "should have #subform :grid option handle :legend and :labels nil values" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>nil, :labels=>nil)}.to_s.must_equal '<form class="forme album" method="post"><table><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><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></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>nil, :labels=>nil)}.to_s.must_equal '<form class="forme album" method="post"><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><table><tbody><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></form>'
   end
 
   it "should have #subform :grid option handle :skip_primary_key option" do
     Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :skip_primary_key=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><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></form>'
   end
   
+  it "should handle non-Sequel forms with Sequel inputs" do
+    Forme.form{|f| f.input(:name, :obj=>@ab).to_s.must_equal '<label>Name: <input id="name" maxlength="255" name="name" type="text" value="b"/></label>'}
+  end
 end
 
 describe "Forme Sequel plugin default input types based on column names" do

data/spec/sequel_set_plugin_spec.rb

@@ -1,5 +1,5 @@
-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'
 
 describe "Sequel forme_set plugin" do
   before do
@@ -222,4 +222,11 @@ describe "Sequel forme_set plugin" do
     @ab.forme_validations[:name] = [:bar, []]
     proc{@ab.valid?}.must_raise Sequel::Plugins::Forme::Error
   end
+
+  it "should handle frozen instances as form inputs" do
+    @ab.freeze
+    @ab.forme_inputs.must_equal({})
+    @ab.forme_validations.must_equal({})
+    @f.input(:name).must_equal '<label>Name: <input id="album_name" maxlength="255" name="album[name]" type="text"/></label>'
+  end
 end

data/spec/shared_erb_specs.rb

@@ -0,0 +1,71 @@
+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').sub(/ 4\z/, '4').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_simple').sub(/ 4\z/, '4').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 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 3 </form>4'
+
+    sin_get('/nest_seq').sub(/ 4\z/, '4').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 correctly handle subform with :grid option with block" do
+    sin_get('/grid-block').sub(/ 4\z/, '4').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"/><table><caption>Foo</caption><thead><tr><th>Name</th></tr></thead><tbody><tr><td class="string"><input id="album_artist_attributes_name" maxlength="255" name="album[artist_attributes][name]" type="text" value="A"/></td> 2 </tr></tbody></table> 3 <input type="submit" value="Sub"/></form>4'
+  end
+
+  it "#form should correctly handle subform with :grid option without block" do
+    sin_get('/grid-noblock').sub(/ 3\z/, '3').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"/><table><caption>Foo</caption><thead><tr><th>Name</th></tr></thead><tbody><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 "#form should correctly handle subform with :grid option without block" do
+    sin_get('/grid-noblock-multiple').sub(/ 3\z/, '3').sub(%r{<input name="_csrf" type="hidden" value="([^"]+)"/>}, '<input name="_csrf" type="hidden" value="csrf"/>').must_equal '0 <form action="/baz" class="forme artist" method="post"><input name="_csrf" type="hidden" value="csrf"/> 1 <input id="artist_albums_attributes_0_id" name="artist[albums_attributes][0][id]" type="hidden" value="1"/><table><caption>Foo</caption><thead><tr><th>Name</th><th>Copies</th></tr></thead><tbody><tr><td class="string"><input id="artist_albums_attributes_0_name" maxlength="255" name="artist[albums_attributes][0][name]" type="text" value="N"/></td><td class="integer"><input id="artist_albums_attributes_0_copies_sold" name="artist[albums_attributes][0][copies_sold]" type="number" value="2"/></td></tr></tbody></table> 2 <input type="submit" value="Sub"/></form>3'
+  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/sinatra_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 'sinatra/base'
 require 'rack/csrf'
@@ -19,9 +18,9 @@ rescue LoadError
     require 'erb'
   end
 end
-require 'forme/sinatra'
+require_relative '../lib/forme/erb'
 class FormeSinatraTest < Sinatra::Base
-  helpers(Forme::Sinatra::ERB)
+  helpers(Forme::ERB::Helper)
   disable :show_exceptions
   enable :raise_errors
   enable :sessions

data/spec/spec_helper.rb

@@ -1,18 +1,31 @@
 $:.unshift(File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib'))
 
-if ENV['WARNING']
-  require 'warning'
-  Warning.ignore([:missing_ivar, :not_reached])
-end
-
 if ENV['COVERAGE']
-  require File.join(File.dirname(File.expand_path(__FILE__)), "forme_coverage")
+  require_relative 'forme_coverage'
   SimpleCov.forme_coverage
 end
 
-require 'forme'
+require_relative '../lib/forme'
 
-require 'rubygems'
 ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
 gem 'minitest'
 require 'minitest/global_expectations/autorun'
+
+module Minitest::Spec::DSL
+  def silence_warnings(name, &block)
+    it(name) do
+      silence_warnings do
+        instance_exec(&block)
+      end
+    end
+  end
+end
+
+class Minitest::Spec
+  def silence_warnings
+    verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = verbose
+  end
+end