finnish-holidays 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a96fdda7e141d2aeef96e7411d75713a4859bb2
-  data.tar.gz: 8107710192f342dde63a4c4059f95c28b7defd97
+  metadata.gz: 2f98f959c3e3d413358ca9b43c1fb0d1da649207
+  data.tar.gz: ee529c556d7589b7abb33a898e84d58afbafed05
 SHA512:
-  metadata.gz: 00aa8f9d3798e07f3c297ce2c83ff5cb326dc6e27d3b1bd4ee92ed1d3dc37980907b96ddc6233116faea0b0234436b564eaa412acba700b862720465aaa416df
-  data.tar.gz: 10e5409dd54d31472a15e3a306d6bc7a174e15ff26cb634e87cdfb0b893bcad5baea6b0823c779b1029377294714d011be7f15a1986aeee2ffb4c6a8f37d5bc6
+  metadata.gz: dd21bfc4682c22986478b89020c6c7edc507fbf18c9f423bb3469102531330daba673370f609e83eb74e892cd0dc5b83c81ef810f4ba85ab35a6367b6a355ffa
+  data.tar.gz: dece5244f589cfdd0546f16721d0032ca2504aad5233832ae3b5b29a96caec6f6443cac91aa9000fde9f83b87c8a4416b939a3a451470c4279423de43d47cf42

data/.gitignore

@@ -1,4 +1,2 @@
 .bundle/
-data/
-!data/.gitkeep
 *.gem

data/bin/finnish-holidays

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
+require 'date'
 require 'optparse'
 require_relative '../lib/finnish-holidays'
 require_relative '../lib/version'
@@ -54,7 +55,7 @@ else
 end
 
 holidays.each do |holiday|
-  t = DateUtils.create_date(holiday['year'], holiday['month'], holiday['day'])
+  t = Date.new(holiday['year'], holiday['month'], holiday['day'])
   date = t.strftime('%a, %b %e, %Y')
   puts "#{date} #{holiday['description']}"
 end

data/lib/classes/calendar.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'time'
 require_relative 'year'
 require_relative '../utils/date-utils'
@@ -22,15 +21,13 @@ class Calendar
     holidays = []
 
     while holidays.length < count
-      month_index = @m.to_s
-
       if !include_weekends
         @year.discard_weekends()
       end
 
-      if (defined? @year.holidays[month_index]) && (@year.holidays[month_index].is_a? Array)
-        @year.holidays[month_index].each do |holiday|
-          if (holidays.length < count) && (holiday['day'].to_i >= @d)
+      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
@@ -67,8 +64,8 @@ class Calendar
 
     holidays = []
 
-    if @year.holidays[month.to_s].is_a? Array
-      @year.holidays[month.to_s].each do |holiday|
+    if @year.holidays[month].is_a? Array
+      @year.holidays[month].each do |holiday|
         holidays.push(holiday)
       end
     end

data/lib/classes/year.rb

@@ -1,15 +1,12 @@
-require 'nokogiri'
-require 'open-uri'
-require 'json'
-require 'time'
+require 'date'
 require_relative '../utils/date-utils'
 
 class Year
   def initialize(year)
-    if (year.is_a? Integer) && (year > 0)
-      @year = year.to_i
+    if year > 0
+      @year = year
       @holidays = {}
-      load_data()
+      load_holidays()
     else
       raise "Invalid year: #{year}"
     end
@@ -39,54 +36,32 @@ class Year
 
 private
 
-  def load_data
-    file = get_cache_file_path()
-
-    if File.exist?(file)
-      load_from_file()
-    else
-      load_from_web()
-      load_additional_holidays()
-      cache()
-    end
+  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 load_from_file
-    json = File.read(get_cache_file_path())
-    @holidays = JSON.parse(json)
-  end
-
-  def load_from_web
-    page = Nokogiri::HTML(open('http://www.webcal.fi/fi-FI/pyhat.php?y=' + @year.to_s))
-
-    page.css('table.basic tr').each do |el|
-      if el.css('th:last-child').text != 'Päivämäärä' # TODO: Improve check.
-        date_el = el.css('td:nth-child(4)')
-        description_el = el.css('td:nth-child(2)')
-
-        month = DateUtils.parse_month(date_el.text)
-        day = DateUtils.parse_day(date_el.text)
-        description = description_el.text
+  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)
 
-        add_holiday(@year, month, day, description)
-      end
-    end
-  end
-
-  def load_additional_holidays
-    add_holiday(@year, 12, 24, 'Jouluaatto (unofficial)', true)
-    add_holiday(@year, 6, DateUtils.get_midsummer_eve(@year), 'Juhannusaatto (unofficial)', true)
-  end
-
-  def add_holiday(year, month, day, description, find_position = false)
-    year = year.to_i
-    month = month.to_i
-    day = day.to_i
-
-    month_index = month.to_s
-
-    if !@holidays[month_index].is_a? Array
-      @holidays[month_index] = []
+    if !@holidays[month].is_a? Array
+      @holidays[month] = []
     end
 
     holiday = {
@@ -96,28 +71,6 @@ private
       'description' => description
     }
 
-    if find_position && (@holidays[month_index].length > 0)
-      found = false
-
-      @holidays[month_index].each_with_index do |h, index|
-        if !found
-          if day.to_i < h['day'].to_i
-            @holidays[month_index].insert(index, holiday)
-            found = true
-          end
-        end
-      end
-    else
-      @holidays[month_index].push(holiday)
-    end
-  end
-
-  def cache
-    File.write(get_cache_file_path(), @holidays.to_json)
-  end
-
-  def get_cache_file_path
-    cwd = File.dirname(__FILE__)
-    "#{cwd}/../../data/#{@year}.json"
+    @holidays[month].push(holiday)
   end
 end

data/lib/utils/date-utils.rb

@@ -1,41 +1,124 @@
+require 'date'
+
 class DateUtils
   FRIDAY = 5
   SATURDAY = 6
   SUNDAY = 7
 
-  def self.create_date(year, month, day)
-    day = self.zerofy(day)
-    month = self.zerofy(month)
-    year = year.to_s
+  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
 
-    Time.parse("#{year}-#{month}-#{day}")
+  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
 
-  def self.parse_day(date_string)
-    parts = date_string.split('.')
-    parts[0].to_i
+  # 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
 
-  def self.parse_month(date_string)
-     parts = date_string.split('.')
-     parts[1].to_i
+  # 39 days after Easter Sunday
+  def self.ascension_day(year)
+    easter_sunday = self.easter_sunday(year)
+    easter_sunday.next_day(39)
   end
 
-  def self.is_weekend(year, month, day)
-    t = self.create_date(year, month, day)
-    day_of_week = t.strftime('%u').to_i
-    [SATURDAY, SUNDAY].include? day_of_week
+  # 49 days after Easter Sunday
+  def self.pentecost(year)
+    easter_sunday = self.easter_sunday(year)
+    easter_sunday.next_day(49)
   end
 
-  def self.get_midsummer_eve(year)
-    [19, 20, 21, 22, 23, 24, 25].each do |day|
-      day_of_week = self.create_date(year, 6, day).strftime('%u').to_i
+  # 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 day
+        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
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FinnishHolidays
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finnish-holidays
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Nishio
@@ -84,7 +84,6 @@ files:
 - README.md
 - Rakefile
 - bin/finnish-holidays
-- data/.gitkeep
 - finnish-holidays.gemspec
 - lib/classes/calendar.rb
 - lib/classes/year.rb
@@ -112,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A tool for displaying Finnish national holidays.