epb_view_models 1.2.2 → 2.0.0

data/lib/view_model/rd_sap_schema_170/common_schema.rb

@@ -160,11 +160,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 estimated_energy_cost; end
@@ -201,40 +201,40 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def energy_rating_current
-        xpath(%w[Energy-Rating-Current])
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def energy_rating_potential
-        xpath(%w[Energy-Rating-Potential])
+        xpath(%w[Energy-Rating-Potential])&.to_i
       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 primary_energy_use
@@ -328,7 +328,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def main_heating_controls
@@ -344,7 +344,7 @@ module ViewModel
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def low_energy_lighting
@@ -352,15 +352,15 @@ module ViewModel
       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
@@ -376,7 +376,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -432,7 +432,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def report_type
@@ -528,14 +528,6 @@ module ViewModel
       def has_cylinder_thermostat
         xpath(%w[Cylinder-Thermostat])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_171/common_schema.rb

@@ -160,11 +160,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 estimated_energy_cost; end
@@ -201,40 +201,40 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def energy_rating_current
-        xpath(%w[Energy-Rating-Current])
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def energy_rating_potential
-        xpath(%w[Energy-Rating-Potential])
+        xpath(%w[Energy-Rating-Potential])&.to_i
       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 primary_energy_use
@@ -324,7 +324,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def main_heating_controls
@@ -340,7 +340,7 @@ module ViewModel
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def low_energy_lighting
@@ -348,15 +348,15 @@ module ViewModel
       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
@@ -372,7 +372,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -428,7 +428,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def report_type
@@ -528,14 +528,6 @@ module ViewModel
       def has_cylinder_thermostat
         xpath(%w[Cylinder-Thermostat])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_180/common_schema.rb

@@ -160,11 +160,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 estimated_energy_cost; end
@@ -201,40 +201,40 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def energy_rating_current
-        xpath(%w[Energy-Rating-Current])
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def energy_rating_potential
-        xpath(%w[Energy-Rating-Potential])
+        xpath(%w[Energy-Rating-Potential])&.to_i
       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 primary_energy_use
@@ -314,7 +314,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def main_heating_controls
@@ -330,7 +330,7 @@ module ViewModel
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def low_energy_lighting
@@ -338,15 +338,15 @@ module ViewModel
       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
@@ -372,7 +372,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -428,7 +428,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def report_type
@@ -528,14 +528,6 @@ module ViewModel
       def has_cylinder_thermostat
         xpath(%w[Cylinder-Thermostat])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_190/common_schema.rb

@@ -160,11 +160,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 estimated_energy_cost; end
@@ -201,40 +201,40 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def energy_rating_current
-        xpath(%w[Energy-Rating-Current])
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def energy_rating_potential
-        xpath(%w[Energy-Rating-Potential])
+        xpath(%w[Energy-Rating-Potential])&.to_i
       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 primary_energy_use
@@ -324,7 +324,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def main_heating_controls
@@ -340,7 +340,7 @@ module ViewModel
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def low_energy_lighting
@@ -348,15 +348,15 @@ module ViewModel
       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
@@ -372,7 +372,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -428,7 +428,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def report_type
@@ -528,14 +528,6 @@ module ViewModel
       def has_cylinder_thermostat
         xpath(%w[Cylinder-Thermostat])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_200/common_schema.rb

@@ -165,11 +165,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 estimated_energy_cost; end
@@ -206,40 +206,40 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def energy_rating_current
-        xpath(%w[Energy-Rating-Current])
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def energy_rating_potential
-        xpath(%w[Energy-Rating-Potential])
+        xpath(%w[Energy-Rating-Potential])&.to_i
       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 primary_energy_use
@@ -311,7 +311,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def building_part_number
@@ -398,7 +398,7 @@ module ViewModel
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def low_energy_lighting
@@ -406,15 +406,15 @@ module ViewModel
       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
@@ -430,7 +430,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -486,7 +486,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def report_type
@@ -582,14 +582,6 @@ module ViewModel
       def has_cylinder_thermostat
         xpath(%w[Cylinder-Thermostat])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end