holiday_japan 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9540283004068cd99eab88dd20123e9f488f97ea
-  data.tar.gz: 0ea0c38cab28e850c8fea2468d08a28294d65619
+  metadata.gz: 867527a26b8126f7719f9b8c722b3768e0e88c74
+  data.tar.gz: 5802282ae981d997c06b732c09ae7cf1928fe514
 SHA512:
-  metadata.gz: 1187af861c7a00fcc313aa3e234093af659c9d31130c3498480e15334b5a56e67a0b3100047da9c5edd43c3646ac9012ce5d20a4d49e2581a25621a8adbaf490
-  data.tar.gz: a8047ccd3ef055af57c1020510f7d018beb9775e6a2eed91aa64762bad0c9f7f90ca8cec6bd96b1e6b304a86bd4cf2e33790cca79265dc0d4dfa89be4d1b7973
+  metadata.gz: 2bd7a06035156dc216eed51b77ca31ac4fc533dbbcdbac215c62b9b433548c634995b24238c5300de399f9ca42472f86e31f86a4c9445fad30062f24f59d802f
+  data.tar.gz: 234f7ccbaf9bd0d8303fcdcb140a04f9cfde739540b67eebefc36d46ba454a0389e679ec7bbe1d50e2784e419dc772db60b9dd8c03817aa62aab85f345c8a7d6

data/README.md

@@ -163,7 +163,8 @@
 ##  祝日データ
 
 * 1948年7月20日(祝日法発令) 以降の祝日に対応
-* 2016年の[暦要項](http://eco.mtk.nao.ac.jp/koyomi/yoko/)まで確認（法改正がない限り以降も有効）
+* 2017年の[暦要項](http://eco.mtk.nao.ac.jp/koyomi/yoko/)まで確認（法改正がない限り以降も有効）
+* 春分の日・秋分の日の計算は2150年まで
 
 ## Author:
     Masahiro TANAKA

data/lib/holiday_japan.rb

@@ -6,12 +6,12 @@ require "date"
 
 module HolidayJapan
 
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 
-  WEEK1 = 1..7
-  WEEK2 = 8..14
-  WEEK3 = 15..21
-  WEEK4 = 22..28
+  WEEK1 =  1
+  WEEK2 =  8
+  WEEK3 = 15
+  WEEK4 = 22
   SUN,MON,TUE,WED,THU,FRU,SAT = (0..6).to_a
   INF = (defined? Float::INFINITY) ? Float::INFINITY : 1e34
 
@@ -38,17 +38,17 @@ module HolidayJapan
     ["勤労感謝の日",1948..INF , 11,  23        ],
     ["天皇誕生日",  1989..INF , 12,  23        ],
     ["春分の日",    1949..1979,  3,
-      proc{|y|Integer(20.8357+0.242194*(y-1980))-Integer((y-1983)/4.0)} ],
+     proc{|y|Integer(20.8357+0.242194*(y-1980))-Integer((y-1983)/4.0)} ],
     ["春分の日",    1980..2099,  3,
-      proc{|y|Integer(20.8431+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
+     proc{|y|Integer(20.8431+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
     ["春分の日",    2100..2150,  3,
-      proc{|y|Integer(21.8510+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
+     proc{|y|Integer(21.8510+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
     ["秋分の日" ,   1948..1979,  9,
-      proc{|y|Integer(23.2588+0.242194*(y-1980))-Integer((y-1983)/4.0)} ],
+     proc{|y|Integer(23.2588+0.242194*(y-1980))-Integer((y-1983)/4.0)} ],
     ["秋分の日" ,   1980..2099,  9,
-      proc{|y|Integer(23.2488+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
+     proc{|y|Integer(23.2488+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
     ["秋分の日" ,   2100..2150,  9,
-      proc{|y|Integer(24.2488+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
+     proc{|y|Integer(24.2488+0.242194*(y-1980))-Integer((y-1980)/4.0)} ],
     ["皇太子明仁親王の結婚の儀", 1959..1959,  4, 10 ],
     ["昭和天皇の大喪の礼",       1989..1989,  2, 24 ],
     ["即位礼正殿の儀",           1990..1990, 11, 12 ],
@@ -65,13 +65,15 @@ module HolidayJapan
     name,year_range,mon,day,wday = data
     if year_range === year
       case day
-      when Fixnum
-	Date.new( year, mon, day )
-      when Range
-	wday0 = Date.new(year,mon,day.first).wday
-	Date.new( year, mon, day.first+(wday-wday0+7)%7 )
+      when Integer
+        if wday
+          wday0 = Date.new(year,mon,day).wday
+          Date.new( year, mon, day+(wday-wday0+7)%7 )
+        else
+          Date.new( year, mon, day )
+        end
       when Proc
-	Date.new( year, mon, day.call(year) )
+        Date.new( year, mon, day.call(year) )
       end
     end
   end
@@ -83,22 +85,22 @@ module HolidayJapan
     DATA.each do |x|
       if d = holiday_date(y,x)
         h[d] = x[0]
-	a << d
+        a << d
       end
     end
     # compensating holiday
     if y >= 2007
       a.each do |d|
         if d.wday==SUN
-	  d+=1 while h[d]
-	  h[d] = "振替休日"
-	end
+          d+=1 while h[d]
+          h[d] = "振替休日"
+        end
       end
     elsif y >= 1973
       a.each do |d|
         if d.wday==SUN and d>=FURIKAE_START
-	  h[d+1] = "振替休日"
-	end
+          h[d+1] = "振替休日"
+        end
       end
     end
     # consecutive holiday
@@ -151,13 +153,23 @@ module HolidayJapan
     result
   end
 
-  def print_year(year)
+  def _print_year(year)
     puts "listing year #{year}..."
     list_year(year).each do |y|
       puts "#{y[0].strftime('%Y-%m-%d %a')} #{y[1]}"
     end
   end
 
+  def print_year(year)
+    case year
+    when Range
+      year.each do |y|
+        _print_year(y)
+      end
+    else
+      _print_year(year)
+    end
+  end
 end
 
 
@@ -171,5 +183,10 @@ end
 # command line
 if __FILE__ == $0
   # print holiday list of the year
-  HolidayJapan.print_year(ARGV[0])
+  begin
+    arg = eval(ARGV[0])
+  rescue
+    raise ArgumentError,"invalid argument : #{ARGV[0]}"
+  end
+  HolidayJapan.print_year(arg)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holiday_japan
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies: []
 description: Calculate National Holidays of Japan between 1948..2150
 email:
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Calculate National Holidays of Japan