epb_view_models 2.2.20 → 2.3.0

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/rd_sap_wrapper.rb

@@ -93,6 +93,8 @@ module ViewModel
         ViewModel::RdSapSchemaS1700::CommonSchema.new xml_doc
       when :"RdSAP-Schema-S-16.1"
         ViewModel::RdSapSchemaS161::CommonSchema.new xml_doc
+      when :"RdSAP-Schema-S-14.0"
+        ViewModel::RdSapSchemaS140::CommonSchema.new xml_doc
       else
         raise ArgumentError, "Unsupported schema type"
       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.20
+  version: 2.3.0
 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
@@ -328,6 +342,49 @@ files:
 - api/schemas/xml/RdSAP-Schema-NI-21.0.1/RdSAP/Templates/RdSAP-Report.xsd
 - api/schemas/xml/RdSAP-Schema-NI-21.0.1/RdSAP/UDT/EPC-Domains.xsd
 - api/schemas/xml/RdSAP-Schema-NI-21.0.1/RdSAP/UDT/SAP-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/CommonFiles/CommonStructures.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/CommonFiles/Exceptions.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/ExternalDefinitions.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportChangeAccessRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportChangeAccessResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportChangeStatusRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportChangeStatusResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportCreateRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportCreateResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportRetrieveRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportRetrieveResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/HomeInspectorRegisterUpdateRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/HomeInspectorRegisterUpdateResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/HomeInspectorRegisterUpdateStatusRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/HomeInspectorRegisterUpdateStatusResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/PropertyUPRNValidationRequest_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/PropertyUPRNValidationResponse_1.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/Templates/EPC-Certificate.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/Templates/Property.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/Templates/SAP05-CollectedData.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/Templates/SAP05-Report.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/Templates/UserManagement.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/UDT/BaseDataTypes.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/UDT/EPC-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/UDT/SAP05-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/SAP-EPC/UDT/SharedDomains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/EPC-Certificate.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/EPC-CollectedData.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HCR-FeaturesExternal.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HCR-FeaturesGrounds.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HCR-FeaturesInternal.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HCR-FeaturesServices.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HCR-PropertyDetails.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HCR-RiskAssessment.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/HIP-Reports.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/Property.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Templates/UserManagement.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/UDT/BaseDataTypes.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/UDT/EPC-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/UDT/HCR-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/UDT/SAP-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/UDT/SharedDomains.xsd
+- api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/UDT/TypeDefinitions.xsd
 - api/schemas/xml/RdSAP-Schema-S-16.1/RdSAP/ExternalDefinitions.xml
 - api/schemas/xml/RdSAP-Schema-S-16.1/RdSAP/ExternalDefinitions.xsd
 - api/schemas/xml/RdSAP-Schema-S-16.1/RdSAP/Templates/All-HIP.xsd
@@ -1768,6 +1825,7 @@ files:
 - lib/view_model/rd_sap_schema_ni_200/common_schema.rb
 - lib/view_model/rd_sap_schema_ni_210/common_schema.rb
 - lib/view_model/rd_sap_schema_ni_2101/common_schema.rb
+- lib/view_model/rd_sap_schema_s_140/common_schema.rb
 - lib/view_model/rd_sap_schema_s_161/common_schema.rb
 - lib/view_model/rd_sap_schema_s_1700/common_schema.rb
 - lib/view_model/rd_sap_schema_s_180/common_schema.rb
@@ -1874,7 +1932,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:
   - - ">="