feedx 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ad83b2f9b53fb7574dc5bb90b39e9157a0f6f3bdbcc08065935cf9ffd97bb4f
-  data.tar.gz: d8e41fb163afd5d9b301b064a2f437ba8ebfb8850bcb3fd1e3497045c9c46a2e
+  metadata.gz: a1ed7080e3ec08c76cba3676907b7946b72e3611a8abd32a7f61dcd0cb0df29a
+  data.tar.gz: f4d4aaa22f712c3c3e333c95e3a7b702ea2ceef7c4f7277aa8c26a6f474764ad
 SHA512:
-  metadata.gz: 54a9d0f4269c11533576abedd48fc8180fc0de67d0e5d8008f5d82074a200ea2ba0644039ffd8dda6f4495956224e62f20410243da303911ed11dfa563dec10a
-  data.tar.gz: 9f9a46443a06d5f1d5ef95144414b90a5163db8086fc56b6a81d934fc1dc0f9df8ed33289cc4fbadb8ec06c4f065401106d35ed414c2a055395f6ca02cff52f2
+  metadata.gz: 02a12dd77a8c89fe9f549d1bea0d2de675df7e39d67ea1b5c47edc64e6e9a03710b062c948e5c1a9842c6f54fc5b848177355a65be7a6eebfd15710931e05ba2
+  data.tar.gz: a61d6510fa25780f2a8157a18e5a73196c502b6d1ac792c1d0e11030d09bffb45f5a1ebb0decbfed74419c7f77c72f3d3bf2393237fe64fb0e98443647a4b3af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feedx (0.5.2)
+    feedx (0.5.3)
       bfs (>= 0.3.4)
 
 GEM

data/feedx.gemspec

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

data/go.mod

@@ -7,5 +7,5 @@ require (
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
 	golang.org/x/net v0.0.0-20190514140710-3ec191127204 // indirect
-	golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f // indirect
+	golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 // indirect
 )

data/go.sum

@@ -126,8 +126,8 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190429094411-2cc0cad0ac78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f h1:Xab8gg26GrI/x3RNdVhVkHHM1XLyGeRBEvz4Q5x4YW8=
-golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 h1:khxRGsvPk4n2y8I/mLLjp7e5dMTJmH75wvqS6nMwUtY=
+golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

data/producer.go

@@ -19,6 +19,10 @@ type ProducerOptions struct {
 	// Default: 1m
 	Interval time.Duration
 
+	// LastModCheck this function will be called before each push attempt
+	// to dynamically determine the last modified time.
+	LastModCheck func(context.Context) (time.Time, error)
+
 	// AfterPush callbacks are triggered after each push cycle, receiving
 	// an error (if occurred).
 	AfterPush func(error)
@@ -117,12 +121,20 @@ func (p *Producer) Close() error {
 }
 
 func (p *Producer) push() error {
-	now := timestampFromTime(time.Now()).Millis()
-	defer func() {
-		atomic.StoreInt64(&p.lastPush, now)
-	}()
+	start := time.Now()
+	atomic.StoreInt64(&p.lastPush, timestampFromTime(start).Millis())
+
+	wopt := p.opt.WriterOptions
+	wopt.LastMod = start
+	if p.opt.LastModCheck != nil {
+		modTime, err := p.opt.LastModCheck(p.ctx)
+		if err != nil {
+			return err
+		}
+		wopt.LastMod = modTime
+	}
 
-	writer, err := NewWriter(p.ctx, p.remote, &p.opt.WriterOptions)
+	writer, err := NewWriter(p.ctx, p.remote, &wopt)
 	if err != nil {
 		return err
 	}
@@ -141,7 +153,7 @@ func (p *Producer) push() error {
 	}
 
 	atomic.StoreInt64(&p.numWritten, int64(writer.NumWritten()))
-	atomic.StoreInt64(&p.lastMod, now)
+	atomic.StoreInt64(&p.lastMod, timestampFromTime(wopt.LastMod).Millis())
 	return nil
 }
 

data/producer_test.go

@@ -15,11 +15,9 @@ var _ = Describe("Producer", func() {
 	var obj *bfs.Object
 	var ctx = context.Background()
 
-	BeforeEach(func() {
-		obj = bfs.NewInMemObject("path/to/file.jsonz")
-
+	setup := func(o *feedx.ProducerOptions) {
 		var err error
-		subject, err = feedx.NewProducerForRemote(ctx, obj, nil, func(enc feedx.FormatPureEncoder) error {
+		subject, err = feedx.NewProducerForRemote(ctx, obj, o, func(enc feedx.FormatPureEncoder) error {
 			for i := 0; i < 10; i++ {
 				fix := fixture
 				if err := enc.Encode(&fix); err != nil {
@@ -29,16 +27,43 @@ var _ = Describe("Producer", func() {
 			return nil
 		})
 		Expect(err).NotTo(HaveOccurred())
+	}
+
+	BeforeEach(func() {
+		obj = bfs.NewInMemObject("path/to/file.jsonz")
 	})
 
 	AfterEach(func() {
-		Expect(subject.Close()).To(Succeed())
+		if subject != nil {
+			Expect(subject.Close()).To(Succeed())
+		}
 	})
 
 	It("should produce", func() {
+		setup(nil)
+
 		Expect(subject.LastPush()).To(BeTemporally("~", time.Now(), time.Second))
-		Expect(subject.LastModified()).To(Equal(subject.LastPush()))
+		Expect(subject.LastModified()).To(BeTemporally("~", time.Now(), time.Second))
 		Expect(subject.NumWritten()).To(Equal(10))
 		Expect(subject.Close()).To(Succeed())
+
+		info, err := obj.Head(ctx)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(info.Size).To(BeNumerically("~", 75, 10))
+	})
+
+	It("should produce with custom last-mod check", func() {
+		setup(&feedx.ProducerOptions{
+			LastModCheck: func(_ context.Context) (time.Time, error) { return time.Unix(1515151515, 0), nil },
+		})
+
+		Expect(subject.LastPush()).To(BeTemporally("~", time.Now(), time.Second))
+		Expect(subject.LastModified()).To(Equal(time.Unix(1515151515, 0)))
+		Expect(subject.NumWritten()).To(Equal(10))
+
+		info, err := obj.Head(ctx)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(info.Size).To(BeNumerically("~", 75, 10))
+		Expect(info.Metadata).To(HaveKeyWithValue("x-feedx-last-modified", "1515151515000"))
 	})
 })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedx
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs