forme 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee6b65bc378fc1ea557f3280b5782527735c561e58344e20920a1e728ce4592f
-  data.tar.gz: 4e2b963f58361fb962034c1727f122f22414c7bfcac8f80a969dfa216187ebc3
+  metadata.gz: f9ee8a7a7efaf9ff59c55404e6c11aba0125cdf59972366b94aa3359b06c6c1f
+  data.tar.gz: dd9f90ad552c827b66a3d8146f8933e5258b34ece1db5a8a9515ac9e2aeada44
 SHA512:
-  metadata.gz: e40c6db1223714f80e6d603dcd25c48b3baa6ecc89126738f495b9ffc68b84412697b1874c248d8c87c94916b6be6325f47604be17da9c8be390fcced572a1ab
-  data.tar.gz: 5a5ed453fee72ac73348c5fed4083404758d2dbe979d0ca28fb72a50c125e167804e9e55b5ca1491f3e79bc860991e98f5926b35be82e47240763ed7a47a7ef9
+  metadata.gz: 5867cc14f49ea0a2419e4f7d30a518a8886753f11e4e6af46f7565106ef54869c9bf9d5ba691f7f08ee7fab5d729bb16e8b1463939dc043d7e91aeb5e8bf1f2e
+  data.tar.gz: 25bf44d57e37ef994cab9a6c2bf532b4dddd209fff6b1542b21596e2cdbfa1e20a1ae04af9d2b4c0ad113f322c06fe1e8a662a4d2facd36439f2c1a45d2e4250

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.12.0 (2021-08-25)
+
+* Make forme_set Sequel plugin handle frozen Sequel::Model instances (jeremyevans)
+
+* Do not override an error on a field when using the Sequel plugin if :error option is already given (jeremyevans)
+
+* Avoid error when creating label text when using Sequel input on non-Sequel form without an explicit :label option (jeremyevans)
+
+* Make :select_options option for date/datetime selects support providing both option texts and option values using a 2 element array (jeremyevans)
+
 === 1.11.0 (2020-01-03)
 
 * Add Roda forme_set plugin, using HMACed form metadata to automatically handle submitted form parameters (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2019 Jeremy Evans
+Copyright (c) 2011-2021 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

@@ -101,8 +101,7 @@ by creating your own transformer and then calling the existing transformer.
 Demo Site :: http://forme-demo.jeremyevans.net
 RDoc :: http://forme.jeremyevans.net
 Source :: https://github.com/jeremyevans/forme
-IRC :: irc://irc.freenode.net/forme
-Google Group :: https://groups.google.com/forum/#!forum/ruby-forme
+Discussion Forum :: https://github.com/jeremyevans/forme/discussions
 Bug Tracker :: https://github.com/jeremyevans/forme/issues
 
 = Basic Usage
@@ -940,6 +939,7 @@ These options are supported by all of the input types:
 :disabled :: Set the disabled attribute if true
 :error :: Set an error message, invoking the error_handler
 :error_handler :: Set a custom error_handler, overriding the form's default
+:help :: Set help text to use, invoking the helper
 :helper :: Set a custom helper, overriding the form's default
 :id :: The id attribute to use
 :key :: The base to use for the name and id attributes, based on the current
@@ -983,9 +983,12 @@ creates multiple select options. Options:
           (:date default: <tt>[:year, '-', :month, '-', :day]</tt>)
           (:datetime default: <tt>[:year, '-', :month, '-', :day, ' ', :hour, ':', :minute, ':', :second]</tt>)
 :select_labels :: The labels to use for the select boxes.  Should be a hash keyed by the
-                   symbol used in order.  By default, no labels are used.
+                  symbol used (e.g. <tt>{:month=>'Month'}</tt>).  By default, no labels are used.
 :select_options :: The options to use for the select boxes.  Should be a hash keyed by the
-                   symbol used in order (e.g. <tt>{:year=>1970..2020}</tt>)
+                   symbol used in order (e.g. <tt>{:year=>1970..2020}</tt>).  The values
+                   can be a number used as both the value and the text of the option or
+                   an array with two elements, the first of which is the value for the option
+                   and the second of which is the text for the option.
 
 === :select
 
@@ -1005,7 +1008,8 @@ Creates a select tag, containing option tags specified by the :options option.
 :options :: An enumerable of options used for creating option tags.
             If the :text_method and :value_method are not given and the entry is an 
             array, uses the first entry of the array as the text of the option, and
-            the second entry of the array as the value of the option.
+            the last entry of the array as the value of the option. If the last entry
+            of the array is a hash, uses the hash as the attributes for the option.
 :selected :: The value that should be selected.  Any options that are equal to
              this value (or included in this value if a multiple select box),
              are set to selected.

data/lib/forme/transformers/formatter.rb

@@ -160,7 +160,10 @@ module Forme
       @opts[:select_labels] ||= {}
       order.map do |x|
         next x if x.is_a?(String)
-        opts = @opts.merge(:label=>@opts[:select_labels][x], :wrapper=>nil, :error=>nil, :name=>"#{name}[#{x}]", :value=>values[x], :options=>ops[x].map{|y| [sprintf(format, y), y]})
+        options = ops[x].map do |value, text|
+          [text || sprintf(format, value), value]
+        end
+        opts = @opts.merge(:label=>@opts[:select_labels][x], :wrapper=>nil, :error=>nil, :name=>"#{name}[#{x}]", :value=>values[x], :options=>options)
         opts[:id] = if first_input
           first_input = false
           id

data/lib/forme/version.rb

@@ -6,7 +6,7 @@ module Forme
   MAJOR = 1
 
   # The minor version of Forme, updated for new feature releases of Forme.
-  MINOR = 11
+  MINOR = 12
 
   # The patch version of Forme, updated only for bug fixes from the last
   # feature release.

data/lib/forme.rb

@@ -10,6 +10,7 @@ module Forme
 
   begin
     require 'cgi/escape'
+  # :nocov:
     unless CGI.respond_to?(:escapeHTML) # work around for JRuby 9.1
       CGI = Object.new
       CGI.extend(defined?(::CGI::Escape) ? ::CGI::Escape : ::CGI::Util)
@@ -32,6 +33,7 @@ module Forme
       end
     end
   end
+  # :nocov:
 
   @default_add_blank_prompt = nil
   @default_config = :default

data/lib/sequel/plugins/forme.rb

@@ -192,6 +192,7 @@ module Sequel # :nodoc:
 
         # Set the error option correctly if the field contains errors
         def handle_errors(f)
+          return if opts.has_key?(:error)
           if e = obj.errors.on(f)
             opts[:error] = e.join(', ')
           end
@@ -346,7 +347,7 @@ module Sequel # :nodoc:
 
         # Delegate to the +form+.
         def humanize(s)
-          form.humanize(s)
+          form.respond_to?(:humanize) ? form.humanize(s) : s.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
         end
 
         # If the column allows +NULL+ values, use a three-valued select

data/lib/sequel/plugins/forme_set.rb

@@ -18,6 +18,7 @@ module Sequel # :nodoc:
       module InstanceMethods
         # Hash with column name symbol keys and Forme::SequelInput values
         def forme_inputs
+          return (@forme_inputs || {}) if frozen?
           @forme_inputs ||= {}
         end
 
@@ -25,12 +26,13 @@ module Sequel # :nodoc:
         # is a boolean flag, if true, the uploaded values should be a subset of the allowed values,
         # otherwise, there should be a single uploaded value that is a member of the allowed values.
         def forme_validations
+          return (@forme_validations || {}) if frozen?
           @forme_validations ||= {}
         end
 
         # Keep track of the inputs used.
         def forme_input(_form, field, _opts)
-          forme_inputs[field] = super
+          frozen? ? super : (forme_inputs[field] = super)
         end
 
         # Given the hash of submitted parameters, return a hash containing information on how to

data/spec/forme_spec.rb

@@ -317,6 +317,10 @@ describe "Forme plain forms" do
     @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :select_options=>{:year=>1970..2020}).to_s.must_equal %{<select id="bar" name="foo[year]">#{sel(1970..2020, 2011)}</select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>}
   end
 
+  it "should support :select_options with both values and text for dates when :as=>:select is given" do
+    @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :select_options=>{:year=>[[2011, 'A'], [2012, 'B']]}).to_s.must_equal %{<select id="bar" name="foo[year]"><option selected="selected" value="2011">A</option><option value="2012">B</option></select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>}
+  end
+
   it "should have explicit labeler and trtd wrapper work with multiple select boxes for dates" do
     @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :wrapper=>:trtd, :labeler=>:explicit, :label=>'Baz').to_s.must_equal %{<tr><td><label class="label-before" for="bar">Baz</label></td><td><select id="bar" name="foo[year]">#{sel(1900..2050, 2011)}</select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select></td></tr>}
   end

data/spec/rails_integration_spec.rb

@@ -3,32 +3,48 @@ 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
-begin
-  require 'active_pack/gem_version'
-rescue LoadError
-end
-require 'forme/rails'
+  require 'action_controller/railtie'
 
-class FormeRails < Rails::Application
-  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
+  begin
+    require 'active_pack/gem_version'
+  rescue LoadError
   end
-  config.active_support.deprecation = :stderr
-  config.middleware.delete(ActionDispatch::HostAuthorization) if defined?(ActionDispatch::HostAuthorization)
-  config.middleware.delete(ActionDispatch::ShowExceptions)
-  config.middleware.delete(Rack::Lock)
-  config.secret_key_base = 'foo'*15
-  config.secret_token = 'secret token'*15 if Rails.respond_to?(:version) && Rails.version < '5.2' 
-  config.eager_load = true
-  initialize!
-end
+  require 'forme/rails'
 
+  if Rails.respond_to?(:version) && Rails.version.start_with?('4')
+    # Work around issue in backported openssl environments where
+    # secret is 64 bytes intead of 32 bytes
+    require 'active_support/message_encryptor'
+    ActiveSupport::MessageEncryptor.send :prepend, Module.new {
+      def initialize(secret, *signature_key_or_options)
+        secret = secret[0, 32]
+        super
+      end
+    }
+  end
+
+  class FormeRails < Rails::Application
+    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::HostAuthorization) if defined?(ActionDispatch::HostAuthorization)
+    config.middleware.delete(ActionDispatch::ShowExceptions)
+    config.middleware.delete(Rack::Lock)
+    config.secret_key_base = 'foo'*15
+    config.secret_token = 'secret token'*15 if Rails.respond_to?(:version) && Rails.version < '5.2' 
+    config.eager_load = true
+    begin
+      initialize!
+    rescue NoMethodError
+      raise LoadError
+    end
+  end
+rescue LoadError
+  warn "unable to load or setup rails, skipping rails spec"
+else
 class FormeController < ActionController::Base
   helper Forme::Rails::ERB
 

data/spec/roda_integration_spec.rb

@@ -149,7 +149,7 @@ else
       forme_set_block = orig_hash.delete(:forme_set_block)
       orig_hash.each{|k,v| hash[k.to_s] = v}
       album = @ab
-      ret, form, data, hmac = nil
+      ret, _, data, hmac = nil
       
       @app.route do |r|
         r.get do
@@ -274,7 +274,7 @@ else
       obj.must_be_same_as @ab
       version.must_be_nil
 
-      h3 = forme_set(@ab, {:name=>'Bar', :forme_set_block=>forme_set_block}, {}, :form_version=>2){|f| f.input(:name)}
+      forme_set(@ab, {:name=>'Bar', :forme_set_block=>forme_set_block}, {}, :form_version=>2){|f| f.input(:name)}
       obj.must_be_same_as @ab
       name.must_equal 'Bar'
       version.must_equal 2

data/spec/sequel_i18n_plugin_spec.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 begin
+  raise LoadError if defined?(JRUBY_VERSION) && /\A9\.2\./.match(JRUBY_VERSION)
   require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_i18n_helper.rb')
 rescue LoadError
   warn "unable to load i18n, skipping i18n Sequel plugin spec"

data/spec/sequel_plugin_spec.rb

@@ -331,6 +331,11 @@ describe "Forme Sequel::Model forms" do
     @b.input(:foo, :type=>:phone).to_s.must_equal '<label>Foo: <input id="album_foo" name="album[foo]" type="phone" value="bar"/></label>'
   end
 
+  it "should not override an explicit :error setting" do
+    @ab.errors.add(:name, 'tis not valid')
+    @b.input(:name, :error=>nil).to_s.must_equal '<label>Name: <input id="album_name" maxlength="255" name="album[name]" type="text" value="b"/></label>'
+  end
+  
   it "should correctly show an error message if there is one" do
     @ab.errors.add(:name, 'tis not valid')
     @b.input(:name).to_s.must_equal '<label>Name: <input aria-describedby="album_name_error_message" aria-invalid="true" class="error" id="album_name" maxlength="255" name="album[name]" type="text" value="b"/></label><span class="error_message" id="album_name_error_message">tis not valid</span>'
@@ -453,6 +458,9 @@ describe "Forme Sequel::Model forms" 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><thead><tr><th>Name</th></tr></thead><tbody><tr><td class="string"><input id="album_artist_attributes_name" maxlength="255" name="album[artist_attributes][name]" type="text" value="a"/></td></tr></tbody></table></form>'
   end
   
+  it "should handle non-Sequel forms with Sequel inputs" do
+    Forme.form{|f| f.input(:name, :obj=>@ab).to_s.must_equal '<label>Name: <input id="name" maxlength="255" name="name" type="text" value="b"/></label>'}
+  end
 end
 
 describe "Forme Sequel plugin default input types based on column names" do

data/spec/sequel_set_plugin_spec.rb

@@ -222,4 +222,11 @@ describe "Sequel forme_set plugin" do
     @ab.forme_validations[:name] = [:bar, []]
     proc{@ab.valid?}.must_raise Sequel::Plugins::Forme::Error
   end
+
+  it "should handle frozen instances as form inputs" do
+    @ab.freeze
+    @ab.forme_inputs.must_equal({})
+    @ab.forme_validations.must_equal({})
+    @f.input(:name).must_be_kind_of(Forme::Input)
+  end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'li
 
 if ENV['WARNING']
   require 'warning'
-  Warning.ignore([:missing_ivar, :not_reached])
+  Warning.ignore([:missing_ivar, :not_reached, :method_redefined])
 end
 
 if ENV['COVERAGE']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -216,7 +216,7 @@ metadata:
   bug_tracker_uri: https://github.com/jeremyevans/forme/issues
   changelog_uri: http://forme.jeremyevans.net/files/CHANGELOG.html
   documentation_uri: http://forme.jeremyevans.net
-  mailing_list_uri: https://groups.google.com/forum/#!forum/ruby-forme
+  mailing_list_uri: https://github.com/jeremyevans/forme/discussions
   source_code_uri: https://github.com/jeremyevans/forme
 post_install_message: 
 rdoc_options:
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: HTML forms library