forme 0.7.0 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 06d7e50cfae657572071affb86ef307636c65345
+  data.tar.gz: 5eef25b91f833f3a57caef3903d25886cb48f00d
+SHA512:
+  metadata.gz: a19e5579fc8f0bfe11c5136f2ecc69db057a23f76d08bc01aad4680c1ebeb9fbd27476a04d60265efe5de1d1e5ab0b16dd615f8bc0081c7b733ef9f188e31581
+  data.tar.gz: ba0fe6ba4e18fe182c0a93eb9b33f28e0d0f30729ec537f2a3b468d8b9db56a75d657aadb17b4c164a3128d901017d7460a7ce8ecd9bd8a923d5017bc1e4d051

data/CHANGELOG

@@ -1,3 +1,15 @@
+=== 0.8.0 (2013-10-30)
+
+* form calls without block or :inputs or :button options are now handled correctly in the Sinatra integration (jeremyevans)
+
+* CSRF token tags are now automatically added to forms in Rails and Sinatra if using rack_csrf (jeremyevans) (#5)
+
+* Form objects now support a :hidden_tags option for automatically adding hidden tags (jeremyevans)
+
+* Sequel many_to_one associations with existing and required values no longer have a blank option added by default (jeremyevans)
+
+* ActiveSupport::SafeBuffer objects are now automatically treated as raw in the Rails integration (jeremyevans)
+
 === 0.7.0 (2012-05-02)
 
 * Support :label_position option in both of the labelers, can be set to :before or :after to override the default (jeremyevans)

data/README.rdoc

@@ -76,7 +76,7 @@ You can even do everything in a single method call:
 
 = Basic Design
 
-Interally, Forme builds an abstract syntax tree of objects that
+Internally, Forme builds an abstract syntax tree of objects that
 represent the form.  The abstract syntax tree goes through a
 series of transformations that convert it from high level
 abstract forms to low level abstract forms and finally to

data/lib/forme.rb

@@ -99,7 +99,7 @@ module Forme
   #                       +obj+ or +block+, but not both.  If +obj+ is given, should be
   #                       either a +Class+ instance or it should respond to +call+.  If a
   #                       +Class+ instance is given, instances of that class should respond
-  #                       to +call+, and the a new instance of that class should be used
+  #                       to +call+, and a new instance of that class should be used
   #                       for each transformation.
   def self.register_transformer(type, sym, obj=nil, &block)
     raise Error, "Not a valid transformer type" unless TRANSFORMERS.has_key?(type)
@@ -145,6 +145,7 @@ module Forme
     # :obj :: Sets the +obj+ attribute
     # :error_handler :: Sets the +error_handler+ for the form
     # :formatter :: Sets the +formatter+ for the form
+    # :hidden_tags :: Sets the hidden tags to automatically add to this form.
     # :inputs_wrapper :: Sets the +inputs_wrapper+ for the form
     # :labeler :: Sets the +labeler+ for the form
     # :wrapper :: Sets the +wrapper+ for the form
@@ -175,6 +176,15 @@ module Forme
     # Must respond to +call+ or be a registered symbol.
     attr_reader :serializer
 
+    # The hidden tags to automatically add to the form.  If set, this should be an
+    # array, where elements are one of the following types:
+    # String, Array, Forme::Tag :: Added directly as a child of the form tag.
+    # Hash :: Adds a hidden tag for each entry, with keys as the name of the hidden
+    #         tag and values as the value of the hidden tag.
+    # Proc :: Will be called with the form tag object, and should return an instance
+    #         of one of the handled types (or nil to not add a tag).
+    attr_reader :hidden_tags
+
     # Create a +Form+ instance and yield it to the block,
     # injecting the opening form tag before yielding and
     # the closing form tag after yielding.
@@ -232,6 +242,7 @@ module Forme
       end
       config = CONFIGURATIONS[@opts[:config]||Forme.default_config]
       TRANSFORMER_TYPES.each{|k| instance_variable_set(:"@#{k}", transformer(k, @opts.fetch(k, config[k])))}
+      @hidden_tags = @opts[:hidden_tags]
       @nesting = []
     end
 
@@ -285,7 +296,7 @@ module Forme
 
     # Create a form tag with the given attributes.
     def form(attr={}, &block)
-      tag(:form, attr, &block)
+      tag(:form, attr, method(:hidden_form_tags), &block)
     end
 
     # Formats the +input+ using the +formatter+.
@@ -429,6 +440,35 @@ module Forme
 
     private
 
+    # Return array of hidden tags to use for this form,
+    # or nil if the form does not have hidden tags added automatically.
+    def hidden_form_tags(form_tag)
+      if hidden_tags
+        tags = []
+        hidden_tags.each do |hidden_tag|
+          hidden_tag = hidden_tag.call(form_tag) if hidden_tag.respond_to?(:call)
+          tags.concat(parse_hidden_tags(hidden_tag))
+        end
+        tags
+      end
+    end
+
+    # Handle various types of hidden tags for the form.
+    def parse_hidden_tags(hidden_tag)
+      case hidden_tag
+      when Array
+        hidden_tag
+      when Tag, String
+        [hidden_tag]
+      when Hash
+        hidden_tag.map{|k,v| _tag(:input, :type=>:hidden, :name=>k, :value=>v)}
+      when nil
+        []
+      else
+        raise Error, "unhandled hidden_tag response: #{hidden_tag.inspect}"
+      end
+    end
+
     # Extend +obj+ with +Serialized+ and associate it with the receiver, such
     # that calling +to_s+ on the object will use the receiver's serializer
     # to generate the resulting string.
@@ -530,15 +570,8 @@ module Forme
 
     # Set the +form+, +type+, +attr+, and +children+.
     def initialize(form, type, attr={}, children=nil)
-      case children
-      when Array
-        @children = children
-      when nil
-        @children = nil
-      else
-        @children = [children]
-      end
       @form, @type, @attr = form, type, (attr||{})
+      @children = parse_children(children)
     end
 
     # Adds a child to the array of receiver's children.
@@ -560,6 +593,22 @@ module Forme
     def to_s
       form.serialize(self)
     end
+
+    private
+
+    # Convert children constructor argument into the children to use for the tag.
+    def parse_children(children)
+      case children
+      when Array
+        children
+      when Proc, Method
+        parse_children(children.call(self))
+      when nil
+        nil
+      else
+        [children]
+      end
+    end
   end
 
   # Module that can extend objects associating them with a specific

data/lib/forme/rails.rb

@@ -1,7 +1,28 @@
 require 'forme'
 
+class ActiveSupport::SafeBuffer
+  include Forme::Raw
+end
+
 module Forme
-  module Rails # :nodoc:
+  module Rails
+    HIDDEN_TAGS = []
+
+    # Add a hidden tag proc that will be used for all forms created via Forme::Rails::ERB#form.
+    # The block is yielded the Forme::Tag object for the form tag.
+    # The block should return either nil if hidden tag should be added, or a Forme::Tag object (or an array of them),
+    # or a hash with keys specifying the name of the tags and the values specifying the values of the tags .
+    def self.add_hidden_tag(&block)
+      HIDDEN_TAGS << block
+    end
+
+    # Add CSRF token tag by default for POST forms
+    add_hidden_tag do |tag|
+      if (form = tag.form) && (template = form.template) && template.protect_against_forgery? && tag.attr[:method].to_s.upcase == 'POST'
+        {template.request_forgery_protection_token=>template.form_authenticity_token}
+      end
+    end
+
     # Subclass used when using Forme/Rails ERB integration,
     # handling integration with the view template.
     class Form < ::Forme::Form
@@ -66,7 +87,7 @@ module Forme
       def tag_(type, attr={}, children=[])
         tag = _tag(type, attr, children)
         emit(serializer.serialize_open(tag)) if serializer.respond_to?(:serialize_open)
-        Array(children).each{|c| emit(c)}
+        Array(tag.children).each{|c| emit(c)}
         yield self if block_given?
         emit(serializer.serialize_close(tag)) if serializer.respond_to?(:serialize_close)
       end
@@ -90,7 +111,7 @@ module Forme
       #                                  opening attributes, third if provided is
       #                                  +Form+'s options.
       def forme(obj=nil, attr={}, opts={}, &block)
-        h = {:template=>self}
+        h = {:template=>self, :hidden_tags=>Forme::Rails::HIDDEN_TAGS}
         (obj.is_a?(Hash) ? attr = attr.merge(h) : opts = opts.merge(h))
         Form.form(obj, attr, opts, &block)
       end

data/lib/forme/sinatra.rb

@@ -1,7 +1,24 @@
 require 'forme'
 
 module Forme
-  module Sinatra # :nodoc:
+  module Sinatra
+    HIDDEN_TAGS = []
+
+    # Add a hidden tag proc that will be used for all forms created via Forme::Sinatra::ERB#form.
+    # The block is yielded the Forme::Tag object for the form tag.
+    # The block should return either nil if hidden tag should be added, or a Forme::Tag object (or an array of them),
+    # or a hash with keys specifying the name of the tags and the values specifying the values of the tags .
+    def self.add_hidden_tag(&block)
+      HIDDEN_TAGS << block
+    end
+
+    # Add CSRF token tag by default for POST forms
+    add_hidden_tag do |tag|
+      if defined?(::Rack::Csrf) && (form = tag.form) && (env = form.opts[:env]) && tag.attr[:method].to_s.upcase == 'POST'
+        {::Rack::Csrf.field=>::Rack::Csrf.token(env)}
+      end
+    end
+
     # Subclass used when using Forme/Sinatra ERB integration.
     # Handles integrating into the view template so that
     # methods with blocks can inject strings into the output.
@@ -37,7 +54,7 @@ module Forme
         if block
           capture(block){super}
         else
-          capture{super}
+          super
         end
       end
 
@@ -50,7 +67,7 @@ module Forme
         if block
           capture(block) do
             emit(serializer.serialize_open(tag)) if serializer.respond_to?(:serialize_open)
-            children.each{|c| emit(c)}
+            Array(tag.children).each{|c| emit(c)}
             yield self
             emit(serializer.serialize_close(tag)) if serializer.respond_to?(:serialize_close)
           end
@@ -92,7 +109,7 @@ module Forme
       #                                  +Form+'s options.
       def form(obj=nil, attr={}, opts={}, &block)
         if block
-          h = {:output=>@_out_buf}
+          h = {:output=>@_out_buf, :hidden_tags=>Forme::Sinatra::HIDDEN_TAGS, :env=>env}
           (obj.is_a?(Hash) ? attr = attr.merge(h) : opts = opts.merge(h))
           Form.form(obj, attr, opts, &block)
         else

data/lib/forme/version.rb

@@ -1,6 +1,6 @@
 module Forme
   # Version constant, use <tt>Forme.version</tt> instead.
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 
   # Returns the version as a frozen string (e.g. '0.1.0')
   def self.version

data/lib/sequel/plugins/forme.rb

@@ -309,8 +309,8 @@ module Sequel # :nodoc:
             wrapper ? wrapper.call(radios, _input(:radio, opts)) : radios
           else
             opts[:id] = form.namespaced_id(key) unless opts.has_key?(:id)
-            opts[:add_blank] = true if !opts.has_key?(:add_blank)
             opts[:required] = true if !opts.has_key?(:required) && (sch = obj.model.db_schema[key]) && !sch[:allow_null]
+            opts[:add_blank] = true if !opts.has_key?(:add_blank) && !(opts[:required] && opts[:value])
             handle_label(field)
             ::Forme.attr_classes(opts[:wrapper_attr], "required") if opts[:required]
             _input(:select, opts)

data/spec/forme_spec.rb

@@ -246,6 +246,16 @@ describe "Forme plain forms" do
     @f.tag(:textarea, {:name=>:foo}, :bar).to_s.should == '<textarea name="foo">bar</textarea>'
   end
 
+  specify "#tag should accept children as procs" do
+    @f.tag(:div, {:class=>"foo"}, lambda{|t| t.form.tag(:input, :class=>t.attr[:class])}).to_s.should == '<div class="foo"><input class="foo"/></div>'
+  end
+
+  specify "#tag should accept children as methods" do
+    o = Object.new
+    def o.foo(t) t.form.tag(:input, :class=>t.attr[:class]) end
+    @f.tag(:div, {:class=>"foo"}, o.method(:foo)).to_s.should == '<div class="foo"><input class="foo"/></div>'
+  end
+
   specify "should have an #inputs method for multiple inputs wrapped in a fieldset" do
     @f.inputs([:textarea, :text]).to_s.should == '<fieldset class="inputs"><textarea></textarea><input type="text"/></fieldset>'
   end
@@ -325,6 +335,10 @@ describe "Forme plain forms" do
     @f.input(:checkbox, :labeler=>:explicit, :label=>'Foo', :value=>'foo', :name=>'a', :id=>'bar', :label_position=>:before).to_s.should == '<label for="bar">Foo</label><input id="bar_hidden" name="a" type="hidden" value="0"/><input id="bar" name="a" type="checkbox" value="foo"/>'
   end
 
+  specify "inputs handle implicit labels or checkboxes without hidden fields with :label_position=>:before" do
+    @f.input(:checkbox, :label=>'Foo', :value=>'foo', :name=>'a', :id=>'bar', :label_position=>:before, :no_hidden=>true).to_s.should == '<label>Foo <input id="bar" name="a" type="checkbox" value="foo"/></label>'
+  end
+
   specify "inputs should accept a :error_handler option to use a custom error_handler" do
     @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.should == '<textarea class="error" id="foo"></textarea>!!! bar'
   end
@@ -360,6 +374,36 @@ describe "Forme plain forms" do
   end
 end
 
+describe "Forme::Form :hidden_tags option " do
+  before do
+    @f = Forme::Form.new
+  end
+
+  specify "should handle hash" do
+    Forme.form({}, :hidden_tags=>[{:a=>'b'}]).to_s.should == '<form><input name="a" type="hidden" value="b"/></form>'
+  end
+
+  specify "should handle array" do
+    Forme.form({}, :hidden_tags=>[["a ", "b"]]).to_s.should == '<form>a b</form>'
+  end
+
+  specify "should handle string" do
+    Forme.form({}, :hidden_tags=>["a "]).to_s.should == '<form>a </form>'
+  end
+
+  specify "should handle proc return hash" do
+    Forme.form({}, :hidden_tags=>[lambda{|tag| {:a=>'b'}}]).to_s.should == '<form><input name="a" type="hidden" value="b"/></form>'
+  end
+
+  specify "should handle proc return tag" do
+    Forme.form({:method=>'post'}, :hidden_tags=>[lambda{|tag| tag.form._tag(tag.attr[:method])}]).to_s.should == '<form method="post"><post></post></form>'
+  end
+
+  specify "should raise error for unhandled object" do
+    proc{Forme.form({}, :hidden_tags=>[Object.new])}.should raise_error
+  end
+end
+
 describe "Forme custom" do
   specify "formatters can be specified as a proc" do
     Forme::Form.new(:formatter=>proc{|i| i.form._tag(:textarea, i.opts.map{|k,v| [v.upcase, k.to_s.downcase]})}).input(:text, :name=>'foo').to_s.should == '<textarea FOO="name"></textarea>'

data/spec/rails_integration_spec.rb

@@ -6,10 +6,12 @@ require 'action_controller/railtie'
 require 'forme/rails'
 
 class FormeRails < Rails::Application
-  config.secret_token = routes.append { match ':action' , :controller=>'forme' }.inspect
+  config.secret_token = routes.append { get ':action' , :controller=>'forme' }.inspect
   config.active_support.deprecation = :stderr
   config.middleware.delete(ActionDispatch::ShowExceptions)
-  config.threadsafe!
+  config.middleware.delete("Rack::Lock")
+  config.secret_key_base = 'foo'
+  config.eager_load = true
   initialize!
 end
 
@@ -139,6 +141,10 @@ END
   def noblock
     render :inline => "<%= forme([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') %>"
   end
+
+  def safe_buffer
+    render :inline => "<%= forme([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'<b>foo</b>'.html_safe) %>"
+  end
 end
 
 describe "Forme Rails integration" do
@@ -174,7 +180,7 @@ describe "Forme Rails integration" do
   end
 
   specify "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
-    sin_get('/nest_seq').should == "0 <form action=\"/baz\" class=\"forme album\" method=\"post\"> 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\" 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\"/> n2 <label>Name2: <input id=\"album_artist_attributes_name2\" name=\"album[artist_attributes][name2]\" type=\"text\" value=\"A2\"/></label> n3 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"
+    sin_get('/nest_seq').sub(%r{<input name=\"authenticity_token\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"authenticity_token\" type=\"hidden\" value=\"csrf\"/>").should == "0 <form action=\"/baz\" class=\"forme album\" method=\"post\"><input name=\"authenticity_token\" 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\" 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\"/> n2 <label>Name2: <input id=\"album_artist_attributes_name2\" name=\"album[artist_attributes][name2]\" type=\"text\" value=\"A2\"/></label> n3 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
 
   specify "#form should accept two hashes instead of requiring obj as first argument" do
@@ -192,4 +198,8 @@ describe "Forme Rails integration" do
   specify "#form should work without a block" do
     sin_get('/noblock').should == '<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
+
+  specify "#form should handle Rails SafeBuffers" do
+    sin_get('/safe_buffer').should == '<form action="/baz"><fieldset class="inputs"><legend><b>foo</b></legend><input id="first" name="first" type="text" value="foo"/></fieldset><input type="submit" value="xyz"/></form>'
+  end
 end

data/spec/sequel_plugin_spec.rb

@@ -17,6 +17,13 @@ describe "Forme Sequel::Model forms" do
     @b.form(:class=>:foo, :method=>:get).to_s.should == '<form class="foo forme album" method="get"></form>'
   end
 
+  specify "should handle invalid methods" do
+    def @ab.db_schema
+      super.merge(:foo=>{:type=>:bar})
+    end
+    @b.input(:foo, :value=>'baz').to_s.should == '<label>Foo: <input id="album_foo" name="album[foo]" type="text" value="baz"/></label>'
+  end
+
   specify "should allow an array of classes" do
     @b.form(:class=>[:foo, :bar]).to_s.should == '<form class="foo bar forme album" method="post"></form>'
     @b.form(:class=>[:foo, [:bar, :baz]]).to_s.should == '<form class="foo bar baz forme album" method="post"></form>'
@@ -122,12 +129,16 @@ describe "Forme Sequel::Model forms" do
     @c.input(:artist).to_s.should == '<label>Artist: <select id="album_artist_id" name="album[artist_id]"><option value=""></option><option value="1">a</option><option selected="selected" value="2">d</option></select></label>'
   end
 
+  specify "should not add a blank option by default if there is a default value and it is required" do
+    @b.input(:artist, :required=>true).to_s.should == '<label>Artist<abbr title="required">*</abbr>: <select id="album_artist_id" name="album[artist_id]" required="required"><option selected="selected" value="1">a</option><option value="2">d</option></select></label>'
+  end
+
   specify "should allow overriding default input type using a :type option" do
     @b.input(:artist, :type=>:string, :value=>nil).to_s.should == '<label>Artist: <input id="album_artist" name="album[artist]" type="text"/></label>'
   end
 
   specify "should use a required wrapper tag for many_to_one required associations" do
-    @b.input(:artist, :required=>true, :wrapper=>:li).to_s.should == '<li class="many_to_one required"><label>Artist<abbr title="required">*</abbr>: <select id="album_artist_id" name="album[artist_id]" required="required"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select></label></li>'
+    @b.input(:artist, :required=>true, :wrapper=>:li).to_s.should == '<li class="many_to_one required"><label>Artist<abbr title="required">*</abbr>: <select id="album_artist_id" name="album[artist_id]" required="required"><option selected="selected" value="1">a</option><option value="2">d</option></select></label></li>'
   end
 
   specify "should use a set of radio buttons for many_to_one associations with :as=>:radio option" do

data/spec/sinatra_integration_spec.rb

@@ -5,11 +5,14 @@ require 'rubygems'
 require 'sinatra/base'
 require 'forme/sinatra'
 require(ENV['ERUBIS'] ? 'erubis' : 'erb')
+require 'rack/csrf'
 
 class FormeSinatraTest < Sinatra::Base
   helpers(Forme::Sinatra::ERB)
   disable :show_exceptions
   enable :raise_errors
+  enable :sessions
+  use Rack::Csrf
 
   get '/' do
     erb <<END
@@ -24,21 +27,17 @@ END
 
   get '/inputs_block' do
     erb <<END
-<% form([:foo, :bar], :action=>'/baz') do |f| %>
-  <% f.inputs(:legend=>'FBB') do %>
+<% form([:foo, :bar], :action=>'/baz') do |f| %><% f.inputs(:legend=>'FBB') do %>
     <%= f.input(:last) %>
-  <% end %>
-<% end %>
+  <% end %><% end %>
 END
   end
 
   get '/inputs_block_wrapper' do
     erb <<END
-<% form([:foo, :bar], {:action=>'/baz'}, :inputs_wrapper=>:fieldset_ol) do |f| %>
-  <% f.inputs(:legend=>'FBB') do %>
+<% form([:foo, :bar], {:action=>'/baz'}, :inputs_wrapper=>:fieldset_ol) do |f| %><% f.inputs(:legend=>'FBB') do %>
     <%= f.input(:last) %>
-  <% end %>
-<% end %>
+  <% end %><% end %>
 END
   end
 
@@ -134,11 +133,17 @@ END
   get '/noblock' do
     erb "<%= form([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') %>"
   end
+
+  get '/noblock_empty' do
+    erb "<%= form(:action=>'/baz') %>"
+  end
 end
 
 describe "Forme Sinatra ERB integration" do
   def sin_get(path)
-    FormeSinatraTest.new.call(@rack.merge('PATH_INFO'=>path))[2].join.gsub(/\s+/, ' ').strip
+    s = ''
+    FormeSinatraTest.new.call(@rack.merge('PATH_INFO'=>path))[2].each{|str| s << str}
+    s.gsub(/\s+/, ' ').strip
   end
   before do
     o = Object.new
@@ -167,7 +172,7 @@ describe "Forme Sinatra ERB integration" do
   end
 
   specify "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
-    sin_get('/nest_seq').should == "0 <form action=\"/baz\" class=\"forme album\" method=\"post\"> 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\" 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\"/> n2 <label>Name2: <input id=\"album_artist_attributes_name2\" name=\"album[artist_attributes][name2]\" type=\"text\" value=\"A2\"/></label> n3 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"
+    sin_get('/nest_seq').sub(%r{<input name=\"_csrf\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"_csrf\" type=\"hidden\" value=\"csrf\"/>").should == "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\" 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\"/> n2 <label>Name2: <input id=\"album_artist_attributes_name2\" name=\"album[artist_attributes][name2]\" type=\"text\" value=\"A2\"/></label> n3 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
 
   specify "#form should accept two hashes instead of requiring obj as first argument" do
@@ -185,4 +190,8 @@ describe "Forme Sinatra ERB integration" do
   specify "#form should work without a block" do
     sin_get('/noblock').should == '<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
+
+  specify "#form with an empty form should work" do
+    sin_get('/noblock_empty').should == '<form action="/baz"></form>'
+  end
 end

metadata

@@ -1,28 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Forme is a forms library with the following goals:
-
+description: |
+  Forme is a forms library with the following goals:
 
   1) Have no external dependencies
-
   2) Have a simple API
-
   3) Support forms both with and without related objects
-
   4) Allow compiling down to different types of output
-
-'
 email: code@jeremyevans.net
 executables: []
 extensions: []
@@ -48,33 +42,32 @@ files:
 - lib/sequel/plugins/forme.rb
 homepage: http://gihub.com/jeremyevans/forme
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --quiet
 - --line-numbers
 - --inline-source
 - --title
-- ! 'Forme: HTML forms library'
+- 'Forme: HTML forms library'
 - --main
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTML forms library
 test_files: []