holiday_jp 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ebd9b74ed9f7e61e341e217748bdae919741cc6f1c05b898be7f27373a9ad45
-  data.tar.gz: 45c09c56ceb0ce8b3c81a8b4ab234fcfdba58994f4d028cc6ba307bec23ad79e
+  metadata.gz: 32d70e14a9053f50182b13a99e481431fd9180fb28b02fcd0ba042959fbb1819
+  data.tar.gz: 60d36bf1854b72e50e32fb1c61f71c5d23925f96bfbc81184c5c86b363190a2c
 SHA512:
-  metadata.gz: 837c9b891e69a4c48b3a792522219dbf90b4fbb773e201dd284498aa6afa702a3dc05b4ade12d0c13ab3d6a02b51ff7b3cf3881b2b4f4c542a54b1c42a9c611e
-  data.tar.gz: e53e61326ef8be41f2a6b0368fc38addc3072dc8da47bb822c0fcfdafb61f1264f91ea05a2f8fbec39313770f4869b3346f57cc834736fd469802d0119381dce
+  metadata.gz: 032dbec25f732d8b880406cfb52c343ced173c0205e57c69d179c5be9e1b8af68b68c30b48ddab86b4585070b035047d63dcd446e3fe4ae492dcc414d5a9b879
+  data.tar.gz: 792dcf1441024706b7c41b879d1679d7e9b7bb2f7665ec477e44287da5698ed6af5adc1664b97085906a7687a55c90f2bb54fb2db14cd06932da2b670a236cbd

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+---
+name: test
+
+on:
+  push:
+  schedule:
+    - cron:  '0 1 * * *'
+
+jobs:
+  job-test:
+    name: Test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [ '2.4', '2.5', '2.6', '2.7' ]
+    steps:
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Check out source code
+        uses: actions/checkout@v2
+
+      - name: Setup
+        run: |
+          git submodule update --init
+          gem install bundler -v '~> 1.6'
+          bundle install
+
+      - name: Run test
+        run: bundle exec rake test

data/README.md

@@ -1,4 +1,4 @@
-# holiday_jp [![Build Status](https://travis-ci.org/holiday-jp/holiday_jp-ruby.svg?branch=master)](https://travis-ci.org/holiday-jp/holiday_jp-ruby)
+# holiday_jp [![test](https://github.com/holiday-jp/holiday_jp-ruby/workflows/test/badge.svg)](https://github.com/holiday-jp/holiday_jp-ruby/actions)
 
 Get holidays in Japan.
 
@@ -13,8 +13,28 @@ HolidayJp.holiday?(Date.new(2016, 8 ,11)) # true
 ## Supported Ruby Version
 Ruby 1.9.3+
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'holiday_jp'
+```
+
+And then execute:
+
+```sh
+$ bundle
+```
+
+Or install it yourself as:
+
+```sh
+$ gem install holiday_jp
+```
+
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/holiday_jp.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler', '~> 1.6'
+  s.add_development_dependency 'bundler', '< 3.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit', '3.0.9'
 end

data/holidays.yml

@@ -1,3 +1,4 @@
+---
 1970-01-01: 元日
 1970-01-15: 成人の日
 1970-02-11: 建国記念の日
@@ -257,7 +258,7 @@
 1989-01-15: 成人の日
 1989-01-16: 振替休日
 1989-02-11: 建国記念の日
-1989-02-24: 昭和天皇の大喪の礼
+1989-02-24: 大喪の礼
 1989-03-21: 春分の日
 1989-04-29: みどりの日
 1989-05-03: 憲法記念日
@@ -327,7 +328,7 @@
 1993-05-03: 憲法記念日
 1993-05-04: 国民の休日
 1993-05-05: こどもの日
-1993-06-09: 皇太子徳仁親王の結婚の儀
+1993-06-09: 結婚の儀
 1993-09-15: 敬老の日
 1993-09-23: 秋分の日
 1993-10-10: 体育の日
@@ -758,9 +759,9 @@
 2019-02-11: 建国記念の日
 2019-03-21: 春分の日
 2019-04-29: 昭和の日
-2019-04-30: 休日
+2019-04-30: 国民の休日
 2019-05-01: 休日（祝日扱い）
-2019-05-02: 休日
+2019-05-02: 国民の休日
 2019-05-03: 憲法記念日
 2019-05-04: みどりの日
 2019-05-05: こどもの日
@@ -770,7 +771,7 @@
 2019-08-12: 振替休日
 2019-09-16: 敬老の日
 2019-09-23: 秋分の日
-2019-10-14: 体育の日
+2019-10-14: 体育の日（スポーツの日）
 2019-10-22: 休日（祝日扱い）
 2019-11-03: 文化の日
 2019-11-04: 振替休日
@@ -802,11 +803,12 @@
 2021-05-03: 憲法記念日
 2021-05-04: みどりの日
 2021-05-05: こどもの日
-2021-07-19: 海の日
-2021-08-11: 山の日
+2021-07-22: 海の日
+2021-07-23: スポーツの日
+2021-08-08: 山の日
+2021-08-09: 振替休日
 2021-09-20: 敬老の日
 2021-09-23: 秋分の日
-2021-10-11: スポーツの日
 2021-11-03: 文化の日
 2021-11-23: 勤労感謝の日
 2022-01-01: 元日

data/lib/holiday_jp/holidays.rb

@@ -14,12 +14,12 @@ module HolidayJp
 
     def between(start, last)
       holidays.find_all do |date, _holiday|
-        start <= date && date <= last
+        start.to_date <= date && date <= last.to_date
       end.map(&:last)
     end
 
     def holiday?(date)
-      holidays[date]
+      holidays.has_key?(date.to_date)
     end
   end
 end

data/lib/holiday_jp/version.rb

@@ -1,3 +1,3 @@
 module HolidayJp
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/test/test_holiday_jp.rb

@@ -19,22 +19,46 @@ class TestHolidayJp < Test::Unit::TestCase
     assert_equal holidays[2].date, Date.new(2009, 1, 12)
   end
 
+  def test_between_accepts_datetime
+    holidays = HolidayJp.between(DateTime.new(2008, 12, 23), DateTime.new(2009, 1, 12))
+    assert_equal holidays[0].date, Date.new(2008, 12, 23)
+    assert_equal holidays[1].date, Date.new(2009, 1, 1)
+    assert_equal holidays[2].date, Date.new(2009, 1, 12)
+  end
+
+  def test_between_accepts_time
+    holidays = HolidayJp.between(Time.new(2008, 12, 23), Time.new(2009, 1, 12))
+    assert_equal holidays[0].date, Date.new(2008, 12, 23)
+    assert_equal holidays[1].date, Date.new(2009, 1, 1)
+    assert_equal holidays[2].date, Date.new(2009, 1, 12)
+  end
+
   def test_holiday?
-    assert HolidayJp.holiday?(Date.new(2011, 9, 19))
-    assert !HolidayJp.holiday?(Date.new(2011, 9, 18))
+    assert_true HolidayJp.holiday?(Date.new(2011, 9, 19))
+    assert_false HolidayJp.holiday?(Date.new(2011, 9, 18))
+  end
+
+  def test_holiday_p_accepts_datetime
+    assert_true HolidayJp.holiday?(DateTime.new(2011, 9, 19))
+    assert_false HolidayJp.holiday?(DateTime.new(2011, 9, 18))
+  end
+
+  def test_holiday_p_accepts_time
+    assert_true HolidayJp.holiday?(Time.new(2011, 9, 19))
+    assert_false HolidayJp.holiday?(Time.new(2011, 9, 18))
   end
 
   def test_mountain_day_from_2016
-    assert !HolidayJp.holiday?(Date.new(2015, 8, 11))
+    assert_false HolidayJp.holiday?(Date.new(2015, 8, 11))
     (2016..2050).each do |year|
-      next if year == 2020 # Tokyo Olympic year
-      assert HolidayJp.holiday?(Date.new(year, 8, 11))
+      next if year == 2020 || year == 2021 # Tokyo Olympic year
+      assert_true HolidayJp.holiday?(Date.new(year, 8, 11))
     end
   end
 
   def test_emperors_birthday
     1970.upto(1988) do |year|
-      assert HolidayJp.holiday?(Date.new(year, 4, 29))
+      assert_true HolidayJp.holiday?(Date.new(year, 4, 29))
     end
 
     1989.upto(2018) do |year|

data/test/test_holiday_jp_yaml.rb

@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
 require 'test/unit'
+require 'net/http'
 require 'yaml'
 
 class TestHolidayJpYaml < Test::Unit::TestCase
   def test_yaml
     yaml = YAML.load_file(File.expand_path('../../holidays.yml', __FILE__))
-    holiday_jp_yaml = YAML.load_file(File.expand_path('../holiday_jp/holidays.yml', __FILE__))
+    uri = URI.parse('https://raw.githubusercontent.com/holiday-jp/holiday_jp/v0.x/holidays.yml')
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
+    holiday_jp_yaml = YAML.load(http.get(uri.request_uri).body)
     yaml.map do |date, name|
       assert_equal holiday_jp_yaml[date], name
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: holiday_jp
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Masaki Komagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,9 +61,9 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gemtest"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -96,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: holiday_jp
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Japanese Holidays.

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.1.5
-  - 2.2.2
-  - 2.2.3
-  - 2.2.5
-  - 2.3.1
-  - 2.4.1
-before_install:
-  - git submodule update --init
-  - sudo apt-get update
-  - gem install bundler -v '~> 1.6'