Skip to content

Commit

Permalink
Fix days jump (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonnynux committed Oct 21, 2020
1 parent 5504756 commit c60d5a7
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lib/cronex/description/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ def segment_description(expression, all_description)
if segments[0].include?('-')
between_segment_of_interval = segments[0]
between_segments = between_segment_of_interval.split('-')
desc += ', ' + format(
between = format(
between_description_format(between_segment_of_interval),
single_item_description(between_segments[0]),
single_item_description(between_segments[1]).gsub(':00', ':59'))
desc += ', ' if !between.start_with?(', ')
desc += between
elsif !Cronex::Utils.include_any?(segments[0], special_chars + ['*'])
desc += ', ' + format(starting_description_format(segments[0]), single_item_description(segments[0]))
end
Expand Down
2 changes: 1 addition & 1 deletion lib/cronex/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Cronex
VERSION = '0.11.0'
VERSION = '0.11.1'
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_de_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,5 +385,9 @@ def desc(expression, opts = {})
expect(desc('0 0 0 1 MAR * 2010/5')).to eq('Um 12:00 AM, am 1 Tag des Monats, nur in März, Alle 5 Jahren, beginnend in 2010')
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('Um 7:30 AM, Alle 2 Tagen, zwischen Tag 1 und der letzte Tag des Monats')
end
end
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_en_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -405,5 +405,9 @@ def desc(expression, opts = {})
expect(desc('0-10 11 * * *', timezone: 'Europe/Vienna')).to eq("Every minute between #{hour}:00 PM and #{hour}:10 PM")
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('At 7:30 AM, every 2 days, between day 1 and the last day of the month')
end
end
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_fr_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,5 +385,9 @@ def desc(expression, opts = {})
expect(desc('0 0 0 1 MAR * 2010/5')).to eq('À 12:00 AM, le 1 de chaque mois, seulement en mars, tous les 5 ans, commence en 2010')
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('À 7:30 AM, tous les 2 jours, entre le jour 1 et le dernier jour du mois')
end
end
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_it_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,5 +385,9 @@ def desc(expression, opts = {})
expect(desc('0 0 0 1 MAR * 2010/5')).to eq('Alle(ai) 12:00 AM, il giorno 1 del mese, solo a(nel) marzo, ogni 5 anni, a partire da 2010')
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('Alle(ai) 7:30 AM, ogni 2 giorni, tra il giorno 1 e il ultimo giorno del mese')
end
end
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_pt_BR_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,5 +385,9 @@ def desc(expression, opts = {})
expect(desc('0 0 0 1 MAR * 2010/5')).to eq('Às 12:00 AM, no dia 1 do mês, em março, a cada 5 anos, iniciando em 2010')
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('Às 7:30 AM, a cada 2 dias, entre os dias 1 e último dia do mês')
end
end
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_ro_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,5 +385,9 @@ def desc(expression, opts = {})
expect(desc('0 0 0 1 MAR * 2010/5')).to eq('La 12:00 AM, în a 1-a zi a lunii, numai în martie, la fiecare 5 ani, pornire în 2010')
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('La 7:30 AM, la fiecare 2 zile, între zilele 1 și ultima zi a lunii')
end
end
end
4 changes: 4 additions & 0 deletions spec/exp_descriptor_ru_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -385,5 +385,9 @@ def desc(expression, opts = {})
expect(desc('0 0 0 1 MAR * 2010/5')).to eq('В 12:00 AM, 1 день месяца, только март, каждые 5 лет, начало в 2010')
end
end

it 'every few days' do
expect(desc('30 7 1-L/2 * *')).to eq('В 7:30 AM, каждые 2 дня(ей), между 1 днем и последним днем месяца')
end
end
end

0 comments on commit c60d5a7

Please sign in to comment.