forme 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 617e4bb020afdaf14cb5a13ec71c57bc0c33f173
-  data.tar.gz: 05ee61e281799560dd9c9eb84911a11bf9ca0c0c
+SHA256:
+  metadata.gz: 4c126daca3403b2140b2059d04c6ef405a11f8d56418ce4e971025ee8f861ec2
+  data.tar.gz: 347c183344c4fe77f42753d0ec0515ce11065e648a9d37d14665b7d10fb090ed
 SHA512:
-  metadata.gz: 90d0384542f59034b2428aeff330e0e9379b9c732877bbfa22d8be3be4cbeb89a24c635495ab638423ca2126dc7cea89ca07c74e4eea49193cd770fe521d67e5
-  data.tar.gz: 6aab3b04c4658e2c104f056104d5e2480580f51b1328e9540bc52b9c6ab0c9941b0bf7bfe5ddb9051b6d501e1bad7b8a6c5b115133caba05b689b28dbee1eb0c
+  metadata.gz: 220b3e73af81b0db1f4187ba2f65505b775780ff8b9459d3b95f139d5160fcaa3eacf5e2172b5f9e883c7f7fc9bf7b4bb23ef05b54abbf815fe2d481844a5038
+  data.tar.gz: 5742f5edf32047920fb23f73bdd86a3c29823d1c2f9b0834718a304d157cabea627767448c534e9b2a0e21c0ab78dbb240c66692706bb68c59e84c1a9c618c2a

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.7.0 (2018-02-07)
+
+* Have radioset and checkboxset inputs respect :error_attr option (jeremyevans)
+
+* Add :tag_labeler option for checkboxsets and radiosets for the labeler to use for individual elements (jeremyevans)
+
+* Use milliseconds instead of microseconds for serializing Time and DateTime values, since that's what datetime-local inputs support (jeremyevans)
+
 === 1.6.0 (2017-05-03)
 
 * Use thead/tbody tags for table inputs_wrapper transformer and Sequel plugin subform :grid option (jeremyevans)

data/README.rdoc

@@ -813,12 +813,16 @@ Creates a select tag, containing option tags specified by the :options option.
 === :checkboxset
 
 Creates a set of checkbox inputs all using the same name.  Supports the same options
-as the select type, except that the :multiple option is assumed to be true.
+as the select type, except that the :multiple option is assumed to be true.  Also supports
+the following options:
+
+:tag_wrapper :: The wrapper transformer for individual tags in the set
+:tag_labeler :: The labeler transformer for individual tags in the set
 
 === :radioset
 
 Creates a set of radio buttons all using the same name.  Supports the same options
-as the select type.
+as the :checkboxset type.
 
 === :textarea
 

data/lib/forme/transformers/formatter.rb

@@ -229,6 +229,7 @@ module Forme
       end
 
       tag_wrapper = Forme.transformer(:tag_wrapper, @opts.delete(:tag_wrapper), @input.form_opts) || :default
+      tag_labeler = Forme.transformer(:labeler, @opts.delete(:tag_labeler), @input.form_opts) || :default
       wrapper = @opts.fetch(:wrapper){@opts[:wrapper] = @input.form_opts[:set_wrapper] || @input.form_opts[:wrapper]}
       wrapper = Forme.transformer(:wrapper, wrapper)
 
@@ -236,7 +237,7 @@ module Forme
         value ||= label
         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 = attrs.merge(tag_attrs).merge(:label=>label||value, :label_attr=>label_attr, :wrapper=>tag_wrapper, :labeler=>tag_labeler)
         r_opts[:value] ||= value if value
         r_opts[:checked] ||= :checked if sel
         r_opts[:formatter] = @opts[:formatter] if @opts[:formatter]
@@ -256,7 +257,7 @@ module Forme
       end
 
       if @opts[:set_error]
-       _add_set_error(tags)
+        _add_set_error(tags)
       end
 
       tags.unshift(set_label) if @opts[:set_label]
@@ -271,8 +272,11 @@ module Forme
     def _add_set_error(tags)
       if (last_input = tags.last) && last_input.is_a?(Input)
         last_input.opts[:error] = @opts[:set_error]
+        last_input.opts[:error_attr] = @opts[:error_attr] if @opts[:error_attr]
       else
-        tags << form._tag(:span, {:class=>'error_message'}, [@opts[:set_error]])
+        attr = @opts[:error_attr] || {}
+        Forme.attr_classes(attr, 'error_message')
+        tags << form._tag(:span, attr, [@opts[:set_error]])
       end
     end
 

data/lib/forme/transformers/serializer.rb

@@ -66,7 +66,7 @@ module Forme
 
     # Return a string in ISO format representing the +Time+ or +DateTime+ instance.
     def format_time(time)
-      time.is_a?(Time) ? (time.strftime('%Y-%m-%dT%H:%M:%S') + sprintf(".%06d", time.usec)) : (time.strftime('%Y-%m-%dT%H:%M:%S.') + time.strftime('%N')[0...6])
+      time.is_a?(Time) ? (time.strftime('%Y-%m-%dT%H:%M:%S') + sprintf(".%03d", time.usec)) : (time.strftime('%Y-%m-%dT%H:%M:%S.') + time.strftime('%N')[0...3])
     end
 
     # Escape ampersands, brackets and quotes to their HTML/XML entities.

data/lib/forme/version.rb

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

data/spec/bs3_sequel_plugin_spec.rb

@@ -54,12 +54,12 @@ describe "Forme Sequel::Model BS3 forms" do
   end
 
   it "should use datetime inputs for Time" do
-    @b.input(:created_at).to_s.must_match %r{<div class="datetime form-group"><label for="album_created_at">Created at</label> <input class="form-control" id="album_created_at" name="album\[created_at\]" type="datetime-local" value="2011-06-05T00:00:00.000000"/></div>}
+    @b.input(:created_at).to_s.must_match %r{<div class="datetime form-group"><label for="album_created_at">Created at</label> <input class="form-control" id="album_created_at" name="album\[created_at\]" type="datetime-local" value="2011-06-05T00:00:00.000"/></div>}
   end
 
   it "should use datetime inputs for DateTimes" do
     @ab.values[:created_at] = DateTime.new(2011, 6, 5)
-    @b.input(:created_at).to_s.must_equal '<div class="datetime form-group"><label for="album_created_at">Created at</label> <input class="form-control" id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000000"/></div>'
+    @b.input(:created_at).to_s.must_equal '<div class="datetime form-group"><label for="album_created_at">Created at</label> <input class="form-control" id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000"/></div>'
   end
 
   it "should include type as wrapper class" do
@@ -67,7 +67,7 @@ describe "Forme Sequel::Model BS3 forms" do
     f = Forme::Form.new(@ab, :config=>:bs3)
     f.input(:name).to_s.must_equal '<div class="form-group string"><label for="album_name">Name</label> <input class="form-control" id="album_name" name="album[name]" type="text" value="b"/></div>'
     f.input(:release_date).to_s.must_equal '<div class="date form-group"><label for="album_release_date">Release date</label> <input class="form-control" id="album_release_date" name="album[release_date]" type="date" value="2011-06-05"/></div>'
-    f.input(:created_at).to_s.must_equal '<div class="datetime form-group"><label for="album_created_at">Created at</label> <input class="form-control" id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000000"/></div>'
+    f.input(:created_at).to_s.must_equal '<div class="datetime form-group"><label for="album_created_at">Created at</label> <input class="form-control" id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000"/></div>'
   end
 
   it "should include required * in label if required" do

data/spec/bs3_spec.rb

@@ -599,8 +599,8 @@ 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_equal '<div foo="2011-06-05T04:03:02.000000"></div>'
+    @f.tag(:div, :foo=>DateTime.new(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000"></div>'
+    @f.tag(:div, :foo=>Time.utc(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000"></div>'
   end
 
   it "should format bigdecimals in standard notation" do

data/spec/forme_spec.rb

@@ -404,6 +404,10 @@ describe "Forme plain forms" 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 radio buttons with :error and :error_attr options" do
+    @f.input(:radioset, :options=>[1, 2, 3], :selected=>2, :error=>'foo', :error_attr=>{'bar'=>'baz'}).to_s.must_equal '<label class="option"><input type="radio" value="1"/> 1</label><label class="option"><input checked="checked" type="radio" value="2"/> 2</label><label class="option"><input class="error" type="radio" value="3"/> 3</label><span bar="baz" class="error_message">foo</span>'
+  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>'
@@ -413,6 +417,18 @@ describe "Forme plain forms" do
     @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :selected=>2).to_s.must_equal '<label class="option"><input type="checkbox" value="1"/> a</label><label class="option"><input checked="checked" type="checkbox" value="2"/> b</label><label class="option"><input type="checkbox" value="3"/> c</label>'
   end
 
+  it "should support :wrapper and :tag_wrapper for checkboxsets" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :tag_wrapper=>:div, :wrapper=>:li).to_s.must_equal '<li><div><label class="option"><input type="checkbox" value="1"/> a</label></div><div><label class="option"><input type="checkbox" value="2"/> b</label></div><div><label class="option"><input type="checkbox" value="3"/> c</label></div></li>'
+  end
+
+  it "should support :label for checkboxsets" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :label=>'foo').to_s.must_equal '<span class="label">foo</span><label class="option"><input type="checkbox" value="1"/> a</label><label class="option"><input type="checkbox" value="2"/> b</label><label class="option"><input type="checkbox" value="3"/> c</label>'
+  end
+
+  it "should support :tag_labeler for checkboxsets" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :tag_labeler=>:explicit).to_s.must_equal '<input type="checkbox" value="1"/><label class="option label-after">a</label><input type="checkbox" value="2"/><label class="option label-after">b</label><input type="checkbox" value="3"/><label class="option label-after">c</label>'
+  end
+
   it "should create set of checkbox buttons with options and values with hashes" do
     @f.input(:checkboxset, :options=>[[:a, {:attr=>{:foo=>1}}], [:b, {:class=>'foo', :value=>2}], [:c, {:id=>:baz}]], :selected=>2).to_s.must_equal '<label class="option"><input foo="1" type="checkbox" value="a"/> a</label><label class="option"><input checked="checked" class="foo" type="checkbox" value="2"/> b</label><label class="option"><input id="baz" type="checkbox" value="c"/> c</label>'
   end
@@ -623,8 +639,8 @@ 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_equal '<div foo="2011-06-05T04:03:02.000000"></div>'
+    @f.tag(:div, :foo=>DateTime.new(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000"></div>'
+    @f.tag(:div, :foo=>Time.utc(2011, 6, 5, 4, 3, 2)).to_s.must_equal '<div foo="2011-06-05T04:03:02.000"></div>'
   end
 
   it "should format bigdecimals in standard notation" do

data/spec/sequel_helper.rb

@@ -50,6 +50,18 @@ t = DB[:tags].insert(:name=>'t')
 DB[:tags].insert(:name=>'u')
 [[b, s], [b, t], [c, t]].each{|k, v| DB[:albums_tags].insert(k, v)}
 
+# Allow loading of pg_array extension even when not on PostgreSQL
+def DB.add_conversion_proc(*)
+  super if defined?(super)
+end
+def DB.conversion_procs_updated(*)
+  super if defined?(super)
+end
+def DB.conversion_procs
+  return super if defined?(super)
+  {}
+end
+
 Sequel::Model.plugin :forme
 class Album < Sequel::Model
   plugin :association_pks

data/spec/sequel_plugin_spec.rb

@@ -53,12 +53,12 @@ describe "Forme Sequel::Model forms" do
   end
   
   it "should use datetime inputs for Time" do
-    @b.input(:created_at).to_s.must_match %r{<label>Created at: <input id="album_created_at" name="album\[created_at\]" type="datetime-local" value="2011-06-05T00:00:00.000000"/></label>}
+    @b.input(:created_at).to_s.must_match %r{<label>Created at: <input id="album_created_at" name="album\[created_at\]" type="datetime-local" value="2011-06-05T00:00:00.000"/></label>}
   end
   
   it "should use datetime inputs for DateTimes" do
     @ab.values[:created_at] = DateTime.new(2011, 6, 5)
-    @b.input(:created_at).to_s.must_equal '<label>Created at: <input id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000000"/></label>'
+    @b.input(:created_at).to_s.must_equal '<label>Created at: <input id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000"/></label>'
   end
 
   it "should include type as wrapper class" do
@@ -66,7 +66,7 @@ describe "Forme Sequel::Model forms" do
     f = Forme::Form.new(@ab, :wrapper=>:li)
     f.input(:name).to_s.must_equal '<li class="string"><label>Name: <input id="album_name" name="album[name]" type="text" value="b"/></label></li>'
     f.input(:release_date).to_s.must_equal '<li class="date"><label>Release date: <input id="album_release_date" name="album[release_date]" type="date" value="2011-06-05"/></label></li>'
-    f.input(:created_at).to_s.must_equal '<li class="datetime"><label>Created at: <input id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000000"/></label></li>'
+    f.input(:created_at).to_s.must_equal '<li class="datetime"><label>Created at: <input id="album_created_at" name="album[created_at]" type="datetime-local" value="2011-06-05T00:00:00.000"/></label></li>'
   end
   
   it "should include required * in label if required" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2018-02-07 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.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: HTML forms library