epb_view_models 2.2.19 → 2.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661d84fa42ff0fe50da64a89df361f3dd55e10625e164d3f08250c54b1eb2611
-  data.tar.gz: 827b38c7c6d4c4e70d6a0cf216bd2b9feff0ee908e7e759d8250bc835ebb7b8d
+  metadata.gz: b51e29596b157eeebfc686cd69b4376a928c5ba1942bc32765c749d2fa4cf4d9
+  data.tar.gz: 784b5e44bade9144169fb83ff1d2b5306f2760306a7771701db0bee110fab0fb
 SHA512:
-  metadata.gz: 4eb6fe384a3f2fb3e78393ff434a42b5d5a0e87073130436c0e21c24d73e822b58d5369683ce6935c6672dad3e05687f1bb6e7659a6e23c7e8fba3abd15f397f
-  data.tar.gz: 68ce538cfddde7c5c2fab1a3baf9c9dc79c24cab53e2a803130298a46c0c65ff18b87ba98f9bf409c9a5a6cc2281feca8e6f3d3fe504effd1d07255645fa0702
+  metadata.gz: d1321d628ac3a2be04fbbc7662ebe31cbc4448cbafba89f19815d526d41a4d465ffe93af77cf520bcf31315aa508820113653b6b95d3c107390e86e4cd312fb1
+  data.tar.gz: 506a4862857dc92e36d9218160c7ada2637b6d57a7f9e167d8318f97fd60a3b9c29d4f0edbcef0a63bca287eb7ea9bba366f63d5a5393863250fdcd91858d000

data/.ruby-version

@@ -1 +1 @@
-3.4.7
+3.4.9

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby ">= 3.3.4", "< 4.0"
+ruby "3.4.9"
 
 source "https://rubygems.org"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.2)
+    activesupport (8.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -16,34 +16,34 @@ GEM
       uri (>= 0.13.1)
     ast (2.4.3)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
-    concurrent-ruby (1.3.6)
+    bigdecimal (4.1.2)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
     diff-lcs (1.6.2)
     drb (2.2.3)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    json (2.18.1)
-    language_server-protocol (3.17.0.5)
+    json (2.21.1)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    minitest (6.0.2)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    nokogiri (1.19.1)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (1.28.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
     racc (1.8.1)
-    rack (3.2.5)
+    rack (3.2.6)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     rexml (3.4.4)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -54,11 +54,11 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.82.1)
+    rubocop (1.86.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -66,18 +66,18 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.2.0)
-      rubocop (= 1.82.1)
-      rubocop-ast (= 1.49.0)
+    rubocop-govuk (5.2.1)
+      rubocop (= 1.86.0)
+      rubocop-ast (= 1.49.1)
       rubocop-capybara (= 2.22.1)
       rubocop-rails (= 2.34.3)
       rubocop-rake (= 0.7.1)
@@ -102,7 +102,7 @@ GEM
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
     uri (1.1.1)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   ruby
@@ -116,7 +116,7 @@ DEPENDENCIES
   zeitwerk (~> 2.6)
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.4.9p82
 
 BUNDLED WITH
    2.3.15

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 = ">= 3.1"
+  spec.required_ruby_version = ">= 3.4"
 
   # 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.
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_dependency "nokogiri", "~> 1.16"
+  spec.add_dependency "nokogiri", "~> 1.18"
+  spec.add_dependency "rexml", "~> 3.3"
   spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
 module EpbViewModels
-  VERSION = "2.2.19"
+  VERSION = "2.2.21"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/cs63/certificate_summary.rb

@@ -53,6 +53,8 @@ module Presenter
           accept_prescriptive_improvements: @view_model.accept_prescriptive_improvements,
           prescriptive_improvements: @view_model.prescriptive_improvements,
           alternative_improvements: @view_model.alternative_improvements,
+          total_emission_savings: @view_model.total_emission_savings,
+          total_energy_savings: @view_model.total_energy_savings,
         }
       end
     end

data/lib/view_model/cepc_s_70/cepc.rb

@@ -103,11 +103,11 @@ module ViewModel
           @xml_doc
             .search("Recommendations-Report RR-Recommendations/#{payback}")
             .map do |node|
-              {
-                code: node.at("Recommendation-Code").content,
-                text: node.at("Recommendation").content,
-                cO2Impact: node.at("CO2-Impact").content,
-              }
+            {
+              code: node.at("Recommendation-Code").content,
+              text: node.at("Recommendation").content,
+              cO2Impact: node.at("CO2-Impact").content,
+            }
           end
         end
       end

data/lib/view_model/cepc_s_71/cepc.rb

@@ -103,11 +103,11 @@ module ViewModel
           @xml_doc
             .search("Recommendations-Report RR-Recommendations/#{payback}")
             .map do |node|
-              {
-                code: node.at("Recommendation-Code").content,
-                text: node.at("Recommendation").content,
-                cO2Impact: node.at("CO2-Impact").content,
-              }
+            {
+              code: node.at("Recommendation-Code").content,
+              text: node.at("Recommendation").content,
+              cO2Impact: node.at("CO2-Impact").content,
+            }
           end
         end
       end

data/lib/view_model/cs63/common_schema.rb

@@ -198,6 +198,14 @@ module ViewModel
       def related_rrn
         nil
       end
+
+      def total_emission_savings
+      xpath(%w[Total-Emission-Savings])
+      end
+
+      def total_energy_savings
+      xpath(%w[Total-Energy-Savings])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_173/common_schema.rb

@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_174/common_schema.rb

@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_180/common_schema.rb

@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_190/common_schema.rb

@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_200/common_schema.rb

@@ -578,14 +578,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-20.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-20.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-20.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-20.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/rd_sap_schema_s_190/common_schema.rb

@@ -543,7 +543,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            xpath(%w[Party-Wall-Construction], node)
+          xpath(%w[Party-Wall-Construction], node)
         end
       end
 
@@ -551,16 +551,16 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              alternative_wall_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness")&.content,
-              alternative_wall_thickness_measured: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness-Measured")&.content,
-              alternative_wall_construction: node.at_xpath("SAP-Alternative-Wall/Wall-Construction")&.content,
-              alternative_wall_u_value: node.at_xpath("SAP-Alternative-Wall/Wall-U-Value")&.content,
-              alternative_wall_insulation_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Insulation-Thickness")&.content,
-              wall_thickness: node.at_xpath("Wall-Thickness")&.content,
-              wall_construction: node.at_xpath("Wall-Construction")&.content,
-              wall_thickness_measured: node.at_xpath("Wall-Thickness-Measured")&.content,
-            }
+          {
+            alternative_wall_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness")&.content,
+            alternative_wall_thickness_measured: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness-Measured")&.content,
+            alternative_wall_construction: node.at_xpath("SAP-Alternative-Wall/Wall-Construction")&.content,
+            alternative_wall_u_value: node.at_xpath("SAP-Alternative-Wall/Wall-U-Value")&.content,
+            alternative_wall_insulation_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Insulation-Thickness")&.content,
+            wall_thickness: node.at_xpath("Wall-Thickness")&.content,
+            wall_construction: node.at_xpath("Wall-Construction")&.content,
+            wall_thickness_measured: node.at_xpath("Wall-Thickness-Measured")&.content,
+          }
         end
       end
 
@@ -568,10 +568,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              roof_insulation_location: node.at_xpath("Roof-Insulation-Location")&.content,
-              roof_construction: node.at_xpath("Roof-Construction")&.content,
-            }
+          {
+            roof_insulation_location: node.at_xpath("Roof-Insulation-Location")&.content,
+            roof_construction: node.at_xpath("Roof-Construction")&.content,
+          }
         end
       end
 
@@ -579,7 +579,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |_node|
-            xpath(%w[SAP-Room-In-Roof Insulation])
+          xpath(%w[SAP-Room-In-Roof Insulation])
         end
       end
 
@@ -587,10 +587,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              floor_u_value: node.at_xpath("Floor-U-Value")&.content,
-              floor_insulation_thickness: node.at_xpath("Floor-Insulation-Thickness")&.content,
-            }
+          {
+            floor_u_value: node.at_xpath("Floor-U-Value")&.content,
+            floor_insulation_thickness: node.at_xpath("Floor-Insulation-Thickness")&.content,
+          }
         end
       end
 
@@ -598,13 +598,13 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              roof_u_value: node.at_xpath("Roof-U-Value")&.content,
-              roof_insulation_thickness: node.at_xpath("Roof-Insulation-Thickness")&.content,
-              rafter_insulation_thickness: node.at_xpath("Rafter-Insulation-Thickness")&.content,
-              flat_roof_insulation_thickness: node.at_xpath("Flat-Roof-Insulation-Thickness")&.content,
-              sloping_ceiling_insulation_thickness: node.at_xpath("Sloping-Ceiling-Insulation-Thickness")&.content,
-            }
+          {
+            roof_u_value: node.at_xpath("Roof-U-Value")&.content,
+            roof_insulation_thickness: node.at_xpath("Roof-Insulation-Thickness")&.content,
+            rafter_insulation_thickness: node.at_xpath("Rafter-Insulation-Thickness")&.content,
+            flat_roof_insulation_thickness: node.at_xpath("Flat-Roof-Insulation-Thickness")&.content,
+            sloping_ceiling_insulation_thickness: node.at_xpath("Sloping-Ceiling-Insulation-Thickness")&.content,
+          }
         end
       end
 
@@ -612,10 +612,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              wall_u_value: node.at_xpath("Wall-U-Value")&.content,
-              wall_insulation_thickness: node.at_xpath("Wall-Insulation-Thickness")&.content,
-            }
+          {
+            wall_u_value: node.at_xpath("Wall-U-Value")&.content,
+            wall_insulation_thickness: node.at_xpath("Wall-Insulation-Thickness")&.content,
+          }
         end
       end
 
@@ -623,7 +623,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            node.at_xpath("SAP-Room-In-Roof")&.content.to_s
+          node.at_xpath("SAP-Room-In-Roof")&.content.to_s
         end
       end
 
@@ -631,10 +631,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |_node|
-            {
-              roof_insulation_thickness: xpath(%w[SAP-Room-In-Roof Roof-Insulation-Thickness]),
-              room_in_roof_details: xpath(%w[SAP-Room-In-Roof Room-In-Roof-Details]),
-            }
+          {
+            roof_insulation_thickness: xpath(%w[SAP-Room-In-Roof Roof-Insulation-Thickness]),
+            room_in_roof_details: xpath(%w[SAP-Room-In-Roof Room-In-Roof-Details]),
+          }
         end
       end
 
@@ -642,11 +642,11 @@ module ViewModel
         @xml_doc
           .search("Main-Heating")
           .map do |_node|
-            {
-              main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
-              sap_main_heating_code: xpath(%w[SAP-Main-Heating-Code]),
-              main_fuel_type: xpath(%w[Main-Fuel-Type]),
-            }
+          {
+            main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
+            sap_main_heating_code: xpath(%w[SAP-Main-Heating-Code]),
+            main_fuel_type: xpath(%w[Main-Fuel-Type]),
+          }
         end
       end
 

data/lib/view_model/rd_sap_schema_s_210/common_schema.rb

@@ -567,7 +567,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            xpath(%w[Party-Wall-Construction], node)
+          xpath(%w[Party-Wall-Construction], node)
         end
       end
 
@@ -575,16 +575,16 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              alternative_wall_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness")&.content,
-              alternative_wall_thickness_measured: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness-Measured")&.content,
-              alternative_wall_construction: node.at_xpath("SAP-Alternative-Wall/Wall-Construction")&.content,
-              alternative_wall_u_value: node.at_xpath("SAP-Alternative-Wall/Wall-U-Value")&.content,
-              alternative_wall_insulation_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Insulation-Thickness")&.content,
-              wall_thickness: node.at_xpath("Wall-Thickness")&.content,
-              wall_construction: node.at_xpath("Wall-Construction")&.content,
-              wall_thickness_measured: node.at_xpath("Wall-Thickness-Measured")&.content,
-            }
+          {
+            alternative_wall_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness")&.content,
+            alternative_wall_thickness_measured: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness-Measured")&.content,
+            alternative_wall_construction: node.at_xpath("SAP-Alternative-Wall/Wall-Construction")&.content,
+            alternative_wall_u_value: node.at_xpath("SAP-Alternative-Wall/Wall-U-Value")&.content,
+            alternative_wall_insulation_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Insulation-Thickness")&.content,
+            wall_thickness: node.at_xpath("Wall-Thickness")&.content,
+            wall_construction: node.at_xpath("Wall-Construction")&.content,
+            wall_thickness_measured: node.at_xpath("Wall-Thickness-Measured")&.content,
+          }
         end
       end
 
@@ -592,10 +592,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              roof_insulation_location: node.at_xpath("Roof-Insulation-Location")&.content,
-              roof_construction: node.at_xpath("Roof-Construction")&.content,
-            }
+          {
+            roof_insulation_location: node.at_xpath("Roof-Insulation-Location")&.content,
+            roof_construction: node.at_xpath("Roof-Construction")&.content,
+          }
         end
       end
 
@@ -607,10 +607,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              floor_u_value: node.at_xpath("Floor-U-Value")&.content,
-              floor_insulation_thickness: node.at_xpath("Floor-Insulation-Thickness")&.content,
-            }
+          {
+            floor_u_value: node.at_xpath("Floor-U-Value")&.content,
+            floor_insulation_thickness: node.at_xpath("Floor-Insulation-Thickness")&.content,
+          }
         end
       end
 
@@ -618,13 +618,13 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              roof_u_value: node.at_xpath("Roof-U-Value")&.content,
-              roof_insulation_thickness: node.at_xpath("Roof-Insulation-Thickness")&.content,
-              rafter_insulation_thickness: node.at_xpath("Rafter-Insulation-Thickness")&.content,
-              flat_roof_insulation_thickness: node.at_xpath("Flat-Roof-Insulation-Thickness")&.content,
-              sloping_ceiling_insulation_thickness: node.at_xpath("Sloping-Ceiling-Insulation-Thickness")&.content,
-            }
+          {
+            roof_u_value: node.at_xpath("Roof-U-Value")&.content,
+            roof_insulation_thickness: node.at_xpath("Roof-Insulation-Thickness")&.content,
+            rafter_insulation_thickness: node.at_xpath("Rafter-Insulation-Thickness")&.content,
+            flat_roof_insulation_thickness: node.at_xpath("Flat-Roof-Insulation-Thickness")&.content,
+            sloping_ceiling_insulation_thickness: node.at_xpath("Sloping-Ceiling-Insulation-Thickness")&.content,
+          }
         end
       end
 
@@ -632,10 +632,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            {
-              wall_u_value: node.at_xpath("Wall-U-Value")&.content,
-              wall_insulation_thickness: node.at_xpath("Wall-Insulation-Thickness")&.content,
-            }
+          {
+            wall_u_value: node.at_xpath("Wall-U-Value")&.content,
+            wall_insulation_thickness: node.at_xpath("Wall-Insulation-Thickness")&.content,
+          }
         end
       end
 
@@ -651,11 +651,11 @@ module ViewModel
         @xml_doc
           .search("Main-Heating")
           .map do |_node|
-            {
-              main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
-              sap_main_heating_code: xpath(%w[SAP-Main-Heating-Code]),
-              main_fuel_type: xpath(%w[Main-Fuel-Type]),
-            }
+          {
+            main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
+            sap_main_heating_code: xpath(%w[SAP-Main-Heating-Code]),
+            main_fuel_type: xpath(%w[Main-Fuel-Type]),
+          }
         end
       end
 

data/lib/view_model/sap_schema_1900/common_schema.rb

@@ -371,12 +371,12 @@ module ViewModel
         @xml_doc
           .search("Fixed-Lights/Fixed-Light")
           .map do |part|
-            {
-              lighting_efficacy:
-                xpath(%w[Lighting-Efficacy], part),
-              lighting_outlets:
-                xpath(%w[Lighting-Outlets], part),
-            }
+          {
+            lighting_efficacy:
+              xpath(%w[Lighting-Efficacy], part),
+            lighting_outlets:
+              xpath(%w[Lighting-Outlets], part),
+          }
         end
       end
 

data/lib/view_model/sap_schema_1910/common_schema.rb

@@ -371,12 +371,12 @@ module ViewModel
         @xml_doc
           .search("Fixed-Lights/Fixed-Light")
           .map do |part|
-            {
-              lighting_efficacy:
-                xpath(%w[Lighting-Efficacy], part),
-              lighting_outlets:
-                xpath(%w[Lighting-Outlets], part),
-            }
+          {
+            lighting_efficacy:
+              xpath(%w[Lighting-Efficacy], part),
+            lighting_outlets:
+              xpath(%w[Lighting-Outlets], part),
+          }
         end
       end
 

data/lib/view_model/sap_schema_1920/common_schema.rb

@@ -371,12 +371,12 @@ module ViewModel
         @xml_doc
           .search("Fixed-Lights/Fixed-Light")
           .map do |part|
-            {
-              lighting_efficacy:
-                xpath(%w[Lighting-Efficacy], part),
-              lighting_outlets:
-                xpath(%w[Lighting-Outlets], part),
-            }
+          {
+            lighting_efficacy:
+              xpath(%w[Lighting-Efficacy], part),
+            lighting_outlets:
+              xpath(%w[Lighting-Outlets], part),
+          }
         end
       end
 

data/lib/view_model/sap_schema_ni_173/common_schema.rb

@@ -454,14 +454,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.3", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.3", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.3", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.3", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/sap_schema_ni_174/common_schema.rb

@@ -454,14 +454,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.4", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.4", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.4", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-17.4", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/sap_schema_ni_1800/common_schema.rb

@@ -510,14 +510,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-            {
-              sequence: xpath(%w[Sequence], node).to_i,
-              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-18.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-18.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-              indicative_cost: xpath(%w[Indicative-Cost], node),
-            }
+          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+          {
+            sequence: xpath(%w[Sequence], node).to_i,
+            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-18.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "SAP-Schema-NI-18.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+            indicative_cost: xpath(%w[Indicative-Cost], node),
+          }
         end
       end
     end

data/lib/view_model/sap_schema_s_1900/common_schema.rb

@@ -367,12 +367,12 @@ module ViewModel
         @xml_doc
           .search("Fixed-Lights/Fixed-Light")
           .map do |part|
-            {
-              lighting_efficacy:
-                xpath(%w[Lighting-Efficacy], part),
-              lighting_outlets:
-                xpath(%w[Lighting-Outlets], part),
-            }
+          {
+            lighting_efficacy:
+              xpath(%w[Lighting-Efficacy], part),
+            lighting_outlets:
+              xpath(%w[Lighting-Outlets], part),
+          }
         end
       end
 
@@ -600,10 +600,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Heating/Main-Heating-Details/Main-Heating")
           .map do |_node|
-            {
-              main_heating_code: xpath(%w[Main-Heating-Code]),
-              main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
-            }
+          {
+            main_heating_code: xpath(%w[Main-Heating-Code]),
+            main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
+          }
         end
       end
 
@@ -611,7 +611,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-            xpath(%w[Construction-Year], node)
+          xpath(%w[Construction-Year], node)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.2.19
+  version: 2.2.21
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
@@ -15,14 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -1874,7 +1888,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="