jp_vaccination 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4db65f5550a96efe19e92b8401da3a6e8bbd327cc2398e33714253b7dc99bd0
-  data.tar.gz: 9c20166769728687f7c9d6e68419986fe8460b084e9fe32dd1e4347e8e22726a
+  metadata.gz: c4cf6a5862f8cd66bc5b4816c99d2db02e2c11aed1649d2071eb2ecfacbe2bf6
+  data.tar.gz: fc9d5f76685ca44773a3e98f51c1a59e10c5e5f31f0948a19e75db698d16e1f2
 SHA512:
-  metadata.gz: 738d8f344f7afa4c0347d4adbf0a0a63439834800c2fb74c3dbcaf60ec881fd27cdc39fc5ca6631d338662be3e00f11dd61e67b9c6522db4433efa2ce497b4a7
-  data.tar.gz: fbe6e5503c027730f52f6cc9481c7abae3c69001d057fef15f709d8db598539293f63c2fd14cfb23fc1cee9e1a39592cad5a7101ade6a5bc647064acaa1762f8
+  metadata.gz: 3c59c8c2afc461b776f3298d39b6e23ce18e3d199326e245ee0d4ae7e5d63900b3e4c90a3fafbc8acbba5c89e974ac70af3d046b606b3d86af07a286af634570
+  data.tar.gz: 0ac5a667a00ff91319d3e60611477da0b6ca53bc05137ef34b8fd9583007db441cf7c5d88b713b9f9cdeb9f3907c98f24b8f52a60a1350efb6a3eda128c9f53b

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 Gemfile.lock
 .gem/

data/Gemfile.lock

@@ -1,55 +1,55 @@
 PATH
   remote: .
   specs:
-    jp_vaccination (0.1.0)
+    jp_vaccination (1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.2)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     rack (2.2.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.4.0)
     rexml (3.2.5)
-    rubocop (1.25.1)
+    rubocop (1.29.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
     rubocop-fjord (0.2.0)
       rubocop (>= 1.0)
       rubocop-performance
-    rubocop-minitest (0.17.2)
+    rubocop-minitest (0.19.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.13.2)
+    rubocop-rails (2.14.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     tzinfo (2.0.4)

data/data/vaccinations.json

@@ -245,6 +245,12 @@
         "start": 60,
         "end": null,
         "less_than": true
+      },
+      "birthday": {
+        "date_type": "month",
+        "start": 12,
+        "end": 15,
+        "less_than": true
       }
     },
     "DPT_IPV_1": {
@@ -294,7 +300,7 @@
       "period": "第１期 ４回目",
       "regular": true,
       "recommended": {
-        "month": 12
+        "month": 17
       },
       "deadline": null,
       "interval": {
@@ -354,9 +360,7 @@
       "type": "生ワクチン",
       "regular": true,
       "recommended": "小学校入学前１年間",
-      "deadline": {
-        "date_type": "小学校入学前１年間"
-      }
+      "deadline": null
     },
     "chickenpox_1": {
       "name": "水痘",
@@ -453,7 +457,7 @@
       "period": "第１期 ３回目",
       "regular": true,
       "recommended": {
-        "year": 4
+        "month": 49
       },
       "deadline": {
         "date_type": "year",

data/lib/jp_vaccination/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JpVaccination
-  VERSION = '1.0.0'
+  VERSION = '1.3.0'
 end

data/lib/jp_vaccination.rb

@@ -5,7 +5,7 @@ require 'json'
 require_relative './jp_vaccination/vaccination'
 require_relative './jp_vaccination/version'
 
-module JpVaccination
+module JpVaccination # rubocop:disable Metrics/ModuleLength
   class << self
     def vaccination_keys
       vaccinations_json.map do |key, _value|
@@ -48,7 +48,7 @@ module JpVaccination
       combined_name_and_date.each_key.group_by { |date| combined_name_and_date[date] }.each_value(&:sort!)
     end
 
-    def next_day(vaccination_key, last_time)
+    def next_day(vaccination_key, last_time, birthday = nil)
       next_day = {}
       vaccinations_json.each do |key, vaccination|
         next unless key == vaccination_key.to_sym
@@ -57,13 +57,13 @@ module JpVaccination
 
         date = case vaccination[:interval]
                when nil
-                 if vaccination[:deadline]
-                   calc_date(period: vaccination[:deadline], start_or_end: :start, date: last_time)
+                 nil_interval(vaccination, last_time)
+               else
+                 if vaccination[:birthday]
+                   pneumococcus_fourth(vaccination, last_time, birthday)
                  else
-                   vaccination[:recommended]
+                   calc_date(period: vaccination[:interval], start_or_end: :start, date: last_time)
                  end
-               else
-                 calc_date(period: vaccination[:interval], start_or_end: :start, date: last_time)
                end
         next_day[:name] = name
         next_day[:date] = date
@@ -95,6 +95,20 @@ module JpVaccination
       period[:less_than] ? date - 1 : date
     end
 
+    def nil_interval(vaccination, last_time)
+      if vaccination[:deadline]
+        calc_date(period: vaccination[:deadline], start_or_end: :start, date: last_time)
+      else
+        vaccination[:recommended]
+      end
+    end
+
+    def pneumococcus_fourth(vaccination, last_time, birthday)
+      interval_date = calc_date(period: vaccination[:interval], start_or_end: :start, date: last_time)
+      birthday_date = Date.parse(birthday) >> vaccination[:birthday][:start]
+      interval_date < birthday_date ? birthday_date : interval_date
+    end
+
     def pre_school_year(birthday, convert_to_strings = nil)
       fifth_birthday = Date.parse(birthday) >> 12 * 5
       year = case fifth_birthday.month

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jp_vaccination
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - napple29
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies: []
 description: We provide data extracted from                         the National Institute
   of Infectious Diseases' immunization schedule                         for people