finnish-holidays 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30218b8e1bae7a864a62a2f7d13477e1654b3f49
-  data.tar.gz: c1e148429bf248bf5c4eec2b15842f09646b3a73
+  metadata.gz: 4594700e2e080308f5611414bd6dca073fe03410
+  data.tar.gz: 2716b3e7d8b4efaab418c7073bce509efbc4b8e4
 SHA512:
-  metadata.gz: 77f13ba900cf0864ebf9c4eebb75fbbafe5e2851c014d41b98b5a1d06d7bdf072e2db5d5b09a1fc565e692d9bf2a745c13a3cedfa02c10a84adc2d0bf137476e
-  data.tar.gz: ed5fb7cf3f20f26a440cb9857b817fca200081ec4295e05a71a3702321a46fa6e24701070d8e2dfeb9e7e55a5ce71e4b93d24088d508d7b7c0b0aa290199a0d7
+  metadata.gz: 17e6e26667a9ad1c485002c2f7752d352c9559316f61925c8da9c935bab93b0453b0153bb5c2a48deb8d15e5a3de8fca234380a5a782095891c340d8ebb2c33a
+  data.tar.gz: c0fa21b9efdc03e8729cfa4c3640e774ae58eb6da2ea402fc44870b8d95f8a61332a4ba662d3c692d3e8927ce5eaeebbb230e93e18aaa05c4c27629d46ddda4f

data/bin/finnish-holidays

@@ -10,13 +10,13 @@ options = {}
 
 optparse = OptionParser.new do |opts|
   options[:count] = 3
-  opts.on('-cCOUNT', '--count=COUNT', 'Number of holidays to show') do |count|
+  opts.on('-cCOUNT', '--count=COUNT', 'Number of holidays to list') do |count|
     options[:count] = count.to_i
   end
 
-  options[:all] = false
+  options[:include_weekends] = false
   opts.on('-a', '--all', 'Include holidays falling on a weekend') do
-    options[:all] = true
+    options[:include_weekends] = true
   end
 
   opts.on('-h', '--help', 'Show this screen') do
@@ -28,11 +28,31 @@ optparse = OptionParser.new do |opts|
     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!
 
-holidays = FinnishHolidays.holidays(options[:count], options[:all])
+if options[:month].is_a? Integer and !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
+  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 = DateUtils.create_date(holiday['year'], holiday['month'], holiday['day'])
   date = t.strftime('%a, %b %e, %Y')

data/lib/classes/calendar.rb

@@ -6,14 +6,15 @@ require_relative '../utils/date-utils'
 class Calendar
   MAX_HOLIDAYS = 100
 
-  def initialize()
-    @y = Time.now.year
-    @m = Time.now.month
-    @d = Time.now.day
+  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 holidays(count = 3, all = false)
+  def next(count = 3, include_weekends = false)
     if count > MAX_HOLIDAYS
       raise "Cannot request more than #{MAX_HOLIDAYS} holidays at once."
     end
@@ -23,7 +24,7 @@ class Calendar
     while holidays.length < count
       month_index = @m.to_s
 
-      if !all
+      if !include_weekends
         @year.discard_weekends()
       end
 
@@ -43,6 +44,38 @@ class Calendar
     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.to_s].is_a? Array
+      @year.holidays[month.to_s].each do |holiday|
+        holidays.push(holiday)
+      end
+    end
+
+    holidays
+  end
+
 private
 
   def next_month

data/lib/classes/year.rb

@@ -77,8 +77,10 @@ private
     month = month.to_i
     day = day.to_i
 
-    if !@holidays[month].is_a? Array
-      @holidays[month] = []
+    month_index = month.to_s
+
+    if !@holidays[month_index].is_a? Array
+      @holidays[month_index] = []
     end
 
     holiday = {
@@ -88,7 +90,7 @@ private
       'description' => description
     }
 
-    @holidays[month].push(holiday)
+    @holidays[month_index].push(holiday)
   end
 
   def cache

data/lib/finnish-holidays.rb

@@ -1,7 +1,18 @@
 require_relative 'classes/calendar'
 
 module FinnishHolidays
-  def self.holidays(count = 3, all = false)
-    Calendar.new.holidays(count, all)
+  # Lists the next holidays relative to today's date
+  def self.next(count = 3, include_weekends = false)
+    Calendar.new.next(count, include_weekends)
+  end
+
+  # Lists holidays for the given year
+  def self.year(year, include_weekends = false)
+    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)
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FinnishHolidays
-  VERSION = '0.1.6'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finnish-holidays
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Nishio
@@ -14,56 +14,56 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: A CLI and library for displaying Finnish national holidays.
@@ -74,10 +74,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .editorconfig
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -102,17 +102,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A tool for displaying Finnish national holidays.