google-cloud-pubsub 0.20.0 → 2.6.1

data/lib/google-cloud-pubsub.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -12,14 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 ##
-# This file is here to be autorequired by bundler, so that the .bigquery and
-# #bigquery methods can be available, but the library and all dependencies won't
-# be loaded until required and used.
+# This file is here to be autorequired by bundler, so that the
+# Google::Cloud.pubsub and Google::Cloud#pubsub methods can be available, but
+# the library and all dependencies won't be loaded until required and used.
 
 
 gem "google-cloud-core"
-require "google/cloud"
+require "google/cloud" unless defined? Google::Cloud.new
+require "google/cloud/config"
+require "googleauth"
 
 module Google
   module Cloud
@@ -27,8 +30,8 @@ module Google
     # Creates a new object for connecting to the Pub/Sub service.
     # Each call creates a new connection.
     #
-    # For more information on connecting to Google Cloud see the [Authentication
-    # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
+    # For more information on connecting to Google Cloud see the
+    # {file:AUTHENTICATION.md Authentication Guide}.
     #
     # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling the
     #   set of resources and operations that the connection can access. See
@@ -38,11 +41,9 @@ module Google
     #   The default scope is:
     #
     #   * `https://www.googleapis.com/auth/pubsub`
-    # @param [Integer] retries Number of times to retry requests on server
-    #   error. The default value is `3`. Optional.
     # @param [Integer] timeout Default timeout to use in requests. Optional.
     #
-    # @return [Google::Cloud::Pubsub::Project]
+    # @return [Google::Cloud::PubSub::Project]
     #
     # @example
     #   require "google/cloud"
@@ -59,23 +60,25 @@ module Google
     #   platform_scope = "https://www.googleapis.com/auth/cloud-platform"
     #   pubsub = gcloud.pubsub scope: platform_scope
     #
-    def pubsub scope: nil, retries: nil, timeout: nil
-      Google::Cloud.pubsub @project, @keyfile, scope: scope,
-                                               retries: (retries || @retries),
-                                               timeout: (timeout || @timeout)
+    def pubsub scope: nil, timeout: nil
+      timeout ||= @timeout
+      Google::Cloud.pubsub @project, @keyfile, scope: scope, timeout: timeout
     end
 
     ##
     # Creates a new object for connecting to the Pub/Sub service.
     # Each call creates a new connection.
     #
-    # For more information on connecting to Google Cloud see the [Authentication
-    # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
+    # For more information on connecting to Google Cloud see the
+    # {file:AUTHENTICATION.md Authentication Guide}.
     #
-    # @param [String] project Project identifier for the Pub/Sub service you are
-    #   connecting to.
-    # @param [String, Hash] keyfile Keyfile downloaded from Google Cloud. If
-    #   file path the file must be readable.
+    # @param [String] project_id Project identifier for the Pub/Sub service you
+    #   are connecting to. If not present, the default project for the
+    #   credentials is used.
+    # @param [String, Hash, Google::Auth::Credentials] credentials The path to
+    #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+    #   Google::Auth::Credentials object.
+    #   (See {Google::Cloud::PubSub::Credentials})
     # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling the
     #   set of resources and operations that the connection can access. See
     #   [Using OAuth 2.0 to Access Google
@@ -84,39 +87,54 @@ module Google
     #   The default scope is:
     #
     #   * `https://www.googleapis.com/auth/pubsub`
-    # @param [Integer] retries Number of times to retry requests on server
-    #   error. The default value is `3`. Optional.
     # @param [Integer] timeout Default timeout to use in requests. Optional.
     #
-    # @return [Google::Cloud::Pubsub::Project]
+    # @return [Google::Cloud::PubSub::Project]
     #
     # @example
-    #   require "google/cloud/pubsub"
+    #   require "google/cloud"
     #
     #   pubsub = Google::Cloud.pubsub
     #
     #   topic = pubsub.topic "my-topic"
     #   topic.publish "task completed"
     #
-    def self.pubsub project = nil, keyfile = nil, scope: nil, retries: nil,
+    def self.pubsub project_id = nil,
+                    credentials = nil,
+                    scope: nil,
                     timeout: nil
       require "google/cloud/pubsub"
-      project ||= Google::Cloud::Pubsub::Project.default_project
-      if ENV["PUBSUB_EMULATOR_HOST"]
-        ps = Google::Cloud::Pubsub::Project.new(
-          project, :this_channel_is_insecure)
-        ps.service.host = ENV["PUBSUB_EMULATOR_HOST"]
-        return ps
-      end
-      if keyfile.nil?
-        credentials = Google::Cloud::Pubsub::Credentials.default scope: scope
-      else
-        credentials = Google::Cloud::Pubsub::Credentials.new(
-          keyfile, scope: scope)
-      end
-      Google::Cloud::Pubsub::Project.new(
-        Google::Cloud::Pubsub::Service.new(
-          project, credentials, retries: retries, timeout: timeout))
+      Google::Cloud::PubSub.new project_id: project_id, credentials: credentials, scope: scope, timeout: timeout
     end
   end
 end
+
+# Set the default pubsub configuration
+Google::Cloud.configure.add_config! :pubsub do |config|
+  default_project = Google::Cloud::Config.deferred do
+    ENV["PUBSUB_PROJECT"]
+  end
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env(
+      "PUBSUB_CREDENTIALS", "PUBSUB_CREDENTIALS_JSON", "PUBSUB_KEYFILE", "PUBSUB_KEYFILE_JSON"
+    )
+  end
+  default_emulator = Google::Cloud::Config.deferred do
+    ENV["PUBSUB_EMULATOR_HOST"]
+  end
+  default_scopes = [
+    "https://www.googleapis.com/auth/cloud-platform",
+    "https://www.googleapis.com/auth/pubsub"
+  ]
+
+  config.add_field! :project_id, default_project, match: String, allow_nil: true
+  config.add_alias! :project, :project_id
+  config.add_field! :credentials, default_creds, match: [String, Hash, Google::Auth::Credentials], allow_nil: true
+  config.add_alias! :keyfile, :credentials
+  config.add_field! :scope, default_scopes, match: [String, Array]
+  config.add_field! :quota_project, nil, match: String
+  config.add_field! :timeout, nil, match: Integer
+  config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
+  config.add_field! :on_error, nil, match: Proc
+  config.add_field! :endpoint, "pubsub.googleapis.com", match: String
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Mike Moore
@@ -9,78 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-cloud-core
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: grpc
+  name: google-cloud-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: google-protobuf
+  name: google-cloud-pubsub-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: googleapis-common-protos
+  name: autotest-suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: avro
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: google-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -124,35 +152,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: autotest-suffix
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -166,19 +194,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.1.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.1.13
 description: google-cloud-pubsub is the official library for Google Cloud Pub/Sub.
 email:
 - mike@blowmage.com
@@ -187,26 +215,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- AUTHENTICATION.md
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- EMULATOR.md
+- LICENSE
+- LOGGING.md
+- OVERVIEW.md
+- TROUBLESHOOTING.md
 - lib/google-cloud-pubsub.rb
 - lib/google/cloud/pubsub.rb
+- lib/google/cloud/pubsub/async_publisher.rb
+- lib/google/cloud/pubsub/async_publisher/batch.rb
+- lib/google/cloud/pubsub/batch_publisher.rb
+- lib/google/cloud/pubsub/convert.rb
 - lib/google/cloud/pubsub/credentials.rb
+- lib/google/cloud/pubsub/errors.rb
 - lib/google/cloud/pubsub/message.rb
 - lib/google/cloud/pubsub/policy.rb
 - lib/google/cloud/pubsub/project.rb
+- lib/google/cloud/pubsub/publish_result.rb
 - lib/google/cloud/pubsub/received_message.rb
+- lib/google/cloud/pubsub/retry_policy.rb
+- lib/google/cloud/pubsub/schema.rb
+- lib/google/cloud/pubsub/schema/list.rb
 - lib/google/cloud/pubsub/service.rb
+- lib/google/cloud/pubsub/snapshot.rb
+- lib/google/cloud/pubsub/snapshot/list.rb
+- lib/google/cloud/pubsub/subscriber.rb
+- lib/google/cloud/pubsub/subscriber/enumerator_queue.rb
+- lib/google/cloud/pubsub/subscriber/inventory.rb
+- lib/google/cloud/pubsub/subscriber/sequencer.rb
+- lib/google/cloud/pubsub/subscriber/stream.rb
+- lib/google/cloud/pubsub/subscriber/timed_unary_buffer.rb
 - lib/google/cloud/pubsub/subscription.rb
 - lib/google/cloud/pubsub/subscription/list.rb
+- lib/google/cloud/pubsub/subscription/push_config.rb
 - lib/google/cloud/pubsub/topic.rb
 - lib/google/cloud/pubsub/topic/list.rb
-- lib/google/cloud/pubsub/topic/publisher.rb
 - lib/google/cloud/pubsub/version.rb
-- lib/google/iam/v1/iam_policy.rb
-- lib/google/iam/v1/iam_policy_services.rb
-- lib/google/iam/v1/policy.rb
-- lib/google/pubsub/v1/pubsub_pb.rb
-- lib/google/pubsub/v1/pubsub_services_pb.rb
-homepage: http://googlecloudplatform.github.io/google-cloud-ruby/
+homepage: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-pubsub
 licenses:
 - Apache-2.0
 metadata: {}
@@ -218,15 +268,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Pub/Sub

data/lib/google/cloud/pubsub/topic/publisher.rb

@@ -1,87 +0,0 @@
-# Copyright 2015 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-module Google
-  module Cloud
-    module Pubsub
-      class Topic
-        ##
-        # Topic Publisher object used to publish multiple messages at once.
-        #
-        # @example
-        #   require "google/cloud"
-        #
-        #   gcloud = Google::Cloud.new
-        #   pubsub = gcloud.pubsub
-        #
-        #   topic = pubsub.topic "my-topic"
-        #   msgs = topic.publish do |t|
-        #     t.publish "new-message-1", foo: :bar
-        #     t.publish "new-message-2", foo: :baz
-        #     t.publish "new-message-3", foo: :bif
-        #   end
-        class Publisher
-          ##
-          # @private The messages to publish
-          attr_reader :messages
-
-          ##
-          # @private Create a new instance of the object.
-          def initialize data = nil, attributes = {}
-            @messages = []
-            @mode = :batch
-            return if data.nil?
-            @mode = :single
-            publish data, attributes
-          end
-
-          ##
-          # Add multiple messages to the topic.
-          # All messages added will be published at once.
-          # See {Google::Cloud::Pubsub::Topic#publish}
-          def publish data, attributes = {}
-            # Convert IO-ish objects to strings
-            if data.respond_to?(:read) && data.respond_to?(:rewind)
-              data.rewind
-              data = data.read
-            end
-            # Convert data to encoded byte array to match the protobuf defn
-            data = String(data).force_encoding("ASCII-8BIT")
-            # Convert attributes to strings to match the protobuf definition
-            attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
-            @messages << [data, attributes]
-          end
-
-          ##
-          # @private Create Message objects with message ids.
-          def to_gcloud_messages message_ids
-            msgs = @messages.zip(Array(message_ids)).map do |arr, id|
-              Message.from_grpc(
-                Google::Pubsub::V1::PubsubMessage.new(
-                  data: arr[0], attributes: arr[1], message_id: id))
-            end
-            # Return just one Message if a single publish,
-            # otherwise return the array of Messages.
-            if @mode == :single && msgs.count <= 1
-              msgs.first
-            else
-              msgs
-            end
-          end
-        end
-      end
-    end
-  end
-end