epb_view_models 1.2.3 → 2.0.0

data/lib/view_model/sap_schema_ni_172/rdsap.rb

@@ -34,11 +34,11 @@ module ViewModel
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def photovoltaic_roof_area_percent
@@ -58,7 +58,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def energy_tariff
@@ -69,10 +69,6 @@ module ViewModel
         xpath(%w[Cylinder-Insulation-Thickness])
       end
 
-      def low_energy_lighting
-        nil
-      end
-
       def multiple_glazed_proportion
         xpath(%w[Multiple-Glazed-Proportion])
       end
@@ -89,22 +85,6 @@ module ViewModel
         xpath(%w[Cylinder-Thermostat])
       end
 
-      def mech_vent_sys_index_number
-        nil
-      end
-
-      def mechanical_vent_data_source
-        nil
-      end
-
-      def thermal_store
-        nil
-      end
-
-      def ventilation_type
-        nil
-      end
-
       def water_heating_fuel
         xpath(%w[Water-Heating-Fuel])
       end

data/lib/view_model/sap_schema_ni_172/sap.rb

@@ -35,7 +35,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source

data/lib/view_model/sap_schema_ni_173/common_schema.rb

@@ -90,7 +90,7 @@ module ViewModel
       end
 
       def related_party_disclosure_number
-        xpath(%w[Related-Party-Disclosure-Number]).to_i
+        xpath(%w[Related-Party-Disclosure-Number])&.to_i
       end
 
       def improvements
@@ -149,11 +149,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -196,18 +196,6 @@ module ViewModel
         xpath(%w[Water-Heating])
       end
 
-      def impact_of_cavity_insulation
-        nil
-      end
-
-      def impact_of_loft_insulation
-        nil
-      end
-
-      def impact_of_solid_wall_insulation
-        nil
-      end
-
       def country_code
         xpath(%w[Country-Code])
       end
@@ -229,21 +217,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def level
         xpath(%w[Level])
       end
@@ -253,44 +237,24 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
 
-      def multiple_glazed_proportion
-        nil
-      end
-
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -341,20 +305,8 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
-      end
-
-      def heat_loss_corridor
-        nil
-      end
-
-      def unheated_corridor_length
-        nil
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def built_form
@@ -409,14 +361,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -439,10 +383,6 @@ module ViewModel
         nil
       end
 
-      def extensions_count
-        nil
-      end
-
       def all_main_heating_environmental_efficiency
         @xml_doc
           .search("Main-Heating/Environmental-Efficiency-Rating")
@@ -494,7 +434,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source
@@ -508,14 +448,6 @@ module ViewModel
       def ventilation_type
         xpath(%w[Ventilation-Type])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_174/common_schema.rb

@@ -90,7 +90,7 @@ module ViewModel
       end
 
       def related_party_disclosure_number
-        xpath(%w[Related-Party-Disclosure-Number]).to_i
+        xpath(%w[Related-Party-Disclosure-Number])&.to_i
       end
 
       def improvements
@@ -149,11 +149,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -196,18 +196,6 @@ module ViewModel
         xpath(%w[Water-Heating])
       end
 
-      def impact_of_cavity_insulation
-        nil
-      end
-
-      def impact_of_loft_insulation
-        nil
-      end
-
-      def impact_of_solid_wall_insulation
-        nil
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end
@@ -233,21 +221,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def level
         xpath(%w[Level])
       end
@@ -257,44 +241,24 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
 
-      def multiple_glazed_proportion
-        nil
-      end
-
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -345,20 +309,8 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
-      end
-
-      def heat_loss_corridor
-        nil
-      end
-
-      def unheated_corridor_length
-        nil
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def built_form
@@ -409,18 +361,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -494,7 +434,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source
@@ -508,14 +448,6 @@ module ViewModel
       def ventilation_type
         xpath(%w[Ventilation-Type])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_1800/common_schema.rb

@@ -94,7 +94,7 @@ module ViewModel
       end
 
       def related_party_disclosure_number
-        xpath(%w[Related-Party-Disclosure-Number]).to_i
+        xpath(%w[Related-Party-Disclosure-Number])&.to_i
       end
 
       def improvements
@@ -153,11 +153,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -200,18 +200,6 @@ module ViewModel
         xpath(%w[Water-Heating])
       end
 
-      def impact_of_cavity_insulation
-        nil
-      end
-
-      def impact_of_loft_insulation
-        nil
-      end
-
-      def impact_of_solid_wall_insulation
-        nil
-      end
-
       def all_sap_floor_dimensions
         @xml_doc.search("SAP-Floor-Dimension").select(&:element?).map { |node|
           { total_floor_area: xpath(%w[Total-Floor-Area], node).to_f }
@@ -227,10 +215,6 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def building_part_number
         xpath(%w[Building-Part-Number])
       end
@@ -298,55 +282,35 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
 
-      def multiple_glazed_proportion
-        nil
-      end
-
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -397,26 +361,14 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
-      end
-
-      def heat_loss_corridor
-        nil
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end
 
-      def unheated_corridor_length
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
@@ -465,18 +417,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -550,7 +490,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source
@@ -564,14 +504,6 @@ module ViewModel
       def ventilation_type
         xpath(%w[Ventilation-Type])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0
 platform: ruby
 authors:
 - DLUHC Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement