consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split duration component in two

Browse Source 
We were displaying dates in two different formats in the same component,
leading to strange hacks like manually calling the `call` method or not
being able to use `render_inline` in the tests.

Since we're going to reuse one of these formats outside the budgets
section, we're splitting the component. We're also removing the
mentioned hacks.
This commit is contained in:
Javi Martín
2022-09-06 10:02:14 +02:00
parent 67d13d2899
commit 7227815a16
10 changed files with 105 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/admin/budget_phases/phases_component.rb
View File

@@ -12,7 +12,7 @@ class Admin::BudgetPhases::PhasesComponent < ApplicationComponent
end
def dates(phase)
Admin::Budgets::DurationComponent.new(phase).dates
render Admin::DurationComponent.new(phase)
end
def enabled_cell(phase)

25
app/components/admin/budgets/duration_component.rb
View File

@@ -1,25 +0,0 @@
class Admin::Budgets::DurationComponent < ApplicationComponent
attr_reader :durable
def initialize(durable)
@durable = durable
end
def dates
Admin::DateRangeComponent.new(start_time, end_time).call
end
def duration
distance_of_time_in_words(durable.starts_at, durable.ends_at) if durable.starts_at && durable.ends_at
end
private
def start_time
durable.starts_at
end
def end_time
durable.ends_at - 1.second if durable.ends_at.present?
end
end

1
app/components/admin/budgets/duration_in_words_component.html.erb Normal file
View File

@@ -0,0 +1 @@
<%= duration -%>

17
app/components/admin/budgets/duration_in_words_component.rb Normal file
View File

@@ -0,0 +1,17 @@
class Admin::Budgets::DurationInWordsComponent < ApplicationComponent
attr_reader :durable
def initialize(durable)
@durable = durable
end
def render?
durable.starts_at && durable.ends_at
end
private
def duration
distance_of_time_in_words(durable.starts_at, durable.ends_at)
end
end

4
app/components/admin/budgets/index_component.rb
View File

@@ -37,11 +37,11 @@ class Admin::Budgets::IndexComponent < ApplicationComponent
end
def dates(budget)
Admin::Budgets::DurationComponent.new(budget).dates
render Admin::DurationComponent.new(budget)
end
def duration(budget)
Admin::Budgets::DurationComponent.new(budget).duration
render Admin::Budgets::DurationInWordsComponent.new(budget)
end
def status_html_class(budget)

1
app/components/admin/duration_component.html.erb Normal file
View File

@@ -0,0 +1 @@
<%= dates -%>

21
app/components/admin/duration_component.rb Normal file
View File

@@ -0,0 +1,21 @@
class Admin::DurationComponent < ApplicationComponent
attr_reader :durable
def initialize(durable)
@durable = durable
end
private
def dates
render Admin::DateRangeComponent.new(start_time, end_time)
end
def start_time
durable.starts_at
end
def end_time
durable.ends_at - 1.second if durable.ends_at.present?
end
end

73
spec/components/admin/budgets/duration_component_spec.rb
View File

@@ -1,73 +0,0 @@
require "rails_helper"
describe Admin::Budgets::DurationComponent do
describe "#dates" do
it "shows both dates when both are defined" do
durable = double(
starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0),
ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00)
)
dates = Admin::Budgets::DurationComponent.new(durable).dates
render dates
expect(page.text).to eq "2015-08-01 12:00 - 2016-09-30 16:29"
expect(dates).to be_html_safe
end
it "shows the start date when no end date is defined" do
durable = double(starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0), ends_at: nil)
render Admin::Budgets::DurationComponent.new(durable).dates
expect(page.text).to eq "2015-08-01 12:00 - "
end
it "shows the end date when no start date is defined" do
durable = double(starts_at: nil, ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00))
render Admin::Budgets::DurationComponent.new(durable).dates
expect(page.text).to eq "- 2016-09-30 16:29"
end
end
describe "#duration" do
it "describes the total duration in human language" do
durable = double(
starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0),
ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00)
)
render Admin::Budgets::DurationComponent.new(durable).duration
expect(page.text).to eq "about 1 year"
end
it "is not defined when no end date is defined" do
durable = double(starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0), ends_at: nil)
render Admin::Budgets::DurationComponent.new(durable).duration
expect(page).not_to be_rendered
end
it "is not defined when no start date is defined" do
durable = double(starts_at: nil, ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00))
render Admin::Budgets::DurationComponent.new(durable).duration
expect(page).not_to be_rendered
end
end
attr_reader :content
def render(content)
@content = content
end
def page
Capybara::Node::Simple.new(content.to_s)
end
end

30
spec/components/admin/budgets/duration_in_words_component_spec.rb Normal file
View File

@@ -0,0 +1,30 @@
require "rails_helper"
describe Admin::Budgets::DurationInWordsComponent do
it "describes the total duration in human language" do
durable = double(
starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0),
ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00)
)
render_inline Admin::Budgets::DurationInWordsComponent.new(durable)
expect(page.text).to eq "about 1 year"
end
it "is not defined when no end date is defined" do
durable = double(starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0), ends_at: nil)
render_inline Admin::Budgets::DurationInWordsComponent.new(durable)
expect(page).not_to be_rendered
end
it "is not defined when no start date is defined" do
durable = double(starts_at: nil, ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00))
render_inline Admin::Budgets::DurationInWordsComponent.new(durable)
expect(page).not_to be_rendered
end
end

32
spec/components/admin/duration_component_spec.rb Normal file
View File

@@ -0,0 +1,32 @@
require "rails_helper"
describe Admin::DurationComponent do
it "shows both dates when both are defined" do
durable = double(
starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0),
ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00)
)
render_inline Admin::DurationComponent.new(durable)
expect(page.text).to eq "2015-08-01 12:00 - 2016-09-30 16:29"
expect(page).to have_css "time", exact_text: "2015-08-01 12:00"
expect(page).to have_css "time", exact_text: "2016-09-30 16:29"
end
it "shows the start date when no end date is defined" do
durable = double(starts_at: Time.zone.local(2015, 8, 1, 12, 0, 0), ends_at: nil)
render_inline Admin::DurationComponent.new(durable)
expect(page.text).to eq "2015-08-01 12:00 - "
end
it "shows the end date when no start date is defined" do
durable = double(starts_at: nil, ends_at: Time.zone.local(2016, 9, 30, 16, 30, 00))
render_inline Admin::DurationComponent.new(durable)
expect(page.text).to eq "- 2016-09-30 16:29"
end
end