defra_ruby_validators 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ba4d07bb3d5c11c1ab241e4121d64004a0e8c2
-  data.tar.gz: 4b16fc9065a8d4072e55f4529d0ab04a9d905006
+  metadata.gz: 04bc1dd6e518b45824a7a10ac6e2c7c6d1013109
+  data.tar.gz: 1e98e3f97bafae4035294e95706db57a3374ef4d
 SHA512:
-  metadata.gz: 91e943e088401c6c5345cc30c2a7710b65e09b01ae85cc97626a5f2959087ff1ee004cadaf137dd78a4c7a8d499b64e2c1972e2ae24a892c67cf68e95bdcc033
-  data.tar.gz: 94c9eb588a7916a290e66dd9f1a2d628ffecde5db21c7ee55fd84b857a78f55088ab02935307f85ca5fd9679855fc00673f24b714e4636286115d2afefb374c6
+  metadata.gz: a19e32a494bf6865f35b067d7a6e650a5a568aa02f70944f1941e64142cb99ae9c5b4eeeabe7ec0d625005ee8c2e8147359e494e60f55e069a088e89e600fd52
+  data.tar.gz: fe26d0c04ecfbd11557b53a8b9c9969ff0e4efcdb5c075e4e6c118c6349d0632f8f04c544551c94e331d4148602125354d0681be063daf3eb60c9bfc6f8ec705

data/config/locales/defra_ruby/validators/past_date_validator/en.yml

@@ -3,3 +3,4 @@ en:
     validators:
       PastDateValidator:
         past_date: "Date cannot be in the future"
+        invalid_date: "You must enter a valid date"

data/lib/defra_ruby/validators/past_date_validator.rb

@@ -6,11 +6,21 @@ module DefraRuby
       def validate_each(record, attribute, value)
         return false if value.blank?
 
-        return true if value.to_date <= Date.today
+        date = value.to_date
 
-        record.errors[attribute] << error_message(:past_date)
+        if date > Date.today
+          record.errors[attribute] << error_message(:past_date)
 
-        false
+          return false
+        end
+
+        if date.year < 1900
+          record.errors[attribute] << error_message(:invalid_date)
+
+          return false
+        end
+
+        true
       end
     end
   end

data/lib/defra_ruby/validators/version.rb

@@ -2,6 +2,6 @@
 
 module DefraRuby
   module Validators
-    VERSION = "2.3.0"
+    VERSION = "2.3.1"
   end
 end

data/spec/defra_ruby/validators/past_date_validator_spec.rb

@@ -15,14 +15,21 @@ module DefraRuby
     RSpec.describe PastDateValidator, type: :model do
 
       valid_date = Date.today
-      invalid_date = Date.today + 1
+      future_date = Date.today + 1
+      invalid_date = Date.new(20, 2, 2)
 
       it_behaves_like "a valid record", Test::PastDateValidatable.new(valid_date)
       it_behaves_like "an invalid record",
-                      validatable: Test::PastDateValidatable.new(invalid_date),
+                      validatable: Test::PastDateValidatable.new(future_date),
                       attribute: :date,
                       error: :past_date,
                       error_message: Helpers::Translator.error_message(PastDateValidator, :past_date)
+
+      it_behaves_like "an invalid record",
+                      validatable: Test::PastDateValidatable.new(invalid_date),
+                      attribute: :date,
+                      error: :invalid_date,
+                      error_message: Helpers::Translator.error_message(PastDateValidator, :invalid_date)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_validators
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Defra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel