Skip to content

Commit 12339f1

Browse files
sshaplyginsshaplygin
authored
Merge pull request #5 from sshaplygin/sshaplygin-patch-1
Create go.yml
2 parents d559d4e + 6cad43f commit 12339f1

File tree

12 files changed

+71
-48
lines changed

12 files changed

+71
-48
lines changed

‎.github/workflows/go.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This workflow will build a golang project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
3+
4+
name: Go
5+
6+
on:
7+
push:
8+
branches: [ "master" ]
9+
pull_request:
10+
branches: [ "master" ]
11+
12+
jobs:
13+
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v3
18+
19+
- name: Set up Go
20+
uses: actions/setup-go@v4
21+
with:
22+
go-version: '1.20'
23+
24+
- name: Build
25+
run: go build -v ./...
26+
27+
- name: Test
28+
run: go test -v ./...
29+
30+
- name: Update coverage report
31+
uses: ncruces/go-coverage-report@v0
32+
with:
33+
report: true
34+
chart: true
35+
amend: true
36+
if: github.event_name == 'push'
37+
continue-on-error: true

‎.travis.yml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# ru-doc-code
2-
[![GoDoc](https://godoc.org/github.com/sshaplygin/ru-doc-code?status.svg)](https://godoc.org/github.com/sshaplygin/ru-doc-code) [![Build Status](https://travis-ci.org/sshaplygin/ru-doc-code.svg)](https://travis-ci.org/sshaplygin/ru-doc-code.svg?branch=master) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/sshaplygin/ru-doc-code/blob/master/LICENSE) [![Go Report Card](https://goreportcard.com/badge/github.com/sshaplygin/ru-doc-code)](https://goreportcard.com/report/github.com/sshaplygin/ru-doc-code)
32

4-
It is validator about official of code documents from Russia in Go
3+
[![GoDoc](https://godoc.org/github.com/sshaplygin/ru-doc-code?status.svg)](https://godoc.org/github.com/sshaplygin/ru-doc-code) [![Go Coverage](https://github.com/sshaplygin/ru-doc-code/wiki/coverage.svg)](https://raw.githack.com/wiki/sshaplygin/ru-doc-code/coverage.html) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/sshaplygin/ru-doc-code/blob/master/LICENSE) [![Go Report Card](https://goreportcard.com/badge/github.com/sshaplygin/ru-doc-code)](https://goreportcard.com/report/github.com/sshaplygin/ru-doc-code)
54

6-
## Usage
5+
It is validator about official of code documents from Russia in Go
6+
7+
## Usage
78

89
* go get github.com/sshaplygin/ru-doc-code
910

1011
### Example
11-
12+
1213
```go
1314

1415
import (
@@ -26,14 +27,13 @@ if err != nil {
2627
if isValid {
2728
log.Println("INN is valid")
2829
}
29-
3030
```
3131

3232
## Documentation
3333

34-
- Info about INN - [ИНН](https://ru.wikipedia.org/wiki/%D0%98%D0%B4%D0%B5%D0%BD%D1%82%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BD%D0%BE%D0%BC%D0%B5%D1%80_%D0%BD%D0%B0%D0%BB%D0%BE%D0%B3%D0%BE%D0%BF%D0%BB%D0%B0%D1%82%D0%B5%D0%BB%D1%8C%D1%89%D0%B8%D0%BA%D0%B0)
35-
- Info about SNILS - [СНИЛС](http://www.consultant.ru/document/cons_doc_LAW_124607/68ac3b2d1745f9cc7d4332b63c2818ca5d5d20d0/)
36-
- Info about OGRN - [ОГРН](https://ru.wikipedia.org/wiki/%D0%9E%D1%81%D0%BD%D0%BE%D0%B2%D0%BD%D0%BE%D0%B9_%D0%B3%D0%BE%D1%81%D1%83%D0%B4%D0%B0%D1%80%D1%81%D1%82%D0%B2%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9_%D1%80%D0%B5%D0%B3%D0%B8%D1%81%D1%82%D1%80%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BD%D0%BE%D0%BC%D0%B5%D1%80)
37-
- Info about OGRNIP - [ОГРНИП](http://www.temabiz.com/terminy/chto-takoe-ogrnip.html)
38-
- Info about BIK - [БИК](https://ru.wikipedia.org/wiki/%D0%91%D0%B0%D0%BD%D0%BA%D0%BE%D0%B2%D1%81%D0%BA%D0%B8%D0%B9_%D0%B8%D0%B4%D0%B5%D0%BD%D1%82%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BA%D0%BE%D0%B4)
39-
- Info about KPP - [КПП](https://dic.academic.ru/dic.nsf/ruwiki/239834)
34+
-Info about INN - [ИНН](https://ru.wikipedia.org/wiki/%D0%98%D0%B4%D0%B5%D0%BD%D1%82%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BD%D0%BE%D0%BC%D0%B5%D1%80_%D0%BD%D0%B0%D0%BB%D0%BE%D0%B3%D0%BE%D0%BF%D0%BB%D0%B0%D1%82%D0%B5%D0%BB%D1%8C%D1%89%D0%B8%D0%BA%D0%B0) \
35+
-Info about SNILS - [СНИЛС](http://www.consultant.ru/document/cons_doc_LAW_124607/68ac3b2d1745f9cc7d4332b63c2818ca5d5d20d0/) \
36+
-Info about OGRN - [ОГРН](https://ru.wikipedia.org/wiki/%D0%9E%D1%81%D0%BD%D0%BE%D0%B2%D0%BD%D0%BE%D0%B9_%D0%B3%D0%BE%D1%81%D1%83%D0%B4%D0%B0%D1%80%D1%81%D1%82%D0%B2%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9_%D1%80%D0%B5%D0%B3%D0%B8%D1%81%D1%82%D1%80%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BD%D0%BE%D0%BC%D0%B5%D1%80) \
37+
-Info about OGRNIP - [ОГРНИП](http://www.temabiz.com/terminy/chto-takoe-ogrnip.html) \
38+
-Info about BIK - [БИК](https://ru.wikipedia.org/wiki/%D0%91%D0%B0%D0%BD%D0%BA%D0%BE%D0%B2%D1%81%D0%BA%D0%B8%D0%B9_%D0%B8%D0%B4%D0%B5%D0%BD%D1%82%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BA%D0%BE%D0%B4) \
39+
-Info about KPP - [КПП](https://dic.academic.ru/dic.nsf/ruwiki/239834)

‎bik/bik_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package bik
22

33
import (
4-
"errors"
54
"fmt"
65
"testing"
76

@@ -40,9 +39,9 @@ func TestValidate(t *testing.T) {
4039
isValid, err := Validate(test.Code)
4140
assert.Equal(t, test.IsValid, isValid, test.Code)
4241
if err != nil {
43-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
42+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4443
} else {
45-
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
44+
assert.NoError(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4645
}
4746
}
4847
})
@@ -84,7 +83,7 @@ func TestValidate(t *testing.T) {
8483
isValid, err := Validate(test.Code)
8584
assert.Equal(t, test.IsValid, isValid, test.Code, test.IsValid)
8685
if err != nil {
87-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
86+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
8887
} else {
8988
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
9089
}

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module github.com/sshaplygin/ru-doc-code
22

33
go 1.18
44

5-
require github.com/stretchr/testify v1.5.1
5+
require github.com/stretchr/testify v1.8.4
66

77
require (
8-
github.com/davecgh/go-spew v1.1.0 // indirect
8+
github.com/davecgh/go-spew v1.1.1 // indirect
99
github.com/pmezard/go-difflib v1.0.0 // indirect
10-
gopkg.in/yaml.v2 v2.2.2 // indirect
10+
gopkg.in/yaml.v3 v3.0.1 // indirect
1111
)

‎go.sum‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
2-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
44
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6-
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
7-
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
5+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
6+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
87
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
98
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10-
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
11-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
9+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
10+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func StrToArr(str string) ([]int, error) {
2424
for _, number := range numbers {
2525
number, err := strconv.Atoi(number)
2626
if err != nil {
27-
return []int{}, ErrInvalidValue
27+
return nil, ErrInvalidValue
2828
}
2929
arr = append(arr, number)
3030
}

‎inn/inn_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package inn
22

33
import (
4-
"errors"
54
"fmt"
65
"testing"
76

@@ -41,7 +40,7 @@ func TestValidate(t *testing.T) {
4140
isValid, err := Validate(test.Code)
4241
assert.Equal(t, test.IsValid, isValid, test.Code)
4342
if err != nil {
44-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
43+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4544
} else {
4645
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4746
}
@@ -80,7 +79,7 @@ func TestValidate(t *testing.T) {
8079
isValid, err := Validate(test.Code)
8180
assert.Equal(t, test.IsValid, isValid, test.Code)
8281
if err != nil {
83-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
82+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
8483
} else {
8584
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
8685
}

‎kpp/kpp_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package kpp
22

33
import (
4-
"errors"
54
"fmt"
65
"testing"
76

@@ -40,7 +39,7 @@ func TestValidate(t *testing.T) {
4039
isValid, err := Validate(test.Code)
4140
assert.Equal(t, isValid, test.IsValid, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4241
if err != nil {
43-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
42+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4443
} else {
4544
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4645
}
@@ -74,7 +73,7 @@ func TestValidate(t *testing.T) {
7473
isValid, err := Validate(test.Code)
7574
assert.Equal(t, isValid, test.IsValid, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
7675
if err != nil {
77-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
76+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
7877
} else {
7978
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
8079
}
@@ -98,7 +97,7 @@ func TestValidate(t *testing.T) {
9897
isValid, err := Validate(test.Code)
9998
assert.Equal(t, isValid, test.IsValid, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
10099
if err != nil {
101-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
100+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
102101
} else {
103102
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
104103
}

‎ogrn/ogrn_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestValidate(t *testing.T) {
4040
isValid, err := Validate(test.Code)
4141
assert.Equal(t, test.IsValid, isValid, test.Code)
4242
if err != nil {
43-
assert.True(t, errors.As(err, &test.Error), fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
43+
assert.ErrorAs(t, err, &test.Error, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4444
} else {
4545
assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, test.Code))
4646
}

0 commit comments

Comments
 (0)