forme 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb06104f826067a8f31ba5778bed02029abdbb7a
-  data.tar.gz: 910a345e355680be66a4d049edaa35e8ecca6186
+  metadata.gz: 617e4bb020afdaf14cb5a13ec71c57bc0c33f173
+  data.tar.gz: 05ee61e281799560dd9c9eb84911a11bf9ca0c0c
 SHA512:
-  metadata.gz: c829a2fb78d66a347f6ae65ea600aabd80a2ef7373ca0c3ea4894a0409c75c8959df45b096413796f5140590ea8f7fa4b32c0c8b02a5f78f4ce6d7b103abde77
-  data.tar.gz: fd6f0b68a9aadbedcd53d0087e8e5c3ea215c53363834fe9c9e39ea54c728113afc0d6459119cf65bda15355eb2757ac26688cba23266c93179047c16c5cd270
+  metadata.gz: 90d0384542f59034b2428aeff330e0e9379b9c732877bbfa22d8be3be4cbeb89a24c635495ab638423ca2126dc7cea89ca07c74e4eea49193cd770fe521d67e5
+  data.tar.gz: 6aab3b04c4658e2c104f056104d5e2480580f51b1328e9540bc52b9c6ab0c9941b0bf7bfe5ddb9051b6d501e1bad7b8a6c5b115133caba05b689b28dbee1eb0c

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.6.0 (2017-05-03)
+
+* Use thead/tbody tags for table inputs_wrapper transformer and Sequel plugin subform :grid option (jeremyevans)
+
+* Do not create a hidden input for checkboxes when using disabled/readonly formatters (jeremyevans)
+
+* Add support for overriding forme_namespace on the Sequel::Model instance to change forme's namespacing (mwpastore, jeremyevans) (#17)
+
+* Allow :label_attr for checkboxset and radioset to set attributes for individual labels in the set (jeremyevans)
+
 === 1.5.0 (2016-08-09)
 
 * Add forme_set Sequel plugin, for handling the intake of submitted params based on form fields (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2016 Jeremy Evans
+Copyright (c) 2011-2017 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -48,31 +48,50 @@ data is broken down to the following steps (called transformers):
 +Serializer+ :: converts a <tt>Forme::Tag</tt> instance into an
                 html string.
 
-Technically, only the +Serializer+ is necessary.  The +input+
-and +tag+ methods return +Input+ and +Tag+ objects.  These objects
+Technically, only the +Serializer+ is necessary.  The <tt>Forme::Form#input</tt>
+and <tt>Forme::Form#tag</tt> methods return +Input+ and +Tag+ objects.  These objects
 both have +to_s+ defined to call the appropriate +Serializer+ with
 themselves.  The +Serializer+ calls the appropriate +Formatter+ if
 it encounters an +Input+ instance, and attempts to serialize the
 output of that (which is usually a +Tag+ instance).  It is up to
-the +Formatter+ to call the +Labeler+ and/or +ErrorHandler+ (if
-necessary) and the +Wrapper+.
-
-There is also an +InputsWrapper+ transformer, that is called by
-<tt>Forme::Form#inputs</tt>.  It's used to wrap up a group of
-related options (in a fieldset by default).
+the +Formatter+ to call the +Labeler+, +ErrorHandler+, +Helper+, 
+and/or +Wrapper+.
 
 The <tt>Forme::Form</tt> object takes the 6 transformers as options (:formatter,
 :labeler, :error_handler, :helper, :wrapper, :inputs_wrapper, and :serializer), all of which
 should be objects responding to +call+ (so you can use +Proc+s) or be symbols
 registered with the library using <tt>Forme.register_transformer</tt>:
 
-  Forme.register_transformer(:wrapper, :p){|t| t.tag(:p, {}, t)}
+  Forme.register_transformer(:wrapper, :p) do |tag, input|
+    input.tag(:p, {}, tag)
+  end
+
+Most transformers are called with two arguments, +tag+ and +input+.  +tag+
+is a <tt>Forme::Tag</tt> instance, and +input+ is a <tt>Forme::Input</tt>
+instance.  The +Formatter+ and +Serializer+ transformers are the two
+exceptions, with +Formatter+ being called with just an +input+, and
++Serializer+ potentionally being called with any object.  The +Serializer+
+will in general recursively call itself with children of the argument
+given.
+
+There is also an +InputsWrapper+ transformer, that is called by
+<tt>Forme::Form#inputs</tt>.  It's used to wrap up a group of
+related options (in a fieldset by default).  It takes +form+
+(<tt>Forme::Form</tt> instance) and +input_opts+ (+Hash+) arguments.
 
 Most of the transformers can be overridden on a per instance basis by
-passing the appopriate option to +input+ or +inputs+:
+passing the appropriate option to +input+ or +inputs+:
 
   f.input(:name, :wrapper=>:p)
 
+Existing transformers can be easily extended (ie, to set the class attribute),
+by creating your own transformer and then calling the existing transformer.
+
+  Forme.register_transformer(:labeler, :explicit) do |tag, input|
+    input.opts[:label_attr] ||= { :class => 'label' }
+    Forme::Labeler::Explicit.new.call(tag, input)
+  end
+
 = Installation
 
   gem install forme
@@ -351,6 +370,17 @@ object in the enumerable, and includes the index in the namespace:
 
 Forme ships with a Sequel plugin (use <tt>Sequel::Model.plugin :forme</tt> to enable), that makes
 Sequel::Model instances support the +forme_config+ and +forme_input+ methods and return customized inputs.
+An additional instance method, +forme_namespace+ can optionally be defined to customize how model classnames
+are transformed into form classes and input IDs and names. This can be useful if your Sequel::Model classes
+are nested under a parent namespace. It falls back to the behaviour of Sequel::Model#underscore.
+
+  module Admin
+    class Albums < Sequel::Model
+      def forme_namespace
+        self.class.name.underscore.tr('/', '_')
+      end
+    end
+  end
 
 == Basics
 
@@ -494,6 +524,8 @@ subform options:
 :inputs :: Automatically call +inputs+ with the given values.  Using
            this, it is not required to pass a block to the method,
            though it will still work if you do.
+:inputs_opts :: When using the :grid option, this allows you to specify options
+                to pass to the table InputsWrapper.
 :legend :: Overrides the default :legend used (which is based on the
            association name).  You can also use a proc as the value,
            which will called with each associated object (and the position
@@ -505,8 +537,8 @@ subform options:
            be created via the :inputs option.  If you are not providing
            an :inputs option or are using a block with additional inputs,
            you should specify this option.
-:inputs_opts :: When using the :grid option, this allows you to specify options
-                to pass to the table InputsWrapper.
+:skip_primary_key :: Skip adding a hidden primary key field for existing
+                     objects.
 
 == Handling form submissions
 
@@ -603,7 +635,7 @@ storing Forme::Form objects and later using them on forms, it is fairly simple t
 Forme::Forme object creation to a method, that you can call both in the initial display
 and when processing the input:
 
-  def show_form(album)
+  def album_form(album)
     Forme.form(album, :action=>'/foo') do |f|
       f.input :name
       f.input :copies_sold

data/Rakefile

@@ -55,9 +55,15 @@ end
 task :default => :spec
 
 desc "Run specs with coverage"
-task :spec do
+task :spec_cov do
   ENV['COVERAGE'] = '1'
-  Rake::Task['spec'].invoke
+  sh "#{FileUtils::RUBY} spec/all.rb"
+end
+
+desc "Run specs with -w, some warnings filtered"
+task :spec_w do
+  ENV['WARNING'] = '1'
+  sh "#{FileUtils::RUBY} -w spec/all.rb"
 end
 
 ### Other

data/lib/forme/bs3.rb

@@ -92,10 +92,6 @@ module Forme
       end
     end
 
-    def set_label
-      form._tag(:span, {:class=>'set-label'}, @opts[:set_label])
-    end
-
     def _add_set_error(tags)
       tags << input.tag(:span, {:class=>'help-block with-errors'}, @opts[:set_error])
     end

data/lib/forme/form.rb

@@ -16,10 +16,6 @@ module Forme
     # The hidden tags to automatically add to the form.
     attr_reader :hidden_tags
 
-    # The namespaces if any for the receiver's inputs.  This can be used to
-    # automatically setup namespaced class and id attributes.
-    attr_accessor :namespaces
-
     # The +serializer+ determines how +Tag+ objects are transformed into strings.
     # Must respond to +call+ or be a registered symbol.
     attr_reader :serializer
@@ -238,7 +234,7 @@ module Forme
     # Create a +Tag+ associated to the receiver with the given arguments and block,
     # doing no other processing.
     def _tag(*a, &block)
-      tag = Tag.new(self, *a, &block)
+      Tag.new(self, *a, &block)
     end
 
     # The object associated with this form, if any. If the +Form+ has an associated
@@ -248,7 +244,8 @@ module Forme
       @opts[:obj]
     end
 
-    # The current namespaces for the form, if any.
+    # The namespaces if any for the receiver's inputs.  This can be used to
+    # automatically setup namespaced class and id attributes.
     def namespaces
       @opts[:namespace]
     end

data/lib/forme/input.rb

@@ -24,12 +24,6 @@ module Forme
       @form_opts = form.opts
     end
 
-    # Replace the +opts+ by merging the given +hash+ into +opts+,
-    # without modifying +opts+.
-    def merge_opts(hash)
-      @opts = @opts.merge(hash)
-    end
-
     # Create a new +Tag+ instance with the given arguments and block
     # related to the receiver's +form+.
     def tag(*a, &block)

data/lib/forme/transformers/formatter.rb

@@ -234,7 +234,9 @@ module Forme
 
       tags = process_select_optgroups(:_format_set_optgroup) do |label, value, sel, attrs|
         value ||= label
-        r_opts = attrs.merge(tag_attrs).merge(:label=>label||value, :label_attr=>{:class=>:option}, :wrapper=>tag_wrapper)
+        label_attr = {:class=>:option}
+        label_attr.merge!(@opts[:label_attr]) if @opts[:label_attr]
+        r_opts = attrs.merge(tag_attrs).merge(:label=>label||value, :label_attr=>label_attr, :wrapper=>tag_wrapper)
         r_opts[:value] ||= value if value
         r_opts[:checked] ||= :checked if sel
         r_opts[:formatter] = @opts[:formatter] if @opts[:formatter]
@@ -476,6 +478,12 @@ module Forme
 
     private
 
+    # Disabled checkbox inputs, without a hidden input.
+    def format_checkbox
+      @opts[:no_hidden] = true unless @opts.has_key?(:no_hidden)
+      super
+    end
+
     # Unless the :disabled option is specifically set
     # to +false+, set the :disabled attribute on the
     # resulting tag.
@@ -498,9 +506,10 @@ module Forme
 
     private
 
-    # Disabled checkbox inputs.
+    # Disabled checkbox inputs, without a hidden input.
     def format_checkbox
       @attr[:disabled] = :disabled
+      @opts[:no_hidden] = true unless @opts.has_key?(:no_hidden)
       super
     end
 

data/lib/forme/transformers/inputs_wrapper.rb

@@ -87,10 +87,14 @@ module Forme
         end
 
         if (labels = opts[:labels]) && !labels.empty?
-          form.emit(form.tag(:tr, {}, labels.map{|l| form._tag(:th, {}, l)}))
+          form.tag(:thead) do
+            form.emit(form.tag(:tr, {}, labels.map{|l| form._tag(:th, {}, l)}))
+          end
         end
 
-        yield
+        form.tag(:tbody) do
+          yield
+        end
       end
     end
   end

data/lib/forme/transformers/wrapper.rb

@@ -36,9 +36,6 @@ module Forme
       if labels.length == 1
         ltd = labels
         rtd = other
-      elsif a.length == 1
-        ltd = [a.first]
-        rtd = a[1..-1]
       else
         ltd = a
       end

data/lib/forme/version.rb

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

data/lib/sequel/plugins/forme.rb

@@ -22,7 +22,7 @@ module Sequel # :nodoc:
         # overridden with the :method attribute.
         def form(attr={}, &block)
           attr = {:method=>:post}.merge(attr)
-          attr[:class] = ::Forme.merge_classes(attr[:class], "forme", obj.model.send(:underscore, obj.model.name))
+          attr[:class] = ::Forme.merge_classes(attr[:class], "forme", obj.forme_namespace)
           super(attr, &block)
         end
 
@@ -44,6 +44,8 @@ module Sequel # :nodoc:
         # :inputs :: Automatically call +inputs+ with the given values.  Using
         #            this, it is not required to pass a block to the method,
         #            though it will still work if you do.
+        # :inputs_opts :: When using the :grid option, this allows you to specify options
+        #                 to pass to the table InputsWrapper.
         # :legend :: Overrides the default :legend used (which is based on the
         #            association name).  You can also use a proc as the value,
         #            which will called with each associated object (and the position
@@ -461,7 +463,7 @@ module Sequel # :nodoc:
         # Configure the +form+ with support for <tt>Sequel::Model</tt>
         # specific code, such as support for nested attributes.
         def forme_config(form)
-          form.namespaces << model.send(:underscore, model.name)
+          form.namespaces << forme_namespace
         end
 
         # Return subclass of base form that includes the necessary Sequel form methods.
@@ -479,6 +481,11 @@ module Sequel # :nodoc:
         def forme_input(form, field, opts)
           SequelInput.new(self, form, field, opts).input
         end
+
+        # Use the underscored model name as the default namespace.
+        def forme_namespace
+          model.send(:underscore, model.name)
+        end
       end
     end
   end

data/spec/bs3_sequel_plugin_spec.rb

@@ -424,23 +424,23 @@ describe "Forme Sequel::Model BS3 forms" do
   end
 
   it "should have #subform :grid option create a grid" do
-    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><tr><th>Name</th></tr><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
 
   it "should have #subform :grid option respect :inputs_opts option to pass options to inputs" do
-    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :inputs_opts=>{:attr=>{:class=>'foo'}})}.to_s.must_equal '<form class="forme album" method="post"><table class="foo"><caption>Artist</caption><tr><th>Name</th></tr><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :inputs_opts=>{:attr=>{:class=>'foo'}})}.to_s.must_equal '<form class="forme album" method="post"><table class="foo"><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
 
   it "should have #subform :grid option handle :legend and :labels options" do
-    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>'Foo', :labels=>%w'Bar')}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Foo</caption><tr><th>Bar</th></tr><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>'Foo', :labels=>%w'Bar')}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Foo</caption><thead><tr><th>Bar</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
 
   it "should have #subform :grid option handle :legend and :labels nil values" do
-    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>nil, :labels=>nil)}.to_s.must_equal '<form class="forme album" method="post"><table><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>nil, :labels=>nil)}.to_s.must_equal '<form class="forme album" method="post"><table><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
 
   it "should have #subform :grid option handle :skip_primary_key option" do
-    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :skip_primary_key=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><tr><th>Name</th></tr><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab, {},{:config=>:bs3}){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :skip_primary_key=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><tr><td class="string"><input class="form-control" id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
   
 end

data/spec/bs3_spec.rb

@@ -217,6 +217,10 @@ describe "Forme Bootstrap3 (BS3) forms" do
     @f.input(:checkbox, :name=>"foo", :hidden_value=>"no").to_s.must_equal '<div class="checkbox"><input name="foo" type="hidden" value="no"/><input name="foo" type="checkbox"/></div>'
   end
 
+  it "should create hidden input" do
+    @f.input(:hidden).to_s.must_equal '<input type="hidden"/>'
+  end
+
   it "should handle :checked option" do
     @f.input(:checkbox, :checked=>true).to_s.must_equal '<div class="checkbox"><input checked="checked" type="checkbox"/></div>'
     @f.input(:checkbox, :checked=>false).to_s.must_equal '<div class="checkbox"><input type="checkbox"/></div>'
@@ -375,6 +379,10 @@ describe "Forme Bootstrap3 (BS3) forms" do
     @f.input(:radioset, :optgroups=>[['d', [[:a, 1], [:b, 2]]], ['e', [[:c, 3]]]], :selected=>2).to_s.must_equal '<div class="radioset"><fieldset><legend>d</legend><div class="radio"><label class="option"><input type="radio" value="1"/> a</label></div><div class="radio"><label class="option"><input checked="checked" type="radio" value="2"/> b</label></div></fieldset><fieldset><legend>e</legend><div class="radio"><label class="option"><input type="radio" value="3"/> c</label></div></fieldset></div>'
   end
   
+  it "should create set of radio buttons with set label" do
+    @f.input(:radioset, :options=>[1, 2, 3], :selected=>2, :label=>'foo').to_s.must_equal '<div class="radioset"><label>foo</label><div class="radio"><label class="option"><input type="radio" value="1"/> 1</label></div><div class="radio"><label class="option"><input checked="checked" type="radio" value="2"/> 2</label></div><div class="radio"><label class="option"><input type="radio" value="3"/> 3</label></div></div>'
+  end
+
   it "should create set of checkbox buttons" do
     @f.input(:checkboxset, :options=>[1, 2, 3], :selected=>2).to_s.must_equal '<div class="checkboxset"><div class="checkbox"><label class="option"><input type="checkbox" value="1"/> 1</label></div><div class="checkbox"><label class="option"><input checked="checked" type="checkbox" value="2"/> 2</label></div><div class="checkbox"><label class="option"><input type="checkbox" value="3"/> 3</label></div></div>'
     @f.input(:checkboxset, :options=>[1, 2, 3], :value=>2).to_s.must_equal '<div class="checkboxset"><div class="checkbox"><label class="option"><input type="checkbox" value="1"/> 1</label></div><div class="checkbox"><label class="option"><input checked="checked" type="checkbox" value="2"/> 2</label></div><div class="checkbox"><label class="option"><input type="checkbox" value="3"/> 3</label></div></div>'
@@ -500,6 +508,10 @@ describe "Forme Bootstrap3 (BS3) forms" do
     @f.button.to_s.must_equal '<input class="btn btn-default" type="submit"/>'
   end
 
+  it "#button should return a submit tag without label" do
+    @f.button(:label=>'foo').to_s.must_equal '<input class="btn btn-default" type="submit"/>'
+  end
+
   it "#button should accept an options hash" do
     @f.button(:name=>'foo', :value=>'bar').to_s.must_equal '<input class="btn btn-default" name="foo" type="submit" value="bar"/>'
   end
@@ -588,7 +600,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
   it "should format dates, times, and datetimes in ISO format" do
     @f.tag(:div, :foo=>Date.new(2011, 6, 5)).to_s.must_equal '<div foo="2011-06-05"></div>'
     @f.tag(:div, :foo=>DateTime.new(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000000"></div>'
-    @f.tag(:div, :foo=>Time.utc(2011, 6, 5, 4, 3, 2)).to_s.must_match /<div foo="2011-06-05T04:03:02.000000"><\/div>/ #/
+    @f.tag(:div, :foo=>Time.utc(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000000"></div>'
   end
 
   it "should format bigdecimals in standard notation" do
@@ -621,6 +633,13 @@ describe "Forme Bootstrap3 (BS3) forms" do
     @f.input(:text, :formatter=>:bs3_readonly, :value=>'1', :label=>'Foo').to_s.must_equal '<div class="form-group"><label>Foo</label> <input class="form-control" readonly="readonly" type="text" value="1"/></div>'
   end
 
+  it "bs3_readonly formatter should disable checkbox, radio, select, and textarea inputs" do
+    @f.input(:checkbox, :formatter=>:bs3_readonly).to_s.must_equal '<div class="checkbox"><input disabled="disabled" type="checkbox"/></div>'
+    @f.input(:radio, :formatter=>:bs3_readonly).to_s.must_equal '<div class="radio"><input disabled="disabled" type="radio"/></div>'
+    @f.input(:select, :formatter=>:bs3_readonly).to_s.must_equal '<div class="form-group"><select class="form-control" disabled="disabled"></select></div>'
+    @f.input(:textarea, :formatter=>:bs3_readonly).to_s.must_equal '<div class="form-group"><textarea class="form-control" readonly="readonly"></textarea></div>' 
+  end
+
   it "inputs should accept a :labeler option to use a custom labeler" do
     @f.input(:textarea, :labeler=>:explicit, :label=>'bar', :id=>:foo).to_s.must_equal '<div class="form-group"><label class="label-before" for="foo">bar</label><textarea class="form-control" id="foo"></textarea></div>'
   end
@@ -648,6 +667,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
   it "#inputs should accept a :inputs_wrapper option to use a custom inputs_wrapper" do
     @f.inputs([:textarea], :inputs_wrapper=>:ol).to_s.must_equal '<ol><div class="form-group"><textarea class="form-control"></textarea></div></ol>'
     @f.inputs([:textarea], :inputs_wrapper=>:bs3_table, :wrapper=>:trtd).to_s.must_equal '<table class="table table-bordered"><tr><td><textarea class="form-control"></textarea></td><td></td></tr></table>'
+    @f.inputs([:textarea], :inputs_wrapper=>:bs3_table, :wrapper=>:trtd, :legend=>'Foo', :labels=>['bar']).to_s.must_equal '<table class="table table-bordered"><caption>Foo</caption><tr><th>bar</th></tr><tr><td><textarea class="form-control"></textarea></td><td></td></tr></table>'
   end
 
   it "inputs should accept a :wrapper=>nil option to not use a wrapper" do

data/spec/forme_spec.rb

@@ -10,7 +10,7 @@ describe "Forme plain forms" do
   end
 
   it "Forme.version should return version string" do
-    Forme.version.must_match /\A\d+\.\d+\.\d+\z/
+    Forme.version.must_match(/\A\d+\.\d+\.\d+\z/)
   end
 
   it "should create a simple input tags" do
@@ -216,6 +216,16 @@ describe "Forme plain forms" do
     @f.input(:checkbox, :name=>"foo").to_s.must_equal '<input name="foo" type="hidden" value="0"/><input name="foo" type="checkbox"/>'
   end
 
+  it "should not create hidden input with value 0 for readonly or disabled checkboxes" do
+    @f.input(:checkbox, :name=>"foo", :formatter=>:disabled).to_s.must_equal '<input disabled="disabled" name="foo" type="checkbox"/>'
+    @f.input(:checkbox, :name=>"foo", :formatter=>:readonly).to_s.must_equal '<input disabled="disabled" name="foo" type="checkbox"/>'
+  end
+
+  it "should create hidden input with value 0 for readonly or disabled checkboxes if no_hidden is explicitly given and not true" do
+    @f.input(:checkbox, :name=>"foo", :formatter=>:disabled, :no_hidden=>false).to_s.must_equal '<input name="foo" type="hidden" value="0"/><input disabled="disabled" name="foo" type="checkbox"/>'
+    @f.input(:checkbox, :name=>"foo", :formatter=>:readonly, :no_hidden=>false).to_s.must_equal '<input name="foo" type="hidden" value="0"/><input disabled="disabled" name="foo" type="checkbox"/>'
+  end
+
   it "should not create hidden input with value 0 for each checkbox with a name if :no_hidden option is used" do
     @f.input(:checkbox, :name=>"foo", :no_hidden=>true).to_s.must_equal '<input name="foo" type="checkbox"/>'
   end
@@ -390,6 +400,10 @@ describe "Forme plain forms" do
     @f.input(:radioset, :optgroups=>[['d', [[:a, 1], [:b, 2]]], ['e', [[:c, 3]]]], :selected=>2).to_s.must_equal '<fieldset><legend>d</legend><label class="option"><input type="radio" value="1"/> a</label><label class="option"><input checked="checked" type="radio" value="2"/> b</label></fieldset><fieldset><legend>e</legend><label class="option"><input type="radio" value="3"/> c</label></fieldset>'
   end
 
+  it "should create set of radio buttons with label attributes" do
+    @f.input(:radioset, :options=>[1, 2, 3], :selected=>2, :label_attr=>{:foo=>:bar}).to_s.must_equal '<label class="option" foo="bar"><input type="radio" value="1"/> 1</label><label class="option" foo="bar"><input checked="checked" type="radio" value="2"/> 2</label><label class="option" foo="bar"><input type="radio" value="3"/> 3</label>'
+  end
+
   it "should create set of checkbox buttons" do
     @f.input(:checkboxset, :options=>[1, 2, 3], :selected=>2).to_s.must_equal '<label class="option"><input type="checkbox" value="1"/> 1</label><label class="option"><input checked="checked" type="checkbox" value="2"/> 2</label><label class="option"><input type="checkbox" value="3"/> 3</label>'
     @f.input(:checkboxset, :options=>[1, 2, 3], :value=>2).to_s.must_equal '<label class="option"><input type="checkbox" value="1"/> 1</label><label class="option"><input checked="checked" type="checkbox" value="2"/> 2</label><label class="option"><input type="checkbox" value="3"/> 3</label>'
@@ -436,6 +450,10 @@ describe "Forme plain forms" do
     @f.input(:checkboxset, :optgroups=>[['d', [[:a, 1], [:b, 2]]], ['e', [[:c, 3]]]], :selected=>2).to_s.must_equal '<fieldset><legend>d</legend><label class="option"><input type="checkbox" value="1"/> a</label><label class="option"><input checked="checked" type="checkbox" value="2"/> b</label></fieldset><fieldset><legend>e</legend><label class="option"><input type="checkbox" value="3"/> c</label></fieldset>'
   end
 
+  it "should create set of checkbox buttons with label attributes" do
+    @f.input(:checkboxset, :options=>[1, 2, 3], :selected=>2, :label_attr=>{:foo=>:bar}).to_s.must_equal '<label class="option" foo="bar"><input type="checkbox" value="1"/> 1</label><label class="option" foo="bar"><input checked="checked" type="checkbox" value="2"/> 2</label><label class="option" foo="bar"><input type="checkbox" value="3"/> 3</label>'
+  end
+
   it "should raise an Error for empty checkbox sets" do
     @f.input(:checkboxset, :options=>[], :error=>'foo', :value=>2).to_s.must_equal '<span class="error_message">foo</span>'
   end
@@ -606,7 +624,7 @@ describe "Forme plain forms" do
   it "should format dates, times, and datetimes in ISO format" do
     @f.tag(:div, :foo=>Date.new(2011, 6, 5)).to_s.must_equal '<div foo="2011-06-05"></div>'
     @f.tag(:div, :foo=>DateTime.new(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000000"></div>'
-    @f.tag(:div, :foo=>Time.utc(2011, 6, 5, 4, 3, 2)).to_s.must_match /<div foo="2011-06-05T04:03:02.000000"><\/div>/
+    @f.tag(:div, :foo=>Time.utc(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000000"></div>'
   end
 
   it "should format bigdecimals in standard notation" do
@@ -854,9 +872,9 @@ describe "Forme built-in custom" do
   end
 
   it "wrapper: table should use a trtd wrapper and table inputs_wrapper" do
-    Forme::Form.new(:wrapper=>:table).inputs([:textarea]).to_s.must_equal '<table><tr><td><textarea></textarea></td><td></td></tr></table>'
+    Forme::Form.new(:wrapper=>:table).inputs([:textarea]).to_s.must_equal '<table><tbody><tr><td><textarea></textarea></td><td></td></tr></tbody></table>'
     f = Forme::Form.new
-    f.with_opts(:wrapper=>:table){f.inputs([:textarea])}.to_s.must_equal '<table><tr><td><textarea></textarea></td><td></td></tr></table>'
+    f.with_opts(:wrapper=>:table){f.inputs([:textarea])}.to_s.must_equal '<table><tbody><tr><td><textarea></textarea></td><td></td></tr></tbody></table>'
   end
 
   it "wrapper: ol should use an li wrapper and ol inputs_wrapper" do
@@ -902,24 +920,24 @@ describe "Forme built-in custom" do
   end
 
   it "inputs_wrapper: table wraps tags in an table" do
-    Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea]).to_s.must_equal '<table><tr><td><textarea></textarea></td><td></td></tr></table>'
-    Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea], :attr=>{:foo=>1}).to_s.must_equal '<table foo="1"><tr><td><textarea></textarea></td><td></td></tr></table>'
+    Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea]).to_s.must_equal '<table><tbody><tr><td><textarea></textarea></td><td></td></tr></tbody></table>'
+    Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea], :attr=>{:foo=>1}).to_s.must_equal '<table foo="1"><tbody><tr><td><textarea></textarea></td><td></td></tr></tbody></table>'
   end
 
   it "inputs_wrapper: table accepts a :legend option" do
-   Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea], :legend=>'Inputs').to_s.must_equal '<table><caption>Inputs</caption><tr><td><textarea></textarea></td><td></td></tr></table>'
+   Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea], :legend=>'Inputs').to_s.must_equal '<table><caption>Inputs</caption><tbody><tr><td><textarea></textarea></td><td></td></tr></tbody></table>'
   end
 
   it "inputs_wrapper: table accepts a :legend_attr option" do
-    Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea], :legend=>'Inputs', :legend_attr=>{:class=>'foo'}).to_s.must_equal '<table><caption class="foo">Inputs</caption><tr><td><textarea></textarea></td><td></td></tr></table>'
+    Forme::Form.new(:inputs_wrapper=>:table, :wrapper=>:trtd).inputs([:textarea], :legend=>'Inputs', :legend_attr=>{:class=>'foo'}).to_s.must_equal '<table><caption class="foo">Inputs</caption><tbody><tr><td><textarea></textarea></td><td></td></tr></tbody></table>'
   end
 
   it "inputs_wrapper: table accepts a :labels option" do
-    Forme::Form.new(:inputs_wrapper=>:table).inputs(:labels=>%w'A B C').to_s.must_equal '<table><tr><th>A</th><th>B</th><th>C</th></tr></table>'
+    Forme::Form.new(:inputs_wrapper=>:table).inputs(:labels=>%w'A B C').to_s.must_equal '<table><thead><tr><th>A</th><th>B</th><th>C</th></tr></thead><tbody></tbody></table>'
   end
 
   it "inputs_wrapper: table doesn't add empty header row for :labels=>[]" do
-    Forme::Form.new(:inputs_wrapper=>:table).inputs(:labels=>[]).to_s.must_equal '<table></table>'
+    Forme::Form.new(:inputs_wrapper=>:table).inputs(:labels=>[]).to_s.must_equal '<table><tbody></tbody></table>'
   end
 
   it "serializer: html_usa formats dates and datetimes in American format without timezones" do

data/spec/rails_integration_spec.rb

@@ -7,14 +7,23 @@ require 'action_controller/railtie'
 rescue LoadError
   warn "unable to load rails, skipping rails spec"
 else
+begin
+  require 'active_pack/gem_version'
+rescue LoadError
+end
 require 'forme/rails'
 
 class FormeRails < Rails::Application
-  config.secret_token = routes.append { get ':action' , :controller=>'forme' }.inspect
+  routes.append do
+    %w'index inputs_block inputs_block_wrapper nest nest_sep nest_inputs nest_seq hash legend combined noblock noblock_post safe_buffer'.each do |action|
+      get action, :controller=>'forme', :action=>action
+    end
+  end
   config.active_support.deprecation = :stderr
   config.middleware.delete(ActionDispatch::ShowExceptions)
-  config.middleware.delete("Rack::Lock")
-  config.secret_key_base = 'foo'
+  config.middleware.delete(Rack::Lock)
+  config.secret_key_base = 'foo'*15
+  config.secret_token = 'secret token'*15
   config.eager_load = true
   initialize!
 end
@@ -217,8 +226,14 @@ describe "Forme Rails integration" do
     sin_get('/nest_inputs').must_equal "0 <form action=\"/baz\"> 1 <p>FBB</p> 2 n1 <fieldset class=\"inputs\"> n2 <input id=\"first\" name=\"first\" type=\"text\" value=\"foo\"/> <input id=\"last\" name=\"last\" type=\"text\" value=\"bar\"/> n3 </fieldset> 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').sub(%r{<input name=\"authenticity_token\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"authenticity_token\" type=\"hidden\" value=\"csrf\"/>").must_equal "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\"/><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"
+  unless defined?(JRUBY_VERSION) && JRUBY_VERSION =~ /\A9\.0/ && defined?(ActionPack::VERSION::STRING) && ActionPack::VERSION::STRING >= '5.1'
+    it "#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=\"authenticity_token\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"authenticity_token\" type=\"hidden\" value=\"csrf\"/>").must_equal "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\"/><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 work without a block with hidden tags" do
+      sin_get('/noblock_post').sub(%r{<input name=\"authenticity_token\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"authenticity_token\" type=\"hidden\" value=\"csrf\"/>").must_equal '<form method="post"><input name="authenticity_token" type="hidden" value="csrf"/><input type="submit" value="xyz"/></form>'
+    end
   end
 
   it "#form should accept two hashes instead of requiring obj as first argument" do
@@ -237,10 +252,6 @@ describe "Forme Rails integration" 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 with hidden tags" do
-    sin_get('/noblock_post').sub(%r{<input name=\"authenticity_token\" type=\"hidden\" value=\"([^\"]+)\"/>}, "<input name=\"authenticity_token\" type=\"hidden\" value=\"csrf\"/>").must_equal '<form method="post"><input name="authenticity_token" type="hidden" value="csrf"/><input type="submit" value="xyz"/></form>'
-  end
-
   it "#form should handle Rails SafeBuffers" do
     sin_get('/safe_buffer').must_equal '<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

data/spec/sequel_helper.rb

@@ -1,8 +1,9 @@
 require 'rubygems'
-require 'sequel/no_core_ext'
+require 'sequel'
 
 db_url = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'
-DB = Sequel.connect(db_url)
+DB = Sequel.connect(db_url, :identifier_mangling=>false)
+DB.extension(:freeze_datasets)
 Sequel.default_timezone = :utc
 DB.create_table(:artists) do
   primary_key :id
@@ -46,7 +47,7 @@ c = DB[:albums].insert(:name=>'c', :artist_id=>d, :gold=>true, :platinum=>true)
 DB[:tracks].insert(:name=>'o', :album_id=>c)
 s = DB[:tags].insert(:name=>'s')
 t = DB[:tags].insert(:name=>'t')
-u = DB[:tags].insert(:name=>'u')
+DB[:tags].insert(:name=>'u')
 [[b, s], [b, t], [c, t]].each{|k, v| DB[:albums_tags].insert(k, v)}
 
 Sequel::Model.plugin :forme

data/spec/sequel_i18n_helper.rb

@@ -21,7 +21,7 @@ DB.create_table(:clients) do
 end
 
 a = DB[:firms].insert(:name=>'a')
-b = DB[:invoices].insert(:name=>'b', :firm_id=>a, :summary=>'a brief summary')
+DB[:invoices].insert(:name=>'b', :firm_id=>a, :summary=>'a brief summary')
 DB[:clients].insert(:name=>'a great client', :firm_id=>a)
 
 class Firm < Sequel::Model

data/spec/sequel_plugin_spec.rb

@@ -426,23 +426,23 @@ describe "Forme Sequel::Model forms" do
   end
 
   it "should have #subform :grid option create a grid" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><tr><th>Name</th></tr><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
   
   it "should have #subform :grid option respect :inputs_opts option to pass options to inputs" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :inputs_opts=>{:attr=>{:class=>'foo'}})}.to_s.must_equal '<form class="forme album" method="post"><table class="foo"><caption>Artist</caption><tr><th>Name</th></tr><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :inputs_opts=>{:attr=>{:class=>'foo'}})}.to_s.must_equal '<form class="forme album" method="post"><table class="foo"><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
   
   it "should have #subform :grid option handle :legend and :labels options" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>'Foo', :labels=>%w'Bar')}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Foo</caption><tr><th>Bar</th></tr><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>'Foo', :labels=>%w'Bar')}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Foo</caption><thead><tr><th>Bar</th></tr></thead><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
   
   it "should have #subform :grid option handle :legend and :labels nil values" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>nil, :labels=>nil)}.to_s.must_equal '<form class="forme album" method="post"><table><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :legend=>nil, :labels=>nil)}.to_s.must_equal '<form class="forme album" method="post"><table><tbody><input id="album_artist_attributes_id" name="album[artist_attributes][id]" type="hidden" value="1"/><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
 
   it "should have #subform :grid option handle :skip_primary_key option" do
-    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :skip_primary_key=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><tr><th>Name</th></tr><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></table></form>'
+    Forme.form(@ab){|f| f.subform(:artist, :inputs=>[:name], :grid=>true, :skip_primary_key=>true)}.to_s.must_equal '<form class="forme album" method="post"><table><caption>Artist</caption><thead><tr><th>Name</th></tr></thead><tbody><tr><td class="string"><input id="album_artist_attributes_name" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
   
 end
@@ -525,3 +525,52 @@ describe "Forme Sequel::Model validation parsing" do
 
 end
 
+describe "Forme Sequel::Model default namespacing" do
+  before do
+    module Foo
+      class Album < ::Album
+      end
+    end
+
+    @ab = Foo::Album[1]
+    @b = Forme::Form.new(@ab)
+  end
+  after do
+    Object.send(:remove_const, :Foo)
+  end
+
+  it "namespaces the form class" do
+    @b.form.to_s.must_equal '<form class="forme foo/album" method="post"></form>'
+  end
+
+  it "namespaces the input id and name" do
+    @b.input(:name).to_s.must_equal '<label>Name: <input id="foo/album_name" name="foo/album[name]" type="text" value="b"/></label>'
+  end
+end
+
+describe "Forme Sequel::Model custom namespacing" do
+  before do
+    module Bar
+      class Album < ::Album
+        def forme_namespace
+          'bar_album'
+        end
+      end
+    end
+
+    @ab = Bar::Album[1]
+    @b = Forme::Form.new(@ab)
+  end
+  after do
+    Object.send(:remove_const, :Bar)
+  end
+
+  it "namespaces the form class" do
+    @b.form.to_s.must_equal '<form class="forme bar_album" method="post"></form>'
+  end
+
+  it "namespaces the form input and name" do
+    @b.input(:name).to_s.must_equal '<label>Name: <input id="bar_album_name" name="bar_album[name]" type="text" value="b"/></label>'
+  end
+
+end

data/spec/sequel_set_plugin_spec.rb

@@ -9,15 +9,15 @@ describe "Sequel forme_set plugin" do
   
   it "#forme_set should only set values in the form" do
     @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal nil
+    @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_equal nil
-    @ab.copies_sold.must_equal nil
+    @ab.name.must_be_nil
+    @ab.copies_sold.must_be_nil
 
     @f.input(:copies_sold)
     @ab.forme_set('name'=>'Bar', 'copies_sold'=>'1')
@@ -30,7 +30,7 @@ describe "Sequel forme_set plugin" do
       @f.input(:name, opts)
 
       @ab.forme_set(:name=>'Foo')
-      @ab.name.must_equal nil
+      @ab.name.must_be_nil
 
       @ab.forme_set('foo'=>'Foo')
       @ab.name.must_equal 'Foo'
@@ -41,19 +41,19 @@ describe "Sequel forme_set plugin" do
   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_equal nil
+    @ab.name.must_be_nil
     @ab.forme_set(nil=>'Foo')
-    @ab.name.must_equal nil
+    @ab.name.must_be_nil
   end
   
   it "#forme_set should skip inputs with disabled/readonly formatter" do
     @f.input(:name, :formatter=>:disabled)
     @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal nil
+    @ab.name.must_be_nil
 
     @f.input(:name, :formatter=>:readonly)
     @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal nil
+    @ab.name.must_be_nil
 
     @f.input(:name, :formatter=>:default)
     @ab.forme_set(:name=>'Foo')
@@ -64,12 +64,12 @@ describe "Sequel forme_set plugin" do
     @f = Forme::Form.new(@ab, :formatter=>:disabled)
     @f.input(:name)
     @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal nil
+    @ab.name.must_be_nil
 
     @f = Forme::Form.new(@ab, :formatter=>:readonly)
     @f.input(:name)
     @ab.forme_set(:name=>'Foo')
-    @ab.name.must_equal nil
+    @ab.name.must_be_nil
 
     @f.input(:name, :formatter=>:default)
     @ab.forme_set(:name=>'Foo')
@@ -78,14 +78,14 @@ describe "Sequel forme_set plugin" do
   
   it "#forme_set should handle setting values for associated objects" do
     @ab.forme_set(:artist_id=>1)
-    @ab.artist_id.must_equal nil
+    @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_equal nil
+    @ab.artist_id.must_be_nil
     @ab.tag_pks.must_equal []
 
     @f.input(:tags)
@@ -120,7 +120,7 @@ describe "Sequel forme_set plugin" do
       @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_equal nil
+      @ab.errors[:tag_pks].must_be_nil
 
       @ab.forme_validations.clear
       @ab.forme_set('artist_id'=>'2', 'tag_pks'=>['2'])

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 $:.unshift(File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib'))
 
+if ENV['WARNING']
+  require 'warning'
+  Warning.ignore(:missing_ivar)
+end
+
 if ENV['COVERAGE']
   require File.join(File.dirname(File.expand_path(__FILE__)), "forme_coverage")
   SimpleCov.forme_coverage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: HTML forms library