From 556842d615ef0b339d818b4deb891c722f1e11b5 Mon Sep 17 00:00:00 2001 From: Spiegel Date: Sat, 25 Feb 2023 10:25:59 +0900 Subject: [PATCH 1/2] Move koyomi.DateJp to koyomi/value.DateJp --- .github/workflows/lint.yml | 8 ++++++-- .github/workflows/vulns.yml | 2 +- README.md | 20 ++++++++++---------- Taskfile.yml | 9 ++++++--- events.go | 15 ++++++++------- example_test.go | 7 ++++--- sample/sample0.go | 7 ++++--- sample/sample1.go | 6 +++--- sample/sample2.go | 6 +++--- sample/sample3.go | 4 ++-- sample/sample4.go | 4 ++-- source.go | 17 +++++++++-------- date.go => value/date.go | 24 ++++++++++++------------ date_test.go => value/date_test.go | 4 ++-- era.go => value/era.go | 26 +++++++++++++------------- era_test.go => value/era_test.go | 4 ++-- zodiac/zodiac.go | 4 ++-- zodiac/zodiac_test.go | 16 ++++++++-------- 18 files changed, 97 insertions(+), 86 deletions(-) rename date.go => value/date.go (80%) rename date_test.go => value/date_test.go (98%) rename era.go => value/era.go (75%) rename era_test.go => value/era_test.go (98%) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e3d8d34..03d8e17 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,10 +14,10 @@ jobs: name: lint runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: ^1.19 - - uses: actions/checkout@v3 + go-version-file: 'go.mod' - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -44,3 +44,7 @@ jobs: # skip-build-cache: true - name: testing run: go test -shuffle on ./... + - name: install govulncheck + run: go install golang.org/x/vuln/cmd/govulncheck@latest + - name: running govulncheck + run: govulncheck ./... diff --git a/.github/workflows/vulns.yml b/.github/workflows/vulns.yml index af80b13..2c51e0e 100644 --- a/.github/workflows/vulns.yml +++ b/.github/workflows/vulns.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version-file: 'go.mod' - name: install depm run: go install github.com/goark/depm@latest - name: WriteGoList diff --git a/README.md b/README.md index fabe740..7f93e12 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ const ( ## 簡単な使い方 ```go -start, _ := koyomi.DateFrom("2019-05-01") -end := koyomi.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST)) +start, _ := value.DateFrom("2019-05-01") +end := value.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST)) k, err := koyomi.NewSource( koyomi.WithCalendarID(koyomi.Holiday, koyomi.SolarTerm), koyomi.WithStartDate(start), @@ -83,7 +83,7 @@ import ( "strconv" "time" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" ) func main() { @@ -106,7 +106,7 @@ func main() { } tm = time.Date(args[0], time.Month(args[1]), args[2], 0, 0, 0, 0, time.Local) } - te := koyomi.NewDate(tm) + te := value.NewDate(tm) n, y := te.YearEraString() if len(n) == 0 { fmt.Fprintln(os.Stderr, "正しい年月日を指定してください") @@ -141,7 +141,7 @@ import ( "strconv" "time" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" ) func main() { @@ -162,7 +162,7 @@ func main() { } args[i] = num } - te := koyomi.NewDateEra(koyomi.EraName(name), args[0], time.Month(args[1]), args[2], 0, 0, 0, 0, time.Local) + te := value.NewDateEra(value.EraName(name), args[0], time.Month(args[1]), args[2]) fmt.Println(te.Format("西暦2006年1月2日")) } ``` @@ -190,7 +190,7 @@ import ( "fmt" "os" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" "github.com/goark/koyomi/zodiac" ) @@ -202,7 +202,7 @@ func main() { return } for _, s := range args { - t, err := koyomi.DateFrom(s) + t, err := value.DateFrom(s) if err != nil { fmt.Fprintln(os.Stderr, err) continue @@ -236,8 +236,8 @@ import ( "fmt" "os" - "github.com/goark/koyomi" "github.com/goark/koyomi/jdn" + "github.com/goark/koyomi/value" ) func main() { @@ -248,7 +248,7 @@ func main() { return } for _, s := range args { - t, err := koyomi.DateFrom(s) + t, err := value.DateFrom(s) if err != nil { fmt.Fprintln(os.Stderr, err) continue diff --git a/Taskfile.yml b/Taskfile.yml index b59a3f6..59dcca6 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -3,7 +3,7 @@ version: '3' tasks: default: cmds: - - task: clean + - task: prepare - task: test - task: nancy - task: graph @@ -13,7 +13,8 @@ tasks: cmds: - go mod verify - go test -shuffle on ./... - - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.50.1 golangci-lint run --enable gosec --timeout 3m0s ./... + - govulncheck ./... + - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.51.2 golangci-lint run --enable gosec --timeout 3m0s ./... sources: - ./go.mod - '**/*.go' @@ -26,13 +27,15 @@ tasks: - ./go.mod - '**/*.go' + prepare: + - go mod tidy -v -go=1.20 + clean: desc: Initialize module and build cache, and remake go.sum file. cmds: - rm -f ./go.sum - go clean -cache - go clean -modcache - - go mod tidy -v -go=1.19 graph: desc: Make grapth of dependency modules. diff --git a/events.go b/events.go index 9373c8e..82f305f 100644 --- a/events.go +++ b/events.go @@ -8,25 +8,26 @@ import ( "strconv" "github.com/goark/errs" + "github.com/goark/koyomi/value" ) -//Event is koyomi event data +// Event is koyomi event data type Event struct { - Date DateJp + Date value.DateJp Title string } -//Koyomi is array of Event +// Koyomi is array of Event type Koyomi struct { events []Event } -//newKoyomi createw Koyomi instance +// newKoyomi createw Koyomi instance func newKoyomi() *Koyomi { return &Koyomi{events: make([]Event, 0)} } -//Events returns event array +// Events returns event array func (k *Koyomi) Events() []Event { if k == nil { return []Event{} @@ -34,7 +35,7 @@ func (k *Koyomi) Events() []Event { return k.events } -//SortByDate sorts event data by date +// SortByDate sorts event data by date func (k *Koyomi) SortByDate() { if k == nil || len(k.events) <= 1 { return @@ -44,7 +45,7 @@ func (k *Koyomi) SortByDate() { }) } -//Add adds other Kyomoi instance +// Add adds other Kyomoi instance func (k *Koyomi) Add(kk *Koyomi) { if kk == nil { return diff --git a/example_test.go b/example_test.go index d13d49e..2da12fb 100644 --- a/example_test.go +++ b/example_test.go @@ -8,11 +8,12 @@ import ( "time" "github.com/goark/koyomi" + "github.com/goark/koyomi/value" ) func ExampleKoyomi() { - start, _ := koyomi.DateFrom("2019-05-01") - end := koyomi.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST)) + start, _ := value.DateFrom("2019-05-01") + end := value.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, value.JST)) k, err := koyomi.NewSource( koyomi.WithCalendarID(koyomi.Holiday, koyomi.SolarTerm), koyomi.WithStartDate(start), @@ -43,7 +44,7 @@ func ExampleKoyomi() { //"2019-05-21","小満" } -/* Copyright 2020 Spiegel +/* Copyright 2020-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/sample/sample0.go b/sample/sample0.go index 5a2d645..f5cc69d 100644 --- a/sample/sample0.go +++ b/sample/sample0.go @@ -10,11 +10,12 @@ import ( "time" "github.com/goark/koyomi" + "github.com/goark/koyomi/value" ) func main() { - start, _ := koyomi.DateFrom("2019-05-01") - end := koyomi.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST)) + start, _ := value.DateFrom("2019-05-01") + end := value.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, value.JST)) k, err := koyomi.NewSource( koyomi.WithCalendarID(koyomi.Holiday, koyomi.SolarTerm), koyomi.WithStartDate(start), @@ -31,7 +32,7 @@ func main() { io.Copy(os.Stdout, bytes.NewReader(csv)) } -/* Copyright 2022 Spiegel +/* Copyright 2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/sample/sample1.go b/sample/sample1.go index 6592d1b..3b4b405 100644 --- a/sample/sample1.go +++ b/sample/sample1.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" ) func main() { @@ -33,7 +33,7 @@ func main() { } tm = time.Date(args[0], time.Month(args[1]), args[2], 0, 0, 0, 0, time.Local) } - te := koyomi.NewDate(tm) + te := value.NewDate(tm) n, y := te.YearEraString() if len(n) == 0 { fmt.Fprintln(os.Stderr, "正しい年月日を指定してください") @@ -42,7 +42,7 @@ func main() { fmt.Printf("%s%s%d月%d日\n", n, y, te.Month(), te.Day()) } -/* Copyright 2019-2022 Spiegel +/* Copyright 2019-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/sample/sample2.go b/sample/sample2.go index 786e5ba..012c41f 100644 --- a/sample/sample2.go +++ b/sample/sample2.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" ) func main() { @@ -31,11 +31,11 @@ func main() { } args[i] = num } - te := koyomi.NewDateEra(koyomi.EraName(name), args[0], time.Month(args[1]), args[2]) + te := value.NewDateEra(value.EraName(name), args[0], time.Month(args[1]), args[2]) fmt.Println(te.Format("西暦2006年1月2日")) } -/* Copyright 2019-2022 Spiegel +/* Copyright 2019-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/sample/sample3.go b/sample/sample3.go index f40039b..d1a057f 100644 --- a/sample/sample3.go +++ b/sample/sample3.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" "github.com/goark/koyomi/zodiac" ) @@ -20,7 +20,7 @@ func main() { return } for _, s := range args { - t, err := koyomi.DateFrom(s) + t, err := value.DateFrom(s) if err != nil { fmt.Fprintln(os.Stderr, err) continue diff --git a/sample/sample4.go b/sample/sample4.go index 115015e..0568931 100644 --- a/sample/sample4.go +++ b/sample/sample4.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "github.com/goark/koyomi" "github.com/goark/koyomi/jdn" + "github.com/goark/koyomi/value" ) func main() { @@ -20,7 +20,7 @@ func main() { return } for _, s := range args { - t, err := koyomi.DateFrom(s) + t, err := value.DateFrom(s) if err != nil { fmt.Fprintln(os.Stderr, err) continue diff --git a/source.go b/source.go index 95376eb..c8a3a2d 100644 --- a/source.go +++ b/source.go @@ -2,14 +2,15 @@ package koyomi import ( "github.com/goark/errs" + "github.com/goark/koyomi/value" ics "github.com/spiegel-im-spiegel/ics-golang" ) // Source is information of data source for koyomi type Source struct { cids []CalendarID - start DateJp - end DateJp + start value.DateJp + end value.DateJp tempDir string //temporary directory for github.com/spiegel-im-spiegel/ics-golang package } @@ -35,14 +36,14 @@ func WithCalendarID(cid ...CalendarID) optFunc { } // WithStartDate returns function for setting Reader -func WithStartDate(start DateJp) optFunc { +func WithStartDate(start value.DateJp) optFunc { return func(s *Source) { s.start = start } } // WithEndDate returns function for setting Reader -func WithEndDate(end DateJp) optFunc { +func WithEndDate(end value.DateJp) optFunc { return func(s *Source) { s.end = end } @@ -78,7 +79,7 @@ func (s *Source) Get() (*Koyomi, error) { return k, nil } -func getFrom(cid CalendarID, start, end DateJp) ([]Event, error) { +func getFrom(cid CalendarID, start, end value.DateJp) ([]Event, error) { url := cid.URL() if len(url) == 0 { return nil, errs.Wrap(ErrNoData, errs.WithContext("cid", int(cid)), errs.WithContext("start", start.String()), errs.WithContext("end", end.String())) @@ -95,7 +96,7 @@ func getFrom(cid CalendarID, start, end DateJp) ([]Event, error) { kevts := []Event{} for _, calendar := range calendars { for _, evt := range calendar.GetEvents() { - e := Event{Date: NewDate(evt.GetStart()), Title: evt.GetSummary()} + e := Event{Date: value.NewDate(evt.GetStart()), Title: evt.GetSummary()} if boundaryIn(e, start, end) { kevts = append(kevts, e) } @@ -104,7 +105,7 @@ func getFrom(cid CalendarID, start, end DateJp) ([]Event, error) { return kevts, nil } -func boundaryIn(e Event, start, end DateJp) bool { +func boundaryIn(e Event, start, end value.DateJp) bool { if e.Date.IsZero() { return false } @@ -117,7 +118,7 @@ func boundaryIn(e Event, start, end DateJp) bool { return true } -/* Copyright 2020-2022 Spiegel +/* Copyright 2020-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/date.go b/value/date.go similarity index 80% rename from date.go rename to value/date.go index c65ce7d..8d425bf 100644 --- a/date.go +++ b/value/date.go @@ -1,4 +1,4 @@ -package koyomi +package value import ( "strconv" @@ -13,12 +13,12 @@ var ( JST = time.FixedZone("JST", int(jstoffset)) // Japan standard Time ) -//DateJp is wrapper class of time.Time +// DateJp is wrapper class of time.Time type DateJp struct { time.Time } -//NewDate returns DateJp instance +// NewDate returns DateJp instance func NewDate(tm time.Time) DateJp { if tm.IsZero() { return DateJp{tm} @@ -34,7 +34,7 @@ var timeTemplate = []string{ time.RFC3339, } -//DateFrom returns DateJp instance from date string +// DateFrom returns DateJp instance from date string func DateFrom(s string) (DateJp, error) { if len(s) == 0 || strings.EqualFold(s, "null") { return NewDate(time.Time{}), nil @@ -50,7 +50,7 @@ func DateFrom(s string) (DateJp, error) { return NewDate(time.Time{}), lastErr } -//UnmarshalJSON returns result of Unmarshal for json.Unmarshal() +// UnmarshalJSON returns result of Unmarshal for json.Unmarshal() func (t *DateJp) UnmarshalJSON(b []byte) error { s, err := strconv.Unquote(string(b)) if err != nil { @@ -64,7 +64,7 @@ func (t *DateJp) UnmarshalJSON(b []byte) error { return nil } -//MarshalJSON returns time string with RFC3339 format +// MarshalJSON returns time string with RFC3339 format func (t *DateJp) MarshalJSON() ([]byte, error) { if t == nil { return []byte("\"\""), nil @@ -79,32 +79,32 @@ func (t DateJp) String() string { return t.Format("2006-01-02") } -//Equal reports whether t and dt represent the same time instant. +// Equal reports whether t and dt represent the same time instant. func (t DateJp) Equal(dt DateJp) bool { return t.Time.Year() == dt.Time.Year() && t.Time.Month() == dt.Time.Month() && t.Time.Day() == dt.Time.Day() } -//Before reports whether the DateJp instant t is before dt. +// Before reports whether the DateJp instant t is before dt. func (t DateJp) Before(dt DateJp) bool { return !t.Equal(dt) && t.Time.Before(dt.Time) } -//After reports whether the DateJp instant t is after dt. +// After reports whether the DateJp instant t is after dt. func (t DateJp) After(dt DateJp) bool { return !t.Equal(dt) && t.Time.After(dt.Time) } -//AddDate method adds years/months/days and returns new Date instance. +// AddDate method adds years/months/days and returns new Date instance. func (t DateJp) AddDate(years int, months int, days int) DateJp { return NewDate(t.Time.AddDate(years, months, days)) } -//AddDay method adds n days and returns new Date instance. +// AddDay method adds n days and returns new Date instance. func (t DateJp) AddDay(days int) DateJp { return t.AddDate(0, 0, days) } -/* Copyright 2020-2022 Spiegel +/* Copyright 2020-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/date_test.go b/value/date_test.go similarity index 98% rename from date_test.go rename to value/date_test.go index 6ad5d42..50f16a7 100644 --- a/date_test.go +++ b/value/date_test.go @@ -1,4 +1,4 @@ -package koyomi +package value import ( "encoding/json" @@ -78,7 +78,7 @@ func TestEqual(t *testing.T) { } } -/* Copyright 2020-2022 Spiegel +/* Copyright 2020-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/era.go b/value/era.go similarity index 75% rename from era.go rename to value/era.go index db1e6e2..850d329 100644 --- a/era.go +++ b/value/era.go @@ -1,11 +1,11 @@ -package koyomi +package value import ( "fmt" "time" ) -//eraName は元号名を表す内部型です。 +// eraName は元号名を表す内部型です。 type eraName int const ( @@ -26,8 +26,8 @@ var eraString = map[eraName]string{ Reiwa: "令和", } -//koyomi.EraName() 関数は元号の文字列から元号名 eraName を取得します。 -//該当する元号名がない場合は era.Unknown を返します。 +// value.EraName() 関数は元号の文字列から元号名 eraName を取得します。 +// 該当する元号名がない場合は era.Unknown を返します。 func EraName(s string) eraName { for k, v := range eraString { if v == s { @@ -55,8 +55,8 @@ var ( eraSorted = []eraName{Reiwa, Heisei, Showa, Taisho, Meiji} //ソートされた元号の配列（降順） ) -//koyomi.NewDateEra() 関数は 元号・年・月・日・時・分・秒・タイムゾーン を指定して koyomi.DateJp 型のインスタンスを返します。 -//起点が定義されない元号を指定した場合は西暦として処理します。 +// value.NewDateEra() 関数は 元号・年・月・日・時・分・秒・タイムゾーン を指定して value.DateJp 型のインスタンスを返します。 +// 起点が定義されない元号を指定した場合は西暦として処理します。 func NewDateEra(en eraName, year int, month time.Month, day int) DateJp { ofset := 0 if dt, ok := eraTrigger[en]; ok { @@ -65,8 +65,8 @@ func NewDateEra(en eraName, year int, month time.Month, day int) DateJp { return NewDate(time.Date(year+ofset, month, day, 0, 0, 0, 0, JST)) } -//koyomi.DateJp.Era() メソッドは元号名 koyomi.eraName のインスタンスを返します。 -//元号が不明の場合は era.Unknown を返します。 +// value.DateJp.Era() メソッドは元号名 value.eraName のインスタンスを返します。 +// 元号が不明の場合は era.Unknown を返します。 func (t DateJp) Era() eraName { for _, es := range eraSorted { if !t.Before(eraTrigger[es]) { @@ -77,8 +77,8 @@ func (t DateJp) Era() eraName { } -//koyomi.DateJp.YearEra() メソッドは元号付きの年の値を返します。 -//元号が不明の場合は (era.Unknown, 0) を返します。 +// value.DateJp.YearEra() メソッドは元号付きの年の値を返します。 +// 元号が不明の場合は (era.Unknown, 0) を返します。 func (t DateJp) YearEra() (eraName, int) { era := t.Era() if era == EraUnknown { @@ -91,8 +91,8 @@ func (t DateJp) YearEra() (eraName, int) { return era, year } -//koyomi.DateJp.YearEraString() メソッドは元号付きの年の値を文字列で返します。 -//元号が不明の場合は空文字列を返します。 +// value.DateJp.YearEraString() メソッドは元号付きの年の値を文字列で返します。 +// 元号が不明の場合は空文字列を返します。 func (t DateJp) YearEraString() (string, string) { era, year := t.YearEra() if era == EraUnknown || year < 1 { @@ -104,7 +104,7 @@ func (t DateJp) YearEraString() (string, string) { return era.String(), fmt.Sprintf("%d年", year) } -/* Copyright 2019-2022 Spiegel +/* Copyright 2019-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/era_test.go b/value/era_test.go similarity index 98% rename from era_test.go rename to value/era_test.go index 836effe..ee5a50b 100644 --- a/era_test.go +++ b/value/era_test.go @@ -1,4 +1,4 @@ -package koyomi +package value import ( "testing" @@ -102,7 +102,7 @@ func TestEraToDate(t *testing.T) { } } -/* Copyright 2019-2022 Spiegel +/* Copyright 2019-2023 Spiegel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/zodiac/zodiac.go b/zodiac/zodiac.go index 58b8fdb..a2d4c6d 100644 --- a/zodiac/zodiac.go +++ b/zodiac/zodiac.go @@ -1,8 +1,8 @@ package zodiac import ( - "github.com/goark/koyomi" "github.com/goark/koyomi/jdn" + "github.com/goark/koyomi/value" ) type Kan10 uint @@ -70,7 +70,7 @@ var ( ) // ZodiacDayNumber function returns japanese zodiac day number. -func ZodiacDayNumber(t koyomi.DateJp) (Kan10, Shi12) { +func ZodiacDayNumber(t value.DateJp) (Kan10, Shi12) { n := jdn.GetJDN(t.Time) + 50 k := n % int64(KanMax) if k < 0 { diff --git a/zodiac/zodiac_test.go b/zodiac/zodiac_test.go index bd04bde..07cf389 100644 --- a/zodiac/zodiac_test.go +++ b/zodiac/zodiac_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/goark/koyomi" + "github.com/goark/koyomi/value" "github.com/goark/koyomi/zodiac" ) @@ -74,18 +74,18 @@ func TestShi12(t *testing.T) { func TestZodiac(t *testing.T) { testCases := []struct { - t koyomi.DateJp + t value.DateJp kanYear zodiac.Kan10 shiYear zodiac.Shi12 kanDay zodiac.Kan10 shiDay zodiac.Shi12 }{ - {t: koyomi.NewDate(time.Date(1983, time.January, 1, 0, 0, 0, 0, koyomi.JST)), kanYear: zodiac.Mizunoto, shiYear: zodiac.Boar, kanDay: zodiac.Tsutinoto, shiDay: zodiac.Ox}, - {t: koyomi.NewDate(time.Date(1984, time.January, 1, 0, 0, 0, 0, koyomi.JST)), kanYear: zodiac.Kinoe, shiYear: zodiac.Rat, kanDay: zodiac.Kinoe, shiDay: zodiac.Horse}, - {t: koyomi.NewDate(time.Date(1985, time.January, 1, 0, 0, 0, 0, koyomi.JST)), kanYear: zodiac.Kinoto, shiYear: zodiac.Ox, kanDay: zodiac.Kanoe, shiDay: zodiac.Rat}, - {t: koyomi.NewDate(time.Date(2000, time.January, 1, 0, 0, 0, 0, koyomi.JST)), kanYear: zodiac.Kanoe, shiYear: zodiac.Dragon, kanDay: zodiac.Tsutinoe, shiDay: zodiac.Horse}, - {t: koyomi.NewDate(time.Date(2001, time.January, 1, 0, 0, 0, 0, koyomi.JST)), kanYear: zodiac.Kanoto, shiYear: zodiac.Snake, kanDay: zodiac.Kinoe, shiDay: zodiac.Rat}, - {t: koyomi.NewDate(time.Date(2002, time.January, 1, 0, 0, 0, 0, koyomi.JST)), kanYear: zodiac.Mizunoe, shiYear: zodiac.Horse, kanDay: zodiac.Tsutinoto, shiDay: zodiac.Snake}, + {t: value.NewDate(time.Date(1983, time.January, 1, 0, 0, 0, 0, value.JST)), kanYear: zodiac.Mizunoto, shiYear: zodiac.Boar, kanDay: zodiac.Tsutinoto, shiDay: zodiac.Ox}, + {t: value.NewDate(time.Date(1984, time.January, 1, 0, 0, 0, 0, value.JST)), kanYear: zodiac.Kinoe, shiYear: zodiac.Rat, kanDay: zodiac.Kinoe, shiDay: zodiac.Horse}, + {t: value.NewDate(time.Date(1985, time.January, 1, 0, 0, 0, 0, value.JST)), kanYear: zodiac.Kinoto, shiYear: zodiac.Ox, kanDay: zodiac.Kanoe, shiDay: zodiac.Rat}, + {t: value.NewDate(time.Date(2000, time.January, 1, 0, 0, 0, 0, value.JST)), kanYear: zodiac.Kanoe, shiYear: zodiac.Dragon, kanDay: zodiac.Tsutinoe, shiDay: zodiac.Horse}, + {t: value.NewDate(time.Date(2001, time.January, 1, 0, 0, 0, 0, value.JST)), kanYear: zodiac.Kanoto, shiYear: zodiac.Snake, kanDay: zodiac.Kinoe, shiDay: zodiac.Rat}, + {t: value.NewDate(time.Date(2002, time.January, 1, 0, 0, 0, 0, value.JST)), kanYear: zodiac.Mizunoe, shiYear: zodiac.Horse, kanDay: zodiac.Tsutinoto, shiDay: zodiac.Snake}, } for _, tc := range testCases { From 35bddb50241810e9cfd7f37b61cbf87feedc0066 Mon Sep 17 00:00:00 2001 From: Spiegel Date: Sat, 25 Feb 2023 10:32:29 +0900 Subject: [PATCH 2/2] Update go.mod --- dependency.png | Bin 59819 -> 59771 bytes go.mod | 4 ++-- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependency.png b/dependency.png index 356eef085afff2afcdcaf97b92d8082da3742e58..b3a17d82a875188018ac33dcf4f766124d679d87 100644 GIT binary patch delta 6088 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