Skip to content

fix spelling of chunk and update tusd version #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrosales wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix spelling of chunk and update tusd version #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b25335
fix spelling of chunk and update tusd version
mrosales Apr 17, 2020
96667e0
enable go modules, update ci configuration to support go1.12 and up
mrosales Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
language: go
go:
- 1.8
- 1.9
- 1.12
- 1.13
- 1.14
- tip
install:
- go get github.com/stretchr/testify
- go get github.com/tus/tusd
- go get github.com/syndtr/goleveldb/leveldb
- go mod download
script: go test -v ./...
notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (c *Client) CreateOrResumeUpload(u *Upload) (*Uploader, error) {
return nil, err
}

func (c *Client) uploadChunck(url string, body io.Reader, size int64, offset int64) (int64, error) {
func (c *Client) uploadChunk(url string, body io.Reader, size int64, offset int64) (int64, error) {
var method string

if !c.Config.OverridePatchMethod {
Expand Down
39 changes: 29 additions & 10 deletions client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package tus

import (
"context"
"fmt"
"net/http"
"net/http/httptest"
Expand All @@ -11,8 +12,8 @@ import (
"time"

"github.com/stretchr/testify/suite"
"github.com/tus/tusd"
"github.com/tus/tusd/filestore"
"github.com/tus/tusd/pkg/filestore"
"github.com/tus/tusd/pkg/handler"
)

type MockStore struct {
Expand Down Expand Up @@ -57,11 +58,11 @@ func (s *UploadTestSuite) SetupSuite() {
Path: os.TempDir(),
}

composer := tusd.NewStoreComposer()
composer := handler.NewStoreComposer()

store.UseIn(composer)

handler, err := tusd.NewHandler(tusd.Config{
handler, err := handler.NewHandler(handler.Config{
BasePath: "/uploads/",
StoreComposer: composer,
MaxSize: 0,
Expand Down Expand Up @@ -107,7 +108,10 @@ func (s *UploadTestSuite) TestSmallUploadFromFile() {
err = uploader.Upload()
s.Nil(err)

fi, err := s.store.GetInfo(uploadIdFromUrl(uploader.url))
retrievedUpload, err := s.store.GetUpload(context.Background(), uploadIdFromUrl(uploader.url))
s.Nil(err)

fi, err := retrievedUpload.GetInfo(context.Background())
s.Nil(err)

s.EqualValues(1048576, fi.Size)
Expand Down Expand Up @@ -137,7 +141,10 @@ func (s *UploadTestSuite) TestLargeUpload() {
err = uploader.Upload()
s.Nil(err)

fi, err := s.store.GetInfo(uploadIdFromUrl(uploader.url))
retrievedUpload, err := s.store.GetUpload(context.Background(), uploadIdFromUrl(uploader.url))
s.Nil(err)

fi, err := retrievedUpload.GetInfo(context.Background())
s.Nil(err)

s.EqualValues(1048576*150, fi.Size)
Expand All @@ -157,7 +164,10 @@ func (s *UploadTestSuite) TestUploadFromBytes() {
err = uploader.Upload()
s.Nil(err)

fi, err := s.store.GetInfo(uploadIdFromUrl(uploader.url))
retrievedUpload, err := s.store.GetUpload(context.Background(), uploadIdFromUrl(uploader.url))
s.Nil(err)

fi, err := retrievedUpload.GetInfo(context.Background())
s.Nil(err)

s.EqualValues(10, fi.Size)
Expand All @@ -179,7 +189,10 @@ func (s *UploadTestSuite) TestOverridePatchMethod() {
err = uploader.Upload()
s.Nil(err)

fi, err := s.store.GetInfo(uploadIdFromUrl(uploader.url))
retrievedUpload, err := s.store.GetUpload(context.Background(), uploadIdFromUrl(uploader.url))
s.Nil(err)

fi, err := retrievedUpload.GetInfo(context.Background())
s.Nil(err)

s.EqualValues(10, fi.Size)
Expand Down Expand Up @@ -217,7 +230,10 @@ func (s *UploadTestSuite) TestConcurrentUploads() {
err = uploader.Upload()
s.Nil(err)

fi, err := s.store.GetInfo(uploadIdFromUrl(uploader.url))
retrievedUpload, err := s.store.GetUpload(context.Background(), uploadIdFromUrl(uploader.url))
s.Nil(err)

fi, err := retrievedUpload.GetInfo(context.Background())
s.Nil(err)

s.EqualValues(1048576*5, fi.Size)
Expand Down Expand Up @@ -276,7 +292,10 @@ func (s *UploadTestSuite) TestResumeUpload() {
err = uploader.Upload()
s.Nil(err)

fi, err := s.store.GetInfo(uploadIdFromUrl(uploader.url))
retrievedUpload, err := s.store.GetUpload(context.Background(), uploadIdFromUrl(uploader.url))
s.Nil(err)

fi, err := retrievedUpload.GetInfo(context.Background())
s.Nil(err)

s.EqualValues(1048576*150, fi.Size)
Expand Down
9 changes: 9 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module github.com/eventials/go-tus

go 1.12

require (
github.com/stretchr/testify v1.5.1
github.com/syndtr/goleveldb v1.0.0
github.com/tus/tusd v1.1.0
)
Loading