forme 2.2.0 → 2.3.0

data/spec/sequel_set_plugin_spec.rb

@@ -1,238 +0,0 @@
-require_relative 'spec_helper'
-require_relative 'sequel_helper'
-
-describe "Sequel forme_set plugin" do
-  before do
-    @ab = Album.new
-    @f = Forme::Form.new(@ab)
-  end
-  
-  it "#forme_set should only set values in the form" do
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_be_nil
-
-    @f.input(:name)
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal 'Foo'
-
-    @ab.forme_set('copies_sold'=>'1')
-    @ab.name.must_be_nil
-    @ab.copies_sold.must_be_nil
-
-    @f.input(:copies_sold)
-    @ab.forme_set('name'=>'Bar', 'copies_sold'=>'1')
-    @ab.name.must_equal 'Bar'
-    @ab.copies_sold.must_equal 1
-  end
-  
-  it "#forme_set should handle different ways to specify parameter names" do
-    [{:attr=>{:name=>'foo'}}, {:attr=>{'name'=>:foo}}, {:name=>'foo'}, {:name=>'foo[]'}, {:name=>'bar[foo][]'}, {:name=>'bar[foo]'}, {:key=>:foo}].each do |opts|
-      @f.input(:name, opts)
-
-      @ab.forme_set(:name=>'Foo')
-      @ab.name.must_be_nil
-
-      @ab.forme_set('foo'=>'Foo')
-      @ab.name.must_equal 'Foo'
-      @ab.forme_inputs.clear
-    end
-  end
-
-  it "#forme_set should ignore values where key is explicitly set to nil" do
-    @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|
-      @f.input(:name, :formatter=>formatter)
-      @ab.forme_set(:name=>'Foo')
-      @ab.name.must_be_nil
-    end
-
-    @f.input(:name, :formatter=>:default)
-    @ab.forme_set(:name=>'Foo')
-    @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|
-      @f = Forme::Form.new(@ab, :formatter=>:disabled)
-      @f.input(:name)
-      @ab.forme_set(:name=>'Foo')
-      @ab.name.must_be_nil
-    end
-
-    @f = Forme::Form.new(@ab, :formatter=>:default)
-    @f.input(:name)
-    @ab.forme_set(:name=>'Foo')
-    @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|
-      @f.with_opts(:formatter=>formatter) do
-        @f.input(:name)
-      end
-      @ab.forme_set(:name=>'Foo')
-      @ab.name.must_be_nil
-    end
-
-    @f.with_opts(:formatter=>:default) do
-      @f.input(:name)
-    end
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal 'Foo'
-  end
-
-  it "#forme_set should prefer input formatter to with_opts formatter" do
-    @f.with_opts(:formatter=>:default) do
-      @f.input(:name, :formatter=>:readonly)
-    end
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_be_nil
-
-    @f.with_opts(:formatter=>:readonly) do
-      @f.input(:name, :formatter=>:default)
-    end
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal 'Foo'
-  end
-
-  it "#forme_set should prefer with_opts formatter to form formatter" do
-    @f = Forme::Form.new(@ab, :formatter=>:default)
-    @f.with_opts(:formatter=>:readonly) do
-      @f.input(:name)
-    end
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_be_nil
-
-    @f = Forme::Form.new(@ab, :formatter=>:readonly)
-    @f.with_opts(:formatter=>:default) do
-      @f.input(:name)
-    end
-    @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal 'Foo'
-  end
-  
-  it "#forme_set should handle setting values for associated objects" do
-    @ab.forme_set(:artist_id=>1)
-    @ab.artist_id.must_be_nil
-
-    @f.input(:artist)
-    @ab.forme_set(:artist_id=>'1')
-    @ab.artist_id.must_equal 1
-
-    @ab.forme_set('tag_pks'=>%w'1 2')
-    @ab.artist_id.must_be_nil
-    @ab.tag_pks.must_equal []
-
-    @f.input(:tags)
-    @ab.forme_set('artist_id'=>'1', 'tag_pks'=>%w'1 2')
-    @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_inputs.clear
-      @f.input(:artist, artist_opts)
-      @f.input(:tags, tag_opts)
-
-      @ab.forme_validations.clear
-      @ab.forme_set('artist_id'=>'1', 'tag_pks'=>%w'1 2')
-      @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
-      @ab.forme_set('artist_id'=>'1', 'tag_pks'=>['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
-      @ab.forme_set('artist_id'=>'2', 'tag_pks'=>['2'])
-      @ab.valid?.must_equal true
-    end
-  end
-
-  it "#forme_set should not add validations for inputs with no options" do
-    @f.input(:artist, :options=>nil)
-    @ab.forme_set('artist_id'=>'1')
-    @ab.valid?.must_equal true
-  end
-
-  it "#forme_set should not require associated values for many_to_one association with select boxes" do
-    @f.input(:artist)
-    @ab.forme_set({})
-    @ab.valid?.must_equal true
-  end
-
-  it "#forme_set should not require associated values for many_to_one association with radio buttons" do
-    @f.input(:artist, :as=>:radio)
-    @ab.forme_set({})
-    @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
-    @f.input(:artist, :required=>true)
-    @ab.forme_set({})
-    @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
-    @f.input(:artist, :as=>:radio, :required=>true)
-    @ab.forme_set({})
-    @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
-    @f.input(:tags)
-    @ab.forme_set({:tag_pks=>[1]})
-    def @ab.tag_pks; nil; end
-    @ab.valid?.must_equal true
-  end
-
-  it "#forme_parse should return hash with values and validations" do
-    @f.input(:name)
-    @ab.forme_parse(:name=>'Foo').must_equal(:values=>{:name=>'Foo'}, :validations=>{})
-
-    @f.input(:artist, :dataset=>proc{|ds| ds.exclude(:id=>1)})
-    hash = @ab.forme_parse(:name=>'Foo', 'artist_id'=>'1')
-    hash[:values] = {:name=>'Foo', :artist_id=>'1'}
-    @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']
-  end
-
-  it "#forme_parse should return hash with values and validations" 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

@@ -1,71 +0,0 @@
-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" inputmode="numeric" name="artist[albums_attributes][0][copies_sold]" pattern="-?[0-9]*" type="text" 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,71 +0,0 @@
-require_relative 'spec_helper'
-require_relative 'sequel_helper'
-require_relative 'erb_helper'
-
-begin
-require 'sinatra/base'
-require 'rack/csrf'
-rescue LoadError
-  warn "unable to load sinatra or rack/csrf, skipping sinatra spec"
-else
-begin
-  require 'tilt/erubis'
-rescue LoadError
-  require 'tilt/erb'
-  begin
-    require 'erubis'
-  rescue LoadError
-    require 'erb'
-  end
-end
-require_relative '../lib/forme/erb'
-class FormeSinatraTest < Sinatra::Base
-  helpers(Forme::ERB::Helper)
-  disable :show_exceptions
-  enable :raise_errors
-  enable :sessions
-  use Rack::Csrf
-
-  def self.get(path, &block)
-    super("/#{path}", &block)
-  end
-
-  instance_exec(self, &ERB_BLOCK)
-
-  get 'no-session' do
-    session = env.delete('rack.session')
-    body = erb <<END
-<% form(:method=>'POST') do %>
-<% end %>
-END
-    env['rack.session'] = session
-    body
-  end
-
-  get 'no-out_buf' do
-    erb(<<END, :outvar=>'@_foo')
-<% form(:method=>'POST') do |f| %>
-  <%= f.input(:text) %>
-<% end %>
-END
-  end
-end
-
-describe "Forme Sinatra ERB integration" do
-  def sin_get(path)
-    s = String.new
-    FormeSinatraTest.new.call(@rack.merge('PATH_INFO'=>path))[2].each{|str| s << str}
-    s.gsub(/\s+/, ' ').strip
-  end
-
-  include FormeErbSpecs
-
-  it "should handle missing rack.session when using Rack::Csrf" do
-    sin_get('/no-session').must_equal '<form method="POST"></form>'
-  end
-
-  it "should handle non-standard outvar, but without emitting into template" do
-    sin_get('/no-out_buf').must_equal '<input type="text"/>'
-  end
-end
-end

data/spec/spec_helper.rb

@@ -1,31 +0,0 @@
-$:.unshift(File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib'))
-
-if ENV['COVERAGE']
-  require_relative 'forme_coverage'
-  SimpleCov.forme_coverage
-end
-
-require_relative '../lib/forme'
-
-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