calendarium-romanum 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783786a54e37a2d755c2bc0a0fdf1cf21b684ce5e1f186e180fb8513a7be8a8d
-  data.tar.gz: 8c4879981d34a5962f604de47ec4d77faf2b63cec5adf2699cfc9d1a718d045f
+  metadata.gz: 4190d0074dc4a169e720b277ae04d3de9d81ea34286e0d6003efb51a5a09fe57
+  data.tar.gz: b0e1d5fb8b5d51b253a9558efa3e886aba1c0d4e2c1501a62a04121637e5fb1d
 SHA512:
-  metadata.gz: ba211f79a4b79ed8169d15871e8630baf2a536182284ec58e851b061a980dd18a9163a8d8749ab8f1f470f2cdec64f5c236710022f8739862d39eb8efd88bcef
-  data.tar.gz: 7c6be1ff8bee1e4ea3159a7add679dc7b53949dfc086b82fc63335d670f69fdfc4518d020944d3db09a22cfeb6442fe733850adaab29948618a91f3ed93a3e82
+  metadata.gz: d961be6997bd1d5f8f266724cb0933bd6cc34bd6b4e1078fb59b91435f2103b3646588da16fd548756960d592fac1e1ff42992c54685925a81593bcadbcd926a
+  data.tar.gz: 1402abc3b7663cedb0ddb710886d57783ec39af4fb688c3317c43c5c6e0298134b0bc28297ebafd400871cf6e46b01ec5b480d2fc1ace3789e1a6c05b385bd95

data/.gitignore

@@ -1,4 +1,5 @@
 *~
 .rvmrc
 *.gem
-coverage/
+coverage/
+.idea/

data/.rubocop.yml

@@ -1,10 +1,10 @@
 Metrics/LineLength:
   Max: 100
 
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
@@ -31,16 +31,19 @@ Style/RaiseArgs:
 Style/RedundantException:
   Enabled: false
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   SpaceBeforeBlockParameters: false
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Style/SpaceInsideRangeLiteral:
+Layout/SpaceInsideRangeLiteral:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
 Style/ZeroLengthPredicate:

data/.travis.yml

@@ -11,6 +11,7 @@ jobs:
     - rvm: 2.6.5 # ~ latest MRI
       script:
         - bundle exec rake spec_all_locales
+        - bundle exec rake data_cmp
         - bash spec/build/gem_build_test.sh
     - rvm: 2.5.0 # oldest officially maintained MRI
     - rvm: 2.0.0 # oldest MRI we support
@@ -19,4 +20,4 @@ jobs:
   #   - rvm: jruby-9.1.12.0
 
 git:
-  depth: 3
+  depth: 3

data/Appraisals

@@ -0,0 +1,67 @@
+### i18n
+
+appraise 'i18n-0.7' do
+  gem 'i18n', '0.7.0'
+end
+
+appraise 'i18n-0.9' do
+  gem 'i18n', '0.9.5'
+end
+
+appraise 'i18n-1.0' do
+  gem 'i18n', '1.0.0'
+end
+
+appraise 'i18n-1.8' do
+  gem 'i18n', '1.8.9'
+end
+
+### thor
+
+appraise 'thor-0.15' do
+  gem 'thor', '0.15.0'
+end
+
+appraise 'thor-0.16' do
+  gem 'thor', '0.15.0'
+end
+
+appraise 'thor-0.17' do
+  gem 'thor', '0.17.0'
+end
+
+appraise 'thor-0.18' do
+  gem 'thor', '0.18.1'
+end
+
+appraise 'thor-0.19' do
+  gem 'thor', '0.19.4'
+end
+
+appraise 'thor-0.20' do
+  gem 'thor', '0.20.3'
+end
+
+# thor >= 1.0 isn't compatible with our version of aruba; CLI specs are broken,
+#   but the CLI itself works well, as can be tested by
+#   `bundle exec appraisal thor-1.1 ruby -Ilib bin/calendariumrom ...`
+
+# ruby >= 2.4 required
+appraise 'thor-1.0' do
+  gem 'thor', '1.0.1'
+
+  group :test do
+    gem 'aruba', '1.0.0'
+    gem 'cucumber', '3.0.0'
+  end
+end
+
+# ruby >= 2.4 required
+appraise 'thor-1.1' do
+  gem 'thor', '1.1.0'
+
+  group :test do
+    gem 'aruba', '1.0.0'
+    gem 'cucumber', '3.0.0'
+  end
+end

data/CHANGELOG.md

@@ -1,5 +1,62 @@
 # Changelog
 
+## [0.9.0] 2021-04-11
+
+### Fixed
+
+- `Transfers` + `Calendar`: on collision of two solemnities of
+  exactly the same rank (e.g. collision of the solemnities of
+  Sacred Heart of Jesus and Birth of St. John the Baptist in 2022)
+  the sanctorale one was scheduled both on the original date and
+  on the transferred date and the temporale solemnity was not
+  scheduled at all
+- liturgical colour of All Souls (has incorrectly been white
+  since the beginning of the project, changed to violet)
+
+### Added
+
+- data: General Roman Calendar in Portuguese + Portuguese locale (by Tomas Monteiro @tmonteiro2344)
+- data: all calendars: new memorial of St. Martha, Mary and Lazarus
+  (replacing memorial of St. Martha alone),
+  new optional memorials of St. Gregory of Narek, St. John De Avila
+  and St. Hildegard of Bingen
+- `SanctoraleWriter.new`: new optional keyword argument `front_matter`
+- `Calendar.new`: new optional keyword argument `transfers`
+  for supplying custom implementation of the solemnity transfer logic
+- `Temporale#provides_celebration?`
+- `Sanctorale#provides_celebration?`, `#by_symbol`, `#merge`
+- CLI: `calendariumrom id` to list celebration symbols included
+  in specified sanctorale data file
+- CLI: `calendariumrom merge` to merge two or more sanctorale data files
+- CLI: `calendariumrom cmp` supports new options `--no-rank`,
+  `--no-colour`, `--no-symbol` for ignoring differences in the specified
+  celebration properties and option `--title` to check for differences
+  in title (ignored by default)
+
+### Changed
+
+- `Temporale::Dates` methods are defined as instance methods and made
+  available as module methods through `extend self` (so far they were
+  defined and only available as module methods)
+- `Temporale::Dates`: helper methods `weekday_before`, `weekday_after`,
+  `octave_of` and their derivatives extracted to a new module
+  `Temporale::DateHelper` (but they are still available on `Temporale::Dates`, too)
+- data: repeated spaces removed from the Latin, Italian and Spanish
+  version of the General Roman Calendar (this does not affect behaviour
+  of calendarium-romanum itself, but may affect some other applications
+  possibly processing the data files directly)
+- `Transfers#call` return value: now it contains not only solemnities
+  transferred (and the destination dates), but also the ones winning
+  the original date, unless they are of the two highest ranks
+- `Transfer#call`: in case of collision of two solemnities of exactly
+  the same rank temporale always wins over sanctorale
+- `Sanctorale#dup` now properly creates for the clone it's own internal
+  data structures independent of the original's ones
+- CLI: `calendariumrom cmp` exits with status 1 if any differences are found
+- CLI: `calendariumrom cmp` prints celebration symbol if available
+- runtime dependencies loosenned: we support `thor` already from version 0.15
+  and `i18n` from version 0.7
+
 ## [0.8.0] 2020-11-25
 
 ### Fixed

data/Gemfile

@@ -11,6 +11,7 @@ end
 group :development do
   gem 'rubocop'
   gem 'yard'
+  gem 'appraisal'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,12 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    appraisal (2.4.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     aruba (0.8.1)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
       rspec-expectations (>= 2.99)
-    ast (2.3.0)
+    ast (2.4.2)
     backports (3.18.1)
     builder (3.2.3)
     childprocess (0.5.9)
@@ -28,14 +32,16 @@ GEM
     ffi (1.9.18)
     gherkin (4.1.3)
     i18n (0.6.9)
+    jaro_winkler (1.5.4)
     json (2.0.2)
     multi_json (1.12.2)
     multi_test (0.1.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.1.0)
+    parallel (1.19.2)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
     rake (12.0.0)
+    rexml (3.2.4)
     roman-numerals (0.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -50,26 +56,29 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (0.81.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.11.0)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     thor (0.18.1)
-    unicode-display_width (1.1.2)
+    unicode-display_width (1.7.0)
     yard (0.9.16)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   aruba
   backports (~> 3.18)
   cucumber (~> 2.99)

data/README.md

@@ -4,6 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/calendarium-romanum.svg)](https://badge.fury.io/rb/calendarium-romanum)
 
 API documentation:
+[0.8.0](http://www.rubydoc.info/gems/calendarium-romanum/0.9.0)
 [0.8.0](http://www.rubydoc.info/gems/calendarium-romanum/0.8.0)
 [0.7.1](http://www.rubydoc.info/gems/calendarium-romanum/0.7.1)
 [0.6.0](http://www.rubydoc.info/gems/calendarium-romanum/0.6.0)
@@ -85,13 +86,13 @@ the dependency to a particular minor version.
 In your app's Gemfile
 
 ```
-gem 'calendarium-romanum', '~>0.8.0'
+gem 'calendarium-romanum', '~>0.9.0'
 ```
 
 or in gemspec of your gem
 
 ```
-spec.add_dependency 'calendarium-romanum', '~>0.8.0'
+spec.add_dependency 'calendarium-romanum', '~>0.9.0'
 ```
 
 ## Usage
@@ -304,7 +305,7 @@ pcal = CR::PerpetualCalendar.new(cache: my_cache)
 ### Use prepared data or create your own
 
 The gem expects data files following a custom format -
-see README in the [data](/data) directory for it's description.
+see README in the [data][data] directory for it's description.
 The same directory contains a bunch of example data files.
 (All of them are also bundled in the gem and accessible via
 `CalendariumRomanum::Data`, as described above.)
@@ -355,7 +356,7 @@ You could copy the file to a new location and add the two proper solemnities,
 but your programmer better self won't allow you to do that.
 What options are left? You can create a new sanctorale file
 with the two proper celebrations and then load it over the calendar
-of the diocese, as explained in [data](/data).
+of the diocese, as explained in [data][data].
 Or, if you need the calendar just for that single little script
 and don't care about creating data files, you can build the two
 proper solemnities in code:
@@ -530,7 +531,7 @@ modify global configuration in order to make the internationalization
 easily and conveniently work.
 If your application requires `calendarium-romanum` to handle
 languages not bundled in the gem, or if you don't like the default
-translations, just prepare a [translation file](/config/locales),
+translations, just prepare a [translation file][translations],
 put it anywhere in your project's tree
 and add it's path to `I18n.config.load_path`.
 If, on the other hand, even the officially supported languages
@@ -582,15 +583,17 @@ Get the sources and install development depencencies:
 
 ### Run Tests
 
-`bundle exec rake spec`
-
-See also `.travis.yml` for comprehensive tests run on the CI.
+- `bundle exec rake spec` to execute the test suite
+- `bundle exec rake spec_all_locales` to run the test suite for each of the supported locales
+- `bundle exec appraisal rake spec` to test compatibility with different versions of dependencies
+- `bash spec/build/gem_build_test.sh` to test that a valid working Ruby gem can be built from the sources
 
 [awesomecc]: https://github.com/calendarium-romanum/awesome-church-calendar
 [gnlyc]: https://www.ewtn.com/catholicism/library/liturgical-year-2193
 [i18n]: https://github.com/svenfuchs/i18n
-[translations]: /tree/master/config/locales
-[liturgical_law]: /tree/master/liturgical_law
+[translations]: /config/locales
+[liturgical_law]: /liturgical_law
+[data]: /data
 [module-included]: http://ruby-doc.org/core-2.2.2/Module.html#method-i-included
 [calrom]: https://github.com/calendarium-romanum/calrom
 [crhistorical]: https://github.com/calendarium-romanum/historical

data/Rakefile

@@ -1,9 +1,11 @@
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
+EXECUTABLE = 'ruby -Ilib bin/calendariumrom'
+
 desc 'Run specs with each fully supported locale'
 task :spec_all_locales do
-  %w(en la cs fr it).each do |locale|
+  %w(en la cs fr it pt).each do |locale|
     sh "LOCALE=#{locale} rake spec"
   end
 end
@@ -11,6 +13,15 @@ end
 desc 'Generates calendar dumps for regression tests anew'
 task :regression_refresh do
   2020.upto(2030).each do |year|
-    sh "ruby -Ilib bin/calendariumrom dump #{year} > spec/regression_dumps/#{year}.txt"
+    sh "#{EXECUTABLE} dump #{year} > spec/regression_dumps/#{year}.txt"
+  end
+end
+
+desc 'Checks that all versions of the General Roman Calendar are the same'
+task :data_cmp do
+  vernacular = Dir['data/universal-*.txt'].delete_if {|f| f.end_with? '-la.txt' }
+
+  vernacular.each do |f|
+    sh "#{EXECUTABLE} cmp data/universal-la.txt #{f}"
   end
 end

data/calendarium-romanum.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0'
 
-  s.add_dependency 'thor', '~> 0.18'
-  s.add_dependency 'i18n', '~> 0.6'
+  s.add_dependency 'thor', '>= 0.15'
+  s.add_dependency 'i18n', '>= 0.7'
   s.add_dependency 'roman-numerals', '~> 0.3'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.5'

data/config/locales/pt.yml

@@ -0,0 +1,94 @@
+pt:
+  temporale:
+    season:
+      advent: Tempo do Advento
+      christmas: Tempo do Natal
+      lent: Tempo da Quaresma
+      triduum: Tríduo Pascal
+      easter: Tempo Pascal
+      ordinary: Tempo Comum
+    solemnity:
+      nativity: Natal do Senhor
+      holy_family: "Sagrada Família de Jesus, Maria e José"
+      mother_of_god: Oitava do Natal. Santa Maria Mãe de Deus
+      epiphany: Epifania do Senhor
+      baptism_of_lord: Baptismo do Senhor
+      ash_wednesday: Quarta-feira de cinzas
+      palm_sunday: Domingo de Ramos na Paixão do Senhor
+      good_friday: Sexta-feira da Paixão do Senhor
+      holy_saturday: Sábado Santo
+      easter_sunday: Domingo de Páscoa da Ressureição do Senhor
+      ascension: Ascensão do Senhor
+      pentecost: Domingo de Pentecostes
+      holy_trinity: Santíssima Trindade
+      corpus_christi: Santíssimo Corpo e Sangue de Cristo
+      sacred_heart: Sagrado Coração de Jesus
+      mother_of_church: Maria Mãe da Igreja
+      immaculate_heart: Coração Imaculado de Maria
+      christ_king: "Nosso Senhor Jesus Cristo, Rei do Universo"
+      saturday_memorial_bvm: Santa Maria no Sábado
+    extension:
+      christ_eternal_priest: "Nosso Senhor Jesus Cristo, Sumo e Eterno Sacerdote"
+      dedication: Aniversário da dedicação da Igreja
+    ordinary:
+      sunday: '%{week}º Domingo do Tempo Comum'
+      ferial: '%{weekday} da %{week}ª semana do Tempo Comum'
+    advent:
+      sunday: '%{week}º Domingo do Advento'
+      ferial: '%{weekday} da %{week}ª semana do Advento'
+      before_christmas: '%{day} de Dezembro'
+    christmas:
+      nativity_octave:
+        ferial: '%{day} na Oitava do Natal'
+      sunday: '%{week}º Domingo do Tempo do Natal'
+      ferial: '%{weekday} da %{week}ª semana do Tempo do Natal'
+      after_epiphany:
+        ferial: '%{weekday} depois da Epifania do Senhor'
+    lent:
+      after_ashes:
+        ferial: '%{weekday} depois das Cinzas'
+      sunday: '%{week}º Domingo da Quaresma'
+      ferial: '%{weekday} da %{week}ª semana da Quaresma'
+      holy_week:
+        ferial: '%{weekday} da Semana Santa'
+    easter:
+      octave:
+        ferial: '%{weekday} da Oitava da Páscoa'
+      sunday: '%{week}º Domingo do Tempo Pascal'
+      ferial: '%{weekday} da %{week}ª semana do Tempo Pascal'
+  rank:
+    '1_1': Tríduo Pascal
+    '1_2': Dias litúrgicos primários
+    '1_3': Solenidades no Calendário Geral
+    '1_4': Solenidades
+    '2_5': Festas do Senhor no Calendário Geral
+    '2_6': Domingos não-privilegiados
+    '2_7': Festas de Santos no Calendário Geral
+    '2_8': Festas
+    '2_9': Dias Privilegiados
+    '3_10': Memórias Obrigatórias no Calendário Geral
+    '3_11': Memórias Obrigatórias
+    '3_12': Memórias Facultativas
+    '3_13': Dias feriais
+    '4_0': Comemorações
+    short:
+      solemnity: solenidade
+      feast: festa
+      sunday: domingo
+      memorial: memória
+      memorial_opt: memória facultativa
+      ferial: dia ferial
+      commemoration: comemoração
+  weekday:
+    '0': Domingo
+    '1': Segunda-feira
+    '2': Terça-feira
+    '3': Quarta-feira
+    '4': Quinta-feira
+    '5': Sexta-feira
+    '6': Sábado
+  colour:
+    violet: roxo
+    white: branco
+    green: verde
+    red: vermelho