hanami-events-cloud_pubsub 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51fcb2486cdeca9c675d1a37e4c70f21ba9cad09fc3a148294cb03f1a2570ec
-  data.tar.gz: cdfad2c9b22abf3c4c80349b977c7f966e0a1c40faf955f4553ab06cbf999eb1
+  metadata.gz: d33982e2387371df286bc6db08827c261359e4b51dac99cc4d9311716dac9624
+  data.tar.gz: bb59baae9c834328876f7ddba328ff2cfe5af8fc2b0aa1922cea05167da8df6b
 SHA512:
-  metadata.gz: 820f3a4bed9594d8ce3b287232d59d1a4d2b96334b6b4ce4ce5ee0693db56536902e89773321f7486319a86a1f39f077ec1410c4a5cd5930004366325724feb0
-  data.tar.gz: 6349ab7adf08c16a7847f51e94278ca771a40ebf1ebbb567b1b78c53e8dabea06143e5a37b07f119533b7d91fa17c331e4693dd4ffe356f69f4f97b4f42c3311
+  metadata.gz: 50f3e78a8a54a75fcb844d67e8a56de59caffba97d45738e23f87db528cd872eef7b47fd628b45243f2844fdcb0ecaf0458eff8a6eca1ed9aac57eb20ddaabdb
+  data.tar.gz: e9320cb4a20633db80fae907da755aaca18775e81552dd2fce0cf61b914d980252e2385414ba4b7bc5f2b568ec9147360eea5f7069635fdef4c57b235d271d1a

data/Gemfile

@@ -7,9 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in hanami-events-cloud_pubsub.gemspec
 gemspec
 
-group :test do
-  gem 'hanami-events', github: 'hanami/events'
-  gem 'pry'
-  gem 'rubocop', '~> 0.54.0'
-  gem 'simplecov', require: false
-end
+gem 'hanami-events', github: 'hanami/events'
+gem 'pry'
+gem 'rubocop'
+gem 'simplecov', require: false

data/Gemfile.lock

@@ -8,9 +8,9 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (2.1.4)
+    hanami-events-cloud_pubsub (2.2.0)
       dry-configurable (~> 0.8.0)
-      google-cloud-pubsub (~> 0.34.0)
+      google-cloud-pubsub (>= 0.34, < 0.38)
       hanami-cli (~> 0.2)
       hanami-events (~> 0.2.0)
 
@@ -21,75 +21,76 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    docile (1.3.1)
-    dry-configurable (0.8.2)
+    docile (1.3.2)
+    dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.0)
+    dry-container (0.7.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
+    dry-core (0.4.8)
       concurrent-ruby (~> 1.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     google-cloud-core (1.3.0)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
+    google-cloud-env (1.2.0)
       faraday (~> 0.11)
-    google-cloud-pubsub (0.34.1)
-      concurrent-ruby (~> 1.0)
+    google-cloud-pubsub (0.37.0)
+      concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.2)
       google-gax (~> 1.3)
+      googleapis-common-protos (>= 1.3.9, < 2.0)
       grpc-google-iam-v1 (~> 0.6.9)
-    google-gax (1.5.0)
+    google-gax (1.7.0)
       google-protobuf (~> 3.2)
       googleapis-common-protos (>= 1.3.5, < 2.0)
       googleauth (>= 0.6.2, < 0.10.0)
       grpc (>= 1.7.2, < 2.0)
       rly (~> 0.2.3)
-    google-protobuf (3.7.0)
-    googleapis-common-protos (1.3.8)
+    google-protobuf (3.8.0-x86_64-linux)
+    googleapis-common-protos (1.3.9)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)
       grpc (~> 1.0)
-    googleapis-common-protos-types (1.0.3)
+    googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    googleauth (0.8.0)
+    googleauth (0.8.1)
       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.19.0)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
+    grpc (1.21.0-x86_64-linux)
+      google-protobuf (~> 3.7)
+      googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (0.6.9)
       googleapis-common-protos (>= 1.3.1, < 2.0)
       grpc (~> 1.0)
     hanami-cli (0.3.1)
       concurrent-ruby (~> 1.0)
       hanami-utils (~> 1.3)
-    hanami-utils (1.3.1)
+    hanami-utils (1.3.2)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
+    jaro_winkler (1.5.3)
     json (2.2.0)
-    jwt (2.1.0)
+    jwt (2.2.1)
     memoist (0.16.0)
     method_source (0.9.2)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
-    os (1.0.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    multipart-post (2.1.1)
+    os (1.0.1)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rainbow (3.0.0)
     rake (12.3.2)
     rly (0.2.3)
@@ -97,35 +98,35 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.54.0)
+    rspec-support (3.8.2)
+    rubocop (0.72.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     transproc (1.0.3)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -137,7 +138,7 @@ DEPENDENCIES
   pry
   rake (~> 12.3)
   rspec (~> 3.0)
-  rubocop (~> 0.54.0)
+  rubocop
   simplecov
 
 BUNDLED WITH

data/hanami-events-cloud_pubsub.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-configurable', '~> 0.8.0'
-  spec.add_dependency 'google-cloud-pubsub', '~> 0.34.0'
+  spec.add_dependency 'google-cloud-pubsub', '>= 0.34', '< 0.38'
   spec.add_dependency 'hanami-cli', '~> 0.2'
   spec.add_dependency 'hanami-events', '~> 0.2.0'
 

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'hanami/events/cloud_pubsub/listener'
+require 'hanami/events/cloud_pubsub/subscriber'
+require 'hanami/events/cloud_pubsub/errors'
 
 module Hanami
   module Events
@@ -49,7 +51,8 @@ module Hanami
 
           logger.debug("Subscribed listener \"#{id}\" for event \"#{event_name}\"")
 
-          @subscribers << Subscriber.new(event_name, block, logger)
+          sub = Hanami::Events::CloudPubsub::Subscriber.new(event_name, block, logger)
+          @subscribers << sub
           topic = topic_for event_name
 
           register_listener(event_name, topic, namespaced_id, subscriber_opts)
@@ -84,7 +87,7 @@ module Hanami
           event_name = message.attributes['event_name']
 
           @subscribers.each do |subscriber|
-            subscriber.call(event_name, payload)
+            subscriber.call(event_name, payload, message)
           end
         end
 
@@ -97,7 +100,7 @@ module Hanami
           @topic_registry[name.to_s] ||= begin
             @pubsub.find_topic(name) ||
               (Hanami::Events::CloudPubsub.auto_create_topics && @pubsub.create_topic(name)) ||
-              raise(CloudPubsub::Errors::TopicNotFoundError, "no topic named: #{name}")
+              raise(::Hanami::Events::CloudPubsub::Errors::TopicNotFoundError, "no topic named: #{name}")
           end
         end
         # rubocop:enable Metrics/LineLength

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

@@ -83,8 +83,8 @@ module Hanami
 
         def run_handler(message)
           middleware.invoke(message) { handler.call(message) }
-        rescue StandardError => err
-          run_error_handlers(err, message)
+        rescue StandardError => e
+          run_error_handlers(e, message)
           raise
         end
 

data/lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb

@@ -19,9 +19,9 @@ module Hanami
             failed = false
             yield(args)
             succeeded = true
-          rescue StandardError => err
+          rescue StandardError => e
             failed = true
-            raise err
+            raise e
           ensure
             ack_or_reject(message, succeeded, failed, args)
           end

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

@@ -7,10 +7,10 @@ module Hanami
       module SafeErrorHandler
         def self.call(handler, err, message)
           handler.call(err, message)
-        rescue StandardError => ex
+        rescue StandardError => e
           CloudPubsub.logger.error '!!! ERROR HANDLER THREW AN ERROR !!!'
-          CloudPubsub.logger.error ex
-          CloudPubsub.logger.error ex.backtrace.join("\n") unless ex.backtrace.nil?
+          CloudPubsub.logger.error e
+          CloudPubsub.logger.error e.backtrace.join("\n") unless e.backtrace.nil?
         end
       end
     end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Events
+    module CloudPubsub
+      # Subscriber class for calling subscriber blocks, with extra support for
+      # passing the raw message.
+      #
+      # @since 0.1.0
+      #
+      # @api private
+      class Subscriber < ::Hanami::Events::Subscriber
+        def initialize(event_name, handler, logger = nil, data_struct_class = nil)
+          super
+          @handler = handler
+        end
+
+        def call(event_name, payload, message)
+          return unless @pattern_matcher.match?(event_name)
+
+          data_object = @data_struct_class ? @data_struct_class.new(payload) : payload
+
+          if @handler.arity == 2
+            @handler.call(data_object, message)
+          else
+            @handler.call(data_object)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '2.1.4'
+      VERSION = '2.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -28,16 +28,22 @@ dependencies:
   name: google-cloud-pubsub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.34'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.34'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +155,7 @@ files:
 - lib/hanami/events/cloud_pubsub/register.rb
 - lib/hanami/events/cloud_pubsub/runner.rb
 - lib/hanami/events/cloud_pubsub/safe_error_handler.rb
+- lib/hanami/events/cloud_pubsub/subscriber.rb
 - lib/hanami/events/cloud_pubsub/thread_inspector.rb
 - lib/hanami/events/cloud_pubsub/version.rb
 - log/.keep
@@ -172,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Google Cloud Pub/Sub adapter for the hanami-events gem