calendarium-romanum 0.1.0 → 0.2.0

data/lib/calendarium-romanum/enums.rb

@@ -1,48 +1,56 @@
 module CalendariumRomanum
 
-  module Seasons
-    ADVENT = :advent
-    CHRISTMAS = :christmas
-    LENT = :lent
-    EASTER = :easter
-    ORDINARY = :ordinary
-    # is Triduum Sacrum a special season? For now I count Friday and Saturday
-    # to the Lent, Sunday to the Easter time
+  class Seasons < Enum
+    values do
+      [
+        ADVENT = :advent,
+        CHRISTMAS = :christmas,
+        LENT = :lent,
+        EASTER = :easter,
+        ORDINARY = :ordinary,
+        # is Triduum Sacrum a special season? For now I count Friday and Saturday
+        # to the Lent, Sunday to the Easter time
+      ]
+    end
   end
 
   LECTIONARY_CYCLES = [:A, :B, :C]
 
   # ranks of celebrations
-  module Ranks
-    # Values are at the same time references to sections
-    # of the Table of Liturgical Days.
-    # The lower value, the higher rank.
-    TRIDUUM           = Rank.new 1.1, I18n.t('rank.1_1')
-    PRIMARY           = Rank.new 1.2, I18n.t('rank.1_2') # description may not be exact
-    SOLEMNITY_GENERAL = Rank.new 1.3, I18n.t('rank.1_3'), I18n.t('rank.short.solemnity') # description may not be exact
-    SOLEMNITY_PROPER  = Rank.new 1.4, I18n.t('rank.1_4'), I18n.t('rank.short.solemnity')
-
-    FEAST_LORD_GENERAL  = Rank.new 2.5, I18n.t('rank.2_5'), I18n.t('rank.short.feast')
-    SUNDAY_UNPRIVILEGED = Rank.new 2.6, I18n.t('rank.2_6'), I18n.t('rank.short.sunday')
-    FEAST_GENERAL       = Rank.new 2.7, I18n.t('rank.2_7'), I18n.t('rank.short.feast')
-    FEAST_PROPER        = Rank.new 2.8, I18n.t('rank.2_8'), I18n.t('rank.short.feast')
-    FERIAL_PRIVILEGED   = Rank.new 2.9, I18n.t('rank.2_9'), I18n.t('rank.short.ferial')
-
-    MEMORIAL_GENERAL  = Rank.new 3.10, I18n.t('rank.3_10'), I18n.t('rank.short.memorial')
-    MEMORIAL_PROPER   = Rank.new 3.11, I18n.t('rank.3_11'), I18n.t('rank.short.memorial')
-    MEMORIAL_OPTIONAL = Rank.new 3.12, I18n.t('rank.3_12'), I18n.t('rank.short.memorial_opt')
-    FERIAL            = Rank.new 3.13, I18n.t('rank.3_13'), I18n.t('rank.short.ferial')
-
-    def self.[](priority)
-      Rank[priority]
+  class Ranks < Enum
+    values(index_by: :priority) do
+      # Values are at the same time references to sections
+      # of the Table of Liturgical Days.
+      # The lower value, the higher rank.
+      [
+        TRIDUUM           = Rank.new(1.1, 'rank.1_1'),
+        PRIMARY           = Rank.new(1.2, 'rank.1_2'), # description may not be exact
+        SOLEMNITY_GENERAL = Rank.new(1.3, 'rank.1_3', 'rank.short.solemnity'), # description may not be exact
+        SOLEMNITY_PROPER  = Rank.new(1.4, 'rank.1_4', 'rank.short.solemnity'),
+
+        FEAST_LORD_GENERAL  = Rank.new(2.5, 'rank.2_5', 'rank.short.feast'),
+        SUNDAY_UNPRIVILEGED = Rank.new(2.6, 'rank.2_6', 'rank.short.sunday'),
+        FEAST_GENERAL       = Rank.new(2.7, 'rank.2_7', 'rank.short.feast'),
+        FEAST_PROPER        = Rank.new(2.8, 'rank.2_8', 'rank.short.feast'),
+        FERIAL_PRIVILEGED   = Rank.new(2.9, 'rank.2_9', 'rank.short.ferial'),
+
+        MEMORIAL_GENERAL  = Rank.new(3.10, 'rank.3_10', 'rank.short.memorial'),
+        MEMORIAL_PROPER   = Rank.new(3.11, 'rank.3_11', 'rank.short.memorial'),
+        MEMORIAL_OPTIONAL = Rank.new(3.12, 'rank.3_12', 'rank.short.memorial_opt'),
+        FERIAL            = Rank.new(3.13, 'rank.3_13', 'rank.short.ferial')
+      ]
     end
   end
 
-  module Colours
-    GREEN = :green
-    VIOLET = :violet
-    WHITE = :white
-    RED = :red
+  class Colours < Enum
+    values do
+      [
+        GREEN = :green,
+        VIOLET = :violet,
+        WHITE = :white,
+        RED = :red
+      ]
+    end
   end
 
   Colors = Colours

data/lib/calendarium-romanum/rank.rb

@@ -1,24 +1,28 @@
 module CalendariumRomanum
-  class Rank < Struct.new(:priority, :desc, :short_desc)
+  class Rank
     include Comparable
 
-    @@instances = {}
-
-    def initialize(*args)
-      super(*args)
-
-      @@instances[self.priority] = self
+    def initialize(priority=nil, desc=nil, short_desc=nil)
+      @priority = priority
+      @desc = desc
+      @short_desc = short_desc
     end
 
-    def <=>(b)
-      b.priority <=> self.priority
+    attr_reader :priority
+    alias_method :to_f, :priority
+
+    def desc
+      @desc && I18n.t(@desc)
     end
 
-    alias_method :to_f, :priority
     alias_method :to_s, :desc
 
-    def self.[](priority)
-      @@instances[priority]
+    def short_desc
+      @short_desc && I18n.t(@short_desc)
+    end
+
+    def <=>(b)
+      b.priority <=> self.priority
     end
 
     def solemnity?

data/lib/calendarium-romanum/sanctorale.rb

@@ -21,6 +21,15 @@ module CalendariumRomanum
         @solemnities[date] = celebration
       end
 
+      unless @days[date].empty?
+        present = @days[date][0]
+        if present.rank != Ranks::MEMORIAL_OPTIONAL
+          raise ArgumentError.new("On #{date} there is already a #{present.rank}. No more celebrations can be added.")
+        elsif celebration.rank != Ranks::MEMORIAL_OPTIONAL
+          raise ArgumentError.new("Celebration of rank #{celebration.rank} cannot be grouped, but there is already another celebration on #{date}")
+        end
+      end
+
       @days[date] << celebration
     end
 

data/lib/calendarium-romanum/sanctoraleloader.rb

@@ -19,10 +19,10 @@ module CalendariumRomanum
                  }
     COLOUR_CODES = {
                     nil => Colours::WHITE,
-                    'W' => Colours::WHITE,
-                    'V' => Colours::VIOLET,
-                    'G' => Colours::GREEN,
-                    'R' => Colours::RED
+                    'w' => Colours::WHITE,
+                    'v' => Colours::VIOLET,
+                    'g' => Colours::GREEN,
+                    'r' => Colours::RED
                    }
 
     # dest should be a Sanctorale,
@@ -50,7 +50,7 @@ module CalendariumRomanum
         end
 
         # celebration record
-        m = l.match /^((\d+)\/)?(\d+)\s*(([mfs])(\d\.\d+)?)?\s*([WVRG])?\s*:(.*)$/
+        m = l.match /^((\d+)\/)?(\d+)\s*(([mfs])?(\d\.\d{1,2})?)?\s*([WVRG])?\s*:(.*)$/i
         if m.nil?
           raise error("Syntax error, line skipped '#{l}'", line_num)
           next
@@ -61,7 +61,7 @@ module CalendariumRomanum
         day = day.to_i
         month = month.to_i
 
-        rank = RANK_CODES[rank_char]
+        rank = RANK_CODES[rank_char && rank_char.downcase]
         if rank.nil?
           raise error("Invalid celebration rank code #{rank_char}", line_num)
         end
@@ -72,7 +72,7 @@ module CalendariumRomanum
 
           if rank_by_num.nil?
             raise error("Invalid celebration rank code #{rank_num}", line_num)
-          elsif rank.priority.to_i != rank_by_num.priority.to_i
+          elsif rank_char && (rank.priority.to_i != rank_by_num.priority.to_i)
             raise error("Invalid combination of rank letter #{rank_char.inspect} and number #{rank_num}.", line_num)
           end
 
@@ -82,7 +82,7 @@ module CalendariumRomanum
         dest.add month, day, Celebration.new(
                                              title.strip,
                                              rank,
-                                             COLOUR_CODES[colour]
+                                             COLOUR_CODES[colour && colour.downcase]
                                             )
       end
 

data/lib/calendarium-romanum/temporale.rb

@@ -55,6 +55,9 @@ module CalendariumRomanum
     end
 
     def range_check(date)
+      # necessary in order to handle Date correctly
+      date = date.to_date if date.class != Date
+
       unless date_range.include? date
         raise RangeError.new "Date out of range #{date}"
       end
@@ -191,12 +194,20 @@ module CalendariumRomanum
       end
     end
 
+    def palm_sunday(year=nil)
+      return easter_sunday(year) - 7
+    end
+
     def good_friday(year=nil)
-      return friday_before(easter_sunday(year))
+      return easter_sunday(year) - 2
     end
 
     def holy_saturday(year=nil)
-      return saturday_before(easter_sunday(year))
+      return easter_sunday(year) - 1
+    end
+
+    def ascension(year=nil)
+      return pentecost(year) - 10
     end
 
     def pentecost(year=nil)
@@ -275,8 +286,9 @@ module CalendariumRomanum
         week += 1
 
         if date > pentecost
-          # gap made by Lent and Easter time
-          week -= 12
+          weeks_after_date = date_difference(first_advent_sunday(@year + 1), date) / 7
+          week = 34 - weeks_after_date
+          week += 1 if date.sunday?
         end
       end
 
@@ -362,15 +374,18 @@ module CalendariumRomanum
       @solemnities = {}
 
       {
-        nativity: [nil, nil],
+        nativity: [Ranks::PRIMARY, nil],
         holy_family: [Ranks::FEAST_LORD_GENERAL, nil],
         mother_of_god: [Ranks::SOLEMNITY_GENERAL],
-        epiphany: [nil, nil],
+        epiphany: [Ranks::PRIMARY, nil],
         baptism_of_lord: [Ranks::FEAST_LORD_GENERAL, nil],
+        ash_wednesday: [Ranks::PRIMARY, nil],
         good_friday: [Ranks::TRIDUUM, Colours::RED],
         holy_saturday: [Ranks::TRIDUUM, nil],
+        palm_sunday: [Ranks::PRIMARY, Colours::RED],
         easter_sunday: [Ranks::TRIDUUM, nil],
-        pentecost: [nil, Colours::RED],
+        ascension: [Ranks::PRIMARY, Colours::WHITE],
+        pentecost: [Ranks::PRIMARY, Colours::RED],
         holy_trinity: [Ranks::SOLEMNITY_GENERAL, Colours::WHITE],
         body_blood: [Ranks::SOLEMNITY_GENERAL, Colours::WHITE],
         sacred_heart: [Ranks::SOLEMNITY_GENERAL, Colours::WHITE],
@@ -379,8 +394,8 @@ module CalendariumRomanum
         date = send(method_name)
         rank, colour = data
         @solemnities[date] = Celebration.new(
-                                             I18n.t("temporale.solemnity.#{method_name}"),
-                                             rank || Ranks::PRIMARY,
+                                             proc { I18n.t("temporale.solemnity.#{method_name}") },
+                                             rank,
                                              colour || SEASON_COLOUR[season(date)]
                                             )
       end

data/lib/calendarium-romanum/version.rb

@@ -1,3 +1,3 @@
 module CalendariumRomanum
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/calendar_spec.rb

@@ -43,12 +43,42 @@ describe CR::Calendar do
     end
 
     describe '#day' do
-      it 'returns a Day' do
-        @c.day(2013, 12, 10).should be_a CR::Day
-      end
+      describe 'received arguments' do
+        describe 'Date' do
+          it 'returns a Day' do
+            @c.day(Date.new(2013, 12, 10)).should be_a CR::Day
+          end
+        end
+
+        describe 'DateTime' do
+          it 'returns a Day' do
+            @c.day(DateTime.new(2013, 12, 10, 12, 10, 0)).should be_a CR::Day
+          end
+        end
 
-      it 'inserts correct year if not given' do
-        expect(@c.day(12, 10).date).to eq Date.new(2013, 12, 10)
+        describe 'three Integers' do
+          it 'returns a Day' do
+            @c.day(2013, 12, 10).should be_a CR::Day
+          end
+        end
+
+        describe 'two integers' do
+          describe 'autumn' do
+            it 'supplies year' do
+              day = @c.day(12, 10)
+              expect(day).to be_a CR::Day
+              expect(day.date).to eq Date.new(2013, 12, 10)
+            end
+          end
+
+          describe 'spring' do
+            it 'supplies year' do
+              day = @c.day(4, 10)
+              expect(day).to be_a CR::Day
+              expect(day.date).to eq Date.new(2014, 4, 10)
+            end
+          end
+        end
       end
 
       it 'throws RangeError if given date not included in the year' do
@@ -97,8 +127,60 @@ describe CR::Calendar do
               expect(@c.day(2014, 1, 13).season_week).to eq 1
             end
 
-            it 'Continue after Pentecost' do
-              expect(@c.day(2014, 6, 9).season_week).to eq 10
+            describe 'after Pentecost' do
+              it '2014' do
+                c = described_class.new(2013)
+                expect(c.day(2014, 6, 9).season_week).to eq 10
+              end
+
+              it '2015' do
+                c = described_class.new(2014)
+                expect(c.day(2015, 5, 25).season_week).to eq 8
+              end
+
+              it '2016' do
+                c = described_class.new(2015)
+                expect(c.day(2016, 5, 16).season_week).to eq 7
+              end
+
+              it '2017' do
+                c = described_class.new(2016)
+                expect(c.day(2017, 6, 5).season_week).to eq 9
+              end
+
+              describe 'works correctly for the whole week' do
+                describe 'first' do
+                  Date.new(2014, 6, 9).upto(Date.new(2014, 6, 14)) do |date|
+                    it date do
+                      expect(@c.day(date).season_week).to eq 10
+                    end
+                  end
+                end
+
+                describe 'second' do
+                  Date.new(2014, 6, 15).upto(Date.new(2014, 6, 21)) do |date|
+                    it date do
+                      expect(@c.day(date).season_week).to eq 11
+                    end
+                  end
+                end
+
+                describe 'second last'  do
+                  Date.new(2014, 11, 16).upto(Date.new(2014, 11, 22)) do |date|
+                    it date do
+                      expect(@c.day(date).season_week).to eq 33
+                    end
+                  end
+                end
+
+                describe 'last' do
+                  Date.new(2014, 11, 23).upto(Date.new(2014, 11, 29)) do |date|
+                    it date do
+                      expect(@c.day(date).season_week).to eq 34
+                    end
+                  end
+                end
+              end
             end
           end
         end

data/spec/cli_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'calendarium-romanum/cli'
+
+describe CalendariumRomanum::CLI do
+  let(:path_universal_la) { File.expand_path('../../data/universal-la.txt', __FILE__) }
+  let(:path_universal_en) { File.expand_path('../../data/universal-en.txt', __FILE__) }
+  describe 'subcommands' do
+    describe 'errors' do
+      it 'raises no exception' do
+        described_class.start(['errors', path_universal_la])
+      end
+
+      it 'fails on a non-existent file' do
+        expect do
+          described_class.start(['errors', 'does-not-exist.txt'])
+        end.to raise_exception Errno::ENOENT
+      end
+    end
+
+    describe 'cmp' do
+      it 'raises no exception' do
+        described_class.start(['cmp', path_universal_la, path_universal_en])
+      end
+    end
+  end
+end

data/spec/data_spec.rb

@@ -1,15 +1,23 @@
 require_relative 'spec_helper'
 
-describe 'sanctorale data files' do
-  let(:loader) { CR::SanctoraleLoader.new }
+describe CalendariumRomanum::Data do
+  describe 'all available data files are included' do
+    data_path = File.expand_path '../data', File.dirname(__FILE__)
+    glob = File.join(data_path, '*.txt')
 
-  data_path = File.expand_path '../data', File.dirname(__FILE__)
-  glob = File.join(data_path, '*.txt')
+    Dir[glob].each do |file|
+      it file do
+        in_data = described_class.all.find {|f| f.path == file }
+        expect(in_data).not_to be nil
+      end
+    end
+  end
 
-  Dir[glob].each do |file|
-    it "#{file} is loadable" do
-      sanctorale = loader.load_from_file file
-      expect(sanctorale).not_to be_empty
+  describe 'all can be loaded' do
+    described_class.each do |data|
+      it data.siglum do
+        expect { data.load }.not_to raise_exception
+      end
     end
   end
 end