epb_view_models 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9e0148c91fdfa17b8230647b7f44630d9197877639f5f8da2948d329afb8e6
-  data.tar.gz: db0feff6c2a220fef4810e938bb53d6382df34df65355ff3946443b58ada8950
+  metadata.gz: aa9d8934087e8309c6b8c03395fbbbb93e9b7353964126b93438d52feb6ad7b6
+  data.tar.gz: 27c06482c14b7b0dec995f24e69b4fa0b2d595632b2fa998e2030269ebe96b94
 SHA512:
-  metadata.gz: f5e51bceb16b9c4ec62cb2a724ccb58e4daf1d8699b67672a755533278b568c00c7f13ee119f7d78983f913bb13a2cd69b36a1d1372e43a4dc4f62f82b89bb03
-  data.tar.gz: 9813262b24abc17231f36b6d5b4bf0eac81f58a31d103b80172e518b228e1974b15176af4c97f6ffeee7bea8cd8ac47cd74b08286554ff57883f6ec9fb3085e3
+  metadata.gz: d274a8af83d9a7d9b98a0aed40aa07ab22c795196d1110e309ba947cdb0e33b29782aa0f3d76be73e4353e61f1eefa1a982e3831be7631ad9fb423120573920f
+  data.tar.gz: 030110e0f77c01c48a4b695d086e6e00d337520eb40fdd3fab2f9074ba4c47d134210b00c187922650da323a0f05f332f435496e4dfd09d1b876491c1c0bf6fa

data/Gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org"
 group :test do
   gem "rake", "~> 13.0.6"
   gem "rspec", "~> 3.0"
-  gem "rubocop-govuk", "~> 4.0.0", require: false
+  gem "rubocop-govuk", "~> 4.7.0", require: false
 end
 
 gem "nokogiri", "~> 1.11"

data/Gemfile.lock

@@ -1,29 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    nokogiri (1.13.3)
+    minitest (5.16.3)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.4)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -34,40 +35,40 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.15.0)
+    rubocop (1.35.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.6.0)
-      parser (>= 3.0.1.1)
-    rubocop-govuk (4.0.0)
-      rubocop (~> 1.15.0)
-      rubocop-ast (~> 1.6.0)
-      rubocop-rails (~> 2.10.0)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (~> 2.3.0)
-    rubocop-rails (2.10.1)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-govuk (4.7.0)
+      rubocop (= 1.35.0)
+      rubocop-ast (= 1.21.0)
+      rubocop-rails (= 2.15.2)
+      rubocop-rake (= 0.6.0)
+      rubocop-rspec (= 2.12.1)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.3.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -78,7 +79,7 @@ DEPENDENCIES
   rake (~> 13.0.6)
   rexml (~> 3.2, >= 3.2.5)
   rspec (~> 3.0)
-  rubocop-govuk (~> 4.0.0)
+  rubocop-govuk (~> 4.7.0)
   zeitwerk (~> 2.4.2)
 
 RUBY VERSION

data/Makefile

@@ -14,4 +14,4 @@ test: ## Run all tests
 	@bundle exec rake spec
 
 format: ## Runs Rubocop with the GOV.UK rules
-	@bundle exec rake rubocop:auto_correct
+	@bundle exec rake rubocop:autocorrect

data/epb_view_models.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Library used to parse Energy Performance Certificates (EPC)"
   spec.homepage      = "https://github.com/communitiesuk/epb-view-models"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.19"
+  VERSION = "1.0.20"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/rd_sap/{hera.rb → domestic_digest.rb}

@@ -1,6 +1,6 @@
 module Presenter
   module RdSap
-    class Hera
+    class DomesticDigest
       TYPE_OF_ASSESSMENT = "RdSAP".freeze
       private_constant :TYPE_OF_ASSESSMENT
 
@@ -9,7 +9,7 @@ module Presenter
         @schema_type = schema_type
       end
 
-      def to_hera_hash
+      def to_domestic_digest
         {
           type_of_assessment: TYPE_OF_ASSESSMENT,
           assessment_id: @view_model.assessment_id,

data/lib/presenter/rd_sap/summary.rb

@@ -54,7 +54,7 @@ module Presenter
             ),
           current_energy_efficiency_rating: @view_model.current_energy_rating,
           dwelling_type: @view_model.dwelling_type,
-          estimated_energy_cost: estimated_energy_cost,
+          estimated_energy_cost:,
           main_fuel_type: @view_model.main_fuel_type,
           heat_demand: {
             current_space_heating_demand:

data/lib/presenter/sap/{hera.rb → domestic_digest.rb}

@@ -1,12 +1,12 @@
 module Presenter
   module Sap
-    class Hera
+    class DomesticDigest
       def initialize(view_model, schema_type)
         @view_model = view_model
         @schema_type = schema_type
       end
 
-      def to_hera_hash
+      def to_domestic_digest
         {
           type_of_assessment: @view_model.type_of_assessment,
           assessment_id: @view_model.assessment_id,

data/lib/presenter/sap/summary.rb

@@ -51,7 +51,7 @@ module Presenter
             ),
           current_energy_efficiency_rating: @view_model.current_energy_rating,
           dwelling_type: @view_model.dwelling_type,
-          estimated_energy_cost: estimated_energy_cost,
+          estimated_energy_cost:,
           main_fuel_type: @view_model.main_fuel_type,
           heat_demand: {
             current_space_heating_demand:

data/lib/view_model/rd_sap_wrapper.rb

@@ -8,7 +8,7 @@ module ViewModel
       @summary = Presenter::RdSap::Summary.new(view_model)
       @report = Presenter::RdSap::Report.new(view_model, schema_type, additional_data)
       @recommendation_report = Presenter::RdSap::RecommendationReport.new(view_model)
-      @hera = Presenter::RdSap::Hera.new(view_model, schema_type)
+      @domestic_digest = Presenter::RdSap::DomesticDigest.new(view_model, schema_type)
     end
 
     def type
@@ -31,10 +31,17 @@ module ViewModel
       @recommendation_report.to_hash
     end
 
+    def to_domestic_digest
+      @domestic_digest.to_domestic_digest
+    end
+
     def to_hera_hash
-      @hera.to_hera_hash
+      to_domestic_digest
     end
 
+    extend Gem::Deprecate
+    deprecate :to_hera_hash, :to_domestic_digest, 2022, 9
+
     def get_view_model
       view_model
     end

data/lib/view_model/sap_schema_1900/common_schema.rb

@@ -1,6 +1,8 @@
 module ViewModel
   module SapSchema1900
     class CommonSchema < ViewModel::DomesticEpcViewModel
+      THRESHOLD_LOW_ENERGY_LIGHTING_EFFICACY = 65
+
       def assessment_id
         xpath(%w[Report-Header RRN])
       end
@@ -387,7 +389,7 @@ module ViewModel
         low_energy_outlet_count = []
 
         format_fixed_light_array.each do |outlet|
-          if outlet[:lighting_efficacy].to_i > 65
+          if outlet[:lighting_efficacy].to_i > THRESHOLD_LOW_ENERGY_LIGHTING_EFFICACY
             low_energy_outlet_count << outlet[:lighting_outlets].to_i
           end
           total_energy_outlet_count << outlet[:lighting_outlets].to_f
@@ -400,7 +402,7 @@ module ViewModel
         low_energy_outlet_count = []
 
         format_fixed_light_array.each do |outlet|
-          if outlet[:lighting_efficacy].to_i > 65
+          if outlet[:lighting_efficacy].to_i > THRESHOLD_LOW_ENERGY_LIGHTING_EFFICACY
             low_energy_outlet_count << outlet[:lighting_outlets].to_i
           end
         end

data/lib/view_model/sap_wrapper.rb

@@ -8,7 +8,7 @@ module ViewModel
       @summary = Presenter::Sap::Summary.new(view_model)
       @report = Presenter::Sap::Report.new(view_model, schema_type, additional_data)
       @recommendation_report = Presenter::Sap::RecommendationReport.new(view_model)
-      @hera = Presenter::Sap::Hera.new(view_model, schema_type)
+      @domestic_digest = Presenter::Sap::DomesticDigest.new(view_model, schema_type)
     end
 
     def type
@@ -31,10 +31,17 @@ module ViewModel
       @recommendation_report.to_hash
     end
 
+    def to_domestic_digest
+      @domestic_digest.to_domestic_digest
+    end
+
     def to_hera_hash
-      @hera.to_hera_hash
+      to_domestic_digest
     end
 
+    extend Gem::Deprecate
+    deprecate :to_hera_hash, :to_domestic_digest, 2022, 9
+
     def get_view_model
       view_model
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1674,13 +1674,13 @@ files:
 - lib/presenter/export/commercial.rb
 - lib/presenter/export/domestic.rb
 - lib/presenter/export/statistics.rb
+- lib/presenter/rd_sap/domestic_digest.rb
 - lib/presenter/rd_sap/export_configuration.rb
-- lib/presenter/rd_sap/hera.rb
 - lib/presenter/rd_sap/recommendation_report.rb
 - lib/presenter/rd_sap/report.rb
 - lib/presenter/rd_sap/summary.rb
+- lib/presenter/sap/domestic_digest.rb
 - lib/presenter/sap/export_configuration.rb
-- lib/presenter/sap/hera.rb
 - lib/presenter/sap/recommendation_report.rb
 - lib/presenter/sap/report.rb
 - lib/presenter/sap/summary.rb
@@ -1863,7 +1863,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="