epb_view_models 1.0.19 → 1.0.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +2 -2
- data/Gemfile.lock +33 -32
- data/Makefile +1 -1
- data/epb_view_models.gemspec +1 -1
- data/lib/epb_view_models.rb +1 -1
- data/lib/presenter/rd_sap/{hera.rb → domestic_digest.rb} +4 -2
- data/lib/presenter/rd_sap/summary.rb +1 -1
- data/lib/presenter/sap/{hera.rb → domestic_digest.rb} +4 -2
- data/lib/presenter/sap/summary.rb +1 -1
- data/lib/view_model/rd_sap_wrapper.rb +9 -2
- data/lib/view_model/sap_schema_1900/common_schema.rb +4 -2
- data/lib/view_model/sap_wrapper.rb +9 -2
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e0e6ce831f238b89c98fe6cd1c3b2f40f100b81e8767defb8d6982496f352de
|
4
|
+
data.tar.gz: 01ff7e085d545dc18949cb296f0a88a5975ac106adee8f2e9843ece653be9885
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 432a163b5435da592f5ba3f8210ba0e5dc0dd41d30434cd2770141d6397684dca2848b4bd3821d582cb2fad360e4609b52c977f42c9fb088b9b31ca3d2f4b912
|
7
|
+
data.tar.gz: c6a49bc15ea220f1bb895723d5dbf9cbff7847364e4cb43c594b3987296fbba718a54c8e5f12de29b3d135e2125f19c669b1484430c3fa06ccca90c86f8781b4
|
data/Gemfile
CHANGED
@@ -7,9 +7,9 @@ source "https://rubygems.org"
|
|
7
7
|
group :test do
|
8
8
|
gem "rake", "~> 13.0.6"
|
9
9
|
gem "rspec", "~> 3.0"
|
10
|
-
gem "rubocop-govuk", "~> 4.
|
10
|
+
gem "rubocop-govuk", "~> 4.7.0", require: false
|
11
11
|
end
|
12
12
|
|
13
13
|
gem "nokogiri", "~> 1.11"
|
14
14
|
gem "rexml", "~> 3.2", ">= 3.2.5"
|
15
|
-
gem "zeitwerk", "~> 2.4
|
15
|
+
gem "zeitwerk", "~> 2.4"
|
data/Gemfile.lock
CHANGED
@@ -1,29 +1,30 @@
|
|
1
1
|
GEM
|
2
2
|
remote: https://rubygems.org/
|
3
3
|
specs:
|
4
|
-
activesupport (7.0.
|
4
|
+
activesupport (7.0.3.1)
|
5
5
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
6
6
|
i18n (>= 1.6, < 2)
|
7
7
|
minitest (>= 5.1)
|
8
8
|
tzinfo (~> 2.0)
|
9
9
|
ast (2.4.2)
|
10
|
-
concurrent-ruby (1.1.
|
10
|
+
concurrent-ruby (1.1.10)
|
11
11
|
diff-lcs (1.5.0)
|
12
|
-
i18n (1.
|
12
|
+
i18n (1.12.0)
|
13
13
|
concurrent-ruby (~> 1.0)
|
14
|
+
json (2.6.2)
|
14
15
|
mini_portile2 (2.8.0)
|
15
|
-
minitest (5.
|
16
|
-
nokogiri (1.13.
|
16
|
+
minitest (5.16.3)
|
17
|
+
nokogiri (1.13.8)
|
17
18
|
mini_portile2 (~> 2.8.0)
|
18
19
|
racc (~> 1.4)
|
19
|
-
parallel (1.
|
20
|
-
parser (3.1.1
|
20
|
+
parallel (1.22.1)
|
21
|
+
parser (3.1.2.1)
|
21
22
|
ast (~> 2.4.1)
|
22
23
|
racc (1.6.0)
|
23
|
-
rack (2.2.
|
24
|
+
rack (2.2.4)
|
24
25
|
rainbow (3.1.1)
|
25
26
|
rake (13.0.6)
|
26
|
-
regexp_parser (2.
|
27
|
+
regexp_parser (2.5.0)
|
27
28
|
rexml (3.2.5)
|
28
29
|
rspec (3.11.0)
|
29
30
|
rspec-core (~> 3.11.0)
|
@@ -34,41 +35,41 @@ GEM
|
|
34
35
|
rspec-expectations (3.11.0)
|
35
36
|
diff-lcs (>= 1.2.0, < 2.0)
|
36
37
|
rspec-support (~> 3.11.0)
|
37
|
-
rspec-mocks (3.11.
|
38
|
+
rspec-mocks (3.11.1)
|
38
39
|
diff-lcs (>= 1.2.0, < 2.0)
|
39
40
|
rspec-support (~> 3.11.0)
|
40
41
|
rspec-support (3.11.0)
|
41
|
-
rubocop (1.
|
42
|
+
rubocop (1.35.0)
|
43
|
+
json (~> 2.3)
|
42
44
|
parallel (~> 1.10)
|
43
|
-
parser (>= 3.
|
45
|
+
parser (>= 3.1.2.1)
|
44
46
|
rainbow (>= 2.2.2, < 4.0)
|
45
47
|
regexp_parser (>= 1.8, < 3.0)
|
46
|
-
rexml
|
47
|
-
rubocop-ast (>= 1.
|
48
|
+
rexml (>= 3.2.5, < 4.0)
|
49
|
+
rubocop-ast (>= 1.20.1, < 2.0)
|
48
50
|
ruby-progressbar (~> 1.7)
|
49
51
|
unicode-display_width (>= 1.4.0, < 3.0)
|
50
|
-
rubocop-ast (1.
|
51
|
-
parser (>= 3.
|
52
|
-
rubocop-govuk (4.
|
53
|
-
rubocop (
|
54
|
-
rubocop-ast (
|
55
|
-
rubocop-rails (
|
56
|
-
rubocop-rake (= 0.
|
57
|
-
rubocop-rspec (
|
58
|
-
rubocop-rails (2.
|
52
|
+
rubocop-ast (1.21.0)
|
53
|
+
parser (>= 3.1.1.0)
|
54
|
+
rubocop-govuk (4.7.0)
|
55
|
+
rubocop (= 1.35.0)
|
56
|
+
rubocop-ast (= 1.21.0)
|
57
|
+
rubocop-rails (= 2.15.2)
|
58
|
+
rubocop-rake (= 0.6.0)
|
59
|
+
rubocop-rspec (= 2.12.1)
|
60
|
+
rubocop-rails (2.15.2)
|
59
61
|
activesupport (>= 4.2.0)
|
60
62
|
rack (>= 1.1)
|
61
63
|
rubocop (>= 1.7.0, < 2.0)
|
62
|
-
rubocop-rake (0.
|
63
|
-
rubocop
|
64
|
-
rubocop-rspec (2.3.0)
|
64
|
+
rubocop-rake (0.6.0)
|
65
65
|
rubocop (~> 1.0)
|
66
|
-
|
66
|
+
rubocop-rspec (2.12.1)
|
67
|
+
rubocop (~> 1.31)
|
67
68
|
ruby-progressbar (1.11.0)
|
68
|
-
tzinfo (2.0.
|
69
|
+
tzinfo (2.0.5)
|
69
70
|
concurrent-ruby (~> 1.0)
|
70
|
-
unicode-display_width (2.
|
71
|
-
zeitwerk (2.
|
71
|
+
unicode-display_width (2.2.0)
|
72
|
+
zeitwerk (2.6.0)
|
72
73
|
|
73
74
|
PLATFORMS
|
74
75
|
ruby
|
@@ -78,8 +79,8 @@ DEPENDENCIES
|
|
78
79
|
rake (~> 13.0.6)
|
79
80
|
rexml (~> 3.2, >= 3.2.5)
|
80
81
|
rspec (~> 3.0)
|
81
|
-
rubocop-govuk (~> 4.
|
82
|
-
zeitwerk (~> 2.4
|
82
|
+
rubocop-govuk (~> 4.7.0)
|
83
|
+
zeitwerk (~> 2.4)
|
83
84
|
|
84
85
|
RUBY VERSION
|
85
86
|
ruby 2.7.5p203
|
data/Makefile
CHANGED
data/epb_view_models.gemspec
CHANGED
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
|
|
10
10
|
spec.summary = "Library used to parse Energy Performance Certificates (EPC)"
|
11
11
|
spec.homepage = "https://github.com/communitiesuk/epb-view-models"
|
12
12
|
spec.license = "MIT"
|
13
|
-
spec.required_ruby_version = ">=
|
13
|
+
spec.required_ruby_version = ">= 3.1"
|
14
14
|
|
15
15
|
# Specify which files should be added to the gem when it is released.
|
16
16
|
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
|
data/lib/epb_view_models.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
module Presenter
|
2
2
|
module RdSap
|
3
|
-
class
|
3
|
+
class DomesticDigest
|
4
4
|
TYPE_OF_ASSESSMENT = "RdSAP".freeze
|
5
5
|
private_constant :TYPE_OF_ASSESSMENT
|
6
6
|
|
@@ -9,7 +9,7 @@ module Presenter
|
|
9
9
|
@schema_type = schema_type
|
10
10
|
end
|
11
11
|
|
12
|
-
def
|
12
|
+
def to_domestic_digest
|
13
13
|
{
|
14
14
|
type_of_assessment: TYPE_OF_ASSESSMENT,
|
15
15
|
assessment_id: @view_model.assessment_id,
|
@@ -35,6 +35,8 @@ module Presenter
|
|
35
35
|
@schema_type,
|
36
36
|
@view_model.report_type),
|
37
37
|
has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
|
38
|
+
total_floor_area: @view_model.total_floor_area.to_s,
|
39
|
+
has_mains_gas: @view_model.mains_gas,
|
38
40
|
}
|
39
41
|
end
|
40
42
|
end
|
@@ -54,7 +54,7 @@ module Presenter
|
|
54
54
|
),
|
55
55
|
current_energy_efficiency_rating: @view_model.current_energy_rating,
|
56
56
|
dwelling_type: @view_model.dwelling_type,
|
57
|
-
estimated_energy_cost
|
57
|
+
estimated_energy_cost:,
|
58
58
|
main_fuel_type: @view_model.main_fuel_type,
|
59
59
|
heat_demand: {
|
60
60
|
current_space_heating_demand:
|
@@ -1,12 +1,12 @@
|
|
1
1
|
module Presenter
|
2
2
|
module Sap
|
3
|
-
class
|
3
|
+
class DomesticDigest
|
4
4
|
def initialize(view_model, schema_type)
|
5
5
|
@view_model = view_model
|
6
6
|
@schema_type = schema_type
|
7
7
|
end
|
8
8
|
|
9
|
-
def
|
9
|
+
def to_domestic_digest
|
10
10
|
{
|
11
11
|
type_of_assessment: @view_model.type_of_assessment,
|
12
12
|
assessment_id: @view_model.assessment_id,
|
@@ -32,6 +32,8 @@ module Presenter
|
|
32
32
|
@schema_type,
|
33
33
|
@view_model.report_type),
|
34
34
|
has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
|
35
|
+
total_floor_area: @view_model.total_floor_area.to_s,
|
36
|
+
has_mains_gas: @view_model.mains_gas,
|
35
37
|
}
|
36
38
|
end
|
37
39
|
end
|
@@ -51,7 +51,7 @@ module Presenter
|
|
51
51
|
),
|
52
52
|
current_energy_efficiency_rating: @view_model.current_energy_rating,
|
53
53
|
dwelling_type: @view_model.dwelling_type,
|
54
|
-
estimated_energy_cost
|
54
|
+
estimated_energy_cost:,
|
55
55
|
main_fuel_type: @view_model.main_fuel_type,
|
56
56
|
heat_demand: {
|
57
57
|
current_space_heating_demand:
|
@@ -8,7 +8,7 @@ module ViewModel
|
|
8
8
|
@summary = Presenter::RdSap::Summary.new(view_model)
|
9
9
|
@report = Presenter::RdSap::Report.new(view_model, schema_type, additional_data)
|
10
10
|
@recommendation_report = Presenter::RdSap::RecommendationReport.new(view_model)
|
11
|
-
@
|
11
|
+
@domestic_digest = Presenter::RdSap::DomesticDigest.new(view_model, schema_type)
|
12
12
|
end
|
13
13
|
|
14
14
|
def type
|
@@ -31,10 +31,17 @@ module ViewModel
|
|
31
31
|
@recommendation_report.to_hash
|
32
32
|
end
|
33
33
|
|
34
|
+
def to_domestic_digest
|
35
|
+
@domestic_digest.to_domestic_digest
|
36
|
+
end
|
37
|
+
|
34
38
|
def to_hera_hash
|
35
|
-
|
39
|
+
to_domestic_digest
|
36
40
|
end
|
37
41
|
|
42
|
+
extend Gem::Deprecate
|
43
|
+
deprecate :to_hera_hash, :to_domestic_digest, 2022, 9
|
44
|
+
|
38
45
|
def get_view_model
|
39
46
|
view_model
|
40
47
|
end
|
@@ -1,6 +1,8 @@
|
|
1
1
|
module ViewModel
|
2
2
|
module SapSchema1900
|
3
3
|
class CommonSchema < ViewModel::DomesticEpcViewModel
|
4
|
+
THRESHOLD_LOW_ENERGY_LIGHTING_EFFICACY = 65
|
5
|
+
|
4
6
|
def assessment_id
|
5
7
|
xpath(%w[Report-Header RRN])
|
6
8
|
end
|
@@ -387,7 +389,7 @@ module ViewModel
|
|
387
389
|
low_energy_outlet_count = []
|
388
390
|
|
389
391
|
format_fixed_light_array.each do |outlet|
|
390
|
-
if outlet[:lighting_efficacy].to_i >
|
392
|
+
if outlet[:lighting_efficacy].to_i > THRESHOLD_LOW_ENERGY_LIGHTING_EFFICACY
|
391
393
|
low_energy_outlet_count << outlet[:lighting_outlets].to_i
|
392
394
|
end
|
393
395
|
total_energy_outlet_count << outlet[:lighting_outlets].to_f
|
@@ -400,7 +402,7 @@ module ViewModel
|
|
400
402
|
low_energy_outlet_count = []
|
401
403
|
|
402
404
|
format_fixed_light_array.each do |outlet|
|
403
|
-
if outlet[:lighting_efficacy].to_i >
|
405
|
+
if outlet[:lighting_efficacy].to_i > THRESHOLD_LOW_ENERGY_LIGHTING_EFFICACY
|
404
406
|
low_energy_outlet_count << outlet[:lighting_outlets].to_i
|
405
407
|
end
|
406
408
|
end
|
@@ -8,7 +8,7 @@ module ViewModel
|
|
8
8
|
@summary = Presenter::Sap::Summary.new(view_model)
|
9
9
|
@report = Presenter::Sap::Report.new(view_model, schema_type, additional_data)
|
10
10
|
@recommendation_report = Presenter::Sap::RecommendationReport.new(view_model)
|
11
|
-
@
|
11
|
+
@domestic_digest = Presenter::Sap::DomesticDigest.new(view_model, schema_type)
|
12
12
|
end
|
13
13
|
|
14
14
|
def type
|
@@ -31,10 +31,17 @@ module ViewModel
|
|
31
31
|
@recommendation_report.to_hash
|
32
32
|
end
|
33
33
|
|
34
|
+
def to_domestic_digest
|
35
|
+
@domestic_digest.to_domestic_digest
|
36
|
+
end
|
37
|
+
|
34
38
|
def to_hera_hash
|
35
|
-
|
39
|
+
to_domestic_digest
|
36
40
|
end
|
37
41
|
|
42
|
+
extend Gem::Deprecate
|
43
|
+
deprecate :to_hera_hash, :to_domestic_digest, 2022, 9
|
44
|
+
|
38
45
|
def get_view_model
|
39
46
|
view_model
|
40
47
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: epb_view_models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.22
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- MHCLG Energy Performance of Buildings
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-09-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nokogiri
|
@@ -1674,13 +1674,13 @@ files:
|
|
1674
1674
|
- lib/presenter/export/commercial.rb
|
1675
1675
|
- lib/presenter/export/domestic.rb
|
1676
1676
|
- lib/presenter/export/statistics.rb
|
1677
|
+
- lib/presenter/rd_sap/domestic_digest.rb
|
1677
1678
|
- lib/presenter/rd_sap/export_configuration.rb
|
1678
|
-
- lib/presenter/rd_sap/hera.rb
|
1679
1679
|
- lib/presenter/rd_sap/recommendation_report.rb
|
1680
1680
|
- lib/presenter/rd_sap/report.rb
|
1681
1681
|
- lib/presenter/rd_sap/summary.rb
|
1682
|
+
- lib/presenter/sap/domestic_digest.rb
|
1682
1683
|
- lib/presenter/sap/export_configuration.rb
|
1683
|
-
- lib/presenter/sap/hera.rb
|
1684
1684
|
- lib/presenter/sap/recommendation_report.rb
|
1685
1685
|
- lib/presenter/sap/report.rb
|
1686
1686
|
- lib/presenter/sap/summary.rb
|
@@ -1863,7 +1863,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1863
1863
|
requirements:
|
1864
1864
|
- - ">="
|
1865
1865
|
- !ruby/object:Gem::Version
|
1866
|
-
version:
|
1866
|
+
version: '3.1'
|
1867
1867
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1868
1868
|
requirements:
|
1869
1869
|
- - ">="
|