finnish-holidays 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c15736eed0cd1630d850118e61200b9936ea0df
-  data.tar.gz: 9e48954f4659fe0a7465c88ea8a88985ac737fb7
+  metadata.gz: 30218b8e1bae7a864a62a2f7d13477e1654b3f49
+  data.tar.gz: c1e148429bf248bf5c4eec2b15842f09646b3a73
 SHA512:
-  metadata.gz: 20947d99388deb6e18793170e717f885656b6d0cb4701e793d8687e94716ac5dfad3f9d45401b18bd3da1b616f052835bf5f4d76f27ed80fbeb345f28d21f5f4
-  data.tar.gz: 1b56dca6f8aef598a69fd47ce23e1f6410778e4f129f7a3f8c885763a9f555b33c71c7aff6970de9c8a4baa5fc40246677ca97ea2ed82365d56cc3479df4b942
+  metadata.gz: 77f13ba900cf0864ebf9c4eebb75fbbafe5e2851c014d41b98b5a1d06d7bdf072e2db5d5b09a1fc565e692d9bf2a745c13a3cedfa02c10a84adc2d0bf137476e
+  data.tar.gz: ed5fb7cf3f20f26a440cb9857b817fca200081ec4295e05a71a3702321a46fa6e24701070d8e2dfeb9e7e55a5ce71e4b93d24088d508d7b7c0b0aa290199a0d7

data/bin/finnish-holidays

@@ -2,7 +2,9 @@
 # encoding: UTF-8
 
 require 'optparse'
-require_relative '../lib/calendar'
+require_relative '../lib/finnish-holidays'
+require_relative '../lib/version'
+require_relative '../lib/utils/date-utils'
 
 options = {}
 
@@ -21,8 +23,18 @@ optparse = OptionParser.new do |opts|
     puts opts
     exit
   end
+
+  opts.on('-v', '--version', 'Show version') do
+    puts FinnishHolidays::VERSION
+    exit
+  end
 end
 
 optparse.parse!
 
-Calendar.new.holidays_print(options[:count], options[:all])
+holidays = FinnishHolidays.holidays(options[:count], options[:all])
+holidays.each do |holiday|
+  t = DateUtils.create_date(holiday['year'], holiday['month'], holiday['day'])
+  date = t.strftime('%a, %b %e, %Y')
+  puts "#{date} #{holiday['description']}"
+end

data/finnish-holidays.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = "finnish-holidays"
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.6.2"
-  spec.add_dependency "json", "~> 1.8.2"
+  spec.add_dependency "nokogiri", "~> 1.6"
+  spec.add_dependency "json", "~> 1.8"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/{calendar.rb → classes/calendar.rb}

@@ -1,7 +1,7 @@
 require 'json'
 require 'time'
 require_relative 'year'
-require_relative 'date-utils'
+require_relative '../utils/date-utils'
 
 class Calendar
   MAX_HOLIDAYS = 100
@@ -18,7 +18,7 @@ class Calendar
       raise "Cannot request more than #{MAX_HOLIDAYS} holidays at once."
     end
 
-    holidays = Array.new
+    holidays = []
 
     while holidays.length < count
       month_index = @m.to_s
@@ -43,20 +43,9 @@ class Calendar
     holidays
   end
 
-  def holidays_print(count = 3, all = false)
-    holidays = self.holidays(count, all)
-
-    holidays.each do |holiday|
-      t = DateUtils.create_date(holiday['year'], holiday['month'], holiday['day'])
-      date = t.strftime('%a, %b %e, %Y')
-
-      puts "#{date} #{holiday['description']}"
-    end
-  end
-
 private
 
-  def next_month()
+  def next_month
     if @m == 12
       @m = 1
       @y += 1

data/lib/{year.rb → classes/year.rb}

@@ -2,7 +2,7 @@ require 'nokogiri'
 require 'open-uri'
 require 'json'
 require 'time'
-require_relative 'date-utils'
+require_relative '../utils/date-utils'
 
 class Year
   def initialize(year)
@@ -15,11 +15,11 @@ class Year
     end
   end
 
-  def holidays()
+  def holidays
     @holidays
   end
 
-  def discard_weekends()
+  def discard_weekends
     holidays = {}
 
     @holidays.each do |month, array|
@@ -39,7 +39,7 @@ class Year
 
 private
 
-  def load_data()
+  def load_data
     file = get_cache_file_path()
 
     if File.exist?(file)
@@ -50,12 +50,12 @@ private
     end
   end
 
-  def load_from_file()
+  def load_from_file
     json = File.read(get_cache_file_path())
     @holidays = JSON.parse(json)
   end
 
-  def load_from_web()
+  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|
@@ -91,11 +91,12 @@ private
     @holidays[month].push(holiday)
   end
 
-  def cache()
+  def cache
     File.write(get_cache_file_path(), @holidays.to_json)
   end
 
-  def get_cache_file_path()
-    return File.dirname(__FILE__) + "/../data/#{@year}.json"
+  def get_cache_file_path
+    cwd = File.dirname(__FILE__)
+    "#{cwd}/../../data/#{@year}.json"
   end
 end

data/lib/finnish-holidays.rb

@@ -1,7 +1,7 @@
-require_relative 'calendar'
+require_relative 'classes/calendar'
 
-class FinnishHolidays
+module FinnishHolidays
   def self.holidays(count = 3, all = false)
-    Calendar.new.holidays
+    Calendar.new.holidays(count, all)
   end
 end

data/lib/version.rb

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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: finnish-holidays
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Eric Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        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
@@ -86,11 +86,11 @@ files:
 - bin/finnish-holidays
 - data/.gitkeep
 - finnish-holidays.gemspec
-- lib/calendar.rb
-- lib/date-utils.rb
+- lib/classes/calendar.rb
+- lib/classes/year.rb
 - lib/finnish-holidays.rb
+- lib/utils/date-utils.rb
 - lib/version.rb
-- lib/year.rb
 homepage: https://github.com/ericnishio/finnish-holidays
 licenses:
 - MIT
@@ -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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool for displaying Finnish national holidays.