cronex 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b071e718281eae3aa398857c94a82313f7c86cbc
-  data.tar.gz: 11072364556f0d7b2649dca6d4ddde874facba88
+SHA256:
+  metadata.gz: ba036396e2d9547853a5b7ea2fd71e951a7553c4939771493b5fe66b14f6850d
+  data.tar.gz: 0106175d262f6897fc826fd4b4a9b67126ae854e31417d8071ab06b412bb92bf
 SHA512:
-  metadata.gz: b17652914797dde9564a267cc9fe9a98355299a17850646a0a97f40bd0d4df08e95ed1646a46ec24098262cad567a1fbef0df597e1ad068fd603ef186fffe61c
-  data.tar.gz: 272be7fae9d337fde1e20e2e6e1e10b4d52b578df067b03a7add886b5b5d20264f06dc6efb8ca6d651d6c0fc3fc9e75ca08bd962dadd0748996d5fca41b96fd5
+  metadata.gz: 53f41387e3df259309bf46ab5fccbb7e12484007cd95692545e2c725f9081d404699284e7691184a32674fcb7474ca8b0362bbebea8f8cfd7332cc60863e1c0a
+  data.tar.gz: 7f97a2b9c76f68538e72681165c958788ccb3f70b938b7eea06c0a58181301a88205d3092ec20ff78b481f4c10b84722724bbc4b5bf8dc1e294466d4bf2bf9f4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### [0.11.0] - 2020-10-05
+* Fix handling L in day of month expressions
+
 ### [0.10.0] - 2020-05-26
 * Move locale and timezone arguments to options
 

data/lib/cronex/description/day_of_month.rb

@@ -1,7 +1,7 @@
 module Cronex
   class DayOfMonthDescription < Description
     def single_item_description(expression)
-      expression
+      expression == 'L' ? resources.get('last_day') : expression
     end
 
     def interval_description_format(expression)

data/lib/cronex/version.rb

@@ -1,3 +1,3 @@
 module Cronex
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/resources/resources_de.yml

@@ -16,6 +16,7 @@ past_the_hour:                      'vergangene Stunde'
 at_x_seconds_past_the_minute:       'am %s Sekunden nach der vergangenen Minute'
 minutes_through_past_the_hour:      'Minuten %s bis %s nach der vergangenen Stunde'
 on_day_of_the_month:                'am %s Tag des Monats'
+last_day:                           'der letzte Tag'
 first_weekday:                      'Erster Wochentag'
 weekday_nearest_day:                'Wochentag zum nächsten Tag %s'
 starting:             'beginnend'

data/resources/resources_en.yml

@@ -16,6 +16,7 @@ past_the_hour:                      'past the hour'
 at_x_seconds_past_the_minute:       'at %s seconds past the minute'
 minutes_through_past_the_hour:      'minutes %s through %s past the hour'
 on_day_of_the_month:                'on day %s of the month'
+last_day:                           'the last day'
 first_weekday:                      'first weekday'
 weekday_nearest_day:                'weekday nearest day %s'
 starting:             'starting'

data/resources/resources_fr.yml

@@ -9,13 +9,14 @@ on_the_of_the_month:                'le %s du mois'
 on_the_last_of_the_month:           'le dernier %s du mois'
 on_the_last_day_of_the_month:       'le dernier jour du mois'
 on_the_last_weekday_of_the_month:   'le dernier jour en semaine du mois'
-between_days_of_the_month:          'entre le %s et le %s du mois'
+between_days_of_the_month:          'entre le jour %s et le %s du mois'
 seconds_through_past_the_minute:    'secondes %s à %s après la minute'
 between_x_and_y:                    'entre %s et %s'
 past_the_hour:                      "après l'heure"
 at_x_seconds_past_the_minute:       'à %s secondes après la minute'
 minutes_through_past_the_hour:      "minutes %s à %s après l'heure"
 on_day_of_the_month:                'le %s de chaque mois'
+last_day:                           'dernier jour'
 first_weekday:                      'premier jour de la semaine'
 weekday_nearest_day:                'jour de semaine le plus proche du %s'
 starting:             'commence' # départ

data/resources/resources_it.yml

@@ -9,13 +9,14 @@ on_the_of_the_month:                'il %s del mese'
 on_the_last_of_the_month:           "l'ultimo(a) %s del mese"
 on_the_last_day_of_the_month:       "l'ultimo giorno del mese"
 on_the_last_weekday_of_the_month:   "l'ultimo giorno lavorativo del mese"
-between_days_of_the_month:          'tra il giorno %s e il giorno %s del mese'
+between_days_of_the_month:          'tra il giorno %s e il %s del mese'
 seconds_through_past_the_minute:    'dal secondo %s al %s dopo il minuto'
 between_x_and_y:                    'tra le %s e le %s'
 past_the_hour:                      "dopo l'ora"
 at_x_seconds_past_the_minute:       'a %s secondi dopo il minuto'
 minutes_through_past_the_hour:      "dal minuto %s al %s dopo l'ora"
 on_day_of_the_month:                'il giorno %s del mese'
+last_day:                           'ultimo giorno'
 first_weekday:                      'il primo giorno della settimana lavorativa'
 weekday_nearest_day:                'il prossimo giorno %s della settimana lavorativa'
 starting:             'a partire da'

data/resources/resources_pt_BR.yml

@@ -16,6 +16,7 @@ past_the_hour:                      'após a hora'
 at_x_seconds_past_the_minute:       '%s segundos após o minuto'
 minutes_through_past_the_hour:      'entre %s e %s minutos após a hora'
 on_day_of_the_month:                'no dia %s do mês'
+last_day:                           'último dia'
 first_weekday:                      'primeiro dia útil'
 weekday_nearest_day:                'dia útil mais próximo a %s'
 starting:             'iniciando'

data/resources/resources_ro.yml

@@ -9,13 +9,14 @@ on_the_of_the_month:                'în %s ale lunii'
 on_the_last_of_the_month:           'în ultima %s din lună'
 on_the_last_day_of_the_month:       'în ultima zi a lunii'
 on_the_last_weekday_of_the_month:   'în ultima zi din săptămână a lunii'
-between_days_of_the_month:          'între a %s-a și a %s-a zi a lunii'
+between_days_of_the_month:          'între zilele %s și %s a lunii'
 seconds_through_past_the_minute:    'între secundele %s și %s'
 between_x_and_y:                    'între %s și %s'
 past_the_hour:                      'în fiecare oră'
 at_x_seconds_past_the_minute:       'la secunda %s'
 minutes_through_past_the_hour:      'între minutele %s și %s'
 on_day_of_the_month:                'în a %s-a zi a lunii'
+last_day:                           'ultima zi'
 first_weekday:                      'prima zi din săptămână'
 weekday_nearest_day:                'cea mai apropiată %s din săptămână'
 starting:             pornire

data/resources/resources_ru.yml

@@ -9,13 +9,14 @@ on_the_of_the_month:                'в %s месяца'
 on_the_last_of_the_month:           'в последний %s месяца'
 on_the_last_day_of_the_month:       'в последний день месяца'
 on_the_last_weekday_of_the_month:   'в последний будний день месяца'
-between_days_of_the_month:          'с %s по %s число месяца'
+between_days_of_the_month:          'между %s днем и %s днем месяца'
 seconds_through_past_the_minute:    'секунды с %s по %s'
-between_x_and_y:                    'с %s по %s'
+between_x_and_y:                    'между %s и %s'
 past_the_hour:                      'часа'
 at_x_seconds_past_the_minute:       'в %s секунд'
 minutes_through_past_the_hour:      'минуты с %s по %s'
-on_day_of_the_month:                '%s число месяца'
+on_day_of_the_month:                '%s день месяца'
+last_day:                           'последним'
 first_weekday:                      'первый будний день'
 weekday_nearest_day:                'ближайший будний день к %s'
 starting:             начало

data/spec/exp_descriptor_de_spec.rb

@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('Alle 5 Minuten, am letzten Tag des Monats, nur in Januar')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('Alle 5 Minuten, am letzten Tag des Monats, nur in Januar')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('Alle 5 Minuten, zwischen Tag 23 und der letzte Tag des Monats, nur in Januar')
+      end
     end
 
     it 'time of day with seconds' do

data/spec/exp_descriptor_en_spec.rb

@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('Every 5 minutes, on the last day of the month, only in January')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('Every 5 minutes, on the last day of the month, only in January')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('Every 5 minutes, between day 23 and the last day of the month, only in January')
+      end
     end
 
     it 'time of day with seconds' do

data/spec/exp_descriptor_fr_spec.rb

@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('Tous les 5 minutes, le dernier jour du mois, seulement en janvier')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('Tous les 5 minutes, le dernier jour du mois, seulement en janvier')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('Tous les 5 minutes, entre le jour 23 et le dernier jour du mois, seulement en janvier')
+      end
     end
 
     it 'time of day with seconds' do
@@ -271,7 +277,7 @@ module Cronex
 
     it 'between with interval' do
       expect(desc('2-59/3 1,9,22 11-26 1-6 ?')).to eq(
-        "Tous les 3 minutes, minutes 02 à 59 après l'heure, à 1:00 AM, 9:00 AM et 10:00 PM, entre le 11 et le 26 du mois, janvier à juin")
+        "Tous les 3 minutes, minutes 02 à 59 après l'heure, à 1:00 AM, 9:00 AM et 10:00 PM, entre le jour 11 et le 26 du mois, janvier à juin")
     end
 
     it 'recurring first of month' do

data/spec/exp_descriptor_it_spec.rb

@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('Ogni 5 minuti, l\'ultimo giorno del mese, solo a(nel) gennaio')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('Ogni 5 minuti, l\'ultimo giorno del mese, solo a(nel) gennaio')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('Ogni 5 minuti, tra il giorno 23 e il ultimo giorno del mese, solo a(nel) gennaio')
+      end
     end
 
     it 'time of day with seconds' do
@@ -271,7 +277,7 @@ module Cronex
 
     it 'between with interval' do
       expect(desc('2-59/3 1,9,22 11-26 1-6 ?')).to eq(
-        'Ogni 3 minuti, dal minuto 02 al 59 dopo l\'ora, alle(ai) 1:00 AM, 9:00 AM e 10:00 PM, tra il giorno 11 e il giorno 26 del mese, da gennaio a giugno')
+        'Ogni 3 minuti, dal minuto 02 al 59 dopo l\'ora, alle(ai) 1:00 AM, 9:00 AM e 10:00 PM, tra il giorno 11 e il 26 del mese, da gennaio a giugno')
     end
 
     it 'recurring first of month' do

data/spec/exp_descriptor_pt_BR_spec.rb

@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('A cada 5 minutos, no último dia do mês, em janeiro')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('A cada 5 minutos, no último dia do mês, em janeiro')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('A cada 5 minutos, entre os dias 23 e último dia do mês, em janeiro')
+      end
     end
 
     it 'time of day with seconds' do

data/spec/exp_descriptor_ro_spec.rb

@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('La fiecare 5 minute, în ultima zi a lunii, numai în ianuarie')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('La fiecare 5 minute, în ultima zi a lunii, numai în ianuarie')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('La fiecare 5 minute, între zilele 23 și ultima zi a lunii, numai în ianuarie')
+      end
     end
 
     it 'time of day with seconds' do
@@ -271,7 +277,7 @@ module Cronex
 
     it 'between with interval' do
       expect(desc('2-59/3 1,9,22 11-26 1-6 ?')).to eq(
-        'La fiecare 3 minute, între minutele 02 și 59, la 1:00 AM, 9:00 AM și 10:00 PM, între a 11-a și a 26-a zi a lunii, din ianuarie până în iunie')
+        'La fiecare 3 minute, între minutele 02 și 59, la 1:00 AM, 9:00 AM și 10:00 PM, între zilele 11 și 26 a lunii, din ianuarie până în iunie')
     end
 
     it 'recurring first of month' do

data/spec/exp_descriptor_ru_spec.rb

@@ -178,11 +178,11 @@ module Cronex
     end
 
     it 'day of month' do
-      expect(desc('23 12 15 * *')).to eq('В 12:23 PM, 15 число месяца')
+      expect(desc('23 12 15 * *')).to eq('В 12:23 PM, 15 день месяца')
     end
 
     it 'day of month with day of week' do
-      expect(desc('23 12 15 * SUN')).to eq('В 12:23 PM, 15 число месяца, только воскресенье')
+      expect(desc('23 12 15 * SUN')).to eq('В 12:23 PM, 15 день месяца, только воскресенье')
     end
 
     it 'month name' do
@@ -239,8 +239,14 @@ module Cronex
       end
     end
 
-    it 'last day of the month' do
-      expect(desc('*/5 * L JAN *')).to eq('Каждые 5 минут, в последний день месяца, только январь')
+    context 'last day of the month:' do
+      it 'on the last day of the month' do
+        expect(desc('*/5 * L JAN *')).to eq('Каждые 5 минут, в последний день месяца, только январь')
+      end
+
+      it 'between a day and last day of the month' do
+        expect(desc('*/5 * 23-L JAN *')).to eq('Каждые 5 минут, между 23 днем и последним днем месяца, только январь')
+      end
     end
 
     it 'time of day with seconds' do
@@ -253,7 +259,7 @@ module Cronex
 
     it 'second minutes hours intervals' do
       expect(desc('5-10 30-35 10-12 * * *')).to eq(
-        'Секунды с 5 по 10, минуты с 30 по 35, с 10:00 AM по 12:59 PM')
+        'Секунды с 5 по 10, минуты с 30 по 35, между 10:00 AM и 12:59 PM')
     end
 
     it 'every 5 minutes at 30 seconds' do
@@ -262,7 +268,7 @@ module Cronex
 
     it 'minutes past the hour range' do
       expect(desc('0 30 10-13 ? * WED,FRI')).to eq(
-        'В 30 минут часа, с 10:00 AM по 1:59 PM, только среда и пятница')
+        'В 30 минут часа, между 10:00 AM и 1:59 PM, только среда и пятница')
     end
 
     it 'seconds past the minute interval' do
@@ -271,7 +277,7 @@ module Cronex
 
     it 'between with interval' do
       expect(desc('2-59/3 1,9,22 11-26 1-6 ?')).to eq(
-        'Каждые 3 минут, минуты с 02 по 59, в 1:00 AM, 9:00 AM и 10:00 PM, с 11 по 26 число месяца, январь - июнь')
+        'Каждые 3 минут, минуты с 02 по 59, в 1:00 AM, 9:00 AM и 10:00 PM, между 11 днем и 26 днем месяца, январь - июнь')
     end
 
     it 'recurring first of month' do
@@ -328,11 +334,11 @@ module Cronex
       end
 
       it 'minutes past the hour 5,10 day 2' do
-        expect(desc('5,10 0 2 * *')).to eq('В 05 и 10 минут часа, 2 число месяца')
+        expect(desc('5,10 0 2 * *')).to eq('В 05 и 10 минут часа, 2 день месяца')
       end
 
       it 'minutes past the hour 5/10 day 2' do
-        expect(desc('5/10 0 2 * *')).to eq('Каждые 10 минут, начало в 05 минут часа, 2 число месяца')
+        expect(desc('5/10 0 2 * *')).to eq('Каждые 10 минут, начало в 05 минут часа, 2 день месяца')
       end
     end
 
@@ -346,7 +352,7 @@ module Cronex
       end
 
       it 'seconds past the minute 5,6 day 2' do
-        expect(desc('5,6 0 0 2 * *')).to eq('В 5 и 6 секунд, 2 число месяца')
+        expect(desc('5,6 0 0 2 * *')).to eq('В 5 и 6 секунд, 2 день месяца')
       end
     end
 
@@ -364,7 +370,7 @@ module Cronex
       end
 
       it 'day of month increments' do
-        expect(desc('0 30 8 2/7 * *')).to eq('В 8:30 AM, каждые 7 дня(ей), начало 2 число месяца')
+        expect(desc('0 30 8 2/7 * *')).to eq('В 8:30 AM, каждые 7 дня(ей), начало 2 день месяца')
       end
 
       it 'day of week increments' do
@@ -376,7 +382,7 @@ module Cronex
       end
 
       it 'year increments' do
-        expect(desc('0 0 0 1 MAR * 2010/5')).to eq('В 12:00 AM, 1 число месяца, только март, каждые 5 лет, начало в 2010')
+        expect(desc('0 0 0 1 MAR * 2010/5')).to eq('В 12:00 AM, 1 день месяца, только март, каждые 5 лет, начало в 2010')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronex
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Adrian Kazaku
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -133,7 +133,7 @@ homepage: https://github.com/alpinweis/cronex
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Ruby library that converts cron expressions into human readable strings
 test_files: