defra_ruby_validators 1.1.0 → 1.2.0

data/spec/support/shared_examples/validators/presence_validator.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "a presence validator" do |validator, validatable_class, attribute, values|
+  it "includes CanValidatePresence" do
+    included_modules = described_class.ancestors.select { |ancestor| ancestor.instance_of?(Module) }
+
+    expect(included_modules)
+      .to include(DefraRuby::Validators::CanValidatePresence)
+  end
+
+  describe "#validate_each" do
+    context "when the #{attribute} is valid" do
+      it_behaves_like "a valid record", validatable_class.new(values[:valid])
+    end
+
+    context "when the #{attribute} is not valid" do
+      context "because the #{attribute} is not present" do
+        validatable = validatable_class.new
+        error_message = Helpers::Translator.error_message(validator, attribute, :blank)
+
+        it_behaves_like "an invalid record", validatable, attribute, error_message
+      end
+    end
+  end
+end

data/spec/support/shared_examples/validators/selection_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples "a selection validator" do |validator, validatable_class, property, valid_value|
+RSpec.shared_examples "a selection validator" do |validator, validatable_class, attribute, values|
   it "includes CanValidateSelection" do
     included_modules = described_class.ancestors.select { |ancestor| ancestor.instance_of?(Module) }
 
@@ -9,23 +9,23 @@ RSpec.shared_examples "a selection validator" do |validator, validatable_class,
   end
 
   describe "#validate_each" do
-    context "when the #{property} is valid" do
-      it_behaves_like "a valid record", validatable_class.new(valid_value)
+    context "when the #{attribute} is valid" do
+      it_behaves_like "a valid record", validatable_class.new(values[:valid])
     end
 
-    context "when the #{property} is not valid" do
-      context "because the #{property} is not present" do
+    context "when the #{attribute} is not valid" do
+      context "because the #{attribute} is not present" do
         validatable = validatable_class.new
-        error_message = Helpers::Translator.error_message(klass: validator, error: :inclusion)
+        error_message = Helpers::Translator.error_message(validator, attribute, :inclusion)
 
-        it_behaves_like "an invalid record", validatable, property, error_message
+        it_behaves_like "an invalid record", validatable, attribute, error_message
       end
 
-      context "because the #{property} is not from an approved list" do
-        validatable = validatable_class.new("unexpected_#{property}")
-        error_message = Helpers::Translator.error_message(klass: validator, error: :inclusion)
+      context "because the #{attribute} is not from an approved list" do
+        validatable = validatable_class.new(values[:invalid])
+        error_message = Helpers::Translator.error_message(validator, attribute, :inclusion)
 
-        it_behaves_like "an invalid record", validatable, property, error_message
+        it_behaves_like "an invalid record", validatable, attribute, error_message
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_validators
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Defra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: os_map_ref
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: phonelib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: validates_email_format_of
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: defra_ruby_style
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -218,34 +232,61 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- 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/grid_reference_validator/en.yml
+- config/locales/defra_ruby/validators/location_validator/en.yml
+- config/locales/defra_ruby/validators/phone_number_validator/en.yml
+- config/locales/defra_ruby/validators/position_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
 - lib/defra_ruby/validators/base_validator.rb
+- lib/defra_ruby/validators/business_type_validator.rb
 - lib/defra_ruby/validators/companies_house_number_validator.rb
 - lib/defra_ruby/validators/companies_house_service.rb
+- lib/defra_ruby/validators/concerns/can_validate_characters.rb
+- lib/defra_ruby/validators/concerns/can_validate_length.rb
+- lib/defra_ruby/validators/concerns/can_validate_presence.rb
 - lib/defra_ruby/validators/concerns/can_validate_selection.rb
 - lib/defra_ruby/validators/configuration.rb
+- lib/defra_ruby/validators/email_validator.rb
 - lib/defra_ruby/validators/engine.rb
+- lib/defra_ruby/validators/grid_reference_validator.rb
+- lib/defra_ruby/validators/location_validator.rb
+- lib/defra_ruby/validators/phone_number_validator.rb
+- lib/defra_ruby/validators/position_validator.rb
+- lib/defra_ruby/validators/token_validator.rb
 - lib/defra_ruby/validators/true_false_validator.rb
 - lib/defra_ruby/validators/version.rb
 - lib/defra_ruby_validators.rb
 - spec/cassettes/company_no_inactive.yml
 - spec/cassettes/company_no_not_found.yml
 - spec/cassettes/company_no_valid.yml
+- spec/defra_ruby/validators/business_type_validator_spec.rb
 - spec/defra_ruby/validators/companies_house_number_validator_spec.rb
 - spec/defra_ruby/validators/companies_house_service_spec.rb
 - spec/defra_ruby/validators/configuration_spec.rb
+- spec/defra_ruby/validators/email_validator_spec.rb
+- spec/defra_ruby/validators/grid_reference_validator_spec.rb
+- spec/defra_ruby/validators/location_validator_spec.rb
+- spec/defra_ruby/validators/phone_number_validator_spec.rb
+- spec/defra_ruby/validators/position_validator_spec.rb
+- spec/defra_ruby/validators/token_validator_spec.rb
 - spec/defra_ruby/validators/true_false_validator_spec.rb
 - spec/defra_ruby/validators_spec.rb
 - spec/examples.txt
 - spec/spec_helper.rb
 - spec/support/defra_ruby_validators.rb
-- spec/support/dotenv.rb
+- spec/support/helpers/text_generator.rb
 - spec/support/helpers/translator.rb
 - spec/support/i18n.rb
 - spec/support/pry.rb
+- spec/support/shared_examples/validators/characters_validator.rb
 - spec/support/shared_examples/validators/invalid_record.rb
+- spec/support/shared_examples/validators/length_validator.rb
+- spec/support/shared_examples/validators/presence_validator.rb
 - spec/support/shared_examples/validators/selection_validator.rb
 - spec/support/shared_examples/validators/valid_record.rb
 - spec/support/shared_examples/validators/validator.rb
@@ -281,8 +322,15 @@ test_files:
 - spec/defra_ruby/validators_spec.rb
 - spec/defra_ruby/validators/companies_house_service_spec.rb
 - spec/defra_ruby/validators/configuration_spec.rb
+- spec/defra_ruby/validators/phone_number_validator_spec.rb
+- spec/defra_ruby/validators/position_validator_spec.rb
+- spec/defra_ruby/validators/grid_reference_validator_spec.rb
+- spec/defra_ruby/validators/business_type_validator_spec.rb
 - spec/defra_ruby/validators/companies_house_number_validator_spec.rb
+- spec/defra_ruby/validators/token_validator_spec.rb
 - spec/defra_ruby/validators/true_false_validator_spec.rb
+- spec/defra_ruby/validators/location_validator_spec.rb
+- spec/defra_ruby/validators/email_validator_spec.rb
 - spec/examples.txt
 - spec/cassettes/company_no_not_found.yml
 - spec/cassettes/company_no_valid.yml
@@ -291,10 +339,13 @@ test_files:
 - spec/support/i18n.rb
 - spec/support/vcr.rb
 - spec/support/pry.rb
-- spec/support/dotenv.rb
 - spec/support/defra_ruby_validators.rb
 - spec/support/helpers/translator.rb
+- spec/support/helpers/text_generator.rb
 - spec/support/shared_examples/validators/selection_validator.rb
 - spec/support/shared_examples/validators/invalid_record.rb
+- spec/support/shared_examples/validators/presence_validator.rb
+- spec/support/shared_examples/validators/characters_validator.rb
+- spec/support/shared_examples/validators/length_validator.rb
 - spec/support/shared_examples/validators/valid_record.rb
 - spec/support/shared_examples/validators/validator.rb

data/spec/support/dotenv.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Load env vars from a text file
-require "dotenv/load"