formkeeper 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49bade6105761c7043e33898ec6df3c1384b757b
-  data.tar.gz: c99e1c0952c1f1fc05afc68bee877c9c9280578a
+  metadata.gz: cb42cf5ca99b381d43bed10a94d7a29fbf441eb1
+  data.tar.gz: 23dba3a2f1c63dbd52624a03e408aa19f0cdac17
 SHA512:
-  metadata.gz: 7818cfee006207687639c43c5b018e6d36507d18a76b7fc63c1031c1508bb8082d2716ac7a5382e871c1ae5ef2b08787b805af15143ec61810e42fce77d4f66a
-  data.tar.gz: 97650f0a419d89073b866ab94890bbda3f05787cf15d64a44f6f55140946e1b227f9a13196689c89e8d425deadabc72283adcd5b003f982d57480b64e7892f38
+  metadata.gz: f4d0cc10eab3303e3d6281d9ecf5126644d9f57784d678de8ce531a40e585697edf60e8ee2c3da4071385c51655a3e8967abb8317b761ccdb04e8376005a9377
+  data.tar.gz: de70c2cda94b7a036fba3206cb2735efcfb57500650647b22c79e0301d9d0c1b96fba01f626fea2b55495c71c06148703fb981fc1185aab746fa433f28d5e93c

data/lib/formkeeper.rb

@@ -323,6 +323,13 @@ module FormKeeper
       end
     end
 
+    class Different < Base
+      def validate(values, arg)
+        return false unless values.size == 2
+        values[0] != values[1]
+      end
+    end
+
     class Any < Base
       def validate(values, arg)
         values.any? { |v| not (v.nil? or v.empty?) }
@@ -726,6 +733,7 @@ module FormKeeper
     register_combination_constraint :date, CombinationConstraint::Date.new
     register_combination_constraint :time, CombinationConstraint::Time.new
     register_combination_constraint :same, CombinationConstraint::Same.new
+    register_combination_constraint :diff, CombinationConstraint::Different.new
     register_combination_constraint :any, CombinationConstraint::Any.new
 
     def initialize

data/lib/formkeeper/version.rb

@@ -1,3 +1,3 @@
 module FormKeeper
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/validator_spec.rb

@@ -250,7 +250,7 @@ describe FormKeeper::Validator do
     report.failed_on?(:colors)
   end
 
-  it "validates combination params" do
+  it "validates combination same params" do
 
     rule = FormKeeper::Rule.new
     rule.filters :strip
@@ -275,7 +275,7 @@ describe FormKeeper::Validator do
 
   end
 
-  it "validates combination params by synonym" do
+  it "validates combination same params by synonym" do
 
     rule = FormKeeper::Rule.new
     rule.filters :strip
@@ -300,7 +300,7 @@ describe FormKeeper::Validator do
 
   end
 
-  it "validates invalid combination params" do
+  it "validates invalid combination same params" do
 
     rule = FormKeeper::Rule.new
     rule.filters :strip
@@ -325,5 +325,74 @@ describe FormKeeper::Validator do
     report.failed_on?(:same_email_address).should eql(true)
 
   end
-end
 
+  it "validates combination diff params" do
+
+    rule = FormKeeper::Rule.new
+    rule.filters :strip
+    rule.field :old_password, :present => true, :length => 8..16
+    rule.field :new_password, :present => true, :length => 8..16
+    rule.combination :different_password, :fields => [:old_password, :new_password], :diff => true
+
+    params = {}
+    params['old_password'] = 'hogehogebar_old '
+    params['new_password'] = 'hogehogebar_new  '
+
+    validator = FormKeeper::Validator.new
+    report = validator.validate(params, rule)
+
+    #valid_params.keys.size.should == 2
+    report[:old_password].should == 'hogehogebar_old'
+    report[:new_password].should == 'hogehogebar_new'
+
+    report.failed?.should_not eql(true)
+
+  end
+
+  it "validates combination diff params by synonym" do
+
+    rule = FormKeeper::Rule.new
+    rule.filters :strip
+    rule.field :old_password, :present => true, :length => 8..16
+    rule.field :new_password, :present => true, :length => 8..16
+    rule.diff :different_password, [:old_password, :new_password], :filters => :upcase
+
+    params = {}
+    params['old_password'] = 'hogehogebar_old '
+    params['new_password'] = 'hogehogebar_new  '
+
+    validator = FormKeeper::Validator.new
+    report = validator.validate(params, rule)
+
+    #valid_params.keys.size.should == 2
+    report[:old_password].should == 'hogehogebar_old'
+    report[:new_password].should == 'hogehogebar_new'
+
+    report.failed?.should_not eql(true)
+
+  end
+
+  it "validates invalid combination diff params" do
+
+    rule = FormKeeper::Rule.new
+    rule.filters :strip
+    rule.field :old_password, :present => true, :length => 8..16
+    rule.field :new_password, :present => true, :length => 8..16
+    rule.diff :different_password, [:old_password, :new_password], :filters => :upcase
+
+    params = {}
+    params['old_password'] = 'hogehogebar_old '
+    params['new_password'] = 'hogehogebar_old  '
+
+    validator = FormKeeper::Validator.new
+    report = validator.validate(params, rule)
+
+    #valid_params.keys.size.should == 2
+    report[:old_password].should == 'hogehogebar_old'
+    report[:new_password].should == 'hogehogebar_old'
+
+    report.failed?.should eql(true)
+    report.failed_on?(:different_password).should eql(true)
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formkeeper
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - lyokato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot