form_input 0.9.0.pre2 → 0.9.0

data/README.md

@@ -3120,14 +3120,14 @@ Trivial indeed, isn't it?
 
 ### Supported Locales
 
-The `FormInput` currently includes translations of builtin error messages for the following locales:
+The `FormInput` currently includes translations of builtin error messages for the following languages:
 
 * English
 * Czech
 * Slovak
 * Polish
 
-To add support for another locale,
+To add support for another language,
 simply copy the content of one of the most similar files found in the `form_input/r18n` directory
 to the appropriate translation file in your project,
 and translate it as you see fit.

data/form_input.gemspec

@@ -4,7 +4,7 @@ require File.expand_path( '../lib/form_input/version', __FILE__ )
 
 Gem::Specification.new do |s|
   s.name        = 'form_input'
-  s.version     = FormInput::Version::STRING + '.pre2'
+  s.version     = FormInput::Version::STRING
   s.summary     = 'Form helper which sanitizes, transforms, validates and encapsulates web request input.'
   s.description = <<EOT
 This gem allows you to describe your forms using a simple DSL

data/lib/form_input/localize.rb

@@ -40,7 +40,7 @@ class FormInput
   end
 
   # Get string containing YAML representation of the default R18n translation for all/given FormInput classes.
-  def self.default_translation(forms = self.forms)
+  def self.default_translation( forms = self.forms )
     hash = Hash[ forms.map{ |x| [ x.translation_name, x.translation_hash ] }.reject{ |k, v| v.empty? } ]
     YAML::dump( { forms: hash }.stringify_keys )
   end

data/test/test_core.rb

@@ -190,6 +190,28 @@ describe FormInput do
     end
   end
 
+  should 'allow defining parameters by several means' do
+    c = Class.new( FormInput )
+    c.param :p
+    c.param! :rp
+    c.array :a
+    c.array! :ra
+    c.hash :h
+    c.hash! :rh
+    c.param :p2, hash: false
+    c.param :rp2, array: false, required: true
+    c.param :a2, array: true
+    c.param :ra2, array: true, required: true
+    c.param :h2, hash: true
+    c.param :rh2, hash: true, required: true
+    f = c.new
+    names( f.scalar_params ).should == [ :p, :rp, :p2, :rp2 ]
+    names( f.array_params ).should == [ :a, :ra, :a2, :ra2 ]
+    names( f.hash_params ).should == [ :h, :rh, :h2, :rh2 ]
+    names( f.optional_params ).should == [ :p, :a, :h, :p2, :a2, :h2 ]
+    names( f.required_params ).should == [ :rp, :ra, :rh, :rp2, :ra2, :rh2 ]
+  end
+
   should 'complain about incorrect parameter definition' do
     ->{ TestForm.param :x, "test", "test" }.should.raise( ArgumentError )
     ->{ TestForm.param :x, { type: :email }, :extra }.should.raise( ArgumentError )
@@ -375,6 +397,7 @@ describe FormInput do
 
     f = c.new( request( "?str=1.5&int=1.5&float=1.5&date=2011-12-31&time=31.12.2000+10:24:05&bool=true&str2=Abc&arr=a,b&hsh=1:2,3:4" ) )
     f.should.be.valid
+    names( f.blank_params ).should == [ :int2, :float2 ]
     f.to_h.should == f.to_hash
     f.to_hash.should == {
       str: "1.5",
@@ -428,6 +451,8 @@ describe FormInput do
     f.hsh.should == {}
     names( f.incorrect_params ).should == []
     names( f.invalid_params ).should == []
+    f.empty_params.should == f.params
+    f.blank_params.should == f.params
     f.to_hash.should == {}
     f.url_params.should == {}
     f.url_query.should == ""
@@ -612,6 +637,7 @@ describe FormInput do
     c.param :single, data: ->{ 2.times.map{ |i| [ i, ( 65 + i ).chr ] } }, class: Integer do to_i end
     c.array :multi, data: ->{ 4.times.map{ |i| [ i, ( 65 + i ).chr ] } }, class: Integer do to_i end
     c.param :x, filter: ->{ to_i }, class: Integer
+    c.hash :h
 
     f = c.new( single: 1, multi: [ 1, 3 ], x: 5 )
     f.should.be.valid
@@ -646,23 +672,46 @@ describe FormInput do
     p.form_name.should == "x"
     p.form_value.should == "5"
 
-    f = c.new( request( "?single=0&multi[]=0&multi[]=2&x=3" ) ) ;
+    f = c.new( request( "?single=0&multi[]=0&multi[]=2&x=3" ) )
     f.should.be.valid
     f.to_hash.should == { single: 0, multi: [ 0, 2 ], x: 3 }
     f.url_params.should == { single: "0", multi: [ "0", "2" ], x: "3" }
     f.url_query.should == "single=0&multi[]=0&multi[]=2&x=3"
 
-    f = c.new( request( "?single=5&multi[]=5" ) ) ;
+    f = c.new( request( "?single=5&multi[]=5" ) )
     f.should.be.valid
     f.to_hash.should == { single: 5, multi: [ 5 ] }
     f.url_params.should == { single: "5", multi: [ "5" ] }
     f.url_query.should == "single=5&multi[]=5"
 
-    f = c.new( request( "" ) ) ;
+    f = c.new( request( "" ) )
     f.should.be.valid
     f.to_hash.should == {}
     f.url_params.should == {}
     f.url_query.should == ""
+
+    p = f.param( :single )
+    p.selected?( nil ).should.be.false
+    p.selected?( 0 ).should.be.false
+    p.selected?( 1 ).should.be.false
+    p.selected?( 2 ).should.be.false
+    p.selected?( 3 ).should.be.false
+
+    f = c.new( request( "?h[0]=" ) )
+    f.should.be.valid
+    f.to_hash.should == { h: { 0 => "" } }
+    f.url_params.should == { h: { "0" => "" } }
+    f.url_query.should == "h[0]="
+
+    p = f.param( :h )
+    p.data.should == []
+    p.code.should == :h
+    ->{ p.form_name }.should.raise ArgumentError
+    p.form_name( 0 ).should == "h[0]"
+    p.form_value.should == { "0" => "" }
+    p.selected?( nil ).should.be.false
+    p.selected?( 0 ).should.be.false
+    p.selected?( "" ).should.be.false
   end
 
   should 'classify parameters' do
@@ -1075,7 +1124,7 @@ describe FormInput do
     f.url_params.should == { q: s }
     f.url_query.should == "q=%FF"
 
-    f = TestForm.new( Rack::Request.new( Rack::MockRequest.env_for( "?q=%ff" ) ) )
+    f = TestForm.new( request( "?q=%ff" ) )
     ->{ f.validate }.should.not.raise
     f.should.not.be.valid
     f.error_messages.should == [ "q must use valid encoding" ]
@@ -1085,6 +1134,15 @@ describe FormInput do
     f.url_query.should == "q=%FF"
   end
 
+  should 'reject unexpected values in request input' do
+    ->{ TestForm.new.import( q: "", opts: [], on: {} ) }.should.not.raise
+    ->{ TestForm.new.import( q: [], opts: {}, on: "" ) }.should.not.raise
+    ->{ TestForm.new.import( q: {}, opts: "", on: [] ) }.should.not.raise
+    ->{ TestForm.new.import( q: 1 ) }.should.raise TypeError
+    ->{ TestForm.new.import( q: :x ) }.should.raise TypeError
+    ->{ TestForm.new.import( q: TestForm ) }.should.raise TypeError
+  end
+
   should 'make it easy to create URLs' do
     f = TestForm.new( query: "x", opts: [ 0, 0, 1 ], on: { 0 => 1 }, age: 10, email: nil, password: "", text: " " )
     f.url_params.should == { q: "x", age: "10", text: " ", opts: [ "0", "0", "1" ], on: { "0" => "1" } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: form_input
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre2
+  version: 0.9.0
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -79,7 +79,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.gemfile"
 - ".travis.yml"
 - ".yardopts"
@@ -148,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1