hanami-events-cloud_pubsub 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8628eee6e27df70fa6ffb5161faed7c6002d4a67551606e166cf7998742f27e9
-  data.tar.gz: 448ae6c3b88c65e34841a083e717be14d7530c774a7ae8849ebaa585a217207e
+  metadata.gz: 6a149ec7d07642ff795eb1102b595bc2332368f4baf41b438a8b2a3cba181e11
+  data.tar.gz: c053e05e3cb6523acc2e6b0e4c63579081f09e76ef20285ad7ea4e72ca59b90b
 SHA512:
-  metadata.gz: c39c96539290ab6a7b6d7e52725a41286e660ea544fa58e87b127981ce3ff62490554207f597998ef94ffe1c94f7d63902342fa9216fbc89e3b7927466c8af6b
-  data.tar.gz: 13a1fe610f431e52d8784e4466ac593ff790c96bdc8b129a50645639623bd37cded0766396f6f2d3fb74cd2064f5c77d625d6ea4ff459a4fb193682336586ba7
+  metadata.gz: cc39732f19e786147e7023389e71b30e1f0e61170df1edbd6e8e03ea9eb37fa5be5f300f18cf368bacc765e12f6b53de16df27b17a41f1a0849b137fc632443d
+  data.tar.gz: aa90fc9e19feacb57f9928c05bfc4f8fec02a4ea28e76e16739e6447165b1271edd6de8b972e4e645e12268af072c0ceab253dbd2e42d45086aebd9d5f62b33d

data/.rubocop_todo.yml

@@ -1,29 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-13 22:39:48 -0400 using RuboCop version 0.54.0.
+# on 2019-10-30 15:26:46 -0400 using RuboCop version 0.72.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
-# Offense count: 1
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 6
-
 # Offense count: 1
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
     - 'examples/server.rb'
 
-# Offense count: 23
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 35
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 93
+  Max: 96

data/Gemfile.lock

@@ -8,17 +8,17 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (2.2.1)
+    hanami-events-cloud_pubsub (2.3.0)
       dry-configurable (~> 0.8.0)
-      google-cloud-pubsub (>= 0.38.1, < 0.39)
+      google-cloud-pubsub (>= 0.38.1, < 1.2)
       hanami-cli (~> 0.2)
       hanami-events (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -32,39 +32,39 @@ GEM
       dry-configurable (~> 0.1, >= 0.1.3)
     dry-core (0.4.8)
       concurrent-ruby (~> 1.0)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    google-cloud-core (1.3.0)
+    google-cloud-core (1.4.1)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.2.0)
+    google-cloud-env (1.3.0)
       faraday (~> 0.11)
-    google-cloud-pubsub (0.38.1)
+    google-cloud-pubsub (1.1.0)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.2)
-      google-gax (~> 1.7)
+      google-gax (~> 1.8)
       googleapis-common-protos (>= 1.3.9, < 2.0)
       grpc-google-iam-v1 (~> 0.6.9)
-    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)
+    google-gax (1.8.1)
+      google-protobuf (~> 3.9)
+      googleapis-common-protos (>= 1.3.9, < 2.0)
+      googleauth (~> 0.9)
+      grpc (~> 1.24)
       rly (~> 0.2.3)
-    google-protobuf (3.9.1)
+    google-protobuf (3.10.1)
     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.4)
       google-protobuf (~> 3.0)
-    googleauth (0.9.0)
+    googleauth (0.10.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.23.0)
+      signet (~> 0.12)
+    grpc (1.24.0)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (0.6.9)
@@ -73,7 +73,7 @@ GEM
     hanami-cli (0.3.1)
       concurrent-ruby (~> 1.0)
       hanami-utils (~> 1.3)
-    hanami-utils (1.3.2)
+    hanami-utils (1.3.5)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
     jaro_winkler (1.5.3)
@@ -81,7 +81,7 @@ GEM
     jwt (2.2.1)
     memoist (0.16.0)
     method_source (0.9.2)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     os (1.0.1)
     parallel (1.17.0)
@@ -90,24 +90,24 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (13.0.0)
     rly (0.2.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.72.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -115,7 +115,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    signet (0.11.0)
+    signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -136,7 +136,7 @@ DEPENDENCIES
   hanami-events!
   hanami-events-cloud_pubsub!
   pry
-  rake (~> 12.3)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   simplecov

data/hanami-events-cloud_pubsub.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-configurable', '~> 0.8.0'
-  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 0.39'
+  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 1.2'
   spec.add_dependency 'hanami-cli', '~> 0.2'
   spec.add_dependency 'hanami-events', '~> 0.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

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

@@ -8,6 +8,8 @@ module Hanami
         class Error < StandardError; end
         class TopicNotFoundError < Error; end
         class SubscriptionNotFoundError < Error; end
+        class SubscriptionTopicNameMismatch < Error; end
+        class NoSubscriberError < Error; end
       end
     end
   end

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

@@ -7,8 +7,6 @@ module Hanami
     module CloudPubsub
       # @api private
       class Listener
-        class NoSubscriberError < StandardError; end
-
         attr_reader :topic,
                     :subscriber,
                     :subscriber_id,
@@ -89,13 +87,20 @@ module Hanami
         end
 
         def subscription_for(name)
-          topic.find_subscription(name) ||
-            (CloudPubsub.auto_create_subscriptions && topic.create_subscription(name)) ||
-            raise(Errors::SubscriptionNotFoundError, "no subscription named: #{name}")
+          found_subscription = topic.find_subscription(name)
+
+          if found_subscription
+            ensure_topic_names_match!(name, found_subscription)
+            found_subscription
+          elsif CloudPubsub.auto_create_subscriptions
+            topic.create_subscription(name)
+          else
+            raise Errors::SubscriptionNotFoundError, "no subscription named: #{name}"
+          end
         end
 
         def ensure_subscriber!
-          raise NoSubscriberError, 'No subsriber has been registered' unless @subscriber
+          raise Errors::NoSubscriberError, 'No subsriber has been registered' unless @subscriber
         end
 
         def run_error_handlers(err, message)
@@ -103,6 +108,16 @@ module Hanami
             SafeErrorHandler.call(handler, err, message)
           end
         end
+
+        def ensure_topic_names_match!(sub_name, found_subscription)
+          parsed_name = found_subscription.topic.name.split('/').last
+
+          return true if parsed_name == @event_name
+
+          raise Errors::SubscriptionTopicNameMismatch,
+                "a subscription already exists for #{sub_name} " \
+                "but its name #{found_subscription.topic.name} does not match #{@event_name}"
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '2.2.1'
+      VERSION = '2.3.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.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -33,7 +33,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement