calendarium-romanum 0.8.0 → 0.9.0

data/lib/calendarium-romanum/temporale/extensions/dedication_before_all_saints.rb

@@ -46,7 +46,7 @@ module CalendariumRomanum
         # @param year [Integer] liturgical year
         # @return [Date]
         def self.dedication(year)
-          Dates.sunday_before(Date.new(year + 1, 11, 1))
+          DateHelper.sunday_before(Date.new(year + 1, 11, 1))
         end
 
         def initialize(title: DEFAULT_TITLE, symbol: DEFAULT_SYMBOL)

data/lib/calendarium-romanum/transfers.rb

@@ -1,6 +1,6 @@
 module CalendariumRomanum
 
-  # Internal {Calendar} component.
+  # {Calendar} component.
   # Resolves transfers of conflicting solemnities.
   #
   # For any day {Temporale} has a {Celebration}.
@@ -12,20 +12,31 @@ module CalendariumRomanum
   # one is celebrated on the given day and the less lucky one
   # must be transferred to another day.
   # However, not all days are valid as targets of solemnity transfer.
-  #
-  # @api private
+  # This class handles the logic of transferring impeded solemnities
+  # to suitable dates.
   class Transfers
     # @param temporale [Temporale]
     # @param sanctorale [Sanctorale]
+    # @api private
     def initialize(temporale, sanctorale)
       @temporale = temporale
       @sanctorale = sanctorale
     end
 
+    # Resolves any conflict between temporale and sanctorale solemnities
+    # by deciding which of the conflicting solemnities is to take the original
+    # date, which is to be transferred, and specifying a date for both of them
+    # in the resulting Hash.
+    #
+    # @param temporale [Temporale]
+    # @param sanctorale [Sanctorale]
+    # @return [Hash<Date=>Celebration>]
     def self.call(temporale, sanctorale)
       new(temporale, sanctorale).call
     end
 
+    # @return [Hash<Date=>Celebration>]
+    # @api private
     def call
       @transferred = {}
 
@@ -37,10 +48,10 @@ module CalendariumRomanum
         tc = @temporale[date]
         next unless tc.solemnity?
 
-        sc = @sanctorale[date]
-        next unless sc.size == 1 && sc.first.solemnity?
+        sc = @sanctorale[date].first
+        next unless sc && sc.solemnity?
 
-        loser = [tc, sc.first].sort_by(&:rank).first
+        loser, winner = [sc, tc].sort_by(&:rank)
 
         transfer_to =
           if loser.symbol == :annunciation && in_holy_week?(date)
@@ -50,6 +61,8 @@ module CalendariumRomanum
             free_day_closest_to(date)
           end
         @transferred[transfer_to] = loser
+        # primary celebrations have noone to be beaten by, no need to harden their dates
+        @transferred[date] = winner unless winner.rank == Ranks::PRIMARY
       end
 
       @transferred
@@ -69,17 +82,19 @@ module CalendariumRomanum
 
     # Converts an AbstractDate to a Date in the given
     # liturgical year.
-    # It isn't guaranteed to work well (and probably doesn't work well)
-    # for the grey zone of dates between earliest and latest
-    # possible date of the first Advent Sunday, but that's no problem
-    # as long as there are no sanctorale solemnities in this
-    # date range.
     def concretize_abstract_date(abstract_date)
-      d = abstract_date.concretize(@temporale.year + 1)
+      year = @temporale.year
+      d = abstract_date.concretize(year + 1)
+      d_prev = abstract_date.concretize(year)
+
       if @temporale.date_range.include? d
+        if @temporale.date_range.include?(d_prev)
+          raise RuntimeError.new("Ambiguous case, #{abstract_date} twice in liturgical year #{year}")
+        end
+
         d
       else
-        abstract_date.concretize(@temporale.year)
+        d_prev
       end
     end
 
@@ -88,7 +103,7 @@ module CalendariumRomanum
     end
 
     def dates_around(date)
-      return to_enum(:dates_around, date) unless block_given?
+      return to_enum(__method__, date) unless block_given?
 
       1.upto(100) do |i|
         yield date + i

data/lib/calendarium-romanum/version.rb

@@ -1,7 +1,7 @@
 require 'date'
 
 module CalendariumRomanum
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 
-  RELEASE_DATE = Date.new(2020, 11, 25).freeze
+  RELEASE_DATE = Date.new(2021, 4, 11).freeze
 end

data/liturgical_law/2020_dubia_de_calendario_2022.md

@@ -0,0 +1,100 @@
+---
+title: Responsum ad dubia de calendario liturgico exarando pro anno 2022
+source: http://www.cultodivino.va/content/cultodivino/it/documenti/responsa-ad-dubia/2020/de-calendario-liturgico-2022.html
+---
+
+# RESPONSUM AD DUBIA DE CALENDARIO LITURGICO EXARANDO PRO ANNO 2022
+
+Redactores nonnulli "Ordinis Missae celebrandae et Officii Divini persolvendi" dubia proposuerunt
+de Calendario liturgico pro venturo anno 2022 exarando, cum sollemnitas quaedam die sabbati aut feria
+secunda occurrit.
+
+Attento numero 60 ["Normarum universalium de anno liturgico et de Calendario"](./2002_normae_universales.md),
+infrascriptarum celebrationum ordo sequenti modo erit disponendus:
+
+a) Sollemnitas Sanctae Dei Genetricis Mariae, die 1 ianuarii, sabbato.
+   Dominica II Post Nativitatem, die 2 ianuarii.
+
+   - Die 1 ianuarii II Vesperae et Missa vespertina sollemnitatis Sanctae Dei Genetricis Mariae celebrentur.
+
+```ruby
+calendar = CR::Calendar.new 2021, CR::Data::GENERAL_ROMAN_LATIN.load, vespers: true
+
+date = Date.new(2022, 1, 1)
+expect(date).to be_saturday
+
+day = calendar[date]
+expect(day.celebrations[0].symbol).to be :mother_of_god
+expect(day.vespers).to be nil
+
+expect(calendar[Date.new(2022, 1, 2)].celebrations[0].rank)
+  .to be CR::Ranks::SUNDAY_UNPRIVILEGED
+```
+
+b) Sollemnitas S. Ioseph Sponsi Beatae Mariae Virginis, die 19 martii, sabbato.
+   Dominica III in Quadragesima, die 20 martii.
+
+   - Die 19 martii I Vesperae et Missa vespertina Dominicae III in Quadragesima celebrentur.
+
+```ruby
+calendar = CR::Calendar.new 2021, CR::Data::GENERAL_ROMAN_LATIN.load, vespers: true
+
+date = Date.new(2022, 3, 19)
+expect(date).to be_saturday
+
+I18n.with_locale(:la) do
+  day = calendar[date]
+  expect(day.celebrations[0].symbol).to be :joseph
+  expect(day.vespers.title).to eq 'Dominica III Quadragesimae'
+end
+```
+
+c) Sollemnitas Nativitatis S. Ioanni Baptistae et sollemnitas Sacratissimi Cordis Iesu, eadem die 24 iunii
+   coincidentes.
+
+   - Die 24 iunii, feria VI: sollemnitas Sacratissimi Cordis Iesu celebretur.
+     Sollemnitas Nativitatis S. Ioannis Baptistae ad diem 23 iunii, feriam V, transferatur,
+	 II Vesperae omittantur. I Vesperae sollemnitatis Sacratissimi Cordis Iesu celebrentur.
+
+```ruby
+pending 'ad hoc solution beyond the regular calendar rules, not supported in this version of calendarium-romanum'
+
+calendar = CR::Calendar.new 2021, CR::Data::GENERAL_ROMAN_LATIN.load, vespers: true
+
+i23 = Date.new(2022, 6, 23)
+i24 = i23 + 1
+
+expect(i24).to be_friday
+
+expect(calendar[i24].celebrations[0].symbol).to be :sacred_heart
+
+day = calendar[i23]
+expect(day.celebrations[0].symbol).to be :baptist_birth
+expect(day.vespers.symbol).to be :sacred_heart
+```
+
+Ubi vero S. Ioannes Baptista patronus sit nationis vel dioecesis vel civitatis aut
+communitatis religiosae, sollemnitas Nativitatis S. Ioannis Baptistae die 24 iunii,
+feria VI, celebretur; sollemnitas autem Sacratissimi Cordis Iesu ad diem 23 iunii,
+feriam V transferatur, usque ad horam Nonam inclusive.
+
+```ruby
+skip 'there is currently no pretty way how to model this scenario using calendarium-romanum -
+  significant customizations of core functionalities would be required'
+```
+
+d) Dominica XX Temporis "per annum", die 14 augusti.
+   Sollemnitas Assumptionis Beatae Mariae Virginis, die 15 augusti, feria II.
+
+   - Die 14 augusti I Vesperae et Missa in Vigilia sollemnitatis Assumptionis Beatae Mariae Virginis
+     celebrentur.
+
+```ruby
+calendar = CR::Calendar.new 2021, CR::Data::GENERAL_ROMAN_LATIN.load, vespers: true
+
+date = Date.new(2022, 8, 14)
+expect(date).to be_sunday
+expect(calendar[date].vespers.symbol).to be :assumption
+```
+
+Ex aedibus Congregationis de Cultu Divino et Disciplina Sacramentorum, die 11 mensis maii 2020.

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: calendarium-romanum
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jakub Pavlík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -108,6 +109,7 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/la.yml
+- config/locales/pt.yml
 - data/README.md
 - data/czech-brno-cs.txt
 - data/czech-budejovice-cs.txt
@@ -127,6 +129,7 @@ files:
 - data/universal-fr.txt
 - data/universal-it.txt
 - data/universal-la.txt
+- data/universal-pt.txt
 - doc/data_readme.md
 - doc/images/class_diagram.png
 - doc/images/class_diagram.puml
@@ -157,6 +160,7 @@ files:
 - lib/calendarium-romanum/sanctorale_writer.rb
 - lib/calendarium-romanum/temporale.rb
 - lib/calendarium-romanum/temporale/celebration_factory.rb
+- lib/calendarium-romanum/temporale/date_helper.rb
 - lib/calendarium-romanum/temporale/dates.rb
 - lib/calendarium-romanum/temporale/easter_table.rb
 - lib/calendarium-romanum/temporale/extensions.rb
@@ -172,6 +176,7 @@ files:
 - liturgical_law/2002_normae_universales.md
 - liturgical_law/2006_notification.md
 - liturgical_law/2012_declarationes.md
+- liturgical_law/2020_dubia_de_calendario_2022.md
 - liturgical_law/README.md
 homepage: http://github.com/igneus/calendarium-romanum
 licenses: