forme 1.9.0 → 2.0.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,26 +16,42 @@ rescue LoadError
   rescue LoadError
     require 'tilt/erb'
   end
-end
-
-class FormeRodaTest < Roda
-  use Rack::Session::Cookie, :secret => "__a_very_long_string__"
-
-  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
 
@@ -46,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
   
@@ -60,58 +75,454 @@ 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
+    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 = FormeRodaTest()
+      @app.plugin :route_csrf, plugin_opts
+      @app.plugin(:forme_set, :secret=>'1'*64)
+
+      @ab = Album.new
+    end
+
+    def forme_parse(*args, &block)
+      _forme_set(:forme_parse, *args, &block)
+    end
+
+    def forme_set(*args, &block)
+      _forme_set(:forme_set, *args, &block)
+    end
+
+    def forme_call(params)
+      @app.call('REQUEST_METHOD'=>'POST', 'rack.input'=>StringIO.new, :params=>params)
+    end
+
+    def _forme_set(meth, obj, orig_hash, *form_args, &block)
+      hash = {}
+      forme_set_block = orig_hash.delete(:forme_set_block)
+      orig_hash.each{|k,v| hash[k.to_s] = v}
+      album = @ab
+      ret, _, data, hmac = nil
+      
+      @app.route do |r|
+        r.get do
+          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])
+          ret = send(meth, album, &forme_set_block)
+          nil
+        end
+      end
+      body = @app.call('REQUEST_METHOD'=>'GET', :args=>[album, *form_args], :block=>block)[2].join
+      body =~ %r|<input name="_csrf" type="hidden" value="([^"]+)"/>.*<input name="_forme_set_data" type="hidden" value="([^"]+)"/><input name="_forme_set_data_hmac" type="hidden" value="([^"]+)"/>|n
+      csrf = $1
+      data = $2
+      hmac = $3
+      data.gsub!("&quot;", '"') if data
+      h = {"album"=>hash,  "_forme_set_data"=>data, "_forme_set_data_hmac"=>hmac, "_csrf"=>csrf}
+      if data && hmac
+        forme_call(h)
+      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')
+      proc{forme_call(h)}.must_raise Roda::RodaPlugins::FormeSet::Error
+      @ab.name.must_be_nil
+      @ab.copies_sold.must_be_nil
+
+      h = forme_set(@ab, :name=>'Foo'){|f| f.input(:name)}
+      hmac = h.delete("_forme_set_data_hmac")
+      proc{forme_call(h)}.must_raise Roda::RodaPlugins::FormeSet::Error
+      proc{forme_call(h.merge("_forme_set_data_hmac"=>hmac+'1'))}.must_raise Roda::RodaPlugins::FormeSet::Error
+      data = h["_forme_set_data"]
+      data.sub!(/"csrf":\["_csrf","./, "\"csrf\":[\"_csrf\",\"|")
+      hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA512.new, '1'*64, data)
+      proc{forme_call(h.merge("_forme_set_data_hmac"=>hmac))}.must_raise Roda::RodaPlugins::FormeSet::Error
+      @ab.name.must_equal 'Foo'
+      @ab.copies_sold.must_be_nil
 
-    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
+      forme_set(@ab, :copies_sold=>100){|f| f.input(:name)}
+      @ab.name.must_be_nil
+      @ab.copies_sold.must_be_nil
     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
+    it "#forme_set should handle custom form namespaces" do
+      forme_set(@ab, {"album"=>{"name"=>'Foo', 'copies_sold'=>'100'}}, {}, :namespace=>'album'){|f| f.input(:name); f.input(:copies_sold)}
+      @ab.name.must_equal 'Foo'
+      @ab.copies_sold.must_equal 100
+
+      proc{forme_set(@ab, {"a"=>{"name"=>'Foo'}}, {}, :namespace=>'album'){|f| f.input(:name); f.input(:copies_sold)}}.must_raise Roda::RodaPlugins::FormeSet::Error
     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)
+    it "#forme_set should call plugin block if there is an error with the form submission hmac not matching data" do
+      @app.plugin :forme_set do |error_type, _|
+        request.on{error_type.to_s}
+      end
+
+      h = forme_set(@ab, :name=>'Foo')
+      forme_call(h)[2].must_equal ['missing_data']
+
+      h = forme_set(@ab, :name=>'Foo'){|f| f.input(:name)}
+      hmac = h.delete("_forme_set_data_hmac")
+      forme_call(h)[2].must_equal ['missing_hmac']
+
+      forme_call(h.merge("_forme_set_data_hmac"=>hmac+'1'))[2].must_equal ['hmac_mismatch']
+
+      data = h["_forme_set_data"]
+      data.sub!(/"csrf":\["_csrf","./, "\"csrf\":[\"_csrf\",\"|")
+      hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA512.new, '1'*64, data)
+      forme_call(h.merge("_forme_set_data_hmac"=>hmac))[2].must_equal ['csrf_mismatch']
+
+      h = forme_set(@ab, :name=>'Foo')
+      h.delete('album')
+      forme_call(h)[2].must_equal ['missing_namespace']
     end
 
-    it "should handle the :hidden_tags option" do
-      sin_get('/hidden_tags').must_include 'name="foo" type="hidden" value="bar"'
+    it "#forme_set should raise if plugin block does not raise or throw" do
+      @app.plugin :forme_set do |_, obj|
+        obj
+      end
+      h = forme_set(@ab, :name=>'Foo'){|f| f.input(:name)}
+      h.delete("_forme_set_data_hmac")
+      proc{forme_call(h)}.must_raise Roda::RodaPlugins::FormeSet::Error
     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="'
+    it "#forme_set should only set values in the form" do
+      forme_set(@ab, :name=>'Foo')
+      @ab.name.must_be_nil
+
+      forme_set(@ab, :name=>'Foo'){|f| f.input(:name)}
+      @ab.name.must_equal 'Foo'
+
+      forme_set(@ab, 'copies_sold'=>'1'){|f| f.input(:name)}
+      @ab.name.must_be_nil
+      @ab.copies_sold.must_be_nil
+
+      forme_set(@ab, 'name'=>'Bar', 'copies_sold'=>'1'){|f| f.input(:name); f.input(:copies_sold)}
+      @ab.name.must_equal 'Bar'
+      @ab.copies_sold.must_equal 1
+    end
+
+    it "#forme_set should handle form_versions" do
+      h = forme_set(@ab, {:name=>'Foo'}){|f| f.input(:name)}
+      @ab.name.must_equal 'Foo'
+
+      obj = nil
+      version = nil
+      name = nil
+      forme_set_block = proc do |v, o|
+        obj = o
+        name = o.name
+        version = v
+      end
+      h2 = forme_set(@ab, {:name=>'Foo', :forme_set_block=>forme_set_block}, {}, :form_version=>1){|f| f.input(:name)}
+      obj.must_be_same_as @ab
+      name.must_equal 'Foo'
+      version.must_equal 1
+
+      forme_call(h)
+      obj.must_be_same_as @ab
+      version.must_be_nil
+
+      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
+
+      h['album']['name'] = 'Baz'
+      forme_call(h)
+      obj.must_be_same_as @ab
+      name.must_equal 'Baz'
+      version.must_be_nil
+
+      forme_call(h2)
+      obj.must_be_same_as @ab
+      version.must_equal 1
+    end
+
+    it "#forme_set should work for forms without blocks" do
+      forme_set(@ab, {:name=>'Foo'}, {}, :inputs=>[:name])
+      @ab.name.must_equal 'Foo'
+    end
+
+    it "#forme_set should handle different ways to specify parameter names" do
+      [{:attr=>{:name=>'foo'}}, {:attr=>{'name'=>:foo}}, {:name=>'foo'}, {:name=>'bar[foo]'}, {:key=>:foo}].each do |opts|
+        forme_set(@ab, name=>'Foo'){|f| f.input(:name, opts)}
+        @ab.name.must_be_nil
+
+        forme_set(@ab, 'foo'=>'Foo'){|f| f.input(:name, opts)}
+        @ab.name.must_equal 'Foo'
+      end
+    end
+
+    it "#forme_set should ignore values where key is explicitly set to nil" do
+      forme_set(@ab, :name=>'Foo'){|f| f.input(:name, :key=>nil)}
+      @ab.forme_set(:name=>'Foo')
+      @ab.name.must_be_nil
+      @ab.forme_set(nil=>'Foo')
+      @ab.name.must_be_nil
+    end
+    
+    it "#forme_set should skip inputs with disabled/readonly formatter set on input" do
+      [:disabled, :readonly, ::Forme::Formatter::Disabled, ::Forme::Formatter::ReadOnly].each do |formatter|
+        forme_set(@ab, :name=>'Foo'){|f| f.input(:name, :formatter=>formatter)}
+        @ab.name.must_be_nil
+      end
+
+      forme_set(@ab, :name=>'Foo'){|f| f.input(:name, :formatter=>:default)}
+      @ab.name.must_equal 'Foo'
+    end
+    
+    it "#forme_set should skip inputs with disabled/readonly formatter set on Form" do
+      [:disabled, :readonly, ::Forme::Formatter::Disabled, ::Forme::Formatter::ReadOnly].each do |formatter|
+        forme_set(@ab, {:name=>'Foo'}, {}, :formatter=>:disabled){|f| f.input(:name)}
+        @ab.name.must_be_nil
+      end
+
+      forme_set(@ab, {:name=>'Foo'}, {}, :formatter=>:default){|f| f.input(:name)}
+      @ab.name.must_equal 'Foo'
+    end
+    
+    it "#forme_set should skip inputs with disabled/readonly formatter set using with_opts" do
+      [:disabled, :readonly, ::Forme::Formatter::Disabled, ::Forme::Formatter::ReadOnly].each do |formatter|
+        forme_set(@ab, :name=>'Foo'){|f| f.with_opts(:formatter=>formatter){f.input(:name)}}
+        @ab.name.must_be_nil
+      end
+
+      forme_set(@ab, :name=>'Foo'){|f| f.with_opts(:formatter=>:default){f.input(:name)}}
+      @ab.name.must_equal 'Foo'
+    end
+
+    it "#forme_set should prefer input formatter to with_opts formatter" do
+      forme_set(@ab, :name=>'Foo'){|f| f.with_opts(:formatter=>:default){f.input(:name, :formatter=>:readonly)}}
+      @ab.name.must_be_nil
+
+      forme_set(@ab, :name=>'Foo'){|f| f.with_opts(:formatter=>:readonly){f.input(:name, :formatter=>:default)}}
+      @ab.name.must_equal 'Foo'
+    end
+
+    it "#forme_set should prefer with_opts formatter to form formatter" do
+      forme_set(@ab, {:name=>'Foo'}, {}, :formatter=>:default){|f| f.with_opts(:formatter=>:readonly){f.input(:name)}}
+      @ab.name.must_be_nil
+
+      forme_set(@ab, {:name=>'Foo'}, {}, :formatter=>:readonly){|f| f.with_opts(:formatter=>:default){f.input(:name)}}
+      @ab.name.must_equal 'Foo'
+    end
+    
+    it "#forme_set should handle setting values for associated objects" do
+      forme_set(@ab, :artist_id=>'1')
+      @ab.artist_id.must_be_nil
+
+      forme_set(@ab, :artist_id=>'1'){|f| f.input(:artist)}
+      @ab.artist_id.must_equal 1
+
+      forme_set(@ab, 'tag_pks'=>%w'1 2'){|f| f.input(:artist)}
+      @ab.artist_id.must_be_nil
+      @ab.tag_pks.must_equal []
+
+      forme_set(@ab, 'artist_id'=>'1', 'tag_pks'=>%w'1 2'){|f| f.input(:artist); f.input(:tags)}
+      @ab.artist_id.must_equal 1
+      @ab.tag_pks.must_equal [1, 2]
+    end
+    
+    it "#forme_set should handle validations for filtered associations" do
+      [
+        [{:dataset=>proc{|ds| ds.exclude(:id=>1)}},
+         {:dataset=>proc{|ds| ds.exclude(:id=>1)}}],
+        [{:options=>Artist.exclude(:id=>1).select_order_map([:name, :id])},
+         {:options=>Tag.exclude(:id=>1).select_order_map(:id), :name=>'tag_pks[]'}],
+        [{:options=>Artist.exclude(:id=>1).all, :text_method=>:name, :value_method=>:id},
+         {:options=>Tag.exclude(:id=>1).all, :text_method=>:name, :value_method=>:id}],
+      ].each do |artist_opts, tag_opts|
+        @ab.forme_validations.clear
+        forme_set(@ab, 'artist_id'=>'1', 'tag_pks'=>%w'1 2'){|f| f.input(:artist, artist_opts); f.input(:tags, tag_opts)}
+        @ab.artist_id.must_equal 1
+        @ab.tag_pks.must_equal [1, 2]
+        @ab.valid?.must_equal false
+        @ab.errors[:artist_id].must_equal ['invalid value submitted']
+        @ab.errors[:tag_pks].must_equal ['invalid value submitted']
+
+        @ab.forme_validations.clear
+        forme_set(@ab, 'artist_id'=>'1', 'tag_pks'=>%w'2'){|f| f.input(:artist, artist_opts); f.input(:tags, tag_opts)}
+        @ab.forme_set('artist_id'=>'1', 'tag_pks'=>['2'])
+        @ab.artist_id.must_equal 1
+        @ab.tag_pks.must_equal [2]
+        @ab.valid?.must_equal false
+        @ab.errors[:artist_id].must_equal ['invalid value submitted']
+        @ab.errors[:tag_pks].must_be_nil
+
+        @ab.forme_validations.clear
+        forme_set(@ab, 'artist_id'=>'2', 'tag_pks'=>%w'2'){|f| f.input(:artist, artist_opts); f.input(:tags, tag_opts)}
+        @ab.valid?.must_equal true
+      end
+    end
+
+    it "#forme_set should not require associated values for many_to_one association with select boxes" do
+      forme_set(@ab, {}){|f| f.input(:artist)}
+      @ab.valid?.must_equal true
+
+      forme_set(@ab, {'artist_id'=>nil}){|f| f.input(:artist)}
+      @ab.valid?.must_equal true
+
+      forme_set(@ab, {'artist_id'=>''}){|f| f.input(:artist)}
+      @ab.valid?.must_equal true
+    end
+
+    it "#forme_set should not require associated values for many_to_one association with radio buttons" do
+      forme_set(@ab, {}){|f| f.input(:artist, :as=>:radio)}
+      @ab.valid?.must_equal true
+    end
+
+    it "#forme_set should require associated values for many_to_one association with select boxes when :required is used" do
+      forme_set(@ab, {}){|f| f.input(:artist, :required=>true)}
+      @ab.valid?.must_equal false
+      @ab.errors[:artist_id].must_equal ['invalid value submitted']
+    end
+
+    it "#forme_set should require associated values for many_to_one association with radio buttons when :required is used" do
+      forme_set(@ab, {}){|f| f.input(:artist, :as=>:radio, :required=>true)}
+      @ab.valid?.must_equal false
+      @ab.errors[:artist_id].must_equal ['invalid value submitted']
+    end
+
+    it "#forme_set should handle cases where currently associated values is nil" do
+      def @ab.tag_pks; nil; end
+      forme_set(@ab, :tag_pks=>['1']){|f| f.input(:tags)}
+      @ab.valid?.must_equal true
+    end
+
+    it "#forme_parse should return hash with values and validations" do
+      forme_parse(@ab, :name=>'Foo'){|f| f.input(:name)}.must_equal(:values=>{:name=>'Foo'}, :validations=>{}, :form_version=>nil)
+
+      hash = forme_parse(@ab, :name=>'Foo', 'artist_id'=>'1') do |f|
+        f.input(:name)
+        f.input(:artist, :dataset=>proc{|ds| ds.exclude(:id=>1)})
+      end
+      hash.must_equal(:values=>{:name=>'Foo', :artist_id=>'1'}, :validations=>{:artist_id=>[:valid, false]}, :form_version=>nil)
+
+      @ab.set(hash[:values])
+      @ab.valid?.must_equal true
+
+      @ab.forme_validations.merge!(hash[:validations])
+      @ab.valid?.must_equal false
+      @ab.errors[:artist_id].must_equal ['invalid value submitted']
+
+      @ab = Album.new
+      hash = forme_parse(@ab, {:name=>'Foo', 'artist_id'=>'1'}, {}, :form_version=>1) do |f|
+        f.input(:name)
+        f.input(:artist, :dataset=>proc{|ds| ds.exclude(:id=>2)})
+      end
+      hash.must_equal(:values=>{:name=>'Foo', :artist_id=>'1'}, :validations=>{:artist_id=>[:valid, true]}, :form_version=>1)
+      @ab.set(hash[:values])
+      @ab.valid?.must_equal true
+
+      @ab.forme_validations.merge!(hash[:validations])
+      @ab.valid?.must_equal true
     end
   end
 end

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