calendarium-romanum 0.3.0 → 0.7.1

data/lib/calendarium-romanum/version.rb

@@ -1,3 +1,7 @@
+require 'date'
+
 module CalendariumRomanum
-  VERSION = '0.3.0'
+  VERSION = '0.7.1'.freeze
+
+  RELEASE_DATE = Date.new(2020, 6, 28).freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calendarium-romanum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jakub Pavlík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.5'
 description: calendar computations according to the Roman Catholic liturgical calendar
   as instituted by MP Mysterii Paschalis of Paul VI (1969).
 email: jkb.pavlik@gmail.com
@@ -88,9 +88,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
+- README.md
+- Rakefile
 - bin/calendariumrom
+- calendarium-romanum.gemspec
 - config/locales/cs.yml
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/la.yml
 - data/README.md
@@ -106,43 +119,38 @@ files:
 - data/czech-plzen-cs.txt
 - data/czech-praha-cs.txt
 - data/universal-en.txt
+- data/universal-es.txt
+- data/universal-fr.txt
 - data/universal-it.txt
 - data/universal-la.txt
+- doc/data_readme.md
+- doc/images/class_diagram.png
+- doc/images/class_diagram.puml
+- doc/yard_readme.rdoc
 - lib/calendarium-romanum.rb
 - lib/calendarium-romanum/abstract_date.rb
 - lib/calendarium-romanum/calendar.rb
 - lib/calendarium-romanum/cli.rb
+- lib/calendarium-romanum/cr.rb
 - lib/calendarium-romanum/data.rb
 - lib/calendarium-romanum/day.rb
 - lib/calendarium-romanum/enum.rb
 - lib/calendarium-romanum/enums.rb
+- lib/calendarium-romanum/errors.rb
 - lib/calendarium-romanum/i18n_setup.rb
 - lib/calendarium-romanum/ordinalizer.rb
+- lib/calendarium-romanum/perpetual_calendar.rb
 - lib/calendarium-romanum/rank.rb
 - lib/calendarium-romanum/sanctorale.rb
 - lib/calendarium-romanum/sanctorale_factory.rb
-- lib/calendarium-romanum/sanctoraleloader.rb
+- lib/calendarium-romanum/sanctorale_loader.rb
 - lib/calendarium-romanum/temporale.rb
+- lib/calendarium-romanum/temporale/celebration_factory.rb
 - lib/calendarium-romanum/temporale/dates.rb
 - lib/calendarium-romanum/temporale/extensions/christ_eternal_priest.rb
 - lib/calendarium-romanum/transfers.rb
 - lib/calendarium-romanum/util.rb
 - lib/calendarium-romanum/version.rb
-- spec/abstract_date_spec.rb
-- spec/calendar_spec.rb
-- spec/cli_spec.rb
-- spec/data_spec.rb
-- spec/date_spec.rb
-- spec/dates_spec.rb
-- spec/enum_spec.rb
-- spec/i18n_spec.rb
-- spec/rank_spec.rb
-- spec/readme_spec.rb
-- spec/sanctorale_factory_spec.rb
-- spec/sanctorale_spec.rb
-- spec/sanctoraleloader_spec.rb
-- spec/spec_helper.rb
-- spec/temporale_spec.rb
 homepage: http://github.com/igneus/calendarium-romanum
 licenses:
 - LGPL-3.0
@@ -164,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Roman Catholic liturgical calendar computations

data/lib/calendarium-romanum/sanctoraleloader.rb

@@ -1,115 +0,0 @@
-module CalendariumRomanum
-
-  # understands a plaintext calendar format
-  # and knows how to transform it to Celebrations
-  # and fill them in a Sanctorale
-  #
-  # Format of the file:
-  # 1/31 m : S. Ioannis Bosco, presbyteri
-  #
-  # <month>/<day> <rank shortcut> : <title>
-  # rank shortcut is optional, default value is optional memorial
-  class SanctoraleLoader
-
-    RANK_CODES = {
-                  nil => Ranks::MEMORIAL_OPTIONAL,
-                  'm' => Ranks::MEMORIAL_GENERAL,
-                  'f' => Ranks::FEAST_GENERAL,
-                  's' => Ranks::SOLEMNITY_GENERAL
-                 }
-    COLOUR_CODES = {
-                    nil => Colours::WHITE,
-                    'w' => Colours::WHITE,
-                    'v' => Colours::VIOLET,
-                    'g' => Colours::GREEN,
-                    'r' => Colours::RED
-                   }
-
-    # dest should be a Sanctorale,
-    # src anything with #each_line
-    def load(src, dest=nil)
-      dest ||= Sanctorale.new
-
-      in_front_matter = false
-      month_section = nil
-      src.each_line.with_index(1) do |l, line_num|
-        # skip YAML front matter
-        if line_num == 1 && l.start_with?('---')
-          in_front_matter = true
-          next
-        elsif in_front_matter
-          if l.start_with?('---')
-            in_front_matter = false
-          end
-
-          next
-        end
-
-        # strip whitespace and comments
-        l.sub!(/#.*/, '')
-        l.strip!
-        next if l.empty?
-
-        # month section heading
-        n = l.match /^=\s*(\d+)\s*$/
-        unless n.nil?
-          month_section = n[1].to_i
-          unless month_section >= 1 && month_section <= 12
-            raise error("Invalid month #{month_section}", line_num)
-          end
-          next
-        end
-
-        # celebration record
-        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
-        end
-
-        month, day, rank_char, rank_num, colour, title = m.values_at(2, 3, 5, 6, 7, 8)
-        month ||= month_section
-        day = day.to_i
-        month = month.to_i
-
-        rank = RANK_CODES[rank_char && rank_char.downcase]
-        if rank.nil?
-          raise error("Invalid celebration rank code #{rank_char}", line_num)
-        end
-
-        if rank_num
-          rank_num = rank_num.to_f
-          rank_by_num = Ranks[rank_num]
-
-          if rank_by_num.nil?
-            raise error("Invalid celebration rank code #{rank_num}", line_num)
-          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
-
-          rank = rank_by_num
-        end
-
-        dest.add month, day, Celebration.new(
-                                             title.strip,
-                                             rank,
-                                             COLOUR_CODES[colour && colour.downcase]
-                                            )
-      end
-
-      dest
-    end
-
-    alias_method :load_from_string, :load
-
-    def load_from_file(filename, dest=nil, encoding='utf-8')
-      self.load File.open(filename, 'r', encoding: encoding), dest
-    end
-
-    private
-
-    def error(message, line_number)
-      RuntimeError.new("L#{line_number}: #{message}")
-    end
-  end
-end

data/spec/abstract_date_spec.rb

@@ -1,62 +0,0 @@
-require_relative 'spec_helper'
-
-describe CR::AbstractDate do
-  AD = CR::AbstractDate
-
-  describe '.new' do
-    describe 'fails on invalid' do
-      it 'month' do
-        expect do
-          AD.new(13, 1)
-        end.to raise_exception /Invalid month/
-      end
-
-      it 'day' do
-        expect do
-          AD.new(1, 32)
-        end.to raise_exception /Invalid day/
-      end
-
-      it 'day of month' do
-        expect do
-          AD.new(2, 30)
-        end.to raise_exception /Invalid day/
-      end
-    end
-  end
-
-  # test .new through .from_date on a complete leap year
-  describe '.from_date' do
-    YEAR = 2000
-
-    it 'the test year is leap' do
-      expect(Date.new(YEAR)).to be_leap
-    end
-
-    CR::Util::Year.new(YEAR).each do |date|
-      it date.to_s do
-        expect do
-          AD.from_date date
-        end.not_to raise_exception
-      end
-    end
-  end
-
-  describe '#<' do
-    it { expect(AD.new(1, 1)).to be < AD.new(1, 2) }
-    it { expect(AD.new(1, 1)).to be < AD.new(2, 1) }
-    it { expect(AD.new(1, 1)).not_to be < AD.new(1, 1) }
-  end
-
-  describe '#==' do
-    it { expect(AD.new(1, 1)).to be == AD.new(1, 1) }
-    it { expect(AD.new(1, 1)).not_to be == AD.new(1, 2) }
-  end
-
-  describe 'as a Hash key' do
-    it 'different objects with the same values are considered same key' do
-      h = {AD.new(1, 1) => 1}
-      expect(h).to have_key AD.new(1, 1)
-    end
-  end
-end

data/spec/calendar_spec.rb

@@ -1,352 +0,0 @@
-require_relative 'spec_helper'
-
-describe CR::Calendar do
-
-  describe 'core functions' do
-    before :all do
-      @c = described_class.new 2013
-    end
-
-    describe '#==' do
-      it 'considers calendars with the same year same' do
-        expect(described_class.new(2014) == described_class.new(2014)).to be true
-      end
-
-      it 'considers calendars with different year different' do
-        expect(described_class.new(2014) == described_class.new(2010)).to be false
-      end
-    end
-
-    describe '#lectionary' do
-      it 'detects correctly' do
-        expect(described_class.new(2014).lectionary).to eq :B
-        expect(described_class.new(2013).lectionary).to eq :A
-        expect(described_class.new(2012).lectionary).to eq :C
-      end
-    end
-
-    describe '#ferial_lectionary' do
-      it 'detects correctly' do
-        expect(described_class.new(2014).ferial_lectionary).to eq 1
-        expect(described_class.new(2013).ferial_lectionary).to eq 2
-      end
-    end
-
-    describe '.for_day' do
-      it 'continues the previous year\'s calendar in summer' do
-        expect(described_class.for_day(Date.new(2014, 6, 9))).to eq described_class.new(2013)
-      end
-
-      it 'provides the current year\'s calendar in December' do
-        expect(described_class.for_day(Date.new(2014, 12, 20))).to eq described_class.new(2014)
-      end
-    end
-
-    describe '#day' do
-      describe 'received arguments' do
-        describe 'Date' do
-          it 'returns a Day' do
-            expect(@c.day(Date.new(2013, 12, 10))).to be_a CR::Day
-          end
-        end
-
-        describe 'DateTime' do
-          it 'returns a Day' do
-            expect(@c.day(DateTime.new(2013, 12, 10, 12, 10, 0))).to be_a CR::Day
-          end
-        end
-
-        describe 'three Integers' do
-          it 'returns a Day' do
-            expect(@c.day(2013, 12, 10)).to 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
-
-          describe 'invalid' do
-            describe 'absolutely' do
-              it 'fails' do
-                expect do
-                  day = @c.day(0, 34)
-                end.to raise_exception(ArgumentError, 'invalid date')
-              end
-            end
-
-            describe 'for the given year' do
-              it 'fails' do
-                expect do
-                  day = @c.day(2, 29)
-                end.to raise_exception(ArgumentError, 'invalid date')
-              end
-            end
-          end
-        end
-      end
-
-      it 'throws RangeError if given date not included in the year' do
-        expect { @c.day(2000, 1, 1) }.to raise_error RangeError
-      end
-
-      describe 'temporale features' do
-        describe 'season' do
-          it 'detects Advent correctly' do
-            expect(@c.day(2013, 12, 10).season).to eq CR::Seasons::ADVENT
-          end
-        end
-
-        describe 'week of the season' do
-          describe 'Advent' do
-            it 'sets Advent week correctly' do
-              expect(@c.day(2013, 12, 10).season_week).to eq 2
-              expect(@c.day(2013, 12, 15).season_week).to eq 3
-            end
-          end
-
-          describe 'Christmas' do
-            it 'days before the first Sunday are week 0' do
-              expect(@c.day(2013, 12, 25).season_week).to eq 0
-            end
-
-            it 'first Sunday starts week 1' do
-              expect(@c.day(2013, 12, 29).season_week).to eq 1
-            end
-          end
-
-          describe 'Lent' do
-            it 'Ash Wednesday is week 0' do
-              expect(@c.day(2014, 3, 5).season_week).to eq 0
-            end
-          end
-
-          describe 'Easter' do
-            it 'Easter Sunday opens week 1' do
-              expect(@c.day(2014, 4, 20).season_week).to eq 1
-            end
-          end
-
-          describe 'Ordinary time' do
-            it 'Monday after Baptism of the Lord is week 1' do
-              expect(@c.day(2014, 1, 13).season_week).to eq 1
-            end
-
-            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
-      end
-
-      describe 'Temporale x Sanctorale resolution' do
-        before :all do
-          @s = CR::Data::GENERAL_ROMAN_ENGLISH.load
-          @c = described_class.new 2013, @s
-        end
-
-        it '"empty" day results in a ferial' do
-          d = @c.day(7, 2)
-          expect(d.celebrations.size).to eq 1
-          expect(d.celebrations[0].rank).to eq CR::Ranks::FERIAL
-        end
-
-        it 'sanctorale feast' do
-          d = @c.day(7, 3)
-          expect(d.celebrations.size).to eq 1
-          expect(d.celebrations[0].rank).to eq CR::Ranks::FEAST_GENERAL
-          expect(d.celebrations[0].title).to include 'Thomas'
-        end
-
-        it 'optional memorial does not suppress ferial' do
-          d = @c.day(7, 14)
-          expect(d.celebrations.size).to eq 2
-
-          expect(d.celebrations[0].rank).to eq CR::Ranks::FERIAL
-
-          expect(d.celebrations[1].rank).to eq CR::Ranks::MEMORIAL_OPTIONAL
-          expect(d.celebrations[1].title).to include 'Lellis'
-        end
-
-        it 'obligatory memorial does suppress ferial' do
-          d = @c.day(1, 17)
-          expect(d.celebrations.size).to eq 1
-
-          expect(d.celebrations[0].rank).to eq CR::Ranks::MEMORIAL_GENERAL
-        end
-
-        it 'memorial in Lent becomes mere commemoration' do
-          d = @c.day(4, 2)
-          expect(d.celebrations.size).to eq 2
-
-          comm = d.celebrations[1]
-          expect(comm.rank).to eq CR::Ranks::COMMEMORATION
-          expect(comm.title).to eq 'Saint Francis of Paola, hermit'
-        end
-
-        it 'Sunday suppresses feast' do
-          san = CR::Sanctorale.new
-
-          d = Date.new 2015, 6, 28
-          expect(d).to be_sunday # ensure
-          san.add d.month, d.day, CR::Celebration.new('St. None, programmer', CR::Ranks::FEAST_GENERAL)
-
-          c = described_class.new 2014, san
-
-          celebs = c.day(d).celebrations
-          expect(celebs.size).to eq 1
-          expect(celebs[0].rank).to eq CR::Ranks::SUNDAY_UNPRIVILEGED
-        end
-
-        it 'suppressed fictive solemnity is transferred' do
-          san = CR::Sanctorale.new
-
-          d = CR::Temporale.new(2014).good_friday
-          st_none = CR::Celebration.new('St. None, abbot, founder of the Order of Programmers (OProg)', CR::Ranks::SOLEMNITY_PROPER)
-          san.add d.month, d.day, st_none
-
-          c = described_class.new 2014, san
-
-          # Good Friday suppresses the solemnity
-          celebs = c.day(d).celebrations
-          expect(celebs.size).to eq 1
-          expect(celebs[0].rank).to eq CR::Ranks::TRIDUUM
-          expect(celebs[0].title).to have_translation 'Friday of the Passion of the Lord'
-
-          # it is transferred on a day after the Easter octave
-          d = c.temporale.easter_sunday + 8
-          celebs = c.day(d).celebrations
-          expect(celebs.size).to eq 1
-          expect(celebs[0]).to eq st_none
-        end
-
-        it 'transfer of suppressed Annunciation (real world example)' do
-          c = described_class.new 2015, @s
-
-          d = Date.new(2016, 3, 25)
-
-          # Good Friday suppresses the solemnity
-          celebs = c.day(d).celebrations
-          expect(celebs.size).to eq 1
-          expect(celebs[0].rank).to eq CR::Ranks::TRIDUUM
-          expect(celebs[0].title).to have_translation 'Friday of the Passion of the Lord'
-
-          # it is transferred on a day after the Easter octave
-          d = c.temporale.easter_sunday + 8
-          celebs = c.day(d).celebrations
-          expect(celebs.size).to eq 1
-          expect(celebs[0].title).to eq 'Annunciation of the Lord'
-        end
-      end
-    end
-
-    describe '#pred' do
-      it 'returns a calendar for the previous year' do
-        new_cal = @c.pred
-        expect(new_cal.year).to eq(@c.year - 1)
-        expect(new_cal.sanctorale).to eq (@c.sanctorale)
-      end
-
-      it 'preserves sanctorale' do
-        sanctorale = CR::Sanctorale.new
-        cal = described_class.new(2000, sanctorale)
-        new_cal = cal.pred
-        expect(new_cal.sanctorale).to be sanctorale
-      end
-
-      it 'preserves temporale class' do
-        t_class = Class.new(CR::Temporale)
-        cal = described_class.new(2000, nil, t_class)
-        new_cal = cal.pred
-        expect(new_cal.temporale).to be_a t_class
-      end
-    end
-
-    describe '#succ' do
-      it 'returns a calendar for the subsequent year' do
-        new_cal = @c.succ
-        expect(new_cal.year).to eq(@c.year + 1)
-        expect(new_cal.sanctorale).to eq (@c.sanctorale)
-      end
-
-      it 'preserves sanctorale' do
-        sanctorale = CR::Sanctorale.new
-        cal = described_class.new(2000, sanctorale)
-        new_cal = cal.succ
-        expect(new_cal.sanctorale).to be sanctorale
-      end
-
-      it 'preserves temporale class' do
-        t_class = Class.new(CR::Temporale)
-        cal = described_class.new(2000, nil, t_class)
-        new_cal = cal.succ
-        expect(new_cal.temporale).to be_a t_class
-      end
-    end
-  end
-end