formkeeper 0.0.6 → 0.0.7

data/lib/formkeeper/version.rb

@@ -1,3 +1,3 @@
 module FormKeeper
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/formkeeper.rb

@@ -61,6 +61,12 @@ module FormKeeper
         return value.strip
       end
     end
+
+    class Capitalize < Base
+      def process(value)
+        return value.capitalize
+      end
+    end
   end
 
   module Constraint
@@ -106,16 +112,84 @@ module FormKeeper
     class Int < Base
       def validate(value, arg)
         result = value =~ /^\-?[[:digit:]]+$/
-        result = !result if !arg
-        result
+        if result and arg.kind_of?(Hash)
+          if arg.has_key?(:gt)
+            unless arg[:gt].kind_of?(Fixnum)
+              raise ArgumentError.new ':gt should be Fixnum'
+            end
+            return false unless value.to_i > arg[:gt];
+          end
+          if arg.has_key?(:gte)
+            unless arg[:gte].kind_of?(Fixnum)
+              raise ArgumentError.new ':gte should be Fixnum'
+            end
+            return false unless value.to_i >= arg[:gte];
+          end
+          if arg.has_key?(:lt)
+            unless arg[:lt].kind_of?(Fixnum)
+              raise ArgumentError.new ':lt should be Fixnum'
+            end
+            return false unless value.to_i < arg[:lt];
+          end
+          if arg.has_key?(:lte)
+            unless arg[:lte].kind_of?(Fixnum)
+              raise ArgumentError.new ':lte should be Fixnum'
+            end
+            return false unless value.to_i <= arg[:lte];
+          end
+          if arg.has_key?(:between)
+            unless arg[:between].kind_of?(Range)
+              raise ArgumentError.new ':between should be Range'
+            end
+            return false unless arg[:between].include?(value.to_i);
+          end
+          true
+        else
+          result = !result if !arg
+          result
+        end
       end
     end
 
     class Uint < Base
       def validate(value, arg)
         result = value =~ /^[[:digit:]]+$/
-        result = !result if !arg
-        result
+        if result and arg.kind_of?(Hash)
+          if arg.has_key?(:gt)
+            unless arg[:gt].kind_of?(Fixnum)
+              raise ArgumentError.new ':gt should be Fixnum'
+            end
+            return false unless value.to_i > arg[:gt];
+          end
+          if arg.has_key?(:gte)
+            unless arg[:gte].kind_of?(Fixnum)
+              raise ArgumentError.new ':gte should be Fixnum'
+            end
+            return false unless value.to_i >= arg[:gte];
+          end
+          if arg.has_key?(:lt)
+            unless arg[:lt].kind_of?(Fixnum)
+              raise ArgumentError.new ':lt should be Fixnum'
+            end
+            return false unless value.to_i < arg[:lt];
+          end
+          if arg.has_key?(:lte)
+            unless arg[:lte].kind_of?(Fixnum)
+              raise ArgumentError.new ':lte should be Fixnum'
+            end
+            return false unless value.to_i <= arg[:lte];
+          end
+          if arg.has_key?(:between)
+            unless arg[:between].kind_of?(Range)
+              raise ArgumentError.new ':between should be Range'
+            end
+            return false unless arg[:between].include?(value.to_i);
+          end
+          true
+        else
+          result = !result if !arg
+          result
+        end
       end
     end
 
@@ -573,6 +647,7 @@ module FormKeeper
     register_filter :strip, Filter::Strip.new
     register_filter :downcase, Filter::DownCase.new
     register_filter :upcase, Filter::UpCase.new
+    register_filter :capitalize, Filter::Capitalize.new
 
     register_constraint :ascii, Constraint::Ascii.new
     register_constraint :ascii_space, Constraint::AsciiSpace.new

data/spec/constraint_int_spec.rb

@@ -13,6 +13,14 @@ describe FormKeeper::Constraint::Int do
     constraint.validate('-1111', true).should be_true
     constraint.validate('-1111', false).should_not be_true
 
+    constraint.validate('1111', {:gt => 111}).should be_true
+    constraint.validate('1111', {:gt => 2222}).should_not be_true
+    constraint.validate('1111', {:gt => 111, :lte => 1111}).should be_true
+    constraint.validate('1111', {:gt => 111, :lt => 1111}).should_not be_true
+    constraint.validate('1111', {:gt => 111, :lt => 1112}).should be_true
+    constraint.validate('1111', {:gte => 1111, :lte => 1111}).should be_true
+    constraint.validate('1111', {:between => 1110..1112}).should be_true
+    constraint.validate('1111', {:between => 1113..1115}).should_not be_true
   end
 
 end

data/spec/constraint_uint_spec.rb

@@ -13,6 +13,15 @@ describe FormKeeper::Constraint::Uint do
     constraint.validate('-1111', true).should_not be_true
     constraint.validate('-1111', false).should be_true
 
+    constraint.validate('1111', {:gt => 111}).should be_true
+    constraint.validate('1111', {:gt => 2222}).should_not be_true
+    constraint.validate('1111', {:gt => 111, :lte => 1111}).should be_true
+    constraint.validate('1111', {:gt => 111, :lt => 1111}).should_not be_true
+    constraint.validate('1111', {:gt => 111, :lt => 1112}).should be_true
+    constraint.validate('1111', {:gte => 1111, :lte => 1111}).should be_true
+    constraint.validate('1111', {:between => 1110..1112}).should be_true
+    constraint.validate('1111', {:between => 1113..1115}).should_not be_true
+
   end
 
 end

data/spec/filter_capitalize_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formkeeper
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -45,6 +45,7 @@ files:
 - spec/constraint_regexp_spec.rb
 - spec/constraint_uint_spec.rb
 - spec/constraint_uri_spec.rb
+- spec/filter_capitalize_spec.rb
 - spec/filter_downcase_spec.rb
 - spec/filter_strip_spec.rb
 - spec/filter_upcase_spec.rb
@@ -69,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 356989708151318593
+      hash: -3327834832335453683
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 356989708151318593
+      hash: -3327834832335453683
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -104,6 +105,7 @@ test_files:
 - spec/constraint_regexp_spec.rb
 - spec/constraint_uint_spec.rb
 - spec/constraint_uri_spec.rb
+- spec/filter_capitalize_spec.rb
 - spec/filter_downcase_spec.rb
 - spec/filter_strip_spec.rb
 - spec/filter_upcase_spec.rb