finnish-holidays 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224e5666aa9d75c8e57e77d0480376a22345243a
-  data.tar.gz: 540dbb368cb92bbf004e0cb590a848cdff6df8ad
+  metadata.gz: 6aabc4fbef5921fe6f06313c5f260698233624d9
+  data.tar.gz: d873d3fb42023b992f755cd4707fb1de5d73a599
 SHA512:
-  metadata.gz: 51197b91160e66299f52157657f93d13a0b85313e769df3c907a42ae6f1cb9339824c4ea4b1b55386ec9c7c933ddfc28143fa6a7d3cbfcbb6db800a7b402c5d5
-  data.tar.gz: 2a7879808e30503125447a53c9fe9afab96af571e29f1f4568af6676d620bf441319334ab3d3acf0afb2e2c3221a263db87bb38ea786d62915ca17ac9e34e5dd
+  metadata.gz: 38736d90a8034ae0b78120fea660b907f69f2afee340173453c09a8925ee9a41d1e5ab658c22b1866fbc4398e5b3149aff74a571779781c101f8868b740dc9d0
+  data.tar.gz: c949beca0e6313f4973ffe523a588139ede7b9a9a333274b7d0c3f5d25c191264ebbad722876c41c6877d4d86500581ea4405cebc86a54585c29acd2cb38b8c5

data/.gitignore

@@ -1,2 +1,3 @@
 .bundle/
 *.gem
+Gemfile.lock

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
+script: rspec

data/Gemfile

@@ -1 +1,3 @@
 source 'https://rubygems.org'
+
+gem 'rspec', '3.2.0'

data/README.md

@@ -1,7 +1,9 @@
 finnish-holidays
 ================
 
-A tool for displaying Finnish national holidays.
+[![Build Status](https://travis-ci.org/ericnishio/finnish-holidays.svg?branch=master)](https://travis-ci.org/ericnishio/finnish-holidays)
+
+A CLI and utility library for listing Finnish national holidays.
 
 ## Installation
 

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/bin/finnish-holidays

@@ -1,61 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-require 'date'
-require 'optparse'
-require_relative '../lib/finnish-holidays'
-require_relative '../lib/version'
-require_relative '../lib/utils/date-utils'
+require_relative '../lib/finnish-holidays/cli'
 
-options = {}
-
-optparse = OptionParser.new do |opts|
-  options[:count] = 3
-  opts.on('-cCOUNT', '--count=COUNT', 'Number of holidays to list') do |count|
-    options[:count] = count.to_i
-  end
-
-  options[:include_weekends] = false
-  opts.on('-a', '--all', 'Include holidays falling on a weekend') do
-    options[:include_weekends] = true
-  end
-
-  opts.on('-h', '--help', 'Show this screen') do
-    puts opts
-    exit
-  end
-
-  opts.on('-v', '--version', 'Show version') do
-    puts FinnishHolidays::VERSION
-    exit
-  end
-
-  options[:year] = nil
-  opts.on('-yYEAR', '--year=YEAR', 'List holidays by year') do |year|
-    options[:year] = year.to_i
-  end
-
-  options[:month] = nil
-  opts.on('-mMONTH', '--month=MONTH', 'List holidays by month') do |month|
-    options[:month] = month.to_i
-  end
-end
-
-optparse.parse!
-
-if (options[:month].is_a? Integer) && (!options[:year].is_a? Integer)
-  puts 'You must also specify a year with --year=YEAR'
-  exit
-elsif (options[:year].is_a? Integer) && (options[:month].is_a? Integer)
-  holidays = FinnishHolidays.month(options[:month], options[:year], options[:include_weekends])
-elsif options[:year].is_a? Integer
-  holidays = FinnishHolidays.year(options[:year], options[:include_weekends])
-else
-  holidays = FinnishHolidays.next(options[:count], options[:include_weekends])
-end
-
-holidays.each do |holiday|
-  t = Date.new(holiday['year'], holiday['month'], holiday['day'])
-  date = t.strftime('%a, %b %e, %Y')
-  puts "#{date} #{holiday['description']}"
-end
+FinnishHolidays::CLI.run()

data/finnish-holidays.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version'
+require 'finnish-holidays/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "finnish-holidays"
@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Eric Nishio"]
   spec.email         = ["eric@self-learner.com"]
 
-  spec.summary       = %q{A tool for displaying Finnish national holidays.}
-  spec.description   = %q{A CLI and library for displaying Finnish national holidays.}
+  spec.summary       = %q{A CLI and utility library for listing Finnish national holidays.}
+  spec.description   = %q{Lists Finnish national holidays.}
   spec.homepage      = "https://github.com/ericnishio/finnish-holidays"
   spec.license       = "MIT"
 

data/lib/finnish-holidays/classes/calendar.rb

@@ -0,0 +1,92 @@
+require 'time'
+require_relative 'year'
+require_relative '../date_utils'
+
+module FinnishHolidays
+  class Calendar
+    MAX_HOLIDAYS = 100
+
+    def initialize(y = nil, m = nil, d = nil)
+      @y = y == nil ? Time.now.year : y
+      @m = m == nil ? Time.now.month : m
+      @d = d == nil ? Time.now.day : d
+
+      @year = FinnishHolidays::Year.new(@y)
+    end
+
+    def next(count = 3, include_weekends = false)
+      if count > MAX_HOLIDAYS
+        raise "Cannot request more than #{MAX_HOLIDAYS} holidays at once."
+      end
+
+      holidays = []
+
+      while holidays.length < count
+        if !include_weekends
+          @year.discard_weekends()
+        end
+
+        if (defined? @year.holidays[@m]) && (@year.holidays[@m].is_a? Array)
+          @year.holidays[@m].each do |holiday|
+            if (holidays.length < count) && (holiday['day'] >= @d)
+              holidays.push(holiday)
+            end
+          end
+        end
+
+        if holidays.length < count
+          next_month()
+        end
+      end
+
+      holidays
+    end
+
+    def year(year, weekends = false)
+      if !weekends
+        @year.discard_weekends()
+      end
+
+      holidays = []
+
+      @year.holidays.each do |month, array|
+        array.each do |holiday|
+          holidays.push(holiday)
+        end
+      end
+
+      holidays
+    end
+
+    def month(month, year, weekends = false)
+      if !weekends
+        @year.discard_weekends()
+      end
+
+      holidays = []
+
+      if @year.holidays[month].is_a? Array
+        @year.holidays[month].each do |holiday|
+          holidays.push(holiday)
+        end
+      end
+
+      holidays
+    end
+
+  private
+
+    def next_month
+      if @m == 12
+        @m = 1
+        @y += 1
+        @d = 1
+      else
+        @m += 1
+        @d = 1
+      end
+
+      @year = FinnishHolidays::Year.new(@y)
+    end
+  end
+end

data/lib/finnish-holidays/classes/year.rb

@@ -0,0 +1,78 @@
+require 'date'
+require_relative '../date_utils'
+
+module FinnishHolidays
+  class Year
+    def initialize(year)
+      if year > 0
+        @year = year
+        @holidays = {}
+        load_holidays()
+      else
+        raise "Invalid year: #{year}"
+      end
+    end
+
+    def holidays
+      @holidays
+    end
+
+    def discard_weekends
+      holidays = {}
+
+      @holidays.each do |month, array|
+        array.each do |holiday|
+          if !FinnishHolidays::DateUtils.is_weekend(holiday['year'], holiday['month'], holiday['day'])
+            if !holidays[month].is_a? Array
+              holidays[month] = []
+            end
+
+            holidays[month].push(holiday)
+          end
+        end
+      end
+
+      @holidays = holidays
+    end
+
+  private
+
+    def load_holidays
+      # Holidays must be added in order
+      add_holiday(Date.new(@year, 1, 1), "New Year's Day")
+      add_holiday(Date.new(@year, 1, 6), 'Epiphany')
+      add_holiday(FinnishHolidays::DateUtils.good_friday(@year), 'Good Friday')
+      add_holiday(FinnishHolidays::DateUtils.easter_sunday(@year), 'Easter Sunday')
+      add_holiday(FinnishHolidays::DateUtils.easter_monday(@year), 'Easter Monday')
+      add_holiday(Date.new(@year, 1, 1), 'May Day')
+      add_holiday(FinnishHolidays::DateUtils.ascension_day(@year), 'Ascension Day')
+      add_holiday(FinnishHolidays::DateUtils.pentecost(@year), 'Pentecost')
+      add_holiday(FinnishHolidays::DateUtils.midsummer_eve(@year), 'Midsummer Eve (unofficial)')
+      add_holiday(FinnishHolidays::DateUtils.midsummer_day(@year), 'Midsummer Day')
+      add_holiday(FinnishHolidays::DateUtils.all_saints_day(@year), "All Saints' Day")
+      add_holiday(Date.new(@year, 12, 6), 'Independence Day')
+      add_holiday(Date.new(@year, 12, 24), 'Christmas Eve (unofficial)')
+      add_holiday(Date.new(@year, 12, 25), 'Christmas Day')
+      add_holiday(Date.new(@year, 12, 26), "St. Stephen's Day")
+    end
+
+    def add_holiday(date, description)
+      year = FinnishHolidays::DateUtils.get_year_from_date(date)
+      month = FinnishHolidays::DateUtils.get_month_from_date(date)
+      day = FinnishHolidays::DateUtils.get_day_from_date(date)
+
+      if !@holidays[month].is_a? Array
+        @holidays[month] = []
+      end
+
+      holiday = {
+        'year' => year,
+        'month' => month,
+        'day' => day,
+        'description' => description
+      }
+
+      @holidays[month].push(holiday)
+    end
+  end
+end

data/lib/finnish-holidays/cli.rb

@@ -0,0 +1,81 @@
+require 'date'
+require 'optparse'
+require_relative 'date_utils'
+require_relative 'translate'
+require_relative 'version'
+require_relative '../finnish-holidays'
+
+module FinnishHolidays
+  module CLI
+    def self.run()
+      options = {}
+
+      optparse = OptionParser.new do |opts|
+        options[:count] = 3
+        opts.on('-cCOUNT', '--count=COUNT', 'Number of holidays to list') do |count|
+          options[:count] = count.to_i
+        end
+
+        options[:include_weekends] = false
+        opts.on('-a', '--all', 'Include holidays falling on a weekend') do
+          options[:include_weekends] = true
+        end
+
+        opts.on('-h', '--help', 'Show this screen') do
+          puts opts
+          exit 0
+        end
+
+        opts.on('-v', '--version', 'Show version') do
+          puts FinnishHolidays::VERSION
+          exit 0
+        end
+
+        options[:year] = nil
+        opts.on('-yYEAR', '--year=YEAR', 'List holidays by year') do |year|
+          options[:year] = year.to_i
+        end
+
+        options[:month] = nil
+        opts.on('-mMONTH', '--month=MONTH', 'List holidays by month') do |month|
+          options[:month] = month.to_i
+        end
+
+        options[:language] = nil
+        opts.on('-lLANGUAGE', '--language=LANGUAGE', 'Translate holidays (fi|sv)') do |language|
+          if !['fi', 'sv'].include? language
+            puts 'Language must be fi (Finnish) or sv (Swedish).'
+            exit 1
+          end
+
+          options[:language] = language
+        end
+      end
+
+      optparse.parse!
+
+      if (options[:month].is_a? Integer) && (!options[:year].is_a? Integer)
+        puts 'You must also specify a year with --year=YEAR'
+        exit 1
+      elsif (options[:year].is_a? Integer) && (options[:month].is_a? Integer)
+        holidays = FinnishHolidays.month(options[:month], options[:year], options[:include_weekends])
+      elsif options[:year].is_a? Integer
+        holidays = FinnishHolidays.year(options[:year], options[:include_weekends])
+      else
+        holidays = FinnishHolidays.next(options[:count], options[:include_weekends])
+      end
+
+      holidays.each do |holiday|
+        d = Date.new(holiday['year'], holiday['month'], holiday['day'])
+        date = d.strftime('%a, %b %e, %Y')
+        description = holiday['description']
+
+        if ['fi', 'sv'].include? options[:language]
+          description = FinnishHolidays::Translate.into(options[:language], holiday['description'])
+        end
+
+        puts "#{date} #{description}"
+      end
+    end
+  end
+end

data/lib/finnish-holidays/date_utils.rb

@@ -0,0 +1,135 @@
+require 'date'
+
+module FinnishHolidays
+  class DateUtils
+    FRIDAY = 5
+    SATURDAY = 6
+    SUNDAY = 7
+
+    def self.is_weekend(year, month, day)
+      t = Date.new(year, month, day)
+      day_of_week = t.strftime('%u').to_i
+      [SATURDAY, SUNDAY].include? day_of_week
+    end
+
+    def self.easter_sunday(year)
+      a = year % 19
+      b = year / 100
+      c = year % 100
+      d = b / 4
+      e = b % 4
+      f = (b + 8) / 25
+      g = (b - f + 1) / 3
+      h = (19 * a + b - d - g + 15) % 30
+      i = c / 4
+      k = c % 4
+      l = (32 + 2 * e + 2 * i - h - k) % 7
+      m = (a + 11 * h + 22 * l) / 451
+      x = h + l - 7 * m + 114
+      month = x / 31
+      day = (x % 31) + 1
+      Date.new(year, month, day)
+    end
+
+    # Day after Easter Sunday
+    def self.easter_monday(year)
+      self.easter_sunday(year).next_day
+    end
+
+    # Friday before Easter Sunday
+    def self.good_friday(year)
+      date = self.easter_sunday(year)
+      day_of_week = nil
+
+      while day_of_week != FRIDAY
+        day_of_week = date.strftime('%u').to_i
+
+        if (day_of_week != FRIDAY)
+          date = date.prev_day
+        end
+      end
+
+      date
+    end
+
+    # 39 days after Easter Sunday
+    def self.ascension_day(year)
+      easter_sunday = self.easter_sunday(year)
+      easter_sunday.next_day(39)
+    end
+
+    # 49 days after Easter Sunday
+    def self.pentecost(year)
+      easter_sunday = self.easter_sunday(year)
+      easter_sunday.next_day(49)
+    end
+
+    # Friday between June 19-25
+    def self.midsummer_eve(year)
+      month = 6
+
+      (19..25).to_a.each do |day|
+        day_of_week = Date.new(year, month, day).strftime('%u').to_i
+
+        if day_of_week == FRIDAY
+          return Date.new(year, month, day)
+        end
+      end
+    end
+
+    # Saturday between June 20-26
+    def self.midsummer_day(year)
+      month = 6
+
+      (20..26).to_a.each do |day|
+        day_of_week = Date.new(year, month, day).strftime('%u').to_i
+
+        if day_of_week == SATURDAY
+          return Date.new(year, month, day)
+        end
+      end
+    end
+
+    # Saturday between October 31 and November 6
+    def self.all_saints_day(year)
+      october_31 = Date.new(year, 10, 31)
+      second_month = 11
+
+      if october_31.strftime('%u').to_i == SATURDAY
+        return october_31
+      else
+        (1..6).to_a.each do |day|
+          day_of_week = Date.new(year, second_month, day).strftime('%u').to_i
+
+          if day_of_week == SATURDAY
+            return Date.new(year, second_month, day)
+          end
+        end
+      end
+    end
+
+    def self.get_year_from_date(date)
+      date.strftime('%Y').to_i
+    end
+
+    def self.get_month_from_date(date)
+      date.strftime('%-m').to_i
+    end
+
+    def self.get_day_from_date(date)
+      date.strftime('%-d').to_i
+    end
+
+    def self.zerofy(num)
+      num = num.to_i
+
+      if num < 10
+        num = '0' + num.to_s
+      else
+        num = num.to_s
+      end
+
+      num
+    end
+  end
+end

data/lib/finnish-holidays/translate.rb

@@ -0,0 +1,74 @@
+module FinnishHolidays
+  module Translate
+    def self.into(language, original)
+      translations = {
+        "New Year's Day" => {
+          'fi' => 'Uudenvuodenpäivä',
+          'sv' => 'Nyårsdagen'
+        },
+        'Epiphany' => {
+          'fi' => 'Loppiainen',
+          'sv' => 'Trettondedagen'
+        },
+        'Good Friday' => {
+          'fi' => 'Pitkäperjantai',
+          'sv' => 'Långfredagen'
+        },
+        'Easter Sunday' => {
+          'fi' => 'Pääsiäispäivä',
+          'sv' => 'Påskdagen'
+        },
+        'Easter Monday' => {
+          'fi' => 'Toinen pääsiäispäivä',
+          'sv' => 'Andra påskdagen'
+        },
+        'May Day' => {
+          'fi' => 'Vappu',
+          'sv' => 'Valborgsmässoafton'
+        },
+        'Ascension Day' => {
+          'fi' => 'Helatorstai',
+          'sv' => 'Kristi himmelfärds dag'
+        },
+        'Pentecost' => {
+          'fi' => 'Helluntaipäivä',
+          'sv' => 'Pingst'
+        },
+        'Midsummer Eve (unofficial)' => {
+          'fi' => 'Juhannusaatto (unofficial)',
+          'sv' => 'Midsommarafton (unofficial)'
+        },
+        'Midsummer Day' => {
+          'fi' => 'Juhannuspäivä',
+          'sv' => 'Midsommardagen'
+        },
+        "All Saints' Day" => {
+          'fi' => 'Pyhäinpäivä',
+          'sv' => 'Alla helgons dag'
+        },
+        'Independence Day' => {
+          'fi' => 'Itsenäisyyspäivä',
+          'sv' => 'Självständighetsdagen'
+        },
+        'Christmas Eve (unofficial)' => {
+          'fi' => 'Jouluaatto (unofficial)',
+          'sv' => 'Julafton (unofficial)'
+        },
+        'Christmas Day' => {
+          'fi' => 'Joulupäivä',
+          'sv' => 'Juldagen'
+        },
+        "St. Stephen's Day" => {
+          'fi' => 'Tapaninpäivä',
+          'sv' => 'Andra juldagen'
+        }
+      }
+
+      if translations[original] && (translations[original][language].is_a? String)
+        return translations[original][language]
+      else
+        return original
+      end
+    end
+  end
+end

data/lib/{version.rb → finnish-holidays/version.rb}

@@ -1,3 +1,3 @@
 module FinnishHolidays
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/finnish-holidays.rb

@@ -1,4 +1,4 @@
-require_relative 'classes/calendar'
+require_relative 'finnish-holidays/classes/calendar'
 
 module FinnishHolidays
   # Lists the next holidays relative to today's date
@@ -8,11 +8,11 @@ module FinnishHolidays
 
   # Lists holidays for the given year
   def self.year(year, include_weekends = false)
-    Calendar.new(year, 1, 1).year(year, include_weekends)
+    FinnishHolidays::Calendar.new(year, 1, 1).year(year, include_weekends)
   end
 
   # Lists holidays for the given month (and year)
   def self.month(month, year, include_weekends = false)
-    Calendar.new(year, month, 1).month(month, year, include_weekends)
+    FinnishHolidays::Calendar.new(year, month, 1).month(month, year, include_weekends)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finnish-holidays
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-description: A CLI and library for displaying Finnish national holidays.
+description: Lists Finnish national holidays.
 email:
 - eric@self-learner.com
 executables:
@@ -51,17 +51,18 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/finnish-holidays
 - finnish-holidays.gemspec
-- lib/classes/calendar.rb
-- lib/classes/year.rb
 - lib/finnish-holidays.rb
-- lib/utils/date-utils.rb
-- lib/version.rb
+- lib/finnish-holidays/classes/calendar.rb
+- lib/finnish-holidays/classes/year.rb
+- lib/finnish-holidays/cli.rb
+- lib/finnish-holidays/date_utils.rb
+- lib/finnish-holidays/translate.rb
+- lib/finnish-holidays/version.rb
 homepage: https://github.com/ericnishio/finnish-holidays
 licenses:
 - MIT
@@ -86,5 +87,5 @@ rubyforge_project:
 rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
-summary: A tool for displaying Finnish national holidays.
+summary: A CLI and utility library for listing Finnish national holidays.
 test_files: []

data/Gemfile.lock

@@ -1,8 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES

data/lib/classes/calendar.rb

@@ -1,90 +0,0 @@
-require 'time'
-require_relative 'year'
-require_relative '../utils/date-utils'
-
-class Calendar
-  MAX_HOLIDAYS = 100
-
-  def initialize(y = nil, m = nil, d = nil)
-    @y = y == nil ? Time.now.year : y
-    @m = m == nil ? Time.now.month : m
-    @d = d == nil ? Time.now.day : d
-
-    @year = Year.new(@y)
-  end
-
-  def next(count = 3, include_weekends = false)
-    if count > MAX_HOLIDAYS
-      raise "Cannot request more than #{MAX_HOLIDAYS} holidays at once."
-    end
-
-    holidays = []
-
-    while holidays.length < count
-      if !include_weekends
-        @year.discard_weekends()
-      end
-
-      if (defined? @year.holidays[@m]) && (@year.holidays[@m].is_a? Array)
-        @year.holidays[@m].each do |holiday|
-          if (holidays.length < count) && (holiday['day'] >= @d)
-            holidays.push(holiday)
-          end
-        end
-      end
-
-      if holidays.length < count
-        next_month()
-      end
-    end
-
-    holidays
-  end
-
-  def year(year, weekends = false)
-    if !weekends
-      @year.discard_weekends()
-    end
-
-    holidays = []
-
-    @year.holidays.each do |month, array|
-      array.each do |holiday|
-        holidays.push(holiday)
-      end
-    end
-
-    holidays
-  end
-
-  def month(month, year, weekends = false)
-    if !weekends
-      @year.discard_weekends()
-    end
-
-    holidays = []
-
-    if @year.holidays[month].is_a? Array
-      @year.holidays[month].each do |holiday|
-        holidays.push(holiday)
-      end
-    end
-
-    holidays
-  end
-
-private
-
-  def next_month
-    if @m == 12
-      @m = 1
-      @y += 1
-      @d = 1
-    else
-      @m += 1
-      @d = 1
-    end
-
-    @year = Year.new(@y)
-  end
-end

data/lib/classes/year.rb

@@ -1,76 +0,0 @@
-require 'date'
-require_relative '../utils/date-utils'
-
-class Year
-  def initialize(year)
-    if year > 0
-      @year = year
-      @holidays = {}
-      load_holidays()
-    else
-      raise "Invalid year: #{year}"
-    end
-  end
-
-  def holidays
-    @holidays
-  end
-
-  def discard_weekends
-    holidays = {}
-
-    @holidays.each do |month, array|
-      array.each do |holiday|
-        if !DateUtils.is_weekend(holiday['year'], holiday['month'], holiday['day'])
-          if !holidays[month].is_a? Array
-            holidays[month] = []
-          end
-
-          holidays[month].push(holiday)
-        end
-      end
-    end
-
-    @holidays = holidays
-  end
-
-private
-
-  def load_holidays
-    # Holidays must be added in order
-    add_holiday(Date.new(@year, 1, 1), "New Year's Day")
-    add_holiday(Date.new(@year, 1, 6), 'Epiphany')
-    add_holiday(DateUtils.good_friday(@year), 'Good Friday')
-    add_holiday(DateUtils.easter_sunday(@year), 'Easter Sunday')
-    add_holiday(DateUtils.easter_monday(@year), 'Easter Monday')
-    add_holiday(Date.new(@year, 1, 1), 'May Day')
-    add_holiday(DateUtils.ascension_day(@year), 'Ascension Day')
-    add_holiday(DateUtils.pentecost(@year), 'Pentecost')
-    add_holiday(DateUtils.midsummer_eve(@year), 'Midsummer Eve (unofficial)')
-    add_holiday(DateUtils.midsummer_day(@year), 'Midsummer Day')
-    add_holiday(DateUtils.all_saints_day(@year), "All Saints' Day")
-    add_holiday(Date.new(@year, 12, 6), 'Independence Day')
-    add_holiday(Date.new(@year, 12, 24), 'Christmas Eve (unofficial)')
-    add_holiday(Date.new(@year, 12, 25), 'Christmas Day')
-    add_holiday(Date.new(@year, 12, 26), "St. Stephen's Day")
-  end
-
-  def add_holiday(date, description)
-    year = DateUtils.get_year_from_date(date)
-    month = DateUtils.get_month_from_date(date)
-    day = DateUtils.get_day_from_date(date)
-
-    if !@holidays[month].is_a? Array
-      @holidays[month] = []
-    end
-
-    holiday = {
-      'year' => year,
-      'month' => month,
-      'day' => day,
-      'description' => description
-    }
-
-    @holidays[month].push(holiday)
-  end
-end

data/lib/utils/date-utils.rb

@@ -1,133 +0,0 @@
-require 'date'
-
-class DateUtils
-  FRIDAY = 5
-  SATURDAY = 6
-  SUNDAY = 7
-
-  def self.is_weekend(year, month, day)
-    t = Date.new(year, month, day)
-    day_of_week = t.strftime('%u').to_i
-    [SATURDAY, SUNDAY].include? day_of_week
-  end
-
-  def self.easter_sunday(year)
-    a = year % 19
-    b = year / 100
-    c = year % 100
-    d = b / 4
-    e = b % 4
-    f = (b + 8) / 25
-    g = (b - f + 1) / 3
-    h = (19 * a + b - d - g + 15) % 30
-    i = c / 4
-    k = c % 4
-    l = (32 + 2 * e + 2 * i - h - k) % 7
-    m = (a + 11 * h + 22 * l) / 451
-    x = h + l - 7 * m + 114
-    month = x / 31
-    day = (x % 31) + 1
-    Date.new(year, month, day)
-  end
-
-  # Day after Easter Sunday
-  def self.easter_monday(year)
-    self.easter_sunday(year).next_day
-  end
-
-  # Friday before Easter Sunday
-  def self.good_friday(year)
-    date = self.easter_sunday(year)
-    day_of_week = nil
-
-    while day_of_week != FRIDAY
-      day_of_week = date.strftime('%u').to_i
-
-      if (day_of_week != FRIDAY)
-        date = date.prev_day
-      end
-    end
-
-    date
-  end
-
-  # 39 days after Easter Sunday
-  def self.ascension_day(year)
-    easter_sunday = self.easter_sunday(year)
-    easter_sunday.next_day(39)
-  end
-
-  # 49 days after Easter Sunday
-  def self.pentecost(year)
-    easter_sunday = self.easter_sunday(year)
-    easter_sunday.next_day(49)
-  end
-
-  # Friday between June 19-25
-  def self.midsummer_eve(year)
-    month = 6
-
-    (19..25).to_a.each do |day|
-      day_of_week = Date.new(year, month, day).strftime('%u').to_i
-
-      if day_of_week == FRIDAY
-        return Date.new(year, month, day)
-      end
-    end
-  end
-
-  # Saturday between June 20-26
-  def self.midsummer_day(year)
-    month = 6
-
-    (20..26).to_a.each do |day|
-      day_of_week = Date.new(year, month, day).strftime('%u').to_i
-
-      if day_of_week == SATURDAY
-        return Date.new(year, month, day)
-      end
-    end
-  end
-
-  # Saturday between October 31 and November 6
-  def self.all_saints_day(year)
-    october_31 = Date.new(year, 10, 31)
-    second_month = 11
-
-    if october_31.strftime('%u').to_i == SATURDAY
-      return october_31
-    else
-      (1..6).to_a.each do |day|
-        day_of_week = Date.new(year, second_month, day).strftime('%u').to_i
-
-        if day_of_week == SATURDAY
-          return Date.new(year, second_month, day)
-        end
-      end
-    end
-  end
-
-  def self.get_year_from_date(date)
-    date.strftime('%Y').to_i
-  end
-
-  def self.get_month_from_date(date)
-    date.strftime('%-m').to_i
-  end
-
-  def self.get_day_from_date(date)
-    date.strftime('%-d').to_i
-  end
-
-  def self.zerofy(num)
-    num = num.to_i
-
-    if num < 10
-      num = '0' + num.to_s
-    else
-      num = num.to_s
-    end
-
-    num
-  end
-end