feedx 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a031f3dd500b1d022708f6997ce6b99fc1ca764c58d0d1a2d5c49430797975
-  data.tar.gz: 3cb5fa9951cd4918bb9191c8c644cb422b9c9d9a00944b5f68afc247b80a5935
+  metadata.gz: ac561a2e9f403ede565104432d51ac3848c59fc8147e063e1fbdbba9486a1c34
+  data.tar.gz: ccf838177c08ac2d1247f61323561a3d06d43084466c34f214993f59743d646d
 SHA512:
-  metadata.gz: b2e0b49aafcc5b0f8ddad15b7738f815d097057ed205709a19ce8f734f1aaa50aaf10add1d580412c4fb673decb706c6a73094f8fb6d624e5de15a95c21c74a0
-  data.tar.gz: 96130e3b806c74c719fe6d31cbb4c3dcaa1dcbbdbb80e7a417df9d54a478b1eec166f6b4abeb4f665bf4c37c1f26a6640baaef3a9d3fb4c11afe233c6538a3a3
+  metadata.gz: 2de3eb9b314c84d556201d9cca545ea2c0b255c2dba0f0aba6e40e76a34092975f6ab8c8332028c22263cec358c7000e2fb188833dc45b9ba26bdb111ccda9c7
+  data.tar.gz: 2caa4db04fc18f4ad12b05171e1a6fd7afc9e8f52514100480e4d5762f8b7c4d1328643da9c2e39d08f005f22feefdfe5b976685729b6df2ea8c03572a694bc9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feedx (0.9.2)
+    feedx (0.10.0)
       bfs (>= 0.5.0)
 
 GEM
@@ -42,7 +42,7 @@ GEM
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby

data/feedx.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'feedx'
-  s.version       = '0.9.2'
+  s.version       = '0.10.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Exchange data between components via feeds)

data/feedx_test.go

@@ -31,12 +31,9 @@ var fixture = tbp.Message{
 }
 
 func writeMulti(obj *bfs.Object, numEntries int) error {
-	w, err := feedx.NewWriter(context.Background(), obj, &feedx.WriterOptions{
+	w := feedx.NewWriter(context.Background(), obj, &feedx.WriterOptions{
 		LastMod: time.Unix(1515151515, 123456789),
 	})
-	if err != nil {
-		return err
-	}
 	defer w.Discard()
 
 	for i := 0; i < numEntries; i++ {

data/go.mod

@@ -1,8 +1,7 @@
 module github.com/bsm/feedx
 
 require (
-	github.com/bmatcuk/doublestar v1.2.2 // indirect
-	github.com/bsm/bfs v0.8.1
+	github.com/bsm/bfs v0.9.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.3.2
 	github.com/onsi/ginkgo v1.10.2

data/go.sum

@@ -1,9 +1,7 @@
-github.com/bmatcuk/doublestar v1.1.5 h1:2bNwBOmhyFEFcoB3tGvTD5xanq+4kyOZlB8wFYbMjkk=
-github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0=
 github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
-github.com/bsm/bfs v0.8.1 h1:PS+kH6Pu8IsKUrxOp8E/B6/ASLvGEz2kIeX0GM4DdPc=
-github.com/bsm/bfs v0.8.1/go.mod h1:cVv0jyqUY/jbHoG/WYPuWvOaOhW/HZ4jl7/JMlypvAE=
+github.com/bsm/bfs v0.9.0 h1:7sUB3a5ZzzhBlCELY+2pqCaI6MbO7F2a0jhIgHihhFs=
+github.com/bsm/bfs v0.9.0/go.mod h1:N3md8kQvlteRDcfc8tqw759yW98dhj+6seWEVcg4CmM=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=

data/producer.go

@@ -147,10 +147,7 @@ func (p *Producer) push() (*ProducerPush, error) {
 		return &ProducerPush{Producer: p}, nil
 	}
 
-	writer, err := NewWriter(p.ctx, p.remote, &wopt)
-	if err != nil {
-		return nil, err
-	}
+	writer := NewWriter(p.ctx, p.remote, &wopt)
 	defer writer.Discard()
 
 	if err := p.pfn(writer); err != nil {

data/writer.go

@@ -3,7 +3,6 @@ package feedx
 import (
 	"bufio"
 	"context"
-	"errors"
 	"io"
 	"time"
 
@@ -40,33 +39,29 @@ func (o *WriterOptions) norm(name string) {
 // Writer encodes feeds to remote locations.
 type Writer struct {
 	ctx    context.Context
-	cancel context.CancelFunc
-
 	remote *bfs.Object
 	opt    WriterOptions
 	num    int
 
-	bw io.WriteCloser // bfs writer
+	bw bfs.Writer
 	cw io.WriteCloser // compression writer
 	ww *bufio.Writer
 	fe FormatEncoder
 }
 
 // NewWriter inits a new feed writer.
-func NewWriter(ctx context.Context, remote *bfs.Object, opt *WriterOptions) (*Writer, error) {
+func NewWriter(ctx context.Context, remote *bfs.Object, opt *WriterOptions) *Writer {
 	var o WriterOptions
 	if opt != nil {
 		o = *opt
 	}
 	o.norm(remote.Name())
 
-	ctx, cancel := context.WithCancel(ctx)
 	return &Writer{
 		ctx:    ctx,
-		cancel: cancel,
 		remote: remote,
 		opt:    o,
-	}, nil
+	}
 }
 
 // Write write raw bytes to the feed.
@@ -114,16 +109,27 @@ func (w *Writer) NumWritten() int {
 
 // Discard closes the writer and discards the contents.
 func (w *Writer) Discard() error {
-	w.cancel()
-	if err := w.Commit(); err != nil && !errors.Is(err, context.Canceled) {
-		return err
+	err := w.close()
+	if w.bw != nil {
+		if e := w.bw.Discard(); e != nil {
+			err = e
+		}
 	}
-	return nil
+	return err
 }
 
 // Commit closes the writer and persists the contents.
 func (w *Writer) Commit() error {
-	var err error
+	err := w.close()
+	if w.bw != nil {
+		if e := w.bw.Commit(); e != nil {
+			err = e
+		}
+	}
+	return err
+}
+
+func (w *Writer) close() (err error) {
 	if w.fe != nil {
 		if e := w.fe.Close(); e != nil {
 			err = e
@@ -139,11 +145,6 @@ func (w *Writer) Commit() error {
 			err = e
 		}
 	}
-	if w.bw != nil {
-		if e := w.bw.Close(); e != nil {
-			err = e
-		}
-	}
 	return err
 }
 

data/writer_test.go

@@ -21,10 +21,9 @@ var _ = Describe("Writer", func() {
 	})
 
 	It("should write plain", func() {
-		w, err := feedx.NewWriter(context.Background(), plain, &feedx.WriterOptions{
+		w := feedx.NewWriter(context.Background(), plain, &feedx.WriterOptions{
 			LastMod: time.Unix(1515151515, 123456789),
 		})
-		Expect(err).NotTo(HaveOccurred())
 		defer w.Discard()
 
 		Expect(w.Write(bytes.Repeat([]byte{'x'}, 10000))).To(Equal(10000))
@@ -37,10 +36,9 @@ var _ = Describe("Writer", func() {
 	})
 
 	It("should write compressed", func() {
-		w, err := feedx.NewWriter(context.Background(), compressed, &feedx.WriterOptions{
+		w := feedx.NewWriter(context.Background(), compressed, &feedx.WriterOptions{
 			LastMod: time.Unix(1515151515, 123456789),
 		})
-		Expect(err).NotTo(HaveOccurred())
 		defer w.Discard()
 
 		Expect(w.Write(bytes.Repeat([]byte{'x'}, 10000))).To(Equal(10000))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedx
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs