epb_view_models 2.1.5 → 2.1.7

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

data/lib/presenter/dec/report.rb

@@ -37,7 +37,7 @@ module Presenter
           main_benchmark: @view_model.main_benchmark,
           main_heating_fuel: @view_model.main_heating_fuel,
           special_energy_uses: @view_model.special_energy_uses,
-          renewable_sources: @view_model.renewables_fuel_thermal,
+          renewable_sources: @view_model.respond_to?(:renewable_sources) ? @view_model.renewable_sources : nil,
           total_floor_area: @view_model.floor_area,
           occupancy_level: @view_model.occupancy_level,
           annual_thermal_fuel_usage: @view_model.annual_energy_use_fuel_thermal,

data/lib/view_model/cepc31/dec.rb

@@ -196,6 +196,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc40/dec.rb

@@ -216,6 +216,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc50/dec.rb

@@ -216,6 +216,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc51/dec.rb

@@ -216,6 +216,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc60/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc70/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc71/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc800/dec.rb

@@ -226,6 +226,10 @@ module ViewModel
       def building_category
         xpath(%w[Building-Category])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc_ni800/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_210/common_schema.rb

@@ -125,9 +125,8 @@ module ViewModel
             {
               sequence: xpath(%w[Sequence], node).to_i,
               improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              # the schema version is set to 21.0.1 as 21.0.0 had missing improvements in the external definitions
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.1", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.1", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
               indicative_cost: xpath(%w[Indicative-Cost], node),
             }
           end

data/lib/view_model/rd_sap_schema_ni_210/common_schema.rb

@@ -125,9 +125,8 @@ module ViewModel
             {
               sequence: xpath(%w[Sequence], node).to_i,
               improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              # the schema version is set to 21.0.1 as 21.0.0 had missing improvements in the external definitions
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.1", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.1", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
               indicative_cost: xpath(%w[Indicative-Cost], node),
             }
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.7
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-09 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri