epb_view_models 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbfe61f3dd422c63e6304d3db50ca8763c08ff397aa9beacd7bcde040b19d3b1
-  data.tar.gz: b3e90e80af3d5d0de7ec5946c88db890a68a4d07fce88329147d2f52fbe85314
+  metadata.gz: 8eabee1c7bfdbe1bf088b218d9b2ac1f730810a790bfd84266255855668fa80f
+  data.tar.gz: 8969240277cfe72cbee1e1ff39f9e4b6fe8145daca3bf8f15af9f8c004766333
 SHA512:
-  metadata.gz: c4ab329d35fd03b1ef595b453c68fb85c34401000eef9bb9d2ad58af7a6fa68d9b4eb850102370e524190321e54cf0b127cb611c8f0a107e9e758bdaa1a1bbd3
-  data.tar.gz: 6205e6087b08acaeb89f181282af4f735d0cb6a0d42d0b769d9d08984fc8c6222b636606860fb76a0bdf9b356dff26b67baa1511201e9c9fa306af20ba61e0b6
+  metadata.gz: 7d4eb10d848147f8039a7171a598f03f183c5cc4f8348ce587ce652e86859d1831427ff1dbda4819e938d9a6a3f081e4a90a2b2edb07b9efe2748d2517fc6ae8
+  data.tar.gz: 21eb8a3a148862f30be675a623e082ae8064570391b76dbaad076da7e4b79860bb854ba5559fd35844e90ca6731d7566e68bd82058f4789fd16b6b618e7edea4

data/Gemfile.lock

@@ -1,44 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.2)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
-    nokogiri (1.14.0)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.4)
+    minitest (5.18.1)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    racc (1.6.2)
-    rack (3.0.4.1)
+      racc
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.2)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (1.35.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -65,11 +66,11 @@ GEM
       rubocop (~> 1.0)
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

data/lib/epb_view_models.rb

@@ -5,9 +5,10 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.1.2"
+  VERSION = "1.1.4"
 end
 
+
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast
 # Source: http://jeffgardner.org/2011/08/04/rails-string-to-boolean-method/
 class String

data/lib/presenter/sap/summary.rb

@@ -103,6 +103,7 @@ module Presenter
           tenure: @view_model.tenure,
           transaction_type: @view_model.transaction_type,
           total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
+          total_roof_area: @view_model.respond_to?(:total_roof_area) ? @view_model.total_roof_area : nil,
           status: @view_model.status,
           environmental_impact_current: @view_model.environmental_impact_current,
           environmental_impact_potential:

data/lib/view_model/sap_schema_110/sap.rb

@@ -56,6 +56,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_112/sap.rb

@@ -62,6 +62,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_120/sap.rb

@@ -44,6 +44,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_130/sap.rb

@@ -44,6 +44,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_140/sap.rb

@@ -44,6 +44,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_141/sap.rb

@@ -44,6 +44,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_142/sap.rb

@@ -44,6 +44,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_150/sap.rb

@@ -44,6 +44,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_160/sap.rb

@@ -53,6 +53,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_161/sap.rb

@@ -53,6 +53,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_162/sap.rb

@@ -53,6 +53,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_163/sap.rb

@@ -53,6 +53,18 @@ module ViewModel
       def water_heating_fuel
         xpath(%w[Water-Fuel-Type])
       end
+
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
     end
   end
 end

data/lib/view_model/sap_schema_170/common_schema.rb

@@ -180,6 +180,18 @@ module ViewModel
         xpath(%w[Property-Summary Total-Floor-Area])
       end
 
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
+
       def dwelling_type
         xpath(%w[Dwelling-Type])
       end

data/lib/view_model/sap_schema_171/common_schema.rb

@@ -180,6 +180,18 @@ module ViewModel
         xpath(%w[Property-Summary Total-Floor-Area])
       end
 
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
+
       def dwelling_type
         xpath(%w[Dwelling-Type])
       end

data/lib/view_model/sap_schema_1800/common_schema.rb

@@ -182,6 +182,18 @@ module ViewModel
         xpath(%w[Property-Summary Total-Floor-Area])
       end
 
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
+
       def dwelling_type
         xpath(%w[Dwelling-Type])
       end

data/lib/view_model/sap_schema_1900/common_schema.rb

@@ -184,6 +184,18 @@ module ViewModel
         xpath(%w[Property-Summary Total-Floor-Area]).to_i
       end
 
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
+
       def dwelling_type
         xpath(%w[Dwelling-Type])
       end

data/lib/view_model/sap_schema_1910/common_schema.rb

@@ -184,6 +184,18 @@ module ViewModel
         xpath(%w[Property-Summary Total-Floor-Area]).to_i
       end
 
+      def total_roof_area
+        roofs = @xml_doc.xpath("//SAP-Roofs/SAP-Roof")
+        return nil if roofs.count == 0
+
+        total_roof_area = 0
+        roofs.each do |roof|
+          roof_area = roof.at("Total-Roof-Area")&.content.to_i
+          total_roof_area += roof_area
+        end
+        total_roof_area
+      end
+
       def dwelling_type
         xpath(%w[Dwelling-Type])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - DLUHC Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1884,7 +1884,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Library used to parse Energy Performance Certificates (EPC)