google-cloud-pubsub 0.33.2 → 0.34.0

data/lib/google/cloud/pubsub/project.rb

@@ -22,7 +22,7 @@ require "google/cloud/pubsub/snapshot"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # # Project
       #
@@ -39,7 +39,7 @@ module Google
       # @example
       #   require "google/cloud/pubsub"
       #
-      #   pubsub = Google::Cloud::Pubsub.new
+      #   pubsub = Google::Cloud::PubSub.new
       #
       #   topic = pubsub.topic "my-topic"
       #   topic.publish "task completed"
@@ -60,7 +60,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new(
+        #   pubsub = Google::Cloud::PubSub.new(
         #     project_id: "my-project",
         #     credentials: "/path/to/keyfile.json"
         #   )
@@ -103,37 +103,37 @@ module Google
         #     * `:callback` (Integer) The number of threads to handle the
         #       published messages' callbacks. Default is 8.
         #
-        # @return [Google::Cloud::Pubsub::Topic, nil] Returns `nil` if topic
+        # @return [Google::Cloud::PubSub::Topic, nil] Returns `nil` if topic
         #   does not exist.
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   topic = pubsub.topic "existing-topic"
         #
         # @example By default `nil` will be returned if topic does not exist.
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   topic = pubsub.topic "non-existing-topic" # nil
         #
         # @example Create topic in a different project with the `project` flag.
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   topic = pubsub.topic "another-topic", project: "another-project"
         #
         # @example Skip the lookup against the service with `skip_lookup`:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   topic = pubsub.topic "another-topic", skip_lookup: true
         #
         # @example Configuring AsyncPublisher to increase concurrent callbacks:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   topic = pubsub.topic "my-topic",
         #                        async: { threads: { callback: 16 } }
         #
@@ -150,7 +150,7 @@ module Google
         def topic topic_name, project: nil, skip_lookup: nil, async: nil
           ensure_service!
           options = { project: project }
-          return Topic.new_lazy(topic_name, service, options) if skip_lookup
+          return Topic.from_name(topic_name, service, options) if skip_lookup
           grpc = service.get_topic topic_name
           Topic.from_grpc grpc, service, async: async
         rescue Google::Cloud::NotFoundError
@@ -191,12 +191,12 @@ module Google
         #     * `:callback` (Integer) The number of threads to handle the
         #       published messages' callbacks. Default is 8.
         #
-        # @return [Google::Cloud::Pubsub::Topic]
+        # @return [Google::Cloud::PubSub::Topic]
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   topic = pubsub.create_topic "my-topic"
         #
         def create_topic topic_name, labels: nil, async: nil
@@ -214,13 +214,13 @@ module Google
         #   the system should return the next page of data.
         # @param [Integer] max Maximum number of topics to return.
         #
-        # @return [Array<Google::Cloud::Pubsub::Topic>] (See
-        #   {Google::Cloud::Pubsub::Topic::List})
+        # @return [Array<Google::Cloud::PubSub::Topic>] (See
+        #   {Google::Cloud::PubSub::Topic::List})
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   topics = pubsub.topics
         #   topics.each do |topic|
@@ -230,7 +230,7 @@ module Google
         # @example Retrieve all topics: (See {Topic::List#all})
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   topics = pubsub.topics
         #   topics.all do |topic|
@@ -258,13 +258,13 @@ module Google
         #   service. Calls made on this object will raise errors if the service
         #   resource does not exist. Default is `false`.
         #
-        # @return [Google::Cloud::Pubsub::Subscription, nil] Returns `nil` if
+        # @return [Google::Cloud::PubSub::Subscription, nil] Returns `nil` if
         #   the subscription does not exist
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-sub"
         #   sub.name #=> "projects/my-project/subscriptions/my-sub"
@@ -272,7 +272,7 @@ module Google
         # @example Skip the lookup against the service with `skip_lookup`:
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   # No API call is made to retrieve the subscription information.
         #   sub = pubsub.subscription "my-sub", skip_lookup: true
@@ -282,7 +282,7 @@ module Google
           ensure_service!
           options = { project: project }
           if skip_lookup
-            return Subscription.new_lazy subscription_name, service, options
+            return Subscription.from_name subscription_name, service, options
           end
           grpc = service.get_subscription subscription_name
           Subscription.from_grpc grpc, service
@@ -299,13 +299,13 @@ module Google
         #   part of the larger set of results to view.
         # @param [Integer] max Maximum number of subscriptions to return.
         #
-        # @return [Array<Google::Cloud::Pubsub::Subscription>] (See
-        #   {Google::Cloud::Pubsub::Subscription::List})
+        # @return [Array<Google::Cloud::PubSub::Subscription>] (See
+        #   {Google::Cloud::PubSub::Subscription::List})
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   subs = pubsub.subscriptions
         #   subs.each do |sub|
@@ -315,7 +315,7 @@ module Google
         # @example Retrieve all subscriptions: (See {Subscription::List#all})
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   subs = pubsub.subscriptions
         #   subs.all do |sub|
@@ -339,13 +339,13 @@ module Google
         #   part of the larger set of results to view.
         # @param [Integer] max Maximum number of snapshots to return.
         #
-        # @return [Array<Google::Cloud::Pubsub::Snapshot>] (See
-        #   {Google::Cloud::Pubsub::Snapshot::List})
+        # @return [Array<Google::Cloud::PubSub::Snapshot>] (See
+        #   {Google::Cloud::PubSub::Snapshot::List})
         #
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   snapshots = pubsub.snapshots
         #   snapshots.each do |snapshot|
@@ -355,7 +355,7 @@ module Google
         # @example Retrieve all snapshots: (See {Snapshot::List#all})
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   snapshots = pubsub.snapshots
         #   snapshots.all do |snapshot|
@@ -388,5 +388,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/publish_result.rb

@@ -15,7 +15,7 @@
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # # PublishResult
       #
@@ -92,5 +92,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/received_message.rb

@@ -18,7 +18,7 @@ require "google/cloud/pubsub/message"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # # ReceivedMessage
       #
@@ -27,7 +27,7 @@ module Google
       # @example
       #   require "google/cloud/pubsub"
       #
-      #   pubsub = Google::Cloud::Pubsub.new
+      #   pubsub = Google::Cloud::PubSub.new
       #
       #   sub = pubsub.subscription "my-topic-sub"
       #   subscriber = sub.listen do |received_message|
@@ -47,14 +47,14 @@ module Google
         attr_accessor :subscription
 
         ##
-        # @private The gRPC Google::Pubsub::V1::ReceivedMessage object.
+        # @private The gRPC Google::Cloud::PubSub::V1::ReceivedMessage object.
         attr_accessor :grpc
 
         ##
         # @private Create an empty {Subscription} object.
         def initialize
           @subscription = nil
-          @grpc = Google::Pubsub::V1::ReceivedMessage.new
+          @grpc = Google::Cloud::PubSub::V1::ReceivedMessage.new
         end
 
         ##
@@ -104,7 +104,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   subscriber = sub.listen do |received_message|
@@ -140,7 +140,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   subscriber = sub.listen do |received_message|
@@ -160,7 +160,6 @@ module Google
           ensure_subscription!
           subscription.modify_ack_deadline new_deadline, ack_id
         end
-        alias delay! modify_ack_deadline!
 
         ##
         # Resets the acknowledge deadline for the message without acknowledging
@@ -171,7 +170,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #   subscriber = sub.listen do |received_message|
@@ -188,14 +187,14 @@ module Google
         #   subscriber.stop.wait!
         #
         def reject!
-          delay! 0
+          modify_ack_deadline! 0
         end
         alias nack! reject!
         alias ignore! reject!
 
         ##
         # @private New ReceivedMessage from a
-        # Google::Pubsub::V1::ReceivedMessage object.
+        # Google::Cloud::PubSub::V1::ReceivedMessage object.
         def self.from_grpc grpc, subscription
           new.tap do |rm|
             rm.grpc         = grpc
@@ -212,5 +211,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/service.rb

@@ -22,7 +22,7 @@ require "google/gax/errors"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # @private Represents the GAX Pub/Sub service, including all the API
       # methods.
@@ -62,11 +62,11 @@ module Google
           return mocked_subscriber if mocked_subscriber
           @subscriber ||= begin
             V1::SubscriberClient.new(
-              credentials: channel,
-              timeout: timeout,
+              credentials:   channel,
+              timeout:       timeout,
               client_config: client_config,
-              lib_name: "gccl",
-              lib_version: Google::Cloud::Pubsub::VERSION
+              lib_name:      "gccl",
+              lib_version:   Google::Cloud::PubSub::VERSION
             )
           end
         end
@@ -76,11 +76,11 @@ module Google
           return mocked_publisher if mocked_publisher
           @publisher ||= begin
             V1::PublisherClient.new(
-              credentials: channel,
-              timeout: timeout,
+              credentials:   channel,
+              timeout:       timeout,
               client_config: client_config,
-              lib_name: "gccl",
-              lib_version: Google::Cloud::Pubsub::VERSION
+              lib_name:      "gccl",
+              lib_version:   Google::Cloud::PubSub::VERSION
             )
           end
         end
@@ -108,14 +108,16 @@ module Google
         def list_topics options = {}
           call_options = default_options
           if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new kwargs: default_headers,
-                                                        page_token: token
+            call_options = Google::Gax::CallOptions.new(
+              kwargs:     default_headers,
+              page_token: token
+            )
           end
 
           execute do
             paged_enum = publisher.list_topics project_path(options),
                                                page_size: options[:max],
-                                               options: call_options
+                                               options:   call_options
 
             paged_enum.page.response
           end
@@ -126,7 +128,7 @@ module Google
         def create_topic topic_name, labels: nil, options: {}
           execute do
             publisher.create_topic topic_path(topic_name, options),
-                                   labels: labels,
+                                   labels:  labels,
                                    options: default_options
           end
         end
@@ -177,15 +179,17 @@ module Google
         def list_topics_subscriptions topic, options = {}
           call_options = default_options
           if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new kwargs: default_headers,
-                                                        page_token: token
+            call_options = Google::Gax::CallOptions.new(
+              kwargs:     default_headers,
+              page_token: token
+            )
           end
 
           execute do
             paged_enum = publisher.list_topic_subscriptions \
               topic_path(topic, options),
               page_size: options[:max],
-              options: call_options
+              options:   call_options
 
             paged_enum.page.response
           end
@@ -196,14 +200,16 @@ module Google
         def list_subscriptions options = {}
           call_options = default_options
           if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new kwargs: default_headers,
-                                                        page_token: token
+            call_options = Google::Gax::CallOptions.new(
+              kwargs:     default_headers,
+              page_token: token
+            )
           end
 
           execute do
             paged_enum = subscriber.list_subscriptions project_path(options),
                                                        page_size: options[:max],
-                                                       options: call_options
+                                                       options:   call_options
 
             paged_enum.page.response
           end
@@ -215,9 +221,9 @@ module Google
           name = subscription_path(subscription_name, options)
           topic = topic_path(topic)
           push_config = if options[:endpoint]
-                          Google::Pubsub::V1::PushConfig.new \
+                          Google::Cloud::PubSub::V1::PushConfig.new \
                             push_endpoint: options[:endpoint],
-                            attributes: (options[:attributes] || {}).to_h
+                            attributes:    (options[:attributes] || {}).to_h
                         end
           deadline = options[:deadline]
           retain_acked = options[:retain_acked]
@@ -225,14 +231,14 @@ module Google
           labels = options[:labels]
 
           execute do
-            subscriber.create_subscription name,
-                                           topic,
-                                           push_config: push_config,
-                                           ack_deadline_seconds: deadline,
-                                           retain_acked_messages: retain_acked,
-                                           message_retention_duration: mrd,
-                                           labels: labels,
-                                           options: default_options
+            subscriber.create_subscription \
+              name, topic,
+              push_config:                push_config,
+              ack_deadline_seconds:       deadline,
+              retain_acked_messages:      retain_acked,
+              message_retention_duration: mrd,
+              labels:                     labels,
+              options:                    default_options
           end
         end
 
@@ -265,7 +271,7 @@ module Google
             subscriber.pull subscription,
                             max_messages,
                             return_immediately: return_immediately,
-                            options: default_options
+                            options:            default_options
           end
         end
 
@@ -290,9 +296,9 @@ module Google
           subscription = subscription_path(subscription)
           # Convert attributes to strings to match the protobuf definition
           attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
-          push_config = Google::Pubsub::V1::PushConfig.new(
+          push_config = Google::Cloud::PubSub::V1::PushConfig.new(
             push_endpoint: endpoint,
-            attributes: attributes
+            attributes:    attributes
           )
 
           execute do
@@ -316,14 +322,16 @@ module Google
         def list_snapshots options = {}
           call_options = default_options
           if (token = options[:token])
-            call_options = Google::Gax::CallOptions.new kwargs: default_headers,
-                                                        page_token: token
+            call_options = Google::Gax::CallOptions.new(
+              kwargs:     default_headers,
+              page_token: token
+            )
           end
 
           execute do
             paged_enum = subscriber.list_snapshots project_path(options),
                                                    page_size: options[:max],
-                                                   options: call_options
+                                                   options:   call_options
 
             paged_enum.page.response
           end
@@ -336,7 +344,7 @@ module Google
           execute do
             subscriber.create_snapshot name,
                                        subscription_path(subscription),
-                                       labels: labels,
+                                       labels:  labels,
                                        options: default_options
           end
         end
@@ -373,7 +381,7 @@ module Google
               end
               subscriber.seek subscription,
                               snapshot: snapshot_path(time_or_snapshot),
-                              options: default_options
+                              options:  default_options
             end
           end
         end
@@ -481,5 +489,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end