epb_view_models 2.2.20 → 2.3.0

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.20"
+  VERSION = "2.3.0"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

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

@@ -204,7 +204,7 @@ module ViewModel
       end
 
       def total_energy_savings
-      xpath(%w[Total-Emission-Savings])
+      xpath(%w[Total-Energy-Savings])
       end
     end
   end

data/lib/view_model/factory.rb

@@ -41,6 +41,7 @@ module ViewModel
       RdSAP-Schema-S-18.0
       RdSAP-Schema-S-17.00
       RdSAP-Schema-S-16.1
+      RdSAP-Schema-S-14.0
     ].freeze
     TYPES_OF_SAP = %i[
       SAP-Schema-19.2.0

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