calendarium-romanum 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ae31ccf7ea1277e121ee57b6466a375319628c
-  data.tar.gz: 3199defd61097a21d6fc4baf2a44509091e70579
+  metadata.gz: 4faa0e6242f3815ad7bdc2b32c13c61f203cd5e6
+  data.tar.gz: 78018940d6ae8129c0625db963543991bf980350
 SHA512:
-  metadata.gz: b608b70f30de32af79cbb67e555222640b6855700a7181038d729d84cbee63ab7c26ff7aee0cba943f403c2976acecd6efbed62f626618f81b448c8ebddd03e3
-  data.tar.gz: 0be73effe009b65701f1dbf206813438309b6a3bb46822bda8daa06c2174fce02639978cdf7f61e7177626dfc625b8a99de0a50cb61f11b6041d2eb311c9fb97
+  metadata.gz: f3b27ee6cd3919d97b6a819baa88cf694a9eedf9b5182ddf766dedf39a9ef85fef8c90962d6fee8417ac3261d0062d158bb60f9cd7a801fcd67f7e1d2d816e85
+  data.tar.gz: 2cdfdb4bb9d604e5c1b6e59e604719634458c5b0859c79d70d2cb6fe80bf29139ec5400273f83f7e81854144b88cc75affb49f4dfd25681648f1464dc68fb9d7

data/bin/calendariumrom

@@ -1,4 +1,4 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 
 require 'calendarium-romanum'
 require 'calendarium-romanum/cli'

data/config/locales/cs.yml

@@ -32,6 +32,7 @@ cs:
     advent:
       sunday: '%{week} neděle adventní'
       ferial: '%{weekday} po %{week} neděli adventní'
+      before_christmas: '%{day} prosince'
     christmas:
       nativity_octave:
         ferial: '%{day} den v oktávu Narození Páně'

data/config/locales/en.yml

@@ -30,6 +30,7 @@ en:
     advent:
       sunday: '%{week} Sunday of Advent'
       ferial: '%{weekday}, %{week} week of Advent'
+      before_christmas: '%{day} December'
     christmas:
       nativity_octave:
         ferial: '%{day} day of Christmas Octave'

data/config/locales/fr.yml

@@ -30,6 +30,7 @@ fr:
     advent:
       sunday: '%{week} Dimanche de l''Avent'
       ferial: '%{weekday}, %{week} semaine de L''Avent'
+      before_christmas: '%{day} décembre'
     christmas:
       nativity_octave:
         ferial: 'Jour %{day} de l''Octave de Noël'

data/config/locales/it.yml

@@ -30,6 +30,7 @@ it:
     advent:
       sunday: '%{week} Domenica Avvento'
       ferial: '%{weekday}, %{week} Avvento'
+      before_christmas: '%{day} dicembre'
     christmas:
       nativity_octave:
         ferial: '%{day}, Ottava di Natale'

data/config/locales/la.yml

@@ -30,6 +30,7 @@ la:
     advent:
       sunday: 'Dominica %{week} Adventus'
       ferial: '%{weekday}, hebdomada %{week} Adventus'
+      before_christmas: 'Die %{day} decembris'
     christmas:
       nativity_octave:
         ferial: 'De die %{day} infra octavam Nativitatis'

data/data/czech-cs.txt

@@ -204,6 +204,7 @@ country: cz
 7 m : Panny Marie Růžencové
 9 R : Sv. Dionýsia, biskupa, a druhů, mučedníků
 9 : Sv. Jana Leonardiho, kněze
+11 : Sv. Jana XXIII., papeže
 12 : Sv. Radima, biskupa
 14 R : Sv. Kalista I., papeže a mučedníka
 15 m : Sv. Terezie od Ježíše, panny a učitelky církve
@@ -214,7 +215,7 @@ country: cz
 19 R : Sv. Jana de Brébeuf a Izáka Joguese, kněží, a druhů, mučedníků
 19 : Sv. Pavla od Kříže, kněze
 21 : Bl. Karla Rakouského
-22 : Bl. Jana Pavla II., papeže
+22 : Sv. Jana Pavla II., papeže
 23 : Sv. Jana Kapistránského, kněze
 24 : Sv. Antonína Marie Klareta, biskupa
 28 f R : Sv. Šimona a Judy, apoštolů

data/data/universal-la.txt

@@ -185,6 +185,7 @@ locale: la
 7 m :  B. Mariae Virginis a Rosario
 9 R : Ss. Dionysii, episcopi, et sociorum, martyrum
 9 : S. Ioannis Leonardi, presbyteri
+11 : S. Ioannis XXIII, papae
 14 R : S. Callisti I, papae et martyris
 15 m :  S. Teresiae a Iesu, virginis et Ecclesiae doctoris
 16 : S. Hedvigis, religiosae
@@ -193,6 +194,7 @@ locale: la
 18 f R :  S. Lucae, evangelistae
 19 R : Ss. Ioannis de Brébeuf et Isaac Jogues, presbyterorum, et sociorum, martyrum
 19 : S. Pauli a Cruce, presbyteri
+22 : S. Ioannis Pauli II, papae
 23 : S. Ioannis de Capestrano, presbyteri
 24 : S. Antonii Mariae Claret, episcopi
 28 f R :  Ss. Simonis et Iudae, apostolorum

data/lib/calendarium-romanum.rb

@@ -1,23 +1,25 @@
-%w{
-version
-i18n_setup
-rank
-enum
-enums
-data
-calendar
-perpetual_calendar
-temporale
-temporale/dates
-temporale/extensions/christ_eternal_priest
-sanctorale
-sanctoraleloader
-sanctorale_factory
-transfers
-day
-abstract_date
-util
-ordinalizer
-}.each do |f| 
-  require_relative File.join('calendarium-romanum', f) 
+%w(
+  version
+  i18n_setup
+  rank
+  enum
+  enums
+  errors
+  data
+  day
+  calendar
+  perpetual_calendar
+  temporale/dates
+  temporale/celebration_factory
+  temporale/extensions/christ_eternal_priest
+  temporale
+  sanctorale
+  sanctoraleloader
+  sanctorale_factory
+  transfers
+  abstract_date
+  util
+  ordinalizer
+).each do |f|
+  require_relative File.join('calendarium-romanum', f)
 end

data/lib/calendarium-romanum/calendar.rb

@@ -14,18 +14,20 @@ module CalendariumRomanum
     # year: Integer
     # returns a calendar for the liturgical year beginning with
     # Advent of the specified civil year.
-    def initialize(year, sanctorale=nil, temporale=nil)
+    def initialize(year, sanctorale = nil, temporale = nil, vespers: false)
       if year < (EFFECTIVE_FROM.year - 1)
         raise system_not_effective
       end
 
       if temporale && temporale.year != year
-        raise ArgumentError.new("Temporale year must be the same as year.")
+        raise ArgumentError.new('Temporale year must be the same as year.')
       end
 
       @year = year
       @sanctorale = sanctorale || Sanctorale.new
       @temporale = temporale || Temporale.new(year)
+      @populate_vespers = vespers
+
       @transferred = Transfers.new(@temporale, @sanctorale)
     end
 
@@ -33,15 +35,15 @@ module CalendariumRomanum
       def mk_date(*args)
         ex = TypeError.new('Date, DateTime or three Integers expected')
 
-        if args.size == 3 then
+        if args.size == 3
           args.each do |a|
             unless a.is_a? Integer
               raise ex
             end
           end
-          return Date.new *args
+          return Date.new(*args)
 
-        elsif args.size == 1 then
+        elsif args.size == 1
           a = args.first
           unless a.is_a? Date
             raise ex
@@ -56,7 +58,7 @@ module CalendariumRomanum
       # creates a Calendar for the liturgical year including given
       # date
       def for_day(date, *constructor_args)
-        return new(Temporale.liturgical_year(date), *constructor_args)
+        new(Temporale.liturgical_year(date), *constructor_args)
       end
     end # class << self
 
@@ -70,21 +72,29 @@ module CalendariumRomanum
         return false
       end
 
-      return year == obj.year
+      year == obj.year
+    end
+
+    def [](args)
+      if(args.is_a?(Range))
+        args.map{|date| day(date)}
+      else
+        day(*args)
+      end
     end
 
     # accepts date information represented as
     # Date, DateTime, or two to three integers
     # (month - day or year - month - day);
     # returns filled Day for the specified day
-    def day(*args)
+    def day(*args, vespers: false)
       if args.size == 2
         date = Date.new(@year, *args)
         unless @temporale.date_range.include? date
           date = Date.new(@year + 1, *args)
         end
       else
-        date = self.class.mk_date *args
+        date = self.class.mk_date(*args)
         range_check date
       end
 
@@ -92,13 +102,26 @@ module CalendariumRomanum
         raise system_not_effective
       end
 
+      celebrations = celebrations_for(date)
+      vespers_celebration = nil
+      if @populate_vespers || vespers
+        begin
+          vespers_celebration = first_vespers_on(date, celebrations)
+        rescue RangeError
+          # there is exactly one possible case when
+          # range_check(date) passes and range_check(date + 1) fails:
+          vespers_celebration = Temporale::CelebrationFactory.first_advent_sunday
+        end
+      end
+
       s = @temporale.season(date)
-      return Day.new(
-                     date: date,
-                     season: s,
-                     season_week: @temporale.season_week(s, date),
-                     celebrations: celebrations_for(date)
-                    )
+      Day.new(
+        date: date,
+        season: s,
+        season_week: @temporale.season_week(s, date),
+        celebrations: celebrations,
+        vespers: vespers_celebration
+      )
     end
 
     # Sunday lectionary cycle
@@ -139,10 +162,37 @@ module CalendariumRomanum
           end
           st.unshift t
           return st
+        elsif t.symbol == :immaculate_heart &&
+              [Ranks::MEMORIAL_GENERAL, Ranks::MEMORIAL_PROPER].include?(st.first.rank)
+          optional_memorials = ([t] + st).collect do |celebration|
+            celebration.change rank: Ranks::MEMORIAL_OPTIONAL
+          end
+          ferial = temporale.send :ferial, date # ugly and evil
+          return [ferial] + optional_memorials
+        end
+      end
+
+      [t]
+    end
+
+    def first_vespers_on(date, celebrations)
+      tomorrow = date + 1
+      tomorrow_celebrations = celebrations_for(tomorrow)
+
+      c = tomorrow_celebrations.first
+      if c.rank >= Ranks::SOLEMNITY_PROPER ||
+         c.rank == Ranks::SUNDAY_UNPRIVILEGED ||
+         (c.rank == Ranks::FEAST_LORD_GENERAL && tomorrow.sunday?)
+        if c.symbol == :ash_wednesday || c.symbol == :good_friday
+          return nil
+        end
+
+        if c.rank > celebrations.first.rank || c.symbol == :easter_sunday
+          return c
         end
       end
 
-      return [t]
+      nil
     end
 
     def system_not_effective

data/lib/calendarium-romanum/cli.rb

@@ -8,39 +8,37 @@ module CalendariumRomanum
     desc 'query 2007-06-05', 'show calendar information for a specified date'
     option :calendar, default: 'universal-en', aliases: :c
     option :locale, default: 'en', aliases: :l
-    def query(date_str=nil)
+    def query(date_str = nil)
       I18n.locale = options[:locale]
+      calendar = options[:calendar]
+      if File.exist?(calendar)
+        begin
+          sanctorale = SanctoraleLoader.new.load_from_file(calendar)
+        rescue CalendariumRomanum::InvalidDataError
+          die! 'Invalid file format.'
+        end
+      else
+        data_file = Data[calendar]
 
-      data_file = Data[options[:calendar]]
-      if data_file.nil?
-        STDERR.puts 'Invalid calendar. See subcommand `calendars` for valid options.'
-        exit 1
-      end
-      sanctorale = data_file.load
-
-      date =
-        if date_str
-          begin
-            Date.parse(date_str)
-          rescue ArgumentError
-            STDERR.puts 'Invalid date.'
-            exit 1
-          end
-        else
-          Date.today
+        if data_file.nil?
+          die! "Invalid calendar. Either loading a calendar from filesystem did not succeed, \n or a preinstalled calendar was specified which doesn't exist. See subcommand `calendars` for valid options."
         end
-      calendar = Calendar.for_day(date, sanctorale)
-      day = calendar.day date
+        sanctorale = data_file.load
+      end
 
-      puts date
-      puts "season: #{day.season}"
-      puts
+      pcal = PerpetualCalendar.new sanctorale: sanctorale
 
-      rank_length = day.celebrations.collect {|c| c.rank.short_desc.size }.max
-      day.celebrations.each do |c|
-        print c.rank.short_desc.rjust(rank_length)
-        print ' : '
-        puts c.title
+      if date_str
+        begin
+          parsed_date = DateParser.new(date_str)
+          parsed_date.date_range.each do |day|
+            print_single_date(pcal, day)
+          end
+        rescue ArgumentError
+          die! 'Invalid date.'
+        end
+      else
+        print_single_date(pcal, Date.today)
       end
     end
 
@@ -54,51 +52,85 @@ module CalendariumRomanum
       loader = SanctoraleLoader.new
       files.each do |path|
         s = Sanctorale.new
-        loader.load_from_file path, s
+        begin
+          loader.load_from_file path, s
+        rescue Errno::ENOENT, InvalidDataError => err
+          die! err.message
+        end
       end
     end
 
     desc 'cmp FILE1, FILE2', 'detect differences in rank and colour of corresponding celebrations'
     def cmp(a, b)
       loader = SanctoraleLoader.new
-      sanctorales = []
-
-      [a, b].each do |source|
-        s = Sanctorale.new
-        loader.load_from_file source, s
-        sanctorales << s
-      end
+      paths = [a, b]
+      sanctoralia = paths.collect {|source| loader.load_from_file source }
+      names = paths.collect {|source| File.basename source }
 
       # a leap year must be chosen in order to iterate over
       # all possible days of a Sanctorale
       Year.new(1990).each_day do |d|
-        celebs = sanctorales.collect {|s| s.get d.month, d.day }
-        if celebs.find {|cc| cc.nil? }
-          next
-        end
+        a, b = sanctoralia.collect {|s| s.get(d) }
 
-        celebs[0].each_index do |i|
-          if i >= celebs[1].size
-            break
-          end
+        0.upto([a.size, b.size].max - 1) do |i|
+          ca = a[i]
+          cb = b[i]
+          compared = [ca, cb]
+          differences = []
 
-          ca = celebs[0][i]
-          cb = celebs[1][i]
+          if compared.index(&:nil?)
+            notnili = compared.index {|c| !c.nil? }
 
-          if ca.rank != cb.rank || ca.colour != cb.colour
-            puts "#{d.month}/#{d.day}"
-            print_celebration ca
-            print_celebration cb
+            print date(d)
+            puts " only in #{names[notnili]}:"
+            puts celebration(compared[notnili])
             puts
+            next
           end
+
+          differences << 'rank' if ca.rank != cb.rank
+          differences << 'colour' if ca.colour != cb.colour
+
+          next if differences.empty?
+          print date(d)
+          puts " differs in #{differences.join(', ')}"
+          puts celebration(ca)
+          puts celebration(cb)
+          puts
         end
       end
     end
 
     private
 
-    def print_celebration(c)
-      puts "#{c.rank.priority} #{c.colour.symbol} | #{c.title}"
+    def date(d)
+      "#{d.month}/#{d.day}"
+    end
+
+    def celebration(c)
+      "#{c.rank.priority} #{c.colour.symbol} | #{c.title}"
+    end
+
+    def die!(message, code = 1)
+      STDERR.puts message
+      exit code
     end
+
+    def print_single_date(calendar, date)
+      day = calendar.day date
+
+      puts date
+      puts "season: #{day.season.name}"
+      puts
+
+      rank_length = day.celebrations.collect {|c| c.rank.short_desc.nil? ? 0 : c.rank.short_desc.size }.max
+      day.celebrations.each do |c|
+        next if c.rank.short_desc.nil?
+        print c.rank.short_desc.rjust(rank_length)
+        print ' : '
+        puts c.title
+      end
+    end
+
   end
 end