epb_view_models 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9db4fa85bbd8a3e3ce9d382956d73d0ede454349669d8c417eceaa17ef3364b
-  data.tar.gz: 35e87c714233925e22d192ff0d3d1f2c261f73bd74a7031fa411a9a9133e5ce0
+  metadata.gz: 78f74ec906136a35d182c42870bf5475d182908f774c2d67ab7318537a12723c
+  data.tar.gz: 93c2585995cfaaf1c2be9b4b51e326ac3513db18677ce913d87a163018b0b9f8
 SHA512:
-  metadata.gz: d1a89d38cc64b145833d0e337c7fb103138010b095b2317804a74253e304a79c35b1585cd7888622defd4f1b822bd136f4190f9cf4973a3979bfafc3a6cc7c5b
-  data.tar.gz: 75accbc9e3befa7cf462de14330cee27993017e0888b5b817045d6e527651a826a8cf4812f11599596ca59c81f208718a699a48a7e8820e1caa65ddb90ce1d67
+  metadata.gz: 6c911cc83d2eb27753c56b83518f7b206ecf5e586f28050246c6f03fbe9e02f0c848acd37a19297c27a9c7af7f41fb26012a7a07f88105df55f15af8b46ffcf4
+  data.tar.gz: d38db75247ef3b7def54f418a9275204bebc37ad218ec79194a6e820511996de82332654ee927e09cf1167de9ea31f3fd39e6765f6a4ea17d2f621444b02b934

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -14,75 +14,85 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    diff-lcs (1.5.1)
-    drb (2.2.1)
+    connection_pool (2.5.3)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.0)
-    language_server-protocol (3.17.0.4)
-    logger (1.6.5)
-    minitest (5.25.4)
-    nokogiri (1.18.8-arm64-darwin)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    nokogiri (1.18.8)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
-    rack (3.1.9)
+    prism (1.4.0)
+    racc (1.8.1)
+    rack (3.1.16)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.10.0)
-    rexml (3.4.0)
-    rspec (3.13.0)
+    rexml (3.4.1)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.70.0)
+    rspec-support (3.13.4)
+    rubocop (1.76.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-govuk (5.0.8)
-      rubocop (= 1.70.0)
-      rubocop-ast (= 1.37.0)
-      rubocop-capybara (= 2.21.0)
-      rubocop-rails (= 2.28.0)
-      rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 3.3.0)
-    rubocop-rails (2.28.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-govuk (5.1.15)
+      rubocop (= 1.76.2)
+      rubocop-ast (= 1.45.1)
+      rubocop-capybara (= 2.22.1)
+      rubocop-rails (= 2.32.0)
+      rubocop-rake (= 0.7.1)
+      rubocop-rspec (= 3.6.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.3.0)
-      rubocop (~> 1.61)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     tzinfo (2.0.6)
@@ -90,8 +100,8 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
-    zeitwerk (2.6.13)
+    uri (1.0.3)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby

data/lib/epb_view_models.rb

@@ -5,15 +5,15 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
 module EpbViewModels
-  VERSION = "2.1.0"
+  VERSION = "2.1.3"
 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
   def to_bool
-    return true   if self == true   || self =~ (/(true|t|yes|y|1)$/i)
-    return false  if self == false  || blank? || self =~ (/(false|f|no|n|0)$/i)
+    return true   if self == true   || self =~ /(true|t|yes|y|1)$/i
+    return false  if self == false  || blank? || self =~ /(false|f|no|n|0)$/i
 
     raise ArgumentError, "invalid value for Boolean: \"#{self}\""
   end

data/lib/helper/ac_report_extraction.rb

@@ -104,7 +104,7 @@ module Helper
             xpath(%w[ACI-Cooling-Plant-Refrigeration/Refrigerant-Name], node),
           f_gas_inspection:
             checklist_values_with_guidance(node.at("ACI-Cooling-Plant-Refrigeration"))[
-              :f_gas_inspection
+              :f_gas_inspection,
             ],
           pre_compressor:
             xpath(%w[ACI-Cooling-Plant-Refrigeration/Pre-Compressor], node),
@@ -118,11 +118,11 @@ module Helper
             ),
           compressor_control:
             checklist_values(node.at("ACI-Cooling-Plant-Refrigeration"), skip_state: true)[
-              :compressor_control
+              :compressor_control,
             ],
           refrigerant_leak:
             checklist_values(node.at("ACI-Cooling-Plant-Refrigeration"))[
-              :refrigerant_leak
+              :refrigerant_leak,
             ],
           guidance:
             guidance(node.at("ACI-Cooling-Plant-Refrigeration/Guidance")),
@@ -130,11 +130,11 @@ module Helper
         maintenance: {
           records_kept:
             checklist_values(node.at("ACI-Cooling-Plant-Maintenance"))[
-              :records_kept
+              :records_kept,
             ],
           competent_person:
             checklist_values(node.at("ACI-Cooling-Plant-Maintenance"))[
-              :competent_person
+              :competent_person,
             ],
           guidance: guidance(node.at("ACI-Cooling-Plant-Maintenance/Guidance")),
         },
@@ -146,7 +146,7 @@ module Helper
         },
         humidity_control:
           checklist_values(node.at("ACI-Cooling-Plant-Humidity-Control"))[
-            :humidity_control
+            :humidity_control,
           ],
         chillers:
           if xpath(%w[ACI-Cooling-Plant-Chillers], node).nil?

data/lib/presenter/xml/parser.rb

@@ -153,7 +153,7 @@ module Presenter
       end
 
       def is_bool?(string)
-        string == true || string == false || string =~ (/(true|false)$/i) ? true : false
+        string == true || string == false || string =~ /(true|false)$/i ? true : false
       end
 
       def try_as_number(string)

data/lib/view_model/rd_sap_schema_210/common_schema.rb

@@ -398,13 +398,17 @@ module ViewModel
       end
 
       def low_energy_lighting
-        (low_energy_fixed_lighting_outlets_count / fixed_lighting_outlets_count) * 100
+        if fixed_lighting_outlets_count.zero?
+          return 0
+        end
+
+        ((low_energy_fixed_lighting_outlets_count.to_f / fixed_lighting_outlets_count) * 100).round
       end
 
       def fixed_lighting_outlets_count
         fixed_lighting_outlets_count = low_energy_fixed_lighting_outlets_count
-        if xpath(%w[Incandescent-Lighting-Bulbs-Count])
-          fixed_lighting_outlets_count += xpath(%w[Incandescent-Lighting-Bulbs-Count])&.to_i
+        if xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])
+          fixed_lighting_outlets_count += xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])&.to_i
         end
         fixed_lighting_outlets_count
       end

data/lib/view_model/rd_sap_schema_2101/common_schema.rb

@@ -125,8 +125,8 @@ module ViewModel
             {
               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: "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),
+              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),
               indicative_cost: xpath(%w[Indicative-Cost], node),
             }
           end
@@ -398,13 +398,17 @@ module ViewModel
       end
 
       def low_energy_lighting
-        (low_energy_fixed_lighting_outlets_count / fixed_lighting_outlets_count) * 100
+        if fixed_lighting_outlets_count.zero?
+          return 0
+        end
+
+        ((low_energy_fixed_lighting_outlets_count.to_f / fixed_lighting_outlets_count) * 100).round
       end
 
       def fixed_lighting_outlets_count
         fixed_lighting_outlets_count = low_energy_fixed_lighting_outlets_count
-        if xpath(%w[Incandescent-Lighting-Bulbs-Count])
-          fixed_lighting_outlets_count += xpath(%w[Incandescent-Lighting-Bulbs-Count])&.to_i
+        if xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])
+          fixed_lighting_outlets_count += xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])&.to_i
         end
         fixed_lighting_outlets_count
       end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.3
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -37,6 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+description:
 email:
 - mhclg.digital-services@levellingup.gov.uk
 executables: []
@@ -1948,6 +1950,7 @@ homepage: https://github.com/communitiesuk/epb-view-models
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1962,7 +1965,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Library used to parse Energy Performance Certificates (EPC)
 test_files: []