formkeeper 0.0.4 → 0.0.5

data/lib/formkeeper/version.rb

@@ -1,3 +1,3 @@
 module FormKeeper
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/formkeeper.rb

@@ -87,10 +87,18 @@ module FormKeeper
       end
     end
 
+    class AsciiSpace < Base
+      def validate(value, arg)
+        result = value =~ /^[\x20-\x7e]+$/
+        result = !result if !arg
+        result
+      end
+    end
+
     class Regexp < Base
       def validate(value, arg)
         r = arg
-        r = Regexp.new(r) unless r.kind_of?(Regexp)
+        r = ::Regexp.new(r) unless r.kind_of?(::Regexp)
         value =~ r
       end
     end
@@ -145,7 +153,7 @@ module FormKeeper
 
     class URI < Base
       def validate(value, arg)
-        u = URI.parse(value)
+        u = ::URI.parse(value)
         return false if u.nil?
         arg = [arg] unless arg.kind_of?(Array)
         arg.collect(&:to_s).include?(u.scheme)
@@ -166,12 +174,12 @@ module FormKeeper
       end
     end
 
-    class Characters < Base
+    class ByteSize < Base
       def validate(value, arg)
-        l = value.split(//u).length
+        l = value.bytesize
         case arg
         when Fixnum
-          return (l == args)
+          return (l == arg)
         when Range
           return arg.include?(l)
         else
@@ -564,6 +572,7 @@ module FormKeeper
     register_filter :upcase, Filter::UpCase.new
 
     register_constraint :ascii, Constraint::Ascii.new
+    register_constraint :ascii_space, Constraint::AsciiSpace.new
     register_constraint :regexp, Constraint::Regexp.new
     register_constraint :int, Constraint::Int.new
     register_constraint :uint, Constraint::Uint.new
@@ -573,7 +582,7 @@ module FormKeeper
     register_constraint :alnum_space, Constraint::AlnumSpace.new
     register_constraint :uri, Constraint::URI.new
     register_constraint :length, Constraint::Length.new
-    register_constraint :characters, Constraint::Characters.new
+    register_constraint :bytesize, Constraint::ByteSize.new
 
     register_combination_constraint :datetime, CombinationConstraint::DateTime.new
     register_combination_constraint :date, CombinationConstraint::Date.new

data/spec/constraint_alnum_space_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::AlnumSpace do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::AlnumSpace.new
+    constraint.validate('abcd', true).should be_true
+    constraint.validate('a1234bcd', true).should be_true
+    constraint.validate('a%[]Aaa', true).should_not be_true
+    constraint.validate('ab cd', true).should be_true
+
+  end
+
+end

data/spec/constraint_alnum_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Alnum do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Alnum.new
+    constraint.validate('abcd', true).should be_true
+    constraint.validate('a1234bcd', true).should be_true
+    constraint.validate('a%[]Aaa', true).should_not be_true
+    constraint.validate('ab cd', true).should_not be_true
+
+  end
+
+end

data/spec/constraint_alpha_space_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::AlphaSpace do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::AlphaSpace.new
+    constraint.validate('abcd', true).should be_true
+    constraint.validate('a1234bcd', true).should_not be_true
+    constraint.validate('a%[]Aaa', true).should_not be_true
+    constraint.validate('ab cd', true).should be_true
+
+  end
+
+end

data/spec/constraint_alpha_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Alpha do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Alpha.new
+    constraint.validate('abcd', true).should be_true
+    constraint.validate('a1234bcd', true).should_not be_true
+    constraint.validate('a%[]Aaa', true).should_not be_true
+    constraint.validate('ab cd', true).should_not be_true
+
+  end
+
+end

data/spec/constraint_ascii_space_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::AsciiSpace do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::AsciiSpace.new
+    constraint.validate('aaaa', true).should be_true
+    constraint.validate('a%[]Aaa', false).should_not be_true
+    constraint.validate('[aAaa.', true).should be_true
+    constraint.validate('[a Aaa.', true).should be_true
+
+  end
+
+end

data/spec/constraint_ascii_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Ascii do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Ascii.new
+    constraint.validate('aaaa', true).should be_true
+    constraint.validate('a%[]Aaa', false).should_not be_true
+    constraint.validate('[aAaa.', true).should be_true
+    constraint.validate('[a Aaa.', true).should_not be_true
+
+  end
+
+end

data/spec/constraint_bytesize_spec.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::ByteSize do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::ByteSize.new
+    constraint.validate('aaaa', 0..10).should be_true
+    constraint.validate('aaaa', 0..3).should_not be_true
+    constraint.validate('aaaa', 4).should be_true
+    constraint.validate('aaaa', 3).should_not be_true
+
+    constraint.validate('ほげ', 2).should_not be_true
+
+  end
+
+end

data/spec/constraint_int_spec.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Int do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Int.new
+    constraint.validate('aaaa', true).should_not be_true
+    constraint.validate('aaaa', false).should be_true
+    constraint.validate('1111', true).should be_true
+    constraint.validate('1111', false).should_not be_true
+    constraint.validate('-1111', true).should be_true
+    constraint.validate('-1111', false).should_not be_true
+
+  end
+
+end

data/spec/constraint_length_spec.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Length do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Length.new
+    constraint.validate('aaaa', 0..10).should be_true
+    constraint.validate('aaaa', 0..3).should_not be_true
+    constraint.validate('aaaa', 4).should be_true
+    constraint.validate('aaaa', 3).should_not be_true
+
+    constraint.validate('ほげ', 2).should be_true
+
+  end
+
+end

data/spec/constraint_regexp_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Regexp do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Regexp.new
+    constraint.validate('this is ruby', %r{ruby}).should be_true
+    constraint.validate('this is perl', %r{ruby}).should_not be_true
+
+  end
+
+end

data/spec/constraint_uint_spec.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::Uint do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::Uint.new
+    constraint.validate('aaaa', true).should_not be_true
+    constraint.validate('aaaa', false).should be_true
+    constraint.validate('1111', true).should be_true
+    constraint.validate('1111', false).should_not be_true
+    constraint.validate('-1111', true).should_not be_true
+    constraint.validate('-1111', false).should be_true
+
+  end
+
+end

data/spec/constraint_uri_spec.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::Constraint::URI do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::Constraint::URI.new
+    constraint.validate('aaaa', :http).should_not be_true
+    constraint.validate('http://example.org/', :http).should be_true
+    constraint.validate('http://example.org/', [:http]).should be_true
+    constraint.validate('https://example.org/', [:http]).should_not be_true
+    constraint.validate('http://example.org/', [:http, :https]).should be_true
+    constraint.validate('https://example.org/', [:http, :https]).should be_true
+
+    constraint.validate('aaaa', :http).should_not be_true
+    constraint.validate('aaa', [:http, :https]).should_not be_true
+
+  end
+
+end

data/spec/filter_downcase_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe FormKeeper::Filter::DownCase do
+
+  it "filters value correctly" do
+    filter = FormKeeper::Filter::DownCase.new
+    filter.process("foo").should == "foo";
+    filter.process("Foo").should == "foo";
+    filter.process("FOO").should == "foo";
+    filter.process(" FOO").should == " foo";
+  end
+
+end

data/spec/filter_strip_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe FormKeeper::Filter::Strip do
+
+  it "filters value correctly" do
+    filter = FormKeeper::Filter::Strip.new
+    filter.process("foo").should == "foo";
+    filter.process(" foo").should == "foo";
+    filter.process("foo ").should == "foo";
+    filter.process(" foo ").should == "foo";
+    filter.process("   foo ").should == "foo";
+  end
+
+end

data/spec/filter_upcase_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe FormKeeper::Filter::UpCase do
+
+  it "filters value correctly" do
+    filter = FormKeeper::Filter::UpCase.new
+    filter.process("FOO").should == "FOO";
+    filter.process("fOO").should == "FOO";
+    filter.process("foo").should == "FOO";
+    filter.process(" foo").should == " FOO";
+  end
+
+end

data/spec/record_spec.rb

@@ -19,7 +19,7 @@ describe FormKeeper::Record do
     record.failed?.should be_true
     record.failed_by?(:present).should be_true
     record.failed_by?(:length).should be_true
-    record.failed_by?(:characters).should_not be_true
+    record.failed_by?(:bytesize).should_not be_true
 
     record.failed_constraints[0].should == :present
     record.failed_constraints[1].should == :length

data/spec/respondent_spec.rb

@@ -45,9 +45,9 @@ describe FormKeeper::Respondent do
 <label>Sake</label><input type="radio" name="food" value="1">
 <label>Umeboshi</label><input type="radio" name="food" value="2">
 <h2>Where did you know about this page?</h2>
-<label>web site</label><input type="radio" name="media" value="0" checked>
-<label>magazine</label><input type="radio" name="media" value="1">
-<label>TV show</label><input type="radio" name="media" value="2">
+<label>web site</label><input type="checkbox" name="media" value="0" checked>
+<label>magazine</label><input type="checkbox" name="media" value="1">
+<label>TV show</label><input type="checkbox" name="media" value="2">
 </form>
 </body>
 </html>
@@ -63,9 +63,9 @@ describe FormKeeper::Respondent do
 <label>Sake</label><input type="radio" name="food" value="1" checked="checked" />
 <label>Umeboshi</label><input type="radio" name="food" value="2" />
 <h2>Where did you know about this page?</h2>
-<label>web site</label><input type="radio" name="media" value="0" />
-<label>magazine</label><input type="radio" name="media" value="1" checked="checked" />
-<label>TV show</label><input type="radio" name="media" value="2" checked="checked" />
+<label>web site</label><input type="checkbox" name="media" value="0" />
+<label>magazine</label><input type="checkbox" name="media" value="1" checked="checked" />
+<label>TV show</label><input type="checkbox" name="media" value="2" checked="checked" />
 </form>
 </body>
 </html>

data/spec/validator_spec.rb

@@ -8,7 +8,7 @@ describe FormKeeper::Validator do
     rule.filters :strip
     rule.field :username, :present => true, :length => 8..16
     rule.field :password, :present => true, :length => 8..16
-    rule.field :nickname, :characters => 8..16, :filters => :upcase
+    rule.field :nickname, :bytesize => 8..16, :filters => :upcase
 
     params = {}
     params['username'] = '  hogehogefoo'
@@ -32,7 +32,7 @@ describe FormKeeper::Validator do
     rule.filters :strip
     rule.field :username, :present => true, :length => 8..16
     rule.field :password, :present => true, :length => 8..16
-    rule.field :nickname, :characters => 8..16, :filters => :upcase
+    rule.field :nickname, :bytesize => 8..16, :filters => :upcase
 
     params = {}
     params['username'] = '  hogehogefoo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formkeeper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Helper library for stuff around HTML forms
 email:
@@ -28,6 +28,21 @@ files:
 - lib/formkeeper.rb
 - lib/formkeeper/version.rb
 - spec/asset/messages.yaml
+- spec/constraint_alnum_space_spec.rb
+- spec/constraint_alnum_spec.rb
+- spec/constraint_alpha_space_spec.rb
+- spec/constraint_alpha_spec.rb
+- spec/constraint_ascii_space_spec.rb
+- spec/constraint_ascii_spec.rb
+- spec/constraint_bytesize_spec.rb
+- spec/constraint_int_spec.rb
+- spec/constraint_length_spec.rb
+- spec/constraint_regexp_spec.rb
+- spec/constraint_uint_spec.rb
+- spec/constraint_uri_spec.rb
+- spec/filter_downcase_spec.rb
+- spec/filter_strip_spec.rb
+- spec/filter_upcase_spec.rb
 - spec/messages_spec.rb
 - spec/record_spec.rb
 - spec/report_spec.rb
@@ -49,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2548277773188687121
+      hash: -2485237141662980897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -58,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2548277773188687121
+      hash: -2485237141662980897
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -67,6 +82,21 @@ specification_version: 3
 summary: This modules provides you an easy way for form-validation and fill-in-form
 test_files:
 - spec/asset/messages.yaml
+- spec/constraint_alnum_space_spec.rb
+- spec/constraint_alnum_spec.rb
+- spec/constraint_alpha_space_spec.rb
+- spec/constraint_alpha_spec.rb
+- spec/constraint_ascii_space_spec.rb
+- spec/constraint_ascii_spec.rb
+- spec/constraint_bytesize_spec.rb
+- spec/constraint_int_spec.rb
+- spec/constraint_length_spec.rb
+- spec/constraint_regexp_spec.rb
+- spec/constraint_uint_spec.rb
+- spec/constraint_uri_spec.rb
+- spec/filter_downcase_spec.rb
+- spec/filter_strip_spec.rb
+- spec/filter_upcase_spec.rb
 - spec/messages_spec.rb
 - spec/record_spec.rb
 - spec/report_spec.rb