formkeeper 0.0.5 → 0.0.6

data/lib/formkeeper/version.rb

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

data/lib/formkeeper.rb

@@ -212,24 +212,27 @@ module FormKeeper
     class Date < Base
       def validate(values, arg)
         return false unless values.size == 3
+        return false unless values.all? { |v| v =~ /^[[:digit:]]+$/ }
         # TODO handle range by args[:from] and args[:to]
-        ::Date.valid_date?(values[0], values[1], values[2])
+        ::Date.valid_date?(values[0].to_i, values[1].to_i, values[2].to_i)
       end
     end
 
     class Time < Base
       def validate(values, arg)
         return false unless values.size == 3
+        return false unless values.all? { |v| v =~ /^[[:digit:]]+$/ }
         # TODO handle range by args[:from] and args[:to]
-        (0..23).include?(values[0]) and (0..59).include(values[1]) and (0..59).include(values[2])
+        (0..23).include?(values[0].to_i) and (0..59).include?(values[1].to_i) and (0..59).include?(values[2].to_i)
       end
     end
 
     class DateTime < Base
       def validate(values, arg)
         return false unless values.size == 6
+        return false unless values.all? { |v| v =~ /^[[:digit:]]+$/ }
         # TODO handle range by args[:from] and args[:to]
-        ::Date.valid_date?(values[0], values[1], values[2]) and (0..23).include?(values[3]) and (0..59).include(values[5]) and (0..59).include(values[5])
+        ::Date.valid_date?(values[0].to_i, values[1].to_i, values[2].to_i) and (0..23).include?(values[3].to_i) and (0..59).include?(values[4].to_i) and (0..59).include?(values[5].to_i)
       end
     end
   end 

data/spec/combination_any_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::CombinationConstraint::Any do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::CombinationConstraint::Any.new
+    constraint.validate(['aaaa', 'bbbb'], true).should be_true
+    constraint.validate(['', ''], true).should_not be_true
+    constraint.validate(['', nil], true).should_not be_true
+    constraint.validate(['aaa', nil], true).should be_true
+    constraint.validate(['aaa', 'bbbb', 'cccc', nil], true).should be_true
+
+  end
+
+end

data/spec/combination_date_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::CombinationConstraint::Date do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::CombinationConstraint::Date.new
+    constraint.validate(['2012', '2', '12'], true).should be_true
+    constraint.validate(['2012', '2', '12', '12'], true).should_not be_true
+    constraint.validate(['aaa', '12', '12'], true).should_not be_true
+    constraint.validate(['2012', '28', '12'], true).should_not be_true
+    constraint.validate(['2012', '2', '50'], true).should_not be_true
+
+  end
+
+end

data/spec/combination_datetime_spec.rb

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::CombinationConstraint::DateTime do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::CombinationConstraint::DateTime.new
+    constraint.validate(['2012', '2', '2', '23', '2', '12'], true).should be_true
+    constraint.validate(['2012', '2', '2', '23', '2', '12', '11'], true).should_not be_true
+    constraint.validate(['2012', '2', '2', '23', '2', 'a',], true).should_not be_true
+    constraint.validate(['2012', '13', '2', '23', '2', '12',], true).should_not be_true
+    constraint.validate(['2012', '2', '50', '23', '2', '12',], true).should_not be_true
+    constraint.validate(['2012', '2', '28', '25', '2', '12',], true).should_not be_true
+    constraint.validate(['2012', '2', '28', '23', '60', '12',], true).should_not be_true
+    constraint.validate(['2012', '2', '28', '23', '59', '60',], true).should_not be_true
+
+  end
+
+end

data/spec/combination_same_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::CombinationConstraint::Same do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::CombinationConstraint::Same.new
+    constraint.validate('aaaa', true).should_not be_true
+    constraint.validate(['aaaa', 'bbbb'], true).should_not be_true
+    constraint.validate(['aaaa', 'aaaa', 'aaaa'], true).should_not be_true
+    constraint.validate(['aaaa', 'aaaa'], true).should be_true
+
+  end
+
+end

data/spec/combination_time_spec.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe FormKeeper::CombinationConstraint::Time do
+
+  it "validate value correctly" do
+
+    constraint = FormKeeper::CombinationConstraint::Time.new
+    constraint.validate(['23', '2', '12'], true).should be_true
+    constraint.validate(['23', '2', '12', '11'], true).should_not be_true
+    constraint.validate(['23', '2', 'aa'], true).should_not be_true
+    constraint.validate(['0', '2', '12'], true).should be_true
+    constraint.validate(['-2', '2', '12'], true).should_not be_true
+    constraint.validate(['2', '60', '12'], true).should_not be_true
+    constraint.validate(['2', '2', '60'], true).should_not be_true
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formkeeper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -28,6 +28,11 @@ files:
 - lib/formkeeper.rb
 - lib/formkeeper/version.rb
 - spec/asset/messages.yaml
+- spec/combination_any_spec.rb
+- spec/combination_date_spec.rb
+- spec/combination_datetime_spec.rb
+- spec/combination_same_spec.rb
+- spec/combination_time_spec.rb
 - spec/constraint_alnum_space_spec.rb
 - spec/constraint_alnum_spec.rb
 - spec/constraint_alpha_space_spec.rb
@@ -64,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2485237141662980897
+      hash: 356989708151318593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2485237141662980897
+      hash: 356989708151318593
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -82,6 +87,11 @@ 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/combination_any_spec.rb
+- spec/combination_date_spec.rb
+- spec/combination_datetime_spec.rb
+- spec/combination_same_spec.rb
+- spec/combination_time_spec.rb
 - spec/constraint_alnum_space_spec.rb
 - spec/constraint_alnum_spec.rb
 - spec/constraint_alpha_space_spec.rb