epb_view_models 2.0.10 → 2.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/Gemfile.lock +47 -34
  4. data/lib/epb_view_models.rb +1 -1
  5. data/lib/presenter/rd_sap/certificate_summary.rb +5 -4
  6. data/lib/presenter/rd_sap/domestic_digest.rb +1 -1
  7. data/lib/presenter/sap/certificate_summary.rb +5 -4
  8. data/lib/presenter/sap/domestic_digest.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dbc727b02388eb9194d802c34ae2e16da467f03fdb832bdf940b595a8e228d7c
4
- data.tar.gz: 88d8d77fc287e8740e4dbbbfc0264d94fec8f967783b69b19bc5e81d435bbe3e
3
+ metadata.gz: ea8124e14177faa84d74288dcee49bb42a18623b4239cdb3a1f5070b52143f31
4
+ data.tar.gz: 6851cd8f4e4fef2e758a0760725006b471daab775eb0d91534b75f556e693787
5
5
  SHA512:
6
- metadata.gz: 7cf40bfa11c973b79429f8feade524b9b8868f21cdaf91f7e351b582bcc4bef152de216117d76d3970263f200da9b5263df0f94393ab5fba6b57cdc7863999e8
7
- data.tar.gz: ea30e9bcffdf50d523ceabd091b88515d47091b8d1b05f9563ba81b589780d0cc09b26f53dc5cad0aaf77c9ece9c41454e36ca33c69b4e9ad3cb4f13fce283cf
6
+ metadata.gz: c87458b7dab57f65fd3e46071e90ea1d40258bfe07fbfbd44fc7d0d3ad6ec3cdef3496df9cd058bb08f85598a6d54cede887f36dfff952a34dd591c64bd88bb7
7
+ data.tar.gz: 92775cb540b9ab7c6adfbd7724ec479ba3678664884eaa36127ba67bc607e05efc5c6e7857d65cc9e97a919bb55b2bc624f5333cf78a8b62c95ad57ef280267f
data/Gemfile CHANGED
@@ -7,7 +7,7 @@ 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.7.0", require: false
10
+ gem "rubocop-govuk", "~> 5.0", require: false
11
11
  end
12
12
 
13
13
  gem "nokogiri", "~> 1.16", ">= 1.16.5"
data/Gemfile.lock CHANGED
@@ -1,39 +1,44 @@
1
1
  GEM
2
2
  remote: https://rubygems.org/
3
3
  specs:
4
- activesupport (7.1.3.2)
4
+ activesupport (8.0.1)
5
5
  base64
6
+ benchmark (>= 0.3)
6
7
  bigdecimal
7
- concurrent-ruby (~> 1.0, >= 1.0.2)
8
+ concurrent-ruby (~> 1.0, >= 1.3.1)
8
9
  connection_pool (>= 2.2.5)
9
10
  drb
10
11
  i18n (>= 1.6, < 2)
12
+ logger (>= 1.4.2)
11
13
  minitest (>= 5.1)
12
- mutex_m
13
- tzinfo (~> 2.0)
14
+ securerandom (>= 0.3)
15
+ tzinfo (~> 2.0, >= 2.0.5)
16
+ uri (>= 0.13.1)
14
17
  ast (2.4.2)
15
18
  base64 (0.2.0)
16
- bigdecimal (3.1.6)
17
- concurrent-ruby (1.2.3)
18
- connection_pool (2.4.1)
19
+ benchmark (0.4.0)
20
+ bigdecimal (3.1.9)
21
+ concurrent-ruby (1.3.5)
22
+ connection_pool (2.5.0)
19
23
  diff-lcs (1.5.1)
20
24
  drb (2.2.1)
21
- i18n (1.14.4)
25
+ i18n (1.14.7)
22
26
  concurrent-ruby (~> 1.0)
23
- json (2.7.1)
24
- minitest (5.22.2)
25
- mutex_m (0.2.0)
27
+ json (2.10.0)
28
+ language_server-protocol (3.17.0.4)
29
+ logger (1.6.5)
30
+ minitest (5.25.4)
26
31
  nokogiri (1.18.1-arm64-darwin)
27
32
  racc (~> 1.4)
28
- parallel (1.24.0)
29
- parser (3.3.0.5)
33
+ parallel (1.26.3)
34
+ parser (3.3.7.1)
30
35
  ast (~> 2.4.1)
31
36
  racc
32
37
  racc (1.7.3)
33
- rack (3.0.9.1)
38
+ rack (3.1.9)
34
39
  rainbow (3.1.1)
35
40
  rake (13.0.6)
36
- regexp_parser (2.9.0)
41
+ regexp_parser (2.10.0)
37
42
  rexml (3.4.0)
38
43
  rspec (3.13.0)
39
44
  rspec-core (~> 3.13.0)
@@ -48,36 +53,44 @@ GEM
48
53
  diff-lcs (>= 1.2.0, < 2.0)
49
54
  rspec-support (~> 3.13.0)
50
55
  rspec-support (3.13.1)
51
- rubocop (1.35.0)
56
+ rubocop (1.70.0)
52
57
  json (~> 2.3)
58
+ language_server-protocol (>= 3.17.0)
53
59
  parallel (~> 1.10)
54
- parser (>= 3.1.2.1)
60
+ parser (>= 3.3.0.2)
55
61
  rainbow (>= 2.2.2, < 4.0)
56
- regexp_parser (>= 1.8, < 3.0)
57
- rexml (>= 3.2.5, < 4.0)
58
- rubocop-ast (>= 1.20.1, < 2.0)
62
+ regexp_parser (>= 2.9.3, < 3.0)
63
+ rubocop-ast (>= 1.36.2, < 2.0)
59
64
  ruby-progressbar (~> 1.7)
60
- unicode-display_width (>= 1.4.0, < 3.0)
61
- rubocop-ast (1.21.0)
62
- parser (>= 3.1.1.0)
63
- rubocop-govuk (4.7.0)
64
- rubocop (= 1.35.0)
65
- rubocop-ast (= 1.21.0)
66
- rubocop-rails (= 2.15.2)
65
+ unicode-display_width (>= 2.4.0, < 4.0)
66
+ rubocop-ast (1.37.0)
67
+ parser (>= 3.3.1.0)
68
+ rubocop-capybara (2.21.0)
69
+ rubocop (~> 1.41)
70
+ rubocop-govuk (5.0.8)
71
+ rubocop (= 1.70.0)
72
+ rubocop-ast (= 1.37.0)
73
+ rubocop-capybara (= 2.21.0)
74
+ rubocop-rails (= 2.28.0)
67
75
  rubocop-rake (= 0.6.0)
68
- rubocop-rspec (= 2.12.1)
69
- rubocop-rails (2.15.2)
76
+ rubocop-rspec (= 3.3.0)
77
+ rubocop-rails (2.28.0)
70
78
  activesupport (>= 4.2.0)
71
79
  rack (>= 1.1)
72
- rubocop (>= 1.7.0, < 2.0)
80
+ rubocop (>= 1.52.0, < 2.0)
81
+ rubocop-ast (>= 1.31.1, < 2.0)
73
82
  rubocop-rake (0.6.0)
74
83
  rubocop (~> 1.0)
75
- rubocop-rspec (2.12.1)
76
- rubocop (~> 1.31)
84
+ rubocop-rspec (3.3.0)
85
+ rubocop (~> 1.61)
77
86
  ruby-progressbar (1.13.0)
87
+ securerandom (0.4.1)
78
88
  tzinfo (2.0.6)
79
89
  concurrent-ruby (~> 1.0)
80
- unicode-display_width (2.5.0)
90
+ unicode-display_width (3.1.4)
91
+ unicode-emoji (~> 4.0, >= 4.0.4)
92
+ unicode-emoji (4.0.4)
93
+ uri (1.0.2)
81
94
  zeitwerk (2.6.13)
82
95
 
83
96
  PLATFORMS
@@ -88,7 +101,7 @@ DEPENDENCIES
88
101
  rake (~> 13.0.6)
89
102
  rexml (>= 3.3.9)
90
103
  rspec (~> 3.0)
91
- rubocop-govuk (~> 4.7.0)
104
+ rubocop-govuk (~> 5.0)
92
105
  zeitwerk (~> 2.6)
93
106
 
94
107
  RUBY VERSION
data/lib/epb_view_models.rb CHANGED
@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
5
5
  loader.setup
6
6
 
7
7
  module EpbViewModels
8
- VERSION = "2.0.10"
8
+ VERSION = "2.0.11"
9
9
  end
10
10
 
11
11
  # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast
data/lib/presenter/rd_sap/certificate_summary.rb CHANGED
@@ -47,7 +47,7 @@ module Presenter
47
47
  current_space_heating_demand:
48
48
  @view_model.current_space_heating_demand&.to_i,
49
49
  current_water_heating_demand:
50
- @view_model.current_water_heating_demand&.to_i
50
+ @view_model.current_water_heating_demand&.to_i,
51
51
  },
52
52
  heating_cost_current: @view_model.heating_cost_current,
53
53
  heating_cost_potential: @view_model.heating_cost_potential,
@@ -79,12 +79,13 @@ module Presenter
79
79
  @view_model.related_party_disclosure_text,
80
80
  total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
81
81
  status: @view_model.status,
82
- co2_emissions_current_per_floor_area:
83
- @view_model.co2_emissions_current_per_floor_area,
82
+ environmental_impact_current: @view_model.environmental_impact_current,
83
+ environmental_impact_potential:
84
+ @view_model.environmental_impact_potential,
85
+ primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
84
86
  addendum: @view_model.addendum,
85
87
  gas_smart_meter_present: @view_model.respond_to?(:gas_smart_meter_present) ? @view_model.gas_smart_meter_present : nil,
86
88
  electricity_smart_meter_present: @view_model.respond_to?(:electricity_smart_meter_present) ? @view_model.electricity_smart_meter_present : nil,
87
- country_code: @view_model.country_code,
88
89
  }
89
90
  end
90
91
 
data/lib/presenter/rd_sap/domestic_digest.rb CHANGED
@@ -46,7 +46,7 @@ module Presenter
46
46
  improvement
47
47
  end,
48
48
  photo_supply: @view_model.respond_to?(:photovoltaic_roof_area_percent) && !@view_model.photovoltaic_roof_area_percent.nil? ? @view_model.photovoltaic_roof_area_percent.to_i : nil,
49
- main_heating_controls: @view_model.all_main_heating_controls_descriptions
49
+ main_heating_controls: @view_model.all_main_heating_controls_descriptions,
50
50
  }
51
51
  end
52
52
  end
data/lib/presenter/sap/certificate_summary.rb CHANGED
@@ -44,7 +44,7 @@ module Presenter
44
44
  current_space_heating_demand:
45
45
  @view_model.current_space_heating_demand&.to_i,
46
46
  current_water_heating_demand:
47
- @view_model.current_water_heating_demand&.to_i
47
+ @view_model.current_water_heating_demand&.to_i,
48
48
  },
49
49
  heating_cost_current: @view_model.heating_cost_current,
50
50
  heating_cost_potential: @view_model.heating_cost_potential,
@@ -76,12 +76,13 @@ module Presenter
76
76
  @view_model.related_party_disclosure_text,
77
77
  total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
78
78
  status: @view_model.status,
79
- co2_emissions_current_per_floor_area:
80
- @view_model.co2_emissions_current_per_floor_area,
79
+ environmental_impact_current: @view_model.environmental_impact_current,
80
+ environmental_impact_potential:
81
+ @view_model.environmental_impact_potential,
82
+ primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
81
83
  addendum: @view_model.addendum,
82
84
  gas_smart_meter_present: @view_model.respond_to?(:gas_smart_meter_present) ? @view_model.gas_smart_meter_present : nil,
83
85
  electricity_smart_meter_present: @view_model.respond_to?(:electricity_smart_meter_present) ? @view_model.electricity_smart_meter_present : nil,
84
- country_code: @view_model.country_code,
85
86
  }
86
87
  end
87
88
 
data/lib/presenter/sap/domestic_digest.rb CHANGED
@@ -43,7 +43,7 @@ module Presenter
43
43
  improvement
44
44
  end,
45
45
  photo_supply: @view_model.respond_to?(:photovoltaic_roof_area_percent) && !@view_model.photovoltaic_roof_area_percent.nil? ? @view_model.photovoltaic_roof_area_percent.to_i : nil,
46
- main_heating_controls: @view_model.all_main_heating_controls_descriptions
46
+ main_heating_controls: @view_model.all_main_heating_controls_descriptions,
47
47
  }
48
48
  end
49
49
  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: 2.0.10
4
+ version: 2.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - DLUHC Energy Performance of Buildings
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-02-05 00:00:00.000000000 Z
11
+ date: 2025-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri