finnish-holidays 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cda9ea0464c10d0147a093960444d55883c2548
-  data.tar.gz: 5fb9c50314e9df7ce28400b75fd699d23d011d52
+  metadata.gz: 2a96fdda7e141d2aeef96e7411d75713a4859bb2
+  data.tar.gz: 8107710192f342dde63a4c4059f95c28b7defd97
 SHA512:
-  metadata.gz: 20ff03c4dfa1cc7fb0aac9ea0250c22209a1e48a6a382b64e6cfb9fdcd5c9a1fc3cd509f0f4dcf9da8d17e2126207958b3044be2e8082b321c20fd960e46b4bb
-  data.tar.gz: 6750e3af9d2ceaff7998fed6a5d17d3e23dc974ad9aabcc9b86dc46d40e9569933fb200efe325b1b53cbf15f5bbefd4740efb658ca6cbe8797187e91e3508f44
+  metadata.gz: 00aa8f9d3798e07f3c297ce2c83ff5cb326dc6e27d3b1bd4ee92ed1d3dc37980907b96ddc6233116faea0b0234436b564eaa412acba700b862720465aaa416df
+  data.tar.gz: 10e5409dd54d31472a15e3a306d6bc7a174e15ff26cb634e87cdfb0b893bcad5baea6b0823c779b1029377294714d011be7f15a1986aeee2ffb4c6a8f37d5bc6

data/README.md

@@ -24,3 +24,7 @@ FinnishHolidays.next()
 FinnishHolidays.year(2016)
 FinnishHolidays.month(1, 2017)
 ```
+
+## Run Tests
+
+    $ rspec

data/bin/finnish-holidays

@@ -42,10 +42,10 @@ end
 
 optparse.parse!
 
-if options[:month].is_a? Integer and !options[:year].is_a? Integer
+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 and options[:month].is_a? Integer
+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])

data/lib/classes/calendar.rb

@@ -28,9 +28,9 @@ class Calendar
         @year.discard_weekends()
       end
 
-      if defined? @year.holidays[month_index] and @year.holidays[month_index].is_a? Array
+      if (defined? @year.holidays[month_index]) && (@year.holidays[month_index].is_a? Array)
         @year.holidays[month_index].each do |holiday|
-          if holidays.length < count and holiday['day'].to_i >= @d
+          if (holidays.length < count) && (holiday['day'].to_i >= @d)
             holidays.push(holiday)
           end
         end

data/lib/classes/year.rb

@@ -6,7 +6,7 @@ require_relative '../utils/date-utils'
 
 class Year
   def initialize(year)
-    if year.is_a? Integer and year > 0
+    if (year.is_a? Integer) && (year > 0)
       @year = year.to_i
       @holidays = {}
       load_data()
@@ -46,6 +46,7 @@ private
       load_from_file()
     else
       load_from_web()
+      load_additional_holidays()
       cache()
     end
   end
@@ -72,7 +73,12 @@ private
     end
   end
 
-  def add_holiday(year, month, day, description)
+  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
@@ -90,7 +96,20 @@ private
       'description' => description
     }
 
-    @holidays[month_index].push(holiday)
+    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

data/lib/utils/date-utils.rb

@@ -1,4 +1,8 @@
 class DateUtils
+  FRIDAY = 5
+  SATURDAY = 6
+  SUNDAY = 7
+
   def self.create_date(year, month, day)
     day = self.zerofy(day)
     month = self.zerofy(month)
@@ -20,7 +24,16 @@ class DateUtils
   def self.is_weekend(year, month, day)
     t = self.create_date(year, month, day)
     day_of_week = t.strftime('%u').to_i
-    day_of_week == 6 or day_of_week == 7
+    [SATURDAY, SUNDAY].include? day_of_week
+  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
+      if day_of_week == FRIDAY
+        return day
+      end
+    end
   end
 
   def self.zerofy(num)

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finnish-holidays
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Eric Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri