defra_ruby_validators 2.7.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6206b70eb2b95385d8ee3eaae2600048973784b8d0aec0d6ed8ad6b7160a09c1
-  data.tar.gz: 9882d021eef58fe6912b86df0a464e71efd2b3a366a16fe8a7b327a54aba3e72
+  metadata.gz: e34dff1331e6b8a942f51618779fbace633e14f091eb697ecb95fb5eadb8afba
+  data.tar.gz: 7767d4bd72710a2b020b0635a8b287b13a41a615be7e2aaf500cddd4a2c2feae
 SHA512:
-  metadata.gz: e8030181c4ca547e313e626b90eea3955935d186ee9703011e319de10fe4bd4bec133ae75a84e9509ae04199448c72086e1e64de28078e006fe4d174b53eb863
-  data.tar.gz: 0f77ecfb97c54d08817461737c07b5d926995e2c37c5d968495e8b52e83b3b7ed482b2725645a5aca2316ddada502972c310256b475a023993963925ef7fea24
+  metadata.gz: 7bd048c738c34dbc7bd22f0984989347e0b001ea586259ccf30a274d27e598b4a23ba8bc9bbe9fb737cb6dbbfb8c483101d51268c4eb2b1cd7ae1ee7e1d37cc7
+  data.tar.gz: 7057bcf0ec3b6dcc292aee79f3f344f164c7de8b8d15b5ec2f1ae540fcf9ed97e53d2d2b4fd32755c645d1765c444a17f33189a51cdab8f6292b0bab932e9b75

data/lib/defra_ruby/validators/companies_house_service.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rest-client"
+require "defra_ruby/companies_house"
 
 module DefraRuby
   module Validators
@@ -10,33 +10,22 @@ module DefraRuby
         @permitted_types = permitted_types
 
         validate_permitted_types
-
-        @url = "#{DefraRuby::Validators.configuration.companies_house_host}#{@company_number}"
-        @api_key = DefraRuby::Validators.configuration.companies_house_api_key
       end
 
       def status
-        return :unsupported_company_type unless company_type_is_allowed?(json_response)
+        return :unsupported_company_type unless company_type_is_allowed?(companies_house_response)
 
-        status_is_allowed?(json_response) ? :active : :inactive
-      rescue RestClient::ResourceNotFound
+        status_is_allowed?(companies_house_response) ? :active : :inactive
+      rescue DefraRuby::CompaniesHouse::CompanyNotFoundError
         :not_found
       end
 
-      def json_response
-        @_json_response ||=
-          JSON.parse(
-            RestClient::Request.execute(
-              method: :get,
-              url: @url,
-              user: @api_key,
-              password: ""
-            )
-          )
-      end
-
       private
 
+      def companies_house_response
+        @companies_house_response ||= DefraRuby::CompaniesHouse::API.run(company_number: @company_number)
+      end
+
       def validate_permitted_types
         return if @permitted_types.nil?
 
@@ -45,19 +34,19 @@ module DefraRuby
         raise ArgumentError, I18n.t("defra_ruby.validators.CompaniesHouseNumberValidator.argument_error")
       end
 
-      def status_is_allowed?(json_response)
-        %w[active voluntary-arrangement].include?(json_response["company_status"])
+      def status_is_allowed?(companies_house_response)
+        %i[active voluntary-arrangement].include?(companies_house_response[:company_status])
       end
 
-      def company_type_is_allowed?(json_response)
+      def company_type_is_allowed?(companies_house_response)
         # if permitted_types has not been defined in the validator, we skip this check
         return true if @permitted_types.blank?
 
         case @permitted_types
         when String
-          @permitted_types.to_s == json_response["type"]
+          @permitted_types == companies_house_response[:company_type].to_s
         when Array
-          @permitted_types.include?(json_response["type"])
+          @permitted_types.include?(companies_house_response[:company_type].to_s)
         else
           raise ArgumentError, I18n.t("defra_ruby.validators.CompaniesHouseNumberValidator.argument_error")
         end

data/lib/defra_ruby/validators/configuration.rb

@@ -12,24 +12,7 @@ module DefraRuby
     end
 
     class Configuration
-      ATTRIBUTES = %i[
-        companies_house_host
-        companies_house_api_key
-      ].freeze
-
-      attr_accessor(*ATTRIBUTES)
-
-      def initialize
-        @companies_house_host = "https://api.companieshouse.gov.uk/company/"
-        @companies_house_api_key = nil
-      end
-
-      def ensure_valid
-        missing_attributes = ATTRIBUTES.select { |a| public_send(a).nil? }
-        return true if missing_attributes.empty?
-
-        raise "The following DefraRuby::Validators configuration attributes are missing: #{missing_attributes}"
-      end
+      # Removed companies house configuration but laving the class in place to avoid knock-on impacts on apps.
     end
   end
 end

data/lib/defra_ruby/validators/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_validators
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Defra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: defra_ruby_companies_house
+  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: i18n
   requirement: !ruby/object:Gem::Requirement