companies_house_hub 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5ac91a16eae0a80a8197622ed6280bb6ee4918015e9dc34ae77523f408725b
-  data.tar.gz: 45348b4b15c96ab7c51f6d74641fd376f4bfaf69db4afaccb7c464da08ee84c3
+  metadata.gz: 83ae5b2dfde24b07b5e99ce919e39d6685655e83bbf1addf94c4834eafd5e735
+  data.tar.gz: 823ca7613fee36bb79ce3c22ddab39631fda621e4b3a7aa0400f103b25689d21
 SHA512:
-  metadata.gz: 107dd08400be3d337732c5525673087dec42ef7c74a1b5547e300f91d8c5791989fbf198d11b9714064a8db47625c82a2a82c9107ac4751a821fe9dbdee3653d
-  data.tar.gz: 28d07c7ff36a4f945f9df6c0009d5e0b378ae27eefcf4a479c21f258a76fdaeb65ae43eed8243ca45804fe6fffe9fedf607505b1a73bc549305f09e183f71504
+  metadata.gz: f92b9a1ed0c4aaf8fe7644049e0000f7f6fffed8edcff522a7671203c85a3a02522e9b770aaff16befbacd05cccf021f0ef6f93633232d8f9d13423bad6cb7a8
+  data.tar.gz: 88e8ae8c30f849b8eaebda00fac7d389fe4cb99ed96b0424c0afbcad08aa6946c91bce7d0e68431395aadcb00ed92141c570d689e3e8f2fffbaa7cbd3dd414c8

data/.rubocop.yml

@@ -1,8 +1,5 @@
 require: rubocop-rspec
 
-Metrics/AbcSize:
-  Max: 30
-
 Style/Documentation:
   Enabled: false
 
@@ -31,9 +28,5 @@ Lint/UselessAssignment:
 RSpec/ExampleLength:
   Max: 100
 
-# To be compatible with older versions of ruby
-Performance/RegexpMatch:
-  Enabled: false
-
 RSpec/MultipleExpectations:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.5

data/companies_house_hub.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday'
   spec.add_dependency 'faraday_middleware'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'dotenv', '~> 2.4.0'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'vcr'

data/lib/companies_house_hub/models/company.rb

@@ -54,7 +54,7 @@ module CompaniesHouseHub
       @status = json.dig(:company_status)
       @type = json.dig(:type) || json.dig(:company_type)
       @accounts = json.dig(:accounts)
-      @full_address = json.dig(:address_snippet) || @address.full
+      @full_address = json.fetch(:address_snippet, @address.full)
     end
 
     def filing_histories

data/lib/companies_house_hub/models/filing_history.rb

@@ -16,9 +16,9 @@ module CompaniesHouseHub
     def self.all(options = {})
       options[:items_per_page] ||= DEFAULT_PER_PAGE
 
-      number = options.delete(:company_number)
+      company_number = options.delete(:company_number)
 
-      result = get(format_url(FIND_PATH, company_number: number), options)
+      result = get(format_url(FIND_PATH, company_number: company_number), options)
 
       return [] unless result.body[:items].any?
 
@@ -27,13 +27,13 @@ module CompaniesHouseHub
       filing_histories = result.body[:items].map do |filing_json|
         next if filing_json.dig(:description) == LEGACY_DOC_DESCRIPTION
 
-        new(filing_json)
+        new(filing_json, company_number)
       end
 
       filing_histories.compact
     end
 
-    def initialize(json = {})
+    def initialize(json = {}, company_number = nil)
       @description = json.dig(:description)
       @action_date = json.dig(:action_date)
       @date = json.dig(:date)
@@ -42,6 +42,7 @@ module CompaniesHouseHub
       @transaction_id = json.dig(:transaction_id) # helps on barcode generation
       @barcode = json.dig(:barcode) || generate_barcode
       @description_values = json.dig(:description_values)
+      @company_number = company_number
     end
 
     def formatted_name
@@ -49,7 +50,9 @@ module CompaniesHouseHub
     end
 
     def url(format = 'pdf')
-      file_path = @links[:self]
+      file_path = @links[:self] || build_file_path
+
+      return unless file_path
 
       document_path = "#{file_path}/document?format=#{format}"
 
@@ -66,5 +69,11 @@ module CompaniesHouseHub
 
       Digest::SHA1.hexdigest(string)[0..6].upcase
     end
+
+    def build_file_path
+      required = [@company_number, @transaction_id].all? { |val| val && !val.empty? }
+
+      "/company/#{@company_number}/filing-history/#{@transaction_id}" if required
+    end
   end
 end

data/lib/companies_house_hub/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CompaniesHouseHub
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: companies_house_hub
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ricardo Otero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -223,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A REST client for the UK Companies House API