calendarium-romanum 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4faa0e6242f3815ad7bdc2b32c13c61f203cd5e6
-  data.tar.gz: 78018940d6ae8129c0625db963543991bf980350
+  metadata.gz: ca0a118c46265f72b4b8fc27d6680779a49313c6
+  data.tar.gz: 757e015ca4d21a39a09056589826ee2c37996291
 SHA512:
-  metadata.gz: f3b27ee6cd3919d97b6a819baa88cf694a9eedf9b5182ddf766dedf39a9ef85fef8c90962d6fee8417ac3261d0062d158bb60f9cd7a801fcd67f7e1d2d816e85
-  data.tar.gz: 2cdfdb4bb9d604e5c1b6e59e604719634458c5b0859c79d70d2cb6fe80bf29139ec5400273f83f7e81854144b88cc75affb49f4dfd25681648f1464dc68fb9d7
+  metadata.gz: 1b2d1dd8a18416939f81f2ed73d8300a981264cf7197f1a0dac21ff521fdcd6345af66bb15a2e3b7cbe9ab0d325b79650fe2c9c3ec0b65ff17b3fed946970c94
+  data.tar.gz: 88eabc461278fc61cf1bf381e2db023447849874796949291d2b11cfc87c3f9488d33241c17487a0f28c394d0f2466c619b06fea78ff5d08d99fba952a2ae9f3

data/config/locales/cs.yml

@@ -22,8 +22,10 @@ cs:
       holy_trinity: Nejsvětější Trojice
       corpus_christi: Těla a krve Páně
       sacred_heart: Nejsvětějšího srdce Ježíšova
+      mother_of_church: Panny Marie, Matky církve
       immaculate_heart: Neposkvrněného Srdce Panny Marie
       christ_king: Ježíše Krista krále
+      saturday_memorial_bvm: Sobotní památka Panny Marie
     extension:
       christ_eternal_priest: Ježíše Krista, nejvyššího a věčného kněze
     ordinary:

data/config/locales/en.yml

@@ -7,23 +7,25 @@ en:
       easter: Easter Season
       ordinary: Ordinary Time
     solemnity:
-      nativity: The Nativity of the Lord
-      holy_family: The Holy Family of Jesus, Mary and Joseph
-      mother_of_god: Octave Day of Christmas, of Mary, Mother of God
-      epiphany: The Epiphany of the Lord
+      nativity: Christmas
+      holy_family: The Holy Family
+      mother_of_god: Mary, Mother of God (Octave of Christmas)
+      epiphany: The Epiphany
       baptism_of_lord: The Baptism of the Lord
       ash_wednesday: Ash Wednesday
-      palm_sunday: Palm Sunday of the Passion of the Lord
-      good_friday: Friday of the Passion of the Lord
+      palm_sunday: Passion Sunday (Palm Sunday)
+      good_friday: Good Friday
       holy_saturday: Holy Saturday
-      easter_sunday: Easter Sunday of the Resurrection of the Lord
-      ascension: Ascension of the Lord
-      pentecost: Pentecost Sunday
-      holy_trinity: The Most Holy Trinity
-      corpus_christi: The Most Holy Body and Blood of Christ
-      sacred_heart: The Most Sacred Heart of Jesus
-      immaculate_heart: Immaculate Heart of Mary
-      christ_king: Our Lord Jesus Christ, King of the Universe
+      easter_sunday: Easter Sunday
+      ascension: The Ascension
+      pentecost: Pentecost
+      holy_trinity: Trinity Sunday
+      corpus_christi: Corpus Christi (The Body and Blood of Christ)
+      sacred_heart: The Sacred Heart of Jesus
+      mother_of_church: Mary, Mother of the Church
+      immaculate_heart: The Immaculate Heart of Mary
+      christ_king: Christ The King
+      saturday_memorial_bvm: The Memorial of the Blessed Virgin Mary on Saturday
     ordinary:
       sunday: '%{week} Sunday in Ordinary Time'
       ferial: '%{weekday}, %{week} week in Ordinary Time'

data/config/locales/fr.yml

@@ -22,8 +22,10 @@ fr:
       holy_trinity: La Très Sainte Trinité
       corpus_christi: Le Très Saint Corps et Sang du Christ
       sacred_heart: Le Sacré-Coeur de Jésus
+      mother_of_church: Sainte Marie, Mère de l’Eglise
       immaculate_heart: Le Coeur Immaculé de Marie
       christ_king: Notre Seigneur Jésus Christ, Roi de l'Univers
+      saturday_memorial_bvm: Mémoire de Sainte-Marie le samedi
     ordinary:
       sunday: '%{week} Dimanche de Temps Ordinaire'
       ferial: '%{weekday}, %{week} semaine de Temps Ordinaire'

data/config/locales/it.yml

@@ -22,8 +22,10 @@ it:
       holy_trinity: Santissima Trinità
       corpus_christi: Santissimo Corpo e Sangue di Cristo
       sacred_heart: Sacro Cuore di Gesù
+      mother_of_church: Maria Madre della Chiesa
       immaculate_heart: Cuore Immacolato di Maria
       christ_king: "Nostro Signore Gesù Cristo Re dell'universo"
+      saturday_memorial_bvm: Memoria di santa Maria in sabato
     ordinary:
       sunday: '%{week} Domenica del Tempo Ordinario'
       ferial: '%{weekday} della %{week} settimana del Tempo Ordinario'

data/config/locales/la.yml

@@ -22,8 +22,10 @@ la:
       holy_trinity: Sanctissimae Trinitatis
       corpus_christi: Sanctissimi Corporis et Sanguinis Christi
       sacred_heart: Sacratissimi Cordis Iesu
+      mother_of_church: B. Mariae Virginis Ecclesiae Matris
       immaculate_heart: Immaculati Cordis B. Mariae Virginis
       christ_king: Domini nostri Iesu Christi universorum regis
+      saturday_memorial_bvm: Memoria Sanctae Mariae in Sabbato
     ordinary:
       sunday: 'Dominica %{week} per annum'
       ferial: '%{weekday}, hebdomada %{week} per annum'

data/lib/calendarium-romanum/calendar.rb

@@ -37,17 +37,13 @@ module CalendariumRomanum
 
         if args.size == 3
           args.each do |a|
-            unless a.is_a? Integer
-              raise ex
-            end
+            raise ex unless a.is_a? Integer
           end
           return Date.new(*args)
 
         elsif args.size == 1
           a = args.first
-          unless a.is_a? Date
-            raise ex
-          end
+          raise ex unless a.is_a? Date
           return a
 
         else
@@ -67,19 +63,25 @@ module CalendariumRomanum
     attr_reader :temporale
     attr_reader :sanctorale
 
-    def ==(obj)
-      unless obj.is_a? Calendar
-        return false
-      end
+    def populates_vespers?
+      @populate_vespers
+    end
 
-      year == obj.year
+    # Calendars are equal if they have equal settings
+    # (which means that to equal input they return equal data)
+    def ==(b)
+      b.class == self.class &&
+        year == b.year &&
+        populates_vespers? == b.populates_vespers? &&
+        temporale == b.temporale &&
+        sanctorale == b.sanctorale
     end
 
     def [](args)
       if(args.is_a?(Range))
         args.map{|date| day(date)}
       else
-        day(*args)
+        day(args)
       end
     end
 
@@ -124,6 +126,11 @@ module CalendariumRomanum
       )
     end
 
+    def each
+      (temporale.start_date..temporale.end_date)
+        .each { |date| yield(day(date)) }
+    end
+
     # Sunday lectionary cycle
     def lectionary
       LECTIONARY_CYCLES[@year % 3]
@@ -146,8 +153,15 @@ module CalendariumRomanum
       tr = @transferred.get(date)
       return [tr] if tr
 
-      t = @temporale.get date
-      st = @sanctorale.get date
+      t = @temporale[date]
+      st = @sanctorale[date]
+
+      if date.saturday? &&
+         @temporale.season(date) == Seasons::ORDINARY &&
+         (st.empty? || st.first.rank == Ranks::MEMORIAL_OPTIONAL) &&
+         t.rank <= Ranks::MEMORIAL_OPTIONAL
+        st = st.dup << Temporale::CelebrationFactory.saturday_memorial_bvm
+      end
 
       unless st.empty?
         if st.first.rank > t.rank
@@ -157,11 +171,10 @@ module CalendariumRomanum
             return st
           end
         elsif t.rank == Ranks::FERIAL_PRIVILEGED && st.first.rank.memorial?
-          st = st.collect do |c|
-            Celebration.new(c.title, Ranks::COMMEMORATION, t.colour)
+          commemorations = st.collect do |c|
+            c.change(rank: Ranks::COMMEMORATION, colour: t.colour)
           end
-          st.unshift t
-          return st
+          return commemorations.unshift t
         elsif t.symbol == :immaculate_heart &&
               [Ranks::MEMORIAL_GENERAL, Ranks::MEMORIAL_PROPER].include?(st.first.rank)
           optional_memorials = ([t] + st).collect do |celebration|

data/lib/calendarium-romanum/cli.rb

@@ -76,7 +76,6 @@ module CalendariumRomanum
           ca = a[i]
           cb = b[i]
           compared = [ca, cb]
-          differences = []
 
           if compared.index(&:nil?)
             notnili = compared.index {|c| !c.nil? }
@@ -88,8 +87,9 @@ module CalendariumRomanum
             next
           end
 
-          differences << 'rank' if ca.rank != cb.rank
-          differences << 'colour' if ca.colour != cb.colour
+          differences = %i(rank colour symbol).select do |property|
+            ca.public_send(property) != cb.public_send(property)
+          end
 
           next if differences.empty?
           print date(d)
@@ -101,6 +101,12 @@ module CalendariumRomanum
       end
     end
 
+    desc 'version', 'print version information'
+    def version
+      puts 'calendarium-romanum CLI'
+      puts "calendarium-romanum: version #{CalendariumRomanum::VERSION}, released #{CalendariumRomanum::RELEASE_DATE}"
+    end
+
     private
 
     def date(d)

data/lib/calendarium-romanum/day.rb

@@ -51,20 +51,24 @@ module CalendariumRomanum
 
   # information on one particular celebration of the liturgical year
   # (like a Sunday, feast or memorial);
-  # some days have no (ferial office is used), some have one,
-  # some have more among which one may and may not be chosen
+  # some days have one,
+  # some have more among which one is to be chosen
   class Celebration
     extend Forwardable
 
-    def initialize(title = '', rank = Ranks::FERIAL, colour = Colours::GREEN, symbol = nil)
+    def initialize(title = '', rank = Ranks::FERIAL, colour = Colours::GREEN, symbol = nil, date = nil, cycle = :sanctorale)
       @title = title
       @rank = rank
       @colour = colour
       @symbol = symbol
+      @date = date
+      @cycle = cycle
     end
 
+    # Rank instance
     attr_reader :rank
-    def_delegators :@rank, :solemnity?, :feast?, :memorial?
+
+    def_delegators :@rank, :solemnity?, :feast?, :memorial?, :sunday?, :ferial?
 
     def title
       if @title.respond_to? :call
@@ -74,24 +78,48 @@ module CalendariumRomanum
       end
     end
 
+    # Colour instance (always set) - liturgical colour
     attr_reader :colour
     alias color colour
 
+    # Symbol uniquely identifying the celebration (may be nil)
     attr_reader :symbol
 
-    def ==(other)
-      self.class == other.class &&
-        title == other.title &&
-        rank == other.rank &&
-        colour == other.colour
+    # AbstractDate instance - usual date of the celebration.
+    # Only set for celebrations with fixed date.
+    attr_reader :date
+
+    # Symbol :temporale|:sanctorale
+    # Describes the celebration as belonging either to the
+    # temporale or sanctorale cycle
+    attr_reader :cycle
+
+    def ==(b)
+      self.class == b.class &&
+        title == b.title &&
+        rank == b.rank &&
+        colour == b.colour &&
+        symbol == b.symbol &&
+        date == b.date &&
+        cycle == b.cycle
+    end
+
+    def temporale?
+      cycle == :temporale
+    end
+
+    def sanctorale?
+      cycle == :sanctorale
     end
 
-    def change(title: nil, rank: nil, colour: nil, color: nil, symbol: nil)
+    def change(title: nil, rank: nil, colour: nil, color: nil, symbol: nil, date: nil, cycle: nil)
       self.class.new(
         title || self.title,
         rank || self.rank,
         colour || color || self.colour,
-        symbol || self.symbol
+        symbol || self.symbol,
+        date || self.date,
+        cycle || self.cycle,
       )
     end
   end

data/lib/calendarium-romanum/enums.rb

@@ -1,17 +1,24 @@
 module CalendariumRomanum
-
-  class Colour
-    def initialize(symbol)
-      @symbol = symbol
-      @i18n_key = "colour.#{@symbol}"
-    end
-
+  module ValueObjectInterface
     attr_reader :symbol
     alias to_sym symbol
 
     def name
       I18n.t @i18n_key
     end
+
+    def to_s
+      "#<#{self.class.name} #{symbol}>"
+    end
+  end
+
+  class Colour
+    include ValueObjectInterface
+
+    def initialize(symbol)
+      @symbol = symbol
+      @i18n_key = "colour.#{@symbol}"
+    end
   end
 
   class Colours < Enum
@@ -28,18 +35,15 @@ module CalendariumRomanum
   Colors = Colours
 
   class Season
+    include ValueObjectInterface
+
     def initialize(symbol, colour)
       @symbol = symbol
       @colour = colour
       @i18n_key = "temporale.season.#{@symbol}"
     end
 
-    attr_reader :symbol, :colour
-    alias to_sym symbol
-
-    def name
-      I18n.t @i18n_key
-    end
+    attr_reader :colour
   end
 
   class Seasons < Enum

data/lib/calendarium-romanum/perpetual_calendar.rb

@@ -18,6 +18,16 @@ module CalendariumRomanum
       calendar_for(*args).day(*args)
     end
 
+    def [](arg)
+      if arg.is_a? Range
+        return arg.collect do |date|
+          calendar_for(date).day(date)
+        end
+      end
+
+      day(arg)
+    end
+
     # returns a Calendar instance for the liturgical year containing
     # the specified day
     def calendar_for(*args)

data/lib/calendarium-romanum/rank.rb

@@ -15,7 +15,12 @@ module CalendariumRomanum
       @desc && I18n.t(@desc)
     end
 
-    alias to_s desc
+    def to_s
+      # 'desc' instead of '@desc' is intentional -
+      # for a good reason we don't present contents of an instance
+      # variable but result of an instance method
+      "#<#{self.class.name} @priority=#{priority} desc=#{desc.inspect}>"
+    end
 
     def short_desc
       @short_desc && I18n.t(@short_desc)
@@ -29,6 +34,10 @@ module CalendariumRomanum
       priority.to_i == 1
     end
 
+    def sunday?
+      self == Ranks::SUNDAY_UNPRIVILEGED
+    end
+
     def feast?
       priority.to_i == 2
     end
@@ -36,5 +45,10 @@ module CalendariumRomanum
     def memorial?
       priority.to_i == 3 && priority <= 3.12
     end
+
+    def ferial?
+      self == Ranks::FERIAL ||
+        self == Ranks::FERIAL_PRIVILEGED
+    end
   end
 end

data/lib/calendarium-romanum/sanctorale.rb

@@ -53,6 +53,11 @@ module CalendariumRomanum
       end
     end
 
+    def [](date)
+      adate = date.is_a?(AbstractDate) ? date : AbstractDate.from_date(date)
+      @days[adate] || []
+    end
+
     # returns an Array with one or more Celebrations
     # scheduled for the given day
     #
@@ -66,7 +71,7 @@ module CalendariumRomanum
       end
 
       date = AbstractDate.new(month, day)
-      @days[date] || []
+      self[date]
     end
 
     # for each day for which an entry is available
@@ -92,5 +97,14 @@ module CalendariumRomanum
       @solemnities.freeze
       super
     end
+
+    def ==(b)
+      self.class == b.class &&
+        days == b.days
+    end
+
+    protected
+
+    attr_reader :days
   end
 end