companies-house-rest 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7536b868031c509fe65043133ad6cb31e17b66c4c034ef102b569898a9bb005
-  data.tar.gz: 9f7ae0fdbe3bb6e1572e670963791d4d3fc3db2839fd051a45a22bbd171bd086
+  metadata.gz: acbe329349686658408d7b6d6cc2ba267b6a685f01238a56d00a465853f2862b
+  data.tar.gz: 55ad4bcb56c3895963785a1bb173c7095ad5443b9819bb562280d2df67bcb68d
 SHA512:
-  metadata.gz: 13160029f1134d81eb3f2549e8d09cb580611fd650503946cfa8e952b2900f3f45ce273c4e13a955fa0acb6879ac50934e819ca4bd590dd351f2462fed614714
-  data.tar.gz: '0927b242b41b068f2e487aaad888bb90876cc2bee86b3d821d5c81df65a214764a7249fd86b98bd8fa324def254321de7302267ede2cd03283229dd6c084796e'
+  metadata.gz: a5df96312aae7d77a847b33ad67b916fcfc3ef2ea67c8c333523322389adb79baed76033847c64a4aff29ab30c5b0bc1896ea8b40b6f72365c06fade8ff3ff57
+  data.tar.gz: 05ab11572766fdc6d61fa9d32ed9088297fc3dd399853343a9ad1767ede56ad94ef04f024a92269bbd3fa0641193de24bc05c5b712c02cb11ea2ad85ee292475

data/companies-house-rest.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.5.5"
 
-  spec.add_runtime_dependency "virtus", "~> 1.0", ">= 1.0.5"
+  spec.add_runtime_dependency "dry-struct", "~> 1"
 
   spec.add_development_dependency "activesupport", ">= 4.2", "< 7"
   spec.add_development_dependency "gc_ruboconfig", "~> 2.4"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
   spec.add_development_dependency "timecop", "~> 0.8"

data/lib/companies_house/request.rb

@@ -8,31 +8,30 @@ require "companies_house/timeout_error"
 require "companies_house/bad_gateway_error"
 
 require "net/http"
-require "virtus"
 require "uri"
 require "json"
+require "dry-struct"
 
 module CompaniesHouse
   # This class manages individual requests.
   # Users of the CompaniesHouse gem should not instantiate this class
   # and should instead use CompaniesHouse::Client.
-  class Request
-    include Virtus.model
+  class Request < Dry::Struct
     # API-level attributes
-    attribute :connection, Net::HTTP, required: true
-    attribute :api_key, String, required: true
-    attribute :endpoint, URI, required: true
+    attribute :connection, Dry.Types.Instance(Net::HTTP)
+    attribute :api_key, Dry.Types::String
+    attribute :endpoint, Dry.Types.Instance(URI)
 
     # Physical request attributes
-    attribute :path, String, required: true
-    attribute :query, Hash, required: true
+    attribute :path, Dry.Types::String
+    attribute :query, Dry.Types::Hash
 
     # Logical request attributes
-    attribute :resource_type, Symbol, required: true
-    attribute :resource_id, String
+    attribute :resource_type, Dry.Types::Symbol
+    attribute :resource_id, Dry.Types.Nominal(Integer)
 
-    attribute :transaction_id, String, required: true
-    attribute :instrumentation
+    attribute :transaction_id, Dry.Types::String
+    attribute :instrumentation, Dry.Types.Interface(:publish)
 
     def initialize(args)
       super(args)
@@ -49,11 +48,7 @@ module CompaniesHouse
 
     def execute
       @started = Time.now.utc
-
-      req = Net::HTTP::Get.new(@uri)
-      req.basic_auth @api_key, ""
-
-      response = connection.request req
+      response = request_resource(@uri)
       @notification_payload[:status] = response.code
 
       begin
@@ -70,6 +65,13 @@ module CompaniesHouse
 
     private
 
+    def request_resource(uri)
+      req = Net::HTTP::Get.new(uri)
+      req.basic_auth api_key, ""
+
+      connection.request req
+    end
+
     def publish_notification
       instrumentation.publish(
         "companies_house.#{resource_type}",

data/lib/companies_house/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CompaniesHouse
-  VERSION = "0.4.8"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: companies-house-rest
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - GoCardless Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Look up UK company registration information