forme 1.12.0 → 2.2.0

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
@@ -170,6 +170,12 @@ describe "Sequel forme_set plugin" do
     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({})
@@ -227,6 +233,6 @@ describe "Sequel forme_set plugin" do
     @ab.freeze
     @ab.forme_inputs.must_equal({})
     @ab.forme_validations.must_equal({})
-    @f.input(:name).must_be_kind_of(Forme::Input)
+    @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" 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,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
@@ -32,6 +31,24 @@ class FormeSinatraTest < Sinatra::Base
   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
@@ -42,5 +59,13 @@ describe "Forme Sinatra ERB integration" do
   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,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, :method_redefined])
-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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -172,13 +172,12 @@ files:
 - lib/forme.rb
 - lib/forme/bs3.rb
 - lib/forme/erb.rb
-- lib/forme/erb_form.rb
 - lib/forme/form.rb
 - lib/forme/input.rb
 - lib/forme/rails.rb
 - lib/forme/raw.rb
-- lib/forme/sinatra.rb
 - lib/forme/tag.rb
+- lib/forme/template.rb
 - lib/forme/transformers/error_handler.rb
 - lib/forme/transformers/formatter.rb
 - lib/forme/transformers/helper.rb
@@ -188,6 +187,7 @@ files:
 - lib/forme/transformers/wrapper.rb
 - lib/forme/version.rb
 - lib/roda/plugins/forme.rb
+- lib/roda/plugins/forme_erubi_capture.rb
 - lib/roda/plugins/forme_route_csrf.rb
 - lib/roda/plugins/forme_set.rb
 - lib/sequel/plugins/forme.rb
@@ -198,6 +198,7 @@ files:
 - spec/bs3_sequel_plugin_spec.rb
 - spec/bs3_spec.rb
 - spec/erb_helper.rb
+- spec/erubi_capture_helper.rb
 - spec/forme_coverage.rb
 - spec/forme_spec.rb
 - spec/rails_integration_spec.rb
@@ -207,6 +208,7 @@ files:
 - spec/sequel_i18n_plugin_spec.rb
 - spec/sequel_plugin_spec.rb
 - spec/sequel_set_plugin_spec.rb
+- spec/shared_erb_specs.rb
 - spec/sinatra_integration_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jeremyevans/forme
@@ -233,14 +235,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: HTML forms library

data/lib/forme/erb_form.rb

@@ -1,74 +0,0 @@
-# frozen-string-literal: true
-
-require 'forme'
-
-module Forme
-  module ERB 
-    # Subclass used when using Forme ERB integration.
-    # Handles integrating into the view template so that
-    # methods with blocks can inject strings into the output.
-    class Form < ::Forme::Form
-      # Template output object, where serialized output gets
-      # injected.
-      attr_reader :output
-
-      # Set the template output object when initializing.
-      def initialize(*)
-        super
-        @output = @opts[:output] ? @opts[:output] : String.new
-      end
-
-      # Serialize the tag and inject it into the output.
-      def emit(tag)
-        output << tag.to_s
-      end
-
-      # Capture the inside of the inputs, injecting it into the template
-      # if a block is given, or returning it as a string if not.
-      def inputs(*a, &block)
-        if block
-          capture(block){super}
-        else
-          capture{super}
-        end
-      end
-
-      # Capture the inside of the form, injecting it into the template if
-      # a block is given, or returning it as a string if not.
-      def form(*a, &block)
-        if block
-          capture(block){super}
-        else
-          super
-        end
-      end
-
-      # If a block is given, inject an opening tag into the
-      # output, inject any given children into the output, yield to the
-      # block, inject a closing tag into the output.
-      # If a block is not given, just return the tag created.
-      def tag(type, attr={}, children=[], &block)
-        tag = _tag(type, attr, children)
-        if block
-          capture(block) do
-            emit(serialize_open(tag))
-            Array(tag.children).each{|c| emit(c)}
-            yield self
-            emit(serialize_close(tag))
-          end
-        else
-          tag
-        end
-      end
-
-      def capture(block=String.new) # :nodoc:
-        buf_was, @output = @output, block.is_a?(Proc) ? (eval("@_out_buf", block.binding) || @output) : block
-        yield
-        ret = @output
-        @output = buf_was
-        ret
-      end
-    end
-  end
-end
-

data/lib/forme/sinatra.rb

@@ -1,17 +0,0 @@
-# frozen-string-literal: true
-
-require 'forme/erb'
-
-module Forme
-  # For backwards compatibility only.  New code should
-  # require 'forme/erb' and include the Forme::ERB::Helper
-  # class:
-  #
-  #   helpers Forme::ERB::Helper
-  module Sinatra
-    ERB = Forme::ERB::Helper
-    Erubis = ERB
-    Form = Forme::ERB::Form
-    HIDDEN_TAGS = Forme::ERB::HIDDEN_TAGS
-  end
-end