hanami-events-cloud_pubsub 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4202fc674eb86ffc8156eb9dd5faaf546b19aed5b673cc7ea8df9b065189365d
-  data.tar.gz: b4461cb6f23a773b0959e9d56430d1af15b8b2fa52146e53b655873421543fc1
+  metadata.gz: b786cbc6b85949059720828605ac3263973bda40906a06d0c879984e1f293e9c
+  data.tar.gz: 3850d7de58d0da55bd0c975b1cae04ee0fd218a47e9a1da08791e823361da33e
 SHA512:
-  metadata.gz: 3fbcdcd8e97c5e957e948cd094671cfc601fe1f0ce1ef5e0209006f3a85e0cede7acd622ee8891a5176f1f6af9d09101f8f6d6a3b0894a80b1f09df965339fd8
-  data.tar.gz: 3e0a0ca5506ed182f11eaf0779214d48c56509a95930edffc18bd5dc5f2dfbb8def55c57a8a798e6947f8ae3bc772b60be15dd4e6c09e42350e44278ce236d44
+  metadata.gz: baa476518202b7e5e71c589c16b1c31f49a5b2f8a04c90cc697ce59740fc6b5de04bf7dfa0d7c6b73169ea5d6a8bc840246c20060b9cd6f2e18ae7e21047c00a
+  data.tar.gz: 37fe813d6d91d89bf79d3b6e16fa40973a8bdd9f2ce2f7d0aea7bc3fe07ba91367c08e75b1d71af8fef09adeff0d2ef114bc31a88df7accf0815bc88c16964e5

data/.travis.yml

@@ -10,6 +10,7 @@ env:
     - COVERAGE=true
 rvm:
   - 2.4
+  - 2.6
 before_install:
   - gem install bundler -v 1.16.1
 before_script:

data/Gemfile.lock

@@ -1,94 +1,97 @@
 GIT
   remote: https://github.com/hanami/events
-  revision: e2b076d3ba7c1dfd78daa48500abd9c538a5e9c6
+  revision: 59a36d22b75ea045fa8994f4f660a02c0901f8b2
   specs:
-    hanami-events (0.1.0)
+    hanami-events (0.2.1)
       dry-container (~> 0.6)
 
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (1.4.0)
-      dry-configurable (~> 0.7.0)
-      google-cloud-pubsub (~> 0.33.0)
+    hanami-events-cloud_pubsub (2.0.0)
+      dry-configurable (~> 0.8.0)
+      google-cloud-pubsub (~> 0.34.0)
       hanami-cli (>= 0.2.0)
-      hanami-events (~> 0)
+      hanami-events (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     diff-lcs (1.3)
     docile (1.3.1)
-    dry-configurable (0.7.0)
+    dry-configurable (0.8.2)
       concurrent-ruby (~> 1.0)
-    dry-container (0.6.0)
+      dry-core (~> 0.4, >= 0.4.7)
+    dry-container (0.7.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    faraday (0.15.3)
+    dry-core (0.4.7)
+      concurrent-ruby (~> 1.0)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    google-cloud-core (1.2.7)
+    google-cloud-core (1.3.0)
       google-cloud-env (~> 1.0)
     google-cloud-env (1.0.5)
       faraday (~> 0.11)
-    google-cloud-pubsub (0.33.2)
+    google-cloud-pubsub (0.34.1)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.2)
       google-gax (~> 1.3)
       grpc-google-iam-v1 (~> 0.6.9)
-    google-gax (1.4.0)
+    google-gax (1.5.0)
       google-protobuf (~> 3.2)
       googleapis-common-protos (>= 1.3.5, < 2.0)
-      googleauth (~> 0.6.2)
+      googleauth (>= 0.6.2, < 0.10.0)
       grpc (>= 1.7.2, < 2.0)
       rly (~> 0.2.3)
-    google-protobuf (3.6.1)
-    googleapis-common-protos (1.3.7)
+    google-protobuf (3.7.0)
+    googleapis-common-protos (1.3.8)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)
       grpc (~> 1.0)
-    googleapis-common-protos-types (1.0.2)
+    googleapis-common-protos-types (1.0.3)
       google-protobuf (~> 3.0)
-    googleauth (0.6.7)
+    googleauth (0.8.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    grpc (1.16.0)
+    grpc (1.19.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
     grpc-google-iam-v1 (0.6.9)
       googleapis-common-protos (>= 1.3.1, < 2.0)
       grpc (~> 1.0)
-    hanami-cli (0.3.0)
+    hanami-cli (0.3.1)
       concurrent-ruby (~> 1.0)
       hanami-utils (~> 1.3)
-    hanami-utils (1.3.0)
+    hanami-utils (1.3.1)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     jwt (2.1.0)
     memoist (0.16.0)
-    method_source (0.9.0)
+    method_source (0.9.2)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     os (1.0.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    parallel (1.14.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rly (0.2.3)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -96,7 +99,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -121,8 +124,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    transproc (1.0.2)
-    unicode-display_width (1.4.0)
+    transproc (1.0.3)
+    unicode-display_width (1.5.0)
 
 PLATFORMS
   ruby
@@ -138,4 +141,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.5
+   1.17.1

data/hanami-events-cloud_pubsub.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dry-configurable', '~> 0.7.0'
-  spec.add_dependency 'google-cloud-pubsub', '~> 0.33.0'
+  spec.add_dependency 'dry-configurable', '~> 0.8.0'
+  spec.add_dependency 'google-cloud-pubsub', '~> 0.34.0'
   spec.add_dependency 'hanami-cli', '>= 0.2.0'
-  spec.add_dependency 'hanami-events', '~> 0'
+  spec.add_dependency 'hanami-events', '~> 0.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.3'

data/lib/hanami/events/cloud_pubsub.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'concurrent/async'
 require 'hanami/events'
 require 'hanami/events/cloud_pubsub/version'
 require 'hanami/events/cloud_pubsub/middleware/stack'
 require 'hanami/events/cloud_pubsub/middleware/logging'
-require 'hanami/events/cloud_pubsub/middleware/auto_acknowledge'
+require 'hanami/events/cloud_pubsub/middleware/auto_retry'
 require 'hanami/events/cloud_pubsub/runner'
 require 'google/cloud/pubsub'
 require 'dry-configurable'
@@ -57,7 +58,7 @@ module Hanami
 
       setting :middleware, Middleware::Stack.new(
         Middleware::Logging.new,
-        Middleware::AutoAcknowledge.new
+        Middleware::AutoRetry.new
       )
     end
   end

data/lib/hanami/events/cloud_pubsub/middleware/{auto_acknowledge.rb → auto_retry.rb}

@@ -6,7 +6,7 @@ module Hanami
       # Middleware
       module Middleware
         # Middleware used for automatically acknowledging messages
-        class AutoAcknowledge
+        class AutoRetry
           def initialize(logger: nil)
             @logger = logger
           end
@@ -28,9 +28,14 @@ module Hanami
           def ack_or_reject(message, succeeded, failed)
             id = message.message_id
 
-            if succeeded || failed
+            if succeeded
               message.acknowledge!
               logger.debug "Message(#{id}) was acknowledged"
+            elsif failed
+              seconds = calculate_backoff_seconds(message)
+              success = message.modify_ack_deadline!(seconds)
+              msg = "added #{success ? seconds : 0} seconds of delay to ack deadline"
+              logger.debug "Message(#{id}) failed, #{msg}" if success
             else
               message.reject!
               logger.warn "Message(#{id}) was terminated from outside, rescheduling"
@@ -40,6 +45,11 @@ module Hanami
           def logger
             @logger || CloudPubsub.logger
           end
+
+          def calculate_backoff_seconds(_message)
+            # Figure out a way to keep track of retries
+            60
+          end
         end
       end
     end

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '1.4.0'
+      VERSION = '2.0.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ files:
 - lib/hanami/events/cloud_pubsub/health_check_server.rb
 - lib/hanami/events/cloud_pubsub/integration.rb
 - lib/hanami/events/cloud_pubsub/listener.rb
-- lib/hanami/events/cloud_pubsub/middleware/auto_acknowledge.rb
+- lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb
 - lib/hanami/events/cloud_pubsub/middleware/logging.rb
 - lib/hanami/events/cloud_pubsub/middleware/stack.rb
 - lib/hanami/events/cloud_pubsub/register.rb
@@ -170,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Google Cloud Pub/Sub adapter for the hanami-events gem