form_input 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4014e07ca32e3c7a76ee15db0dfe478a4103d123
-  data.tar.gz: 83224f22dc199d2a3f1bf4d46011f616195d33ca
+  metadata.gz: c46667c81eb96ef6deeaf13501e06f6bc328b862
+  data.tar.gz: e6dc22529b1fdfead38c01c5bd2d6f5b2e1fc52a
 SHA512:
-  metadata.gz: 82f8812fbd77215e7a058f1585bc7b2ee2a5082215d4247ae865b8ced6e2c739c39e836741482ebf4cb089fe57b6c330f8b19726d8998ed8cfca48910faf92ba
-  data.tar.gz: e2e6853f4eb58193d11aa22696164844130c5c653df6b872372a40bfa1d790a8b61cf45bd287046cf7c375c14326709c49d907ba51e5779f0d3a72ad9ff12152
+  metadata.gz: 178de263faf14e4621298bfdee13025cd0852020178448f9370d4c27904c9a9a5bbad2c8fb250a55ee10051c370716f23b42eadeec89a4c157055aa12b444bf7
+  data.tar.gz: e62589e13773fd867abbd1bec66a66dad851bda8214968820348ac3566e612ffe48e702a93d1928b5f505c8b53b7d06591923a67969b19e1989979ec3bf2f275

data/CHANGELOG.md

@@ -1,12 +1,19 @@
+= 1.3.0
+
+ * Further improvements for JSON payloads:
+   * Added set of methods for distinguishing between set and unset parameters.
+   * The `import` now properly handles parameters with `nil` and `false` values.
+   * The `to_data` method now returns all set parameters, regardless of their value.
+
 = 1.2.0
 
  * Few changes for easier import and export of JSON payloads:
-   * The import and the new from_data methods now support numeric, boolean, and nil values natively.
-   * Added to_data method which creates a hash of all non-nil parameters.
+   * The `import` and the new `from_data` methods now support numeric, boolean, and `nil` values natively.
+   * Added `to_data` method which creates a hash of all non-`nil` parameters.
 
 = 1.1.0
 
- * Added report! methods for late reporting of the most fundamental errors.
+ * Added `report!` methods for late reporting of the most fundamental errors.
 
  * Added support for multiple `check` and `test` validation callbacks.
 

data/README.md

@@ -1,6 +1,6 @@
 # Form input
 
-[![Gem Version](https://img.shields.io/gem/v/form_input.svg)](http://rubygems.org/gems/form_input) [![Build Status](https://travis-ci.org/raxoft/form_input.svg?branch=master)](http://travis-ci.org/raxoft/form_input) [![Dependency Status](https://img.shields.io/gemnasium/raxoft/form_input.svg)](https://gemnasium.com/raxoft/form_input) [![Code Climate](https://img.shields.io/codeclimate/github/raxoft/form_input.svg)](https://codeclimate.com/github/raxoft/form_input) [![Coverage](https://img.shields.io/codeclimate/coverage/github/raxoft/form_input.svg)](https://codeclimate.com/github/raxoft/form_input)
+[![Gem Version](https://img.shields.io/gem/v/form_input.svg)](http://rubygems.org/gems/form_input) [![Build Status](https://travis-ci.org/raxoft/form_input.svg?branch=master)](http://travis-ci.org/raxoft/form_input) [![Maintainability](https://api.codeclimate.com/v1/badges/ea19d227eb1285d59860/maintainability)](https://codeclimate.com/github/raxoft/form_input/maintainability) [![Coverage](https://api.codeclimate.com/v1/badges/ea19d227eb1285d59860/test_coverage)](https://codeclimate.com/github/raxoft/form_input/test_coverage)
 
 Form input is a gem which helps dealing with web request input and with the creation of HTML forms.
 
@@ -794,16 +794,19 @@ to include parts of the URL as the form input:
 
 ``` ruby
   get '/contact/:email' do
-    form = ContactForm.new( params )             # NEVER EVER DO THIS!
-    form = ContactForm.new.import( params )      # Do this instead if you need to.
+    form = ContactForm.new( params )            # NEVER EVER DO THIS!
+    form = ContactForm.new.import( params )     # Do this instead (or use from_params).
+    ...
   end
 ```
 
 Similarly, you want to use `import` when feeding form input with JSON data (see [JSON Helpers](#json-helpers) for details):
 
 ``` ruby
-  post '/api/v1/contact' do
-    form = ContactForm.new.import( json_data )
+  post '/api/v1/contacts' do
+    form = ContactForm.new( json_data )         # NEVER EVER DO THIS!
+    form = ContactForm.new.import( json_data )  # Do this instead (or use from_data).
+    ...
   end
 ```
 
@@ -829,6 +832,14 @@ You can either clear the entire form, named parameters, or parameter subsets (wh
   form.clear( form.disabled_params )
 ```
 
+The `unset` method works the same way, except that it always requires an argument:
+
+``` ruby
+  form.unset( :message )
+  form.unset( :name, :company )
+  form.unset( form.invalid_params )
+```
+
 Alternatively, you can create form copies with just a subset of parameters set:
 
 ``` ruby
@@ -1165,6 +1176,9 @@ In fact, the parameter has a dozen of simple boolean getters like this which you
   p.empty?        # Is the value nil or empty?
   p.filled?       # Is the value neither nil nor empty?
 
+  p.set?          # Was the parameter value set to something?
+  p.unset?        # Was the parameter value not set to anything?
+
   p.required?     # Is the parameter required?
   p.optional?     # Is the parameter not required?
 
@@ -1193,6 +1207,8 @@ The following methods are available:
   form.blank_params       # Parameters with nil, empty, or blank value.
   form.empty_params       # Parameters with nil or empty value.
   form.filled_params      # Parameters with some non-empty value.
+  form.set_params         # Parameters whose value was set to something.
+  form.unset_params       # Parameters whose value was not set to anything.
   form.required_params    # Parameters which are required and have to be filled.
   form.optional_params    # Parameters which are not required and can be nil or empty.
   form.disabled_params    # Parameters which are disabled and shall be rendered as such.
@@ -1349,8 +1365,9 @@ The only difference is that the [input filter](#input-filter) is not run in such
 The [input transform](#input-transform) is run as usual,
 and so are all the [validation methods](#errors-and-validation).
 
-Among other things this means that you can declare a parameter as integer using the `INTEGER_ARGS` macro,
+Among other things this means that you can declare a parameter as integer using the `INTEGER_ARGS` macro
 and pass in the value as either string or integer, and you end up with integer in both cases, which is pretty convenient.
+Of course, this works similarly for `FLOAT_ARGS` and `BOOL_ARGS`, too:
 
 ``` ruby
   class NumericInput < FormInput
@@ -1363,10 +1380,11 @@ and pass in the value as either string or integer, and you end up with integer i
 ```
 
 Another difference when dealing with JSON data is that
-the empty strings have completely different significance than in case of web forms.
-For this reason, the result of the `to_data` method includes even empty strings, arrays, and hashes
+the empty strings have completely different significance than in the case of the web forms.
+For this reason, the result of the `to_data` method includes any set parameters,
+even if the values are empty strings, arrays, or hashes
 (unlike the `to_hash` and `to_params` methods).
-The `nil` values are still filtered out, though.
+Even the `nil` values are included for parameters which were explicitly set to `nil`:
 
 ``` ruby
   class OptionalInput < FormInput
@@ -1376,6 +1394,7 @@ The `nil` values are still filtered out, though.
   end
 
   OptionalInput.from_data( string: '' ).to_data     # { string: '' }
+  OptionalInput.from_data( string: nil ).to_data    # { string: nil }
   OptionalInput.from_data( array: [] ).to_data      # { array: [] }
   OptionalInput.from_data( hash: {} ).to_data       # { hash: {} }
 ```
@@ -1384,19 +1403,22 @@ The whole JSON processing may in the end look something like this:
 
 ``` ruby
   require 'oj'
+
   def json_data
-    data = Oj.load( request.body, symbolize_keys: true )
+    data = Oj.load( request.body, mode: :strict, symbolize_keys: true )
     halt( 422, 'Invalid data' ) unless Hash === data
     data
   rescue Oj::Error
     halt( 422, 'Invalid JSON' )
   end
 
-  post '/api/v1/contact' do
+  post '/api/v1/contacts' do
     input = ContactForm.from_data( json_data )
     halt( 422, "Invalid data: #{input.error_messages.first}" ) unless input.valid?
     # Somehow use the input.
-    Contact.create( input.to_data )
+    entry = Contact.create( input.to_data )
+    content_type :json
+    [ 201, Oj.dump( entry.to_hash ) ]
   end
 ```
 

data/example/example.rb

@@ -0,0 +1,97 @@
+#! /usr/bin/env ruby
+#
+# Simple but functional example FormInput application for Sinatra.
+#
+# You will need the following gems:
+#   gem install sinatra sinatra-partial slim form_input
+#
+# Then just run it like this:
+#  ruby example.rb
+
+require 'sinatra'
+require 'sinatra/partial'
+require 'slim/smart'
+require 'form_input'
+
+# The example form. Feel free to experiment with changing this section to whatever you want to test.
+
+class ExampleForm < FormInput
+  param! :email, 'Email address', EMAIL_ARGS
+  param! :name, 'Name'
+  param :company, 'Company'
+  param! :message, 'Message', 1000, type: :textarea, size: 6, filter: ->{ rstrip }
+end
+
+# Support for snippets.
+
+set :partial_template_engine, :slim
+helpers do
+  def snippet( name, opts = {}, **locals )
+    partial( "snippets/#{name}", opts.merge( locals: locals ) )
+  end
+end
+
+# The whole application itself.
+
+get '/' do
+  @form = ExampleForm.new( request )
+  slim :form
+end
+
+post '/' do
+  @form = ExampleForm.new( request )
+  return slim :form unless @form.valid? and params[:action] == 'post'
+  logger.info "These data were successfully posted: #{@form.to_hash.inspect}"
+  slim :post
+end
+
+# Inline templates follow.
+
+__END__
+
+@@ layout
+doctype html
+html
+  head
+    title = @title
+    meta charset='utf-8'
+    meta name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no'
+    link rel='stylesheet' href='https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css' integrity='sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu' crossorigin='anonymous'
+    css:
+      label { width: 100%; }
+  body.container == yield
+
+@@ form
+.panel.panel-default
+  .panel-heading
+    = @title = "Example Form"
+  .panel-body
+    form method='post' action=request.path
+      fieldset
+        == snippet :form_panel, params: @form.params
+        button.btn.btn-default type='submit' name='action' value='post' Submit
+  - unless @form.empty?
+    .panel-footer
+      == partial :dump
+
+@@ post
+.panel.panel-default
+  .panel-heading
+    = @title = "Congratulations!"
+    All inputs are valid.
+  .panel-body
+    == partial :dump
+    form method='post' action=request.path
+      == snippet :form_hidden, params: @form.params
+      button.btn.btn-default type='submit' Go back
+      a.btn.btn-default< href=request.path Start over
+
+@@ dump
+p These are the filled form values:
+dl.dl-horizontal
+  - for p in @form.filled_params
+    dt = p.form_title
+    dd
+      code = p.value.inspect
+
+// EOF //

data/lib/form_input/core.rb

@@ -162,6 +162,16 @@ class FormInput
       not empty?
     end
 
+    # Test if value of given parameter was set.
+    def set?
+      form ? form.instance_variable_defined?( "@#{name}" ) : false
+    end
+
+    # Test if value of given parameter is not set.
+    def unset?
+      not set?
+    end
+
     # Get the proper name for use in form names, adding [] to array and [key] to hash parameters.
     def form_name( key = nil )
       if array?
@@ -835,8 +845,10 @@ class FormInput
   # Import parameter values from given request or hash. Applies parameter input filters and transforms as well.
   # Returns self for chaining.
   def import( request )
+    hash = request.respond_to?( :params ) ? request.params : request.to_hash
     for name, param in @params
-      if value = request[ param.code ]
+      value = hash.fetch( param.code ) { hash.fetch( param.code.to_s, self ) }
+      unless value == self
         value = sanitize_value( value, param.filter )
         if transform = param.transform
           value = value.instance_exec( &transform )
@@ -856,12 +868,20 @@ class FormInput
     self
   end
 
+  # Unset values of given parameters. Both names and parameters are accepted.
+  # Returns self for chaining.
+  def unset( name, *names )
+    clear( name, *names )
+  end
+
   # Clear all/given parameter values. Both names and parameters are accepted.
   # Returns self for chaining.
   def clear( *names )
     names = names.empty? ? params_names : validate_names( names )
     for name in names
+      # Set the value to nil first so it triggers anything necessary.
       self[ name ] = nil
+      remove_instance_variable( "@#{name}" )
     end
     self
   end
@@ -883,7 +903,7 @@ class FormInput
   end
 
   # Return all non-empty parameters as a hash.
-  # See also #to_data, which creates a hash of non-nil parameters,
+  # See also #to_data, which creates a hash of set parameters,
   # and #url_params, which creates a hash suitable for url output.
   def to_hash
     result = {}
@@ -892,13 +912,13 @@ class FormInput
   end
   alias to_h to_hash
 
-  # Return all non-nil parameters as a hash.
+  # Return all set parameters as a hash.
   # Note that the keys are external names of the parameters (should they differ),
   # so the keys created by `from_data(data).to_data` remain consistent.
   # See also #to_hash, which creates a hash of non-empty parameters.
   def to_data
     result = {}
-    params.each{ |x| result[ x.code ] = x.value unless x.value.nil? }
+    set_params.each{ |x| result[ x.code ] = x.value }
     result
   end
 
@@ -914,11 +934,7 @@ class FormInput
 
   # Create copy of itself, with given parameters unset. Both names and parameters are accepted.
   def except( *names )
-    result = dup
-    for name in validate_names( names )
-      result[ name ] = nil
-    end
-    result
+    dup.clear( names )
   end
 
   # Create copy of itself, with only given parameters set. Both names and parameters are accepted.
@@ -926,11 +942,7 @@ class FormInput
     # It would be easier to create new instance here and only copy selected values,
     # but we want to use dup instead of new here, as the derived form can use
     # different parameters in its construction.
-    result = dup
-    for name in params_names - validate_names( names )
-      result[ name ] = nil
-    end
-    result
+    dup.clear( params_names - validate_names( names ) )
   end
 
   # Parameter lists.
@@ -990,6 +1002,18 @@ class FormInput
   end
   alias filled_parameters filled_params
 
+  # Get list of parameters whose values were set.
+  def set_params
+    params.select{ |x| x.set? }
+  end
+  alias set_parameters set_params
+
+  # Get list of parameters whose values were not set.
+  def unset_params
+    params.select{ |x| x.unset? }
+  end
+  alias unset_parameters unset_params
+
   # Get list of required parameters.
   def required_params
     params.select{ |x| x.required? }

data/lib/form_input/version.rb

@@ -3,7 +3,7 @@
 class FormInput
   module Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     STRING = [ MAJOR, MINOR, PATCH ].join( '.' ).freeze
   end

data/test/test_core.rb

@@ -782,6 +782,9 @@ describe FormInput do
     names( f.empty_params ).should == [ :age, :rate, :password, :opts, :on ]
     names( f.blank_params ).should == [ :email, :age, :rate, :password, :opts, :on ]
 
+    names( f.set_params ).should == [ :query, :email, :text, :password ]
+    names( f.unset_params ).should == [ :age, :rate, :opts, :on ]
+
     names( f.tagged_params ).should == [ :age, :rate ]
     names( f.untagged_params ).should == [ :query, :email, :text, :password, :opts, :on ]
 
@@ -857,6 +860,8 @@ describe FormInput do
     p.should.not.be.blank
     p.should.not.be.empty
     p.should.be.filled
+    p.should.be.set
+    p.should.not.be.unset
     p.should.be.valid
     p.should.not.be.invalid
     p.should.be.required
@@ -890,6 +895,8 @@ describe FormInput do
     p.should.be.blank
     p.should.not.be.empty
     p.should.be.filled
+    p.should.be.set
+    p.should.not.be.unset
     p.should.not.be.valid
     p.should.be.invalid
     p.should.not.be.required
@@ -914,6 +921,8 @@ describe FormInput do
     p.should.be.blank
     p.should.be.empty
     p.should.not.be.filled
+    p.should.not.be.set
+    p.should.be.unset
     p.should.be.disabled
     p.should.not.be.enabled
     p[ :tag ].should == :mix
@@ -942,6 +951,8 @@ describe FormInput do
     p.should.be.blank
     p.should.be.empty
     p.should.not.be.filled
+    p.should.not.be.set
+    p.should.be.unset
     p.should.be.array
     p.should.not.be.hash
     p.should.not.be.scalar
@@ -953,6 +964,8 @@ describe FormInput do
     p.should.be.blank
     p.should.be.empty
     p.should.not.be.filled
+    p.should.not.be.set
+    p.should.be.unset
     p.should.not.be.array
     p.should.be.hash
     p.should.not.be.scalar
@@ -990,6 +1003,8 @@ describe FormInput do
     f.except( [ :email, :query ] ).url_query.should == "text=foo"
     f.except( [] ).url_query.should == "q=x&email=a%40b&text=foo"
 
+    f.except( :email ).to_data.should == { q: 'x', text: 'foo' }
+
     f.only( :email ).url_query.should == "email=a%40b"
     f.only( :email, :query ).url_query.should == "q=x&email=a%40b"
     f.only().url_query.should == ""
@@ -997,15 +1012,34 @@ describe FormInput do
     f.only( [ :email, :query ] ).url_query.should == "q=x&email=a%40b"
     f.only( [] ).url_query.should == ""
 
+    f.only( :email ).to_data.should == { email: 'a@b' }
+
+    d = f.dup
+    d.unset( :text )
+    d.should.not.be.empty
+    d.url_query.should == "q=x&email=a%40b"
+    d.to_data.should == { q: 'x', email: 'a@b' }
+    d.unset( d.required_params )
+    d.should.not.be.empty
+    d.url_query.should == "email=a%40b"
+    d.to_data.should == { email: 'a@b' }
+    d.unset( [] )
+    d.should.not.be.empty
+    d.url_query.should == "email=a%40b"
+    d.to_data.should == { email: 'a@b' }
+
     f.clear( :text )
     f.should.not.be.empty
     f.url_query.should == "q=x&email=a%40b"
+    f.to_data.should == { q: 'x', email: 'a@b' }
     f.clear( f.required_params )
     f.should.not.be.empty
     f.url_query.should == "email=a%40b"
+    f.to_data.should == { email: 'a@b' }
     f.clear
     f.should.be.empty
     f.url_query.should == ""
+    f.to_data.should == {}
 
     f = TestForm.new( { age: 2, query: "x" }, { rate: 1, query: "y" } )
     f.url_query.should == "q=y&age=2&rate=1"
@@ -1052,6 +1086,8 @@ describe FormInput do
     f.named_params( :typo, :missing ).should == [ nil, nil ]
 
     ->{ f.set( typo: 10 ) }.should.raise( NoMethodError )
+    ->{ f.unset() }.should.raise( ArgumentError )
+    ->{ f.unset( :typo ) }.should.raise( ArgumentError )
     ->{ f.clear( :typo ) }.should.raise( ArgumentError )
     ->{ f.except( :typo ) }.should.raise( ArgumentError )
     ->{ f.except( [ :typo ] ) }.should.raise( ArgumentError )
@@ -1109,6 +1145,7 @@ describe FormInput do
     f = TestForm.new( query: true, age: 3, rate: 0.35, text: false, opts: [], on: {} )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { query: true, age: 3, rate: 0.35, text: false }
+    f.to_data.should == { q: true, age: 3, rate: 0.35, text: false, opts: [], on: {} }
     f.url_params.should == { q: "true", age: "3", rate: "0.35", text: "false" }
     f.url_query.should == "q=true&age=3&rate=0.35&text=false"
     names( f.incorrect_params ).should == [ :query, :rate, :text ]
@@ -1116,6 +1153,7 @@ describe FormInput do
     f = TestForm.new( opts: 1 )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { opts: 1 }
+    f.to_data.should == { opts: 1 }
     f.url_params.should == { opts: [ "1" ] }
     f.url_query.should == "opts[]=1"
     names( f.incorrect_params ).should == [ :opts ]
@@ -1123,6 +1161,7 @@ describe FormInput do
     f = TestForm.new( opts: [ 2.5, true ] )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { opts: [ 2.5, true ] }
+    f.to_data.should == { opts: [ 2.5, true ] }
     f.url_params.should == { opts: [ "2.5", "true" ] }
     f.url_query.should == "opts[]=2.5&opts[]=true"
     names( f.incorrect_params ).should == []
@@ -1130,6 +1169,7 @@ describe FormInput do
     f = TestForm.new( opts: { "foo" => 10, true => false } )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { opts: { "foo" => 10, true => false } }
+    f.to_data.should == { opts: { "foo" => 10, true => false } }
     f.url_params.should == { opts: [ '["foo", 10]', '[true, false]' ] }
     f.url_query.should == "opts[]=%5B%22foo%22%2C+10%5D&opts[]=%5Btrue%2C+false%5D"
     names( f.incorrect_params ).should == [ :opts ]
@@ -1137,6 +1177,7 @@ describe FormInput do
     f = TestForm.new( on: 1 )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { on: 1 }
+    f.to_data.should == { on: 1 }
     f.url_params.should == { on: { "1" => "" } }
     f.url_query.should == "on[1]="
     names( f.incorrect_params ).should == [ :on ]
@@ -1144,6 +1185,7 @@ describe FormInput do
     f = TestForm.new( on: { 0 => 1, 2 => 3.4 } )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { on: { 0 => 1, 2 => 3.4 } }
+    f.to_data.should == { on: { 0 => 1, 2 => 3.4 } }
     f.url_params.should == { on: { "0" => "1", "2" => "3.4" } }
     f.url_query.should == "on[0]=1&on[2]=3.4"
     names( f.incorrect_params ).should == []
@@ -1151,6 +1193,7 @@ describe FormInput do
     f = TestForm.new( on: [ [ 10, 20 ], [ true, false ] ] )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { on: [ [ 10, 20 ], [ true, false ] ] }
+    f.to_data.should == { on: [ [ 10, 20 ], [ true, false ] ] }
     f.url_params.should == { on: { "10" => "20", "true" => "false" } }
     f.url_query.should == "on[10]=20&on[true]=false"
     names( f.incorrect_params ).should == [ :on ]
@@ -1158,6 +1201,7 @@ describe FormInput do
     f = TestForm.new( on: [ 1, true, false ] )
     ->{ f.validate }.should.not.raise
     f.to_hash.should == { on: [ 1, true, false ] }
+    f.to_data.should == { on: [ 1, true, false ] }
     f.url_params.should == { on: { "1" => "", "true" => "", "false" => "" } }
     f.url_query.should == "on[1]=&on[true]=&on[false]="
     names( f.incorrect_params ).should == [ :on ]
@@ -1172,6 +1216,7 @@ describe FormInput do
     f.error_messages.should == [ "q must use valid encoding" ]
     f.param( :query ).should.not.be.blank
     f.to_hash.should == { query: s }
+    f.to_data.should == { q: s }
     f.url_params.should == { q: s }
     f.url_query.should == "q=%FF"
 
@@ -1181,6 +1226,7 @@ describe FormInput do
     f.error_messages.should == [ "q must use valid encoding" ]
     f.param( :query ).should.not.be.blank
     f.to_hash.should == { query: s.dup.force_encoding( 'BINARY' ) }
+    f.to_data.should == { q: s.dup.force_encoding( 'BINARY' ) }
     f.url_params.should == { q: s.dup.force_encoding( 'BINARY' ) }
     f.url_query.should == "q=%FF"
   end
@@ -1208,10 +1254,11 @@ describe FormInput do
       opts: [],
       on: {},
     }
-    f = TestForm.from_data(data)
+    f = TestForm.from_data( data )
     f.to_data.should == data
 
-    f = TestForm.from_data(data.merge(password: nil))
+    data[ :password ] = nil
+    f = TestForm.from_data( data )
     f.to_data.should == data
 
     f.to_hash.should == {
@@ -1220,8 +1267,6 @@ describe FormInput do
       age: 10,
       rate: 0.5,
     }
-    f.valid?(:age).should.be.true	# has filter and correct class
-    f.valid?(:rate).should.be.false	# has no filter and class
   end
 
   should 'make it easy to create URLs' do
@@ -1370,6 +1415,13 @@ describe FormInput do
     f.dup.validate?.should.be.valid
     f.validate.should.be.valid
     f.validate!.should.be.valid
+
+    f.unset( :query ).should.equal f
+    f.should.be.invalid
+    f.validate?.should.be.invalid
+    f.dup.validate?.should.be.invalid
+    f.validate.should.be.invalid
+    f.validate!.should.be.invalid
   end
 
   should 'support some custom error messages' do

data/test/test_types.rb

@@ -7,41 +7,40 @@ require 'form_input/types'
 require 'rack/test'
 
 class TestBasicTypesForm < FormInput
-
   param :int, INTEGER_ARGS
   param :float, FLOAT_ARGS
   param :bool, BOOL_ARGS
   param :checkbox, CHECKBOX_ARGS
+end
 
+class TestJSONTypesForm < FormInput
+  param :str
+  param :int, INTEGER_ARGS
+  param :float, FLOAT_ARGS
+  param :bool, BOOL_ARGS
 end
 
 class TestAddressTypesForm < FormInput
-
   param :email, EMAIL_ARGS
   param :zip, ZIP_ARGS
   param :phone, PHONE_ARGS
-
 end
 
 class TestTimeTypesForm < FormInput
-
   param :time, TIME_ARGS
   param :us_date, US_DATE_ARGS
   param :uk_date, UK_DATE_ARGS
   param :eu_date, EU_DATE_ARGS
   param :hours, HOURS_ARGS
-
 end
 
 class TestPrunedTypesForm < FormInput
-
   param :str, PRUNED_ARGS
   param :int, INTEGER_ARGS, PRUNED_ARGS
   array :arr, PRUNED_ARGS
   array :int_arr, INTEGER_ARGS, PRUNED_ARGS
   hash :hsh, PRUNED_ARGS
   hash :int_hsh, INTEGER_ARGS, PRUNED_ARGS
-
 end
 
 class Bacon::Context
@@ -131,6 +130,33 @@ describe FormInput do
     f.url_query.should == "int=a&float=b&bool=false&checkbox=true"
   end
 
+  should 'provide presets for standard JSON types' do
+    f = TestJSONTypesForm.from_data( {} )
+    f.should.be.valid
+    f.to_data.should == {}
+
+    f = TestJSONTypesForm.from_data( str: "foo", int: "0123", float: "0123.456", bool: "true" )
+    f.should.be.valid
+    f.to_data.should == { str: 'foo', int: 123, float: 123.456, bool: true }
+
+    f = TestJSONTypesForm.from_data( str: nil, int: 123, float: 123.456, bool: true )
+    f.should.be.valid
+    f.to_data.should == { str: nil, int: 123, float: 123.456, bool: true }
+
+    f = TestJSONTypesForm.from_data( bool: "false" )
+    f.should.be.valid
+    f.to_data.should == { bool: false }
+
+    f = TestJSONTypesForm.from_data( bool: false )
+    f.should.be.valid
+    f.to_data.should == { bool: false }
+
+    f = TestJSONTypesForm.from_data( int: "a", float: "b", bool: "c" )
+    f.should.be.invalid
+    names( f.invalid_params ).should == [ :int, :float ]
+    f.to_data.should == { int: "a", float: "b", bool: false }
+  end
+
   should 'provide presets for address parameter types' do
     f = TestAddressTypesForm.new( request( "?email=me@1.com&zip=12345&phone=123%20456%20789" ) )
     f.should.be.valid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: form_input
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,7 @@ files:
 - example/controllers/ramaze/profile.rb
 - example/controllers/sinatra/press_release.rb
 - example/controllers/sinatra/profile.rb
+- example/example.rb
 - example/forms/change_password_form.rb
 - example/forms/login_form.rb
 - example/forms/lost_password_form.rb