defra_ruby_validators 2.7.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb145644c2a51c737b951282707e436d9b740ab756c04f93d761cf05cbc91a6
-  data.tar.gz: 45ce24942e9e95030e8d051f06db0f20facff88f2320445b96b7c695a35b17f8
+  metadata.gz: 6206b70eb2b95385d8ee3eaae2600048973784b8d0aec0d6ed8ad6b7160a09c1
+  data.tar.gz: 9882d021eef58fe6912b86df0a464e71efd2b3a366a16fe8a7b327a54aba3e72
 SHA512:
-  metadata.gz: 7c6c390badabbd364ed4174746857062d0f85d92405981c2b83e72498e493c6440e5663bc8ade16bc0d87534da467db4ea1a9dcb1871f9b1cc7f810dede007fb
-  data.tar.gz: 31404af40d4a8da9da8c726bb9b081d6d9838eb0843ede3042b270d9dd7036c5810f00becde67f8fcdb0e723ea8f79883b970a8eec38a9eea581b31d9b93c376
+  metadata.gz: e8030181c4ca547e313e626b90eea3955935d186ee9703011e319de10fe4bd4bec133ae75a84e9509ae04199448c72086e1e64de28078e006fe4d174b53eb863
+  data.tar.gz: 0f77ecfb97c54d08817461737c07b5d926995e2c37c5d968495e8b52e83b3b7ed482b2725645a5aca2316ddada502972c310256b475a023993963925ef7fea24

data/README.md

@@ -184,6 +184,16 @@ Add it to your model or form object using
 validates :is_a_farmer, "defra_ruby/validators/true_false": true
 ```
 
+### Price
+
+This validator checks the value is present and in the correct format, meaning it has no more than 2 decimal places. If blank or not in a valid format it will return an error.
+
+Add it to your model or form object using
+
+```ruby
+validates :price, "defra_ruby/validators/price": true
+```
+
 ## Adding custom error messages
 
 All the validators in this gem have built-in error messages. But if you want, you can provide your own custom message in the app, like this:

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

@@ -0,0 +1,6 @@
+en:
+  defra_ruby:
+    validators:
+      PriceValidator:
+        blank: "Enter a price"
+        invalid_format: "Enter a valid price - there’s a mistake in that one"

data/lib/defra_ruby/validators/price_validator.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module DefraRuby
+  module Validators
+    class PriceValidator < BaseValidator
+      include CanValidatePresence
+
+      def validate_each(record, attribute, value)
+        return false unless value_is_present?(record, attribute, value)
+
+        valid_format?(record, attribute, value)
+      end
+
+      private
+
+      def valid_format?(record, attribute, value)
+        return true if value.to_s.match?(/\A\d{1,10}(\.\d{1,2})?\z/)
+
+        add_validation_error(record, attribute, :invalid_format)
+        false
+      end
+
+    end
+  end
+end

data/lib/defra_ruby/validators/version.rb

@@ -2,6 +2,6 @@
 
 module DefraRuby
   module Validators
-    VERSION = "2.7.0"
+    VERSION = "2.7.2"
   end
 end

data/lib/defra_ruby/validators.rb

@@ -24,6 +24,7 @@ require_relative "validators/postcode_validator"
 require_relative "validators/token_validator"
 require_relative "validators/true_false_validator"
 require_relative "validators/past_date_validator"
+require_relative "validators/price_validator"
 
 module DefraRuby
   module Validators

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_validators
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Defra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -137,7 +137,6 @@ files:
 - config/locales/defra_ruby/validators/business_type_validator/en.yml
 - config/locales/defra_ruby/validators/companies_house_number_validator/en.yml
 - config/locales/defra_ruby/validators/email_validator/en.yml
-- config/locales/defra_ruby/validators/future_date_validator/en.yml
 - config/locales/defra_ruby/validators/grid_reference_validator/en.yml
 - config/locales/defra_ruby/validators/location_validator/en.yml
 - config/locales/defra_ruby/validators/mobile_phone_number_validator/en.yml
@@ -145,6 +144,7 @@ files:
 - config/locales/defra_ruby/validators/phone_number_validator/en.yml
 - config/locales/defra_ruby/validators/position_validator/en.yml
 - config/locales/defra_ruby/validators/postcode_validator/en.yml
+- config/locales/defra_ruby/validators/price_validator/en.yml
 - config/locales/defra_ruby/validators/token_validator/en.yml
 - config/locales/defra_ruby/validators/true_false_validator/en.yml
 - lib/defra_ruby/validators.rb
@@ -159,7 +159,6 @@ files:
 - lib/defra_ruby/validators/configuration.rb
 - lib/defra_ruby/validators/email_validator.rb
 - lib/defra_ruby/validators/engine.rb
-- lib/defra_ruby/validators/future_date_validator.rb_park
 - lib/defra_ruby/validators/grid_reference_validator.rb
 - lib/defra_ruby/validators/location_validator.rb
 - lib/defra_ruby/validators/mobile_phone_number_validator.rb
@@ -167,6 +166,7 @@ files:
 - lib/defra_ruby/validators/phone_number_validator.rb
 - lib/defra_ruby/validators/position_validator.rb
 - lib/defra_ruby/validators/postcode_validator.rb
+- lib/defra_ruby/validators/price_validator.rb
 - lib/defra_ruby/validators/token_validator.rb
 - lib/defra_ruby/validators/true_false_validator.rb
 - lib/defra_ruby/validators/version.rb

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

@@ -1,5 +0,0 @@
-en:
-  defra_ruby:
-    validators:
-      FutureDateValidator:
-        future_date: "Date cannot be in the past"

data/lib/defra_ruby/validators/future_date_validator.rb_park

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module DefraRuby
-  module Validators
-    class FutureDateValidator < BaseValidator
-      def validate_each(record, attribute, value)
-        return false if value.blank?
-
-        date = value.to_date
-
-        if date <= Date.today
-          add_validation_error(record, attribute, :future_date)
-
-          return false
-        end
-
-        true
-      end
-    end
-  end
-end