forme 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 610c1c28c2ed6fc3c4f36d520c4e67fea4fa9c1f
-  data.tar.gz: 7bb48306b738007c7c40c0673ad964c94f1e4c0d
+  metadata.gz: 9fb6883778ebb616402a910c3f46f7bd6ba3734b
+  data.tar.gz: aed74dd741f94bb368e97390d14a4000f4b73f39
 SHA512:
-  metadata.gz: a6076239cb78c5f4ad271fb77d5b65947f75899243633e49281ae0d2c350799d134d4deb542aa8129e912f427a0a46ce195bd5f21d34904ab1505e738aab75dd
-  data.tar.gz: de392606364637b2b8999151ff18854bbc0e0b2ec62d54f123ce563b986814e5311154b7c825687274dc16f4e5b579cc0f6a44f5a37c34d08338ee93214cd939
+  metadata.gz: 297661c5e245fcbb2f7c671d59c79f77b4d07d3bcded836ace5c7a6049f237b3d7711923178dcfcfdc3ac704a654b491c217112d114f033bd9d241f2c3f9b2f4
+  data.tar.gz: 68d7a1d1adbae977f2c26649a72633ae2c954f8701bca70883153eac44fe86113aedd1a47015ad261f2e91ad119945aab56355d54480dda0782bc11896557b26

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.0.0 (2014-07-30)
+
+* Add roda plugin for forme (jeremyevans)
+
+* Move forme/sinatra to forme/erb, since it is ERB and not Sinatra specific (jeremyevans)
+
+* Do not extend objects at runtime when using the Sequel support (jeremyevans)
+
 === 0.10.0 (2014-07-01)
 
 * Use #[] instead of #send to get input value for object forms if object is a hash (jeremyevans)

data/lib/forme.rb

@@ -148,6 +148,16 @@ module Forme
     # Must respond to +call+ or be a registered symbol.
     attr_reader :serializer
 
+    # Use appropriate Form subclass for object based on the current class, if the
+    # object responds to +forme_form_class+.
+    def self.new(obj=nil, opts={})
+      if obj && obj.respond_to?(:forme_form_class) && !opts[:_forme_form_class_set]
+        obj.forme_form_class(self).new(obj, opts.merge(:_forme_form_class_set=>true))
+      else
+        super
+      end
+    end
+
     # Create a +Form+ instance and yield it to the block,
     # injecting the opening form tag before yielding and
     # the closing form tag after yielding.
@@ -403,6 +413,13 @@ module Forme
       end
     end
 
+    # Marks the string as containing already escaped output.  Returns string given
+    # by default, but subclasses for specific web frameworks can handle automatic
+    # html escaping by overriding this.
+    def raw_output(s)
+      s
+    end
+
     # Temporarily override the given object and namespace for the form.  Any given
     # namespaces are appended to the form's current namespace.
     def with_obj(obj, namespace=nil)
@@ -471,6 +488,16 @@ module Forme
     ensure
       @nesting.pop
     end
+
+    # Return a serialized opening tag for the given tag.
+    def serialize_open(tag)
+      raw_output(serializer.serialize_open(tag)) if serializer.respond_to?(:serialize_open)
+    end
+
+    # Return a serialized closing tag for the given tag.
+    def serialize_close(tag)
+      raw_output(serializer.serialize_close(tag)) if serializer.respond_to?(:serialize_close)
+    end
   end
 
   # High level abstract tag form, transformed by formatters into the lower
@@ -510,7 +537,7 @@ module Forme
 
     # Return a string containing the serialized content of the receiver.
     def to_s
-      Forme.transform(:serializer, @opts, @form_opts, self)
+      form.raw_output(Forme.transform(:serializer, @opts, @form_opts, self))
     end
 
     # Transform the receiver into a lower level +Tag+ form (or an array
@@ -559,7 +586,7 @@ module Forme
 
     # Return a string containing the serialized content of the receiver.
     def to_s
-      Forme.transform(:serializer, @opts, @form.opts, self)
+      form.raw_output(Forme.transform(:serializer, @opts, @form.opts, self))
     end
 
     private

data/lib/forme/erb.rb

@@ -0,0 +1,104 @@
+require 'forme'
+
+module Forme
+  module ERB 
+    HIDDEN_TAGS = []
+
+    # Add a hidden tag proc that will be used for all forms created via Forme::ERB::Helper#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 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] : ''
+      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='') # :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
+    
+    # This is the module used to add the Forme integration
+    # to ERB.
+    module Helper 
+      # Create a +Form+ object tied to the current output buffer,
+      # using the standard ERB hidden tags.
+      def form(obj=nil, attr={}, opts={}, &block)
+        if block
+          h = {:output=>@_out_buf, :hidden_tags=>Forme::ERB::HIDDEN_TAGS, :env=>env}
+          (obj.is_a?(Hash) ? attr = attr.merge(h) : opts = opts.merge(h))
+          Form.form(obj, attr, opts, &block)
+        else
+          Form.form(obj, attr, opts)
+        end
+      end
+    end 
+  end
+end

data/lib/forme/rails.rb

@@ -38,7 +38,7 @@ module Forme
       # Serialize and mark as already escaped the string version of
       # the input.
       def emit(tag)
-        template.output_buffer << template.raw(tag.to_s)
+        template.output_buffer << tag.to_s
       end
 
       # Capture the inputs into a new output buffer, and return
@@ -63,12 +63,17 @@ module Forme
 
       # Return a string version of the input that is already marked as safe.
       def input(*)
-        template.raw(super.to_s)
+        super.to_s
       end
 
       # Return a string version of the button that is already marked as safe.
       def button(*)
-        template.raw(super.to_s)
+        super.to_s
+      end
+
+      # Use the template's raw method to mark the given string as html safe.
+      def raw_output(s)
+        template.raw(s)
       end
 
       # If a block is given, create a new output buffer and make sure all the
@@ -79,37 +84,22 @@ module Forme
         if block_given?
           template.send(:with_output_buffer){tag_(type, attr, children, &block)}
         else
-          tag = _tag(type, attr, children)
-          template.raw(tag.to_s)
+          _tag(type, attr, children).to_s
         end
       end
       
       def tag_(type, attr={}, children=[]) # :nodoc:
         tag = _tag(type, attr, children)
-        emit(serializer.serialize_open(tag)) if serializer.respond_to?(:serialize_open)
+        emit(serialize_open(tag))
         Array(tag.children).each{|c| emit(c)}
         yield self if block_given?
-        emit(serializer.serialize_close(tag)) if serializer.respond_to?(:serialize_close)
+        emit(serialize_close(tag))
       end
     end
 
     module ERB
-      # Create a +Form+ object and yield it to the block,
-      # injecting the opening form tag before yielding and
-      # the closing form tag after yielding.
-      #
-      # Argument Handling:
-      # No args :: Creates a +Form+ object with no options and not associated
-      #            to an +obj+, and with no attributes in the opening tag.
-      # 1 hash arg :: Treated as opening form tag attributes, creating a
-      #               +Form+ object with no options.
-      # 1 non-hash arg :: Treated as the +Form+'s +obj+, with empty options
-      #                   and no attributes in the opening tag.
-      # 2 hash args :: First hash is opening attributes, second hash is +Form+
-      #                options.
-      # 1 non-hash arg, 1-2 hash args :: First argument is +Form+'s obj, second is
-      #                                  opening attributes, third if provided is
-      #                                  +Form+'s options.
+      # Create a +Form+ object tied to the current template, and using the standard
+      # Rails hidden tags.
       def forme(obj=nil, attr={}, opts={}, &block)
         h = {:template=>self, :hidden_tags=>Forme::Rails::HIDDEN_TAGS}
         (obj.is_a?(Hash) ? attr = attr.merge(h) : opts = opts.merge(h))

data/lib/forme/sinatra.rb

@@ -1,124 +1,15 @@
-require 'forme'
+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
-    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.
-    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] : ''
-      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(serializer.serialize_open(tag)) if serializer.respond_to?(:serialize_open)
-            Array(tag.children).each{|c| emit(c)}
-            yield self
-            emit(serializer.serialize_close(tag)) if serializer.respond_to?(:serialize_close)
-          end
-        else
-          tag
-        end
-      end
-
-      def capture(block='')
-        buf_was, @output = @output, block.is_a?(Proc) ? (eval("@_out_buf", block.binding) || @output) : block
-        yield
-        ret = @output
-        @output = buf_was
-        ret
-      end
-    end
-    
-    # This is the module used to add the Forme integration
-    # to Sinatra.  It should be enabled in Sinatra with the
-    # following code in your <tt>Sinatra::Base</tt> subclass:
-    #
-    #   helpers Forme::Sinatra::ERB
-    module ERB
-      # Create a +Form+ object and yield it to the block,
-      # injecting the opening form tag before yielding and
-      # the closing form tag after yielding.
-      #
-      # Argument Handling:
-      # No args :: Creates a +Form+ object with no options and not associated
-      #            to an +obj+, and with no attributes in the opening tag.
-      # 1 hash arg :: Treated as opening form tag attributes, creating a
-      #               +Form+ object with no options.
-      # 1 non-hash arg :: Treated as the +Form+'s +obj+, with empty options
-      #                   and no attributes in the opening tag.
-      # 2 hash args :: First hash is opening attributes, second hash is +Form+
-      #                options.
-      # 1 non-hash arg, 1-2 hash args :: First argument is +Form+'s obj, second is
-      #                                  opening attributes, third if provided is
-      #                                  +Form+'s options.
-      def form(obj=nil, attr={}, opts={}, &block)
-        if block
-          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
-          Form.form(obj, attr, opts)
-        end
-      end
-    end 
-
-    # Alias of <tt>Forme::Sinatra::ERB</tt>
+    ERB = Forme::ERB::Helper
     Erubis = ERB
+    Form = Forme::ERB::Form
+    HIDDEN_TAGS = Forme::ERB::HIDDEN_TAGS
   end
 end

data/lib/forme/version.rb

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

data/lib/roda/plugins/forme.rb

@@ -0,0 +1,17 @@
+require 'forme/erb'
+
+class Roda
+  module RodaPlugins
+    module Forme
+      # Require the render plugin, since forme template integration
+      # only makes sense with it.
+      def self.load_dependencies(app)
+        app.plugin :render
+      end
+
+      InstanceMethods = ::Forme::ERB::Helper
+    end
+
+    register_plugin(:forme, Forme)
+  end
+end

data/lib/sequel/plugins/forme.rb

@@ -1,4 +1,5 @@
 require 'forme'
+require 'thread'
 
 module Sequel # :nodoc:
   module Plugins # :nodoc:
@@ -418,9 +419,9 @@ module Sequel # :nodoc:
         end
       end
 
-      # Helper module used for Sequel/Sinatra forms.  Necessary for
+      # Helper module used for Sequel forms using ERB template integration.  Necessary for
       # proper subform handling when using such forms with partials.
-      module SinatraSequelForm
+      module ERBSequelForm
         # 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 subform(*, &block)
@@ -431,14 +432,31 @@ module Sequel # :nodoc:
           end
         end
       end
+      SinatraSequelForm = ERBSequelForm
+
+      class Form < ::Forme::Form
+        include SequelForm
+      end
 
       module InstanceMethods
+        MUTEX = Mutex.new
+        FORM_CLASSES = {::Forme::Form=>Form}
+
         # Configure the +form+ with support for <tt>Sequel::Model</tt>
         # specific code, such as support for nested attributes.
         def forme_config(form)
-          form.extend(SequelForm)
           form.namespaces << model.send(:underscore, model.name)
-          form.extend(SinatraSequelForm) if defined?(::Forme::Sinatra::Form) && form.is_a?(::Forme::Sinatra::Form)
+        end
+
+        # Return subclass of base form that includes the necessary Sequel form methods.
+        def forme_form_class(base)
+          unless klass = MUTEX.synchronize{FORM_CLASSES[base]}
+            klass = Class.new(base)
+            klass.send(:include, SequelForm)
+            klass.send(:include, ERBSequelForm) if defined?(::Forme::ERB::Form) && base == ::Forme::ERB::Form
+            MUTEX.synchronize{FORM_CLASSES[base] = klass}
+          end
+          klass
         end
 
         # Return <tt>Forme::Input</tt> instance based on the given arguments.

data/spec/erb_helper.rb

@@ -0,0 +1,177 @@
+ERB_BLOCK = lambda do |r|
+  r.get '' do
+    erb <<END
+<% form([:foo, :bar], :action=>'/baz') do |f| %>
+  <p>FBB</p>
+  <%= f.input(:first) %>
+  <%= f.input(:last) %>
+  <%= f.button('Save') %>
+<% end %>
+END
+  end
+
+  r.get 'inputs_block' do
+    erb <<END
+<% form([:foo, :bar], :action=>'/baz') do |f| %><% f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <% end %><% end %>
+END
+  end
+
+  r.get 'inputs_block_wrapper' do
+    erb <<END
+<% form([:foo, :bar], {:action=>'/baz'}, :inputs_wrapper=>:fieldset_ol) do |f| %><% f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <% end %><% end %>
+END
+  end
+
+  r.get 'nest' do
+    erb <<END
+<% form([:foo, :bar], :action=>'/baz') do |f| %>
+  <%= f.tag(:p, {}, 'FBB') %>
+  <% f.tag(:div) do %>
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+  <% end %>
+
+<% end %>
+END
+  end
+
+  r.get 'nest_sep' do
+    @nest = <<END
+  n1
+  <% f.tag(:div) do %>
+    n2
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+    n3
+  <% end %>
+  n4
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  n5
+END
+    erb <<END
+0
+<% form([:foo, :bar], :action=>'/baz') do |f| %>
+  1
+  <%= f.tag(:p, {}, 'FBB') %>
+  2
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
+  r.get 'nest_seq' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    @nest = <<END
+  n1
+  <% f.subform(:artist) do %>
+    n2
+    <%= f.input(:name2) %>
+    n3
+  <% end %>
+  n4
+  <%= f.subform(:artist, :inputs=>[:name3], :legend=>'Bar') %>
+  n5
+END
+    erb <<END
+0
+<% form(@album, :action=>'/baz') do |f| %>
+  1
+  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo') %>
+  2
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
+  r.get 'hash' do
+    erb "<% form({:action=>'/baz'}, :obj=>[:foo]) do |f| %> <%= f.input(:first) %> <% end %>"
+  end
+
+  r.get 'legend' do
+    erb <<END
+<% form([:foo, :bar], :action=>'/baz') do |f| %>
+  <p>FBB</p>
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  <p>FBB2</p>
+<% end %>
+END
+  end
+
+  r.get 'combined' do
+    erb <<END
+<% form([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') do |f| %>
+  <p>FBB</p>
+  <%= f.input(:last) %>
+<% end %>
+END
+  end
+
+  r.get 'noblock' do
+    erb "<%= form([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') %>"
+  end
+
+  r.get 'noblock_empty' do
+    erb "<%= form(:action=>'/baz') %>"
+  end
+end
+
+shared_examples_for "erb integration" do
+  before do
+    o = Object.new
+    def o.puts(*) end
+    @rack = {'rack.input'=>'', 'REQUEST_METHOD'=>'GET', 'rack.errors'=>o, 'SCRIPT_NAME'=>''}
+  end
+
+  specify "#form should add start and end tags and yield Forme::Form instance" do
+    sin_get('/').should == '<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
+
+  specify "#form should have inputs work with a block" do
+    sin_get('/inputs_block').should == '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend> <input id="last" name="last" type="text" value="bar"/> </fieldset></form>'
+  end
+
+  specify "#form should have inputs with fieldset_ol wrapper work with block" do
+    sin_get('/inputs_block_wrapper').should == '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend><ol> <input id="last" name="last" type="text" value="bar"/> </ol></fieldset></form>'
+  end
+
+  specify "#form should add start and end tags and yield Forme::Form instance" do
+    sin_get('/nest').should == '<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
+
+  specify "#form should correctly handle situation where multiple templates are used with same form object" do
+    sin_get('/nest_sep').should == "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
+
+  specify "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
+    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\"/><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
+
+  specify "#form should accept two hashes instead of requiring obj as first argument" do
+    sin_get('/hash').should == '<form action="/baz"> <input id="first" name="first" type="text" value="foo"/> </form>'
+  end
+
+  specify "#form should deal with emitted code" do
+    sin_get('/legend').should == '<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
+
+  specify "#form should work with :inputs, :button, and :legend options" do
+    sin_get('/combined').should == '<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
+
+  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

data/spec/rails_integration_spec.rb

@@ -2,7 +2,11 @@ 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 'rubygems'
+begin
 require 'action_controller/railtie'
+rescue LoadError
+  warn "unable to load rails, skipping rails spec"
+else
 require 'forme/rails'
 
 class FormeRails < Rails::Application
@@ -233,3 +237,4 @@ describe "Forme Rails integration" 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
+end

data/spec/roda_integration_spec.rb

@@ -0,0 +1,36 @@
+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 'rubygems'
+begin
+require 'roda'
+require(ENV['ERUBIS'] ? 'erubis' : 'erb')
+require 'rack/csrf'
+rescue LoadError
+  warn "unable to load roda or rack/csrf, skipping roda spec"
+else
+class FormeRodaTest < Roda
+  plugin :forme
+  use Rack::Session::Cookie, :secret => "__a_very_long_string__"
+  use Rack::Csrf
+
+  def erb(s, opts={})
+    render(opts.merge(:inline=>s))
+  end
+
+  route do |r|
+    instance_exec(r, &ERB_BLOCK)
+  end
+end
+
+describe "Forme Roda ERB integration" do
+  def sin_get(path)
+    s = ''
+    FormeRodaTest.app.call(@rack.merge('PATH_INFO'=>path))[2].each{|str| s << str}
+    s.gsub(/\s+/, ' ').strip
+  end
+
+  it_should_behave_like "erb integration"
+end
+end

data/spec/sinatra_integration_spec.rb

@@ -1,12 +1,16 @@
 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 'rubygems'
+begin
 require 'sinatra/base'
-require 'forme/sinatra'
 require(ENV['ERUBIS'] ? 'erubis' : 'erb')
 require 'rack/csrf'
-
+rescue LoadError
+  warn "unable to load sinatra or rack/csrf, skipping sinatra spec"
+else
+require 'forme/sinatra'
 class FormeSinatraTest < Sinatra::Base
   helpers(Forme::Sinatra::ERB)
   disable :show_exceptions
@@ -14,129 +18,11 @@ class FormeSinatraTest < Sinatra::Base
   enable :sessions
   use Rack::Csrf
 
-  get '/' do
-    erb <<END
-<% form([:foo, :bar], :action=>'/baz') do |f| %>
-  <p>FBB</p>
-  <%= f.input(:first) %>
-  <%= f.input(:last) %>
-  <%= f.button('Save') %>
-<% end %>
-END
-  end
-
-  get '/inputs_block' do
-    erb <<END
-<% form([:foo, :bar], :action=>'/baz') do |f| %><% f.inputs(:legend=>'FBB') do %>
-    <%= f.input(:last) %>
-  <% 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 %>
-    <%= f.input(:last) %>
-  <% end %><% end %>
-END
-  end
-
-  get '/nest' do
-    erb <<END
-<% form([:foo, :bar], :action=>'/baz') do |f| %>
-  <%= f.tag(:p, {}, 'FBB') %>
-  <% f.tag(:div) do %>
-    <%= f.input(:first) %>
-    <%= f.input(:last) %>
-  <% end %>
-
-<% end %>
-END
-  end
-
-  get '/nest_sep' do
-    @nest = <<END
-  n1
-  <% f.tag(:div) do %>
-    n2
-    <%= f.input(:first) %>
-    <%= f.input(:last) %>
-    n3
-  <% end %>
-  n4
-  <%= f.inputs([:first, :last], :legend=>'Foo') %>
-  n5
-END
-    erb <<END
-0
-<% form([:foo, :bar], :action=>'/baz') do |f| %>
-  1
-  <%= f.tag(:p, {}, 'FBB') %>
-  2
-  <%= erb(@nest, :locals=>{:f=>f}) %>
-  3
-<% end %>
-4
-END
+  def self.get(path, &block)
+    super("/#{path}", &block)
   end
 
-  get '/nest_seq' do
-    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
-    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
-    @nest = <<END
-  n1
-  <% f.subform(:artist) do %>
-    n2
-    <%= f.input(:name2) %>
-    n3
-  <% end %>
-  n4
-  <%= f.subform(:artist, :inputs=>[:name3], :legend=>'Bar') %>
-  n5
-END
-    erb <<END
-0
-<% form(@album, :action=>'/baz') do |f| %>
-  1
-  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo') %>
-  2
-  <%= erb(@nest, :locals=>{:f=>f}) %>
-  3
-<% end %>
-4
-END
-  end
-
-  get '/hash' do
-    erb "<% form({:action=>'/baz'}, :obj=>[:foo]) do |f| %> <%= f.input(:first) %> <% end %>"
-  end
-
-  get '/legend' do
-    erb <<END
-<% form([:foo, :bar], :action=>'/baz') do |f| %>
-  <p>FBB</p>
-  <%= f.inputs([:first, :last], :legend=>'Foo') %>
-  <p>FBB2</p>
-<% end %>
-END
-  end
-
-  get '/combined' do
-    erb <<END
-<% form([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') do |f| %>
-  <p>FBB</p>
-  <%= f.input(:last) %>
-<% end %>
-END
-  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
+  instance_exec(self, &ERB_BLOCK)
 end
 
 describe "Forme Sinatra ERB integration" do
@@ -145,53 +31,7 @@ describe "Forme Sinatra ERB integration" do
     FormeSinatraTest.new.call(@rack.merge('PATH_INFO'=>path))[2].each{|str| s << str}
     s.gsub(/\s+/, ' ').strip
   end
-  before do
-    o = Object.new
-    def o.puts(*) end
-    @rack = {'rack.input'=>'', 'REQUEST_METHOD'=>'GET', 'rack.errors'=>o}
-  end
-
-  specify "#form should add start and end tags and yield Forme::Form instance" do
-    sin_get('/').should == '<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
-
-  specify "#form should have inputs work with a block" do
-    sin_get('/inputs_block').should == '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend> <input id="last" name="last" type="text" value="bar"/> </fieldset></form>'
-  end
-
-  specify "#form should have inputs with fieldset_ol wrapper work with block" do
-    sin_get('/inputs_block_wrapper').should == '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend><ol> <input id="last" name="last" type="text" value="bar"/> </ol></fieldset></form>'
-  end
-
-  specify "#form should add start and end tags and yield Forme::Form instance" do
-    sin_get('/nest').should == '<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
 
-  specify "#form should correctly handle situation where multiple templates are used with same form object" do
-    sin_get('/nest_sep').should == "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
-
-  specify "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
-    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\"/><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
-
-  specify "#form should accept two hashes instead of requiring obj as first argument" do
-    sin_get('/hash').should == '<form action="/baz"> <input id="first" name="first" type="text" value="foo"/> </form>'
-  end
-
-  specify "#form should deal with emitted code" do
-    sin_get('/legend').should == '<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
-
-  specify "#form should work with :inputs, :button, and :legend options" do
-    sin_get('/combined').should == '<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
-
-  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
+  it_should_behave_like "erb integration"
+end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies: []
 description: |
   Forme is a forms library with the following goals:
@@ -30,13 +30,17 @@ files:
 - README.rdoc
 - Rakefile
 - lib/forme.rb
+- lib/forme/erb.rb
 - lib/forme/rails.rb
 - lib/forme/sinatra.rb
 - lib/forme/version.rb
+- lib/roda/plugins/forme.rb
 - lib/sequel/plugins/forme.rb
+- spec/erb_helper.rb
 - spec/forme_coverage.rb
 - spec/forme_spec.rb
 - spec/rails_integration_spec.rb
+- spec/roda_integration_spec.rb
 - spec/sequel_helper.rb
 - spec/sequel_plugin_spec.rb
 - spec/sinatra_integration_spec.rb