epb_view_models 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6921bcda99893c67e6092002a2e3f9f2d7626167fa2daf9de023648b5ad5e95
-  data.tar.gz: 3dc7ea49e4fe1269e5b2ab9811e058cfba1d0b603490e17684680de3a048ec54
+  metadata.gz: b71b827370438edcfacfdd4d8d44e8272526fde8cbd7e58bc77df2d60b5ef1a7
+  data.tar.gz: 374238b4324acea447bcce054ed895960b3c9c684e8efc0e229a418077eb64c2
 SHA512:
-  metadata.gz: fe5118b48a7c6945c38c120cf7f65a2d3efa082a95394017eb879a20489f1ad08e34acebf11719e8b8c37ff732d010fa53dfb0089f3f57abf163177b1a33adbc
-  data.tar.gz: a191bcdb868c250255c1134c7a606de01e5c4f85e9b49987364f7cd0e2c854f6e69e96fbdd56e67fcf68d015b783e765ad04855a74186da4d4831661c8e767fd
+  metadata.gz: e34f118818e142c9d9a9e38628f8f56eb9e02373a41571b632e842674370e84ed36d7bc3fff85e6687af6c06dd61579056050a2f1d34bbb793f21fc125d869ee
+  data.tar.gz: 2b023ad18d63ea973dba32b6849307045372101debda793711a27bca16ebd7bef2459e9c426c1e7e544bdb9835663d07f1905015caca35b90b4ffea3e46953e4

data/Makefile

@@ -4,7 +4,7 @@ SHELL := /bin/bash
 .PHONY: help install test format
 
 help: ## Print help documentation
-	@echo -e "Makefile Help for epb-auth-tools"
+	@echo -e "Makefile Help for epb-view-models"
 	@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 install: ## Install required libraries and setup

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/helper/ac_report_extraction.rb

@@ -12,43 +12,41 @@ module Helper
     end
 
     def checklist_values(checklist, skip_state: false)
-      results =
-        checklist&.element_children&.map { |node|
-          next if xpath(%w[Flag], node).nil? && !skip_state
+      return {} if checklist.nil? || checklist.element_children.nil?
 
-          checklist_item = node.name.underscore.to_sym
-          if skip_state
-            { checklist_item => { note: xpath(%w[Note], node) } }
-          else
-            {
-              checklist_item => {
-                state: xpath(%w[Flag], node) == "Yes",
-                note: xpath(%w[Note], node),
-              },
-            }
-          end
-        }&.compact.inject(&:merge)
-
-      results.nil? ? {} : results
-    end
-
-    def checklist_values_with_guidance(checklist)
-      results =
-        checklist&.element_children&.map { |node|
-          next if xpath(%w[Flag], node).nil?
-
-          checklist_item = node.name.underscore.to_sym
+      checklist.element_children.map { |node|
+        next if xpath(%w[Flag], node).nil? && !skip_state
 
+        checklist_item = node.name.underscore.to_sym
+        if skip_state
+          { checklist_item => { note: xpath(%w[Note], node) } }
+        else
           {
             checklist_item => {
               state: xpath(%w[Flag], node) == "Yes",
               note: xpath(%w[Note], node),
-              guidance: xpath(%w[Text], node),
             },
           }
-        }&.compact.inject(&:merge)
+        end
+      }.compact.inject(&:merge)
+    end
+
+    def checklist_values_with_guidance(checklist)
+      return {} if checklist.nil? || checklist.element_children.nil?
+
+      checklist.element_children.map { |node|
+        next if xpath(%w[Flag], node).nil?
 
-      results.nil? ? {} : results
+        checklist_item = node.name.underscore.to_sym
+
+        {
+          checklist_item => {
+            state: xpath(%w[Flag], node) == "Yes",
+            note: xpath(%w[Note], node),
+            guidance: xpath(%w[Text], node),
+          },
+        }
+      }.compact.inject(&:merge)
     end
 
     def guidance(guidance_elements)

data/lib/view_model/cepc50/cepc.rb

@@ -57,10 +57,6 @@ module ViewModel
         xpath(%w[Other-Fuel-Description])
       end
 
-      def primary_energy_use
-        xpath(%w[Energy-Consumption-Current])
-      end
-
       def primary_energy_use
         nil
       end

data/lib/view_model/cepc60/cepc.rb

@@ -53,10 +53,6 @@ module ViewModel
         xpath(%w[New-Build-Benchmark])
       end
 
-      def other_fuel_description
-        nil
-      end
-
       def other_fuel_description
         xpath(%w[Other-Fuel-Description])
       end

data/lib/view_model/cepc71/dec.rb

@@ -81,10 +81,6 @@ module ViewModel
         xpath(%w[Technical-Information Main-Heating-Fuel])
       end
 
-      def special_energy_uses
-        xpath(%w[Technical-Information Special-Energy-Uses])
-      end
-
       def occupancy_level
         xpath(%w[Benchmarks Benchmark Occupancy-Level])
       end

data/lib/view_model/cepc_ni800/ac_report.rb

@@ -10,12 +10,13 @@ module ViewModel
       end
 
       def extract_aci_recommendations(nodes)
-        nodes.map { |node|
+        recommendations = nodes.map do |node|
           {
             sequence: node.at("Seq-Number").content,
             text: node.at("Text").content,
           }
-        }.reject { |node| node[:text].nil? || node[:text].empty? }
+        end
+        recommendations.reject { |node| node[:text].nil? || node[:text].empty? }
       end
 
       def key_recommendations_efficiency

data/lib/view_model/rd_sap_schema_200/common_schema.rb

@@ -297,10 +297,6 @@ module ViewModel
         @xml_doc.search("Secondary-Heating/Description").map(&:content)
       end
 
-      def all_main_heating_controls_descriptions
-        @xml_doc.search("Main-Heating-Controls/Description").map(&:content)
-      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 }

data/lib/view_model/sap_schema_102/common_schema.rb

@@ -437,10 +437,6 @@ module ViewModel
         xpath(%w[Electricity-Tariff])
       end
 
-      def all_main_heating_energy_efficiency
-        @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
-      end
-
       def solar_water_heating_flag
         nil
       end

data/lib/view_model/sap_schema_110/common_schema.rb

@@ -397,10 +397,6 @@ module ViewModel
         xpath(%w[Wind-Turbines-Count])
       end
 
-      def unheated_corridor_length
-        xpath(%w[Unheated-Corridor-Length])
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end

data/lib/view_model/sap_schema_112/common_schema.rb

@@ -491,10 +491,6 @@ module ViewModel
           .map(&:content)
       end
 
-      def transaction_type
-        nil
-      end
-
       def main_dwelling_construction_age_band_or_year
         sap_building_parts =
           @xml_doc.xpath("//SAP-Building-Parts/SAP-Building-Part")

data/lib/view_model/sap_schema_120/common_schema.rb

@@ -392,10 +392,6 @@ module ViewModel
         xpath(%w[Wind-Turbines-Count])
       end
 
-      def unheated_corridor_length
-        xpath(%w[Unheated-Corridor-Length])
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end
@@ -494,10 +490,6 @@ module ViewModel
         @xml_doc.search("Storey-Height").map(&:content)
       end
 
-      def all_main_heating_energy_efficiency
-        @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
-      end
-
       def all_main_heating_controls_energy_efficiency
         @xml_doc
           .search("Main-Heating-Controls/Energy-Efficiency-Rating")

data/lib/view_model/sap_schema_140/common_schema.rb

@@ -391,10 +391,6 @@ module ViewModel
         xpath(%w[Wind-Turbines-Count])
       end
 
-      def unheated_corridor_length
-        xpath(%w[Unheated-Corridor-Length])
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end

data/lib/view_model/sap_schema_171/common_schema.rb

@@ -393,10 +393,6 @@ module ViewModel
         nil
       end
 
-      def unheated_corridor_length
-        xpath(%w[Unheated-Corridor-Length])
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end

data/lib/view_model/sap_schema_1800/common_schema.rb

@@ -353,10 +353,6 @@ module ViewModel
         nil
       end
 
-      def level
-        xpath(%w[Level])
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end

data/lib/view_model/sap_schema_ni_1800/common_schema.rb

@@ -491,24 +491,6 @@ module ViewModel
         @xml_doc.search("Storey-Height").map(&:content)
       end
 
-      def main_dwelling_construction_age_band_or_year
-        sap_building_parts =
-          @xml_doc.xpath("//SAP-Building-Parts/SAP-Building-Part")
-        sap_building_parts.each do |sap_building_part|
-          building_part_number = sap_building_part.at("Building-Part-Number")
-
-          # Identifies the Main Dwelling
-          if building_part_number&.content == "1"
-            return(
-              sap_building_part.at_xpath(
-                "Construction-Age-Band | Construction-Year",
-              )&.content
-            )
-          end
-        end
-        nil
-      end
-
       def all_main_heating_environmental_efficiency
         @xml_doc
           .search("Main-Heating/Environmental-Efficiency-Rating")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri