google-cloud-firestore 1.4.4 → 2.4.0

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

@@ -26,65 +26,42 @@ module Google
       # @private Represents the gRPC Firestore service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :timeout, :client_config, :host
+        attr_accessor :project, :credentials, :timeout, :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, timeout: nil,
-                       client_config: nil
+        def initialize project, credentials, host: nil, timeout: nil
           @project = project
           @credentials = credentials
-          @host = host || V1::FirestoreClient::SERVICE_ADDRESS
+          @host = host
           @timeout = timeout
-          @client_config = client_config || {}
-        end
-
-        def channel
-          require "grpc"
-          GRPC::Core::Channel.new host, chan_args, chan_creds
-        end
-
-        def chan_args
-          { "grpc.service_config_disable_resolution" => 1 }
-        end
-
-        def chan_creds
-          return credentials if insecure?
-          require "grpc"
-          GRPC::Core::ChannelCredentials.new.compose \
-            GRPC::Core::CallCredentials.new credentials.client.updater_proc
         end
 
         def firestore
           @firestore ||= \
-            V1::FirestoreClient.new(
-              credentials:   channel,
-              timeout:       timeout,
-              client_config: client_config,
-              lib_name:      "gccl",
-              lib_version:   Google::Cloud::Firestore::VERSION
-            )
-        end
-
-        def insecure?
-          credentials == :this_channel_is_insecure
+            V1::Firestore::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Firestore::VERSION
+              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            end
         end
 
         def get_documents document_paths, mask: nil, transaction: nil
-          batch_get_args = {
+          batch_get_req = {
+            database:  database_path,
             documents: document_paths,
             mask:      document_mask(mask)
           }
           if transaction.is_a? String
-            batch_get_args[:transaction] = transaction
+            batch_get_req[:transaction] = transaction
           elsif transaction
-            batch_get_args[:new_transaction] = transaction
+            batch_get_req[:new_transaction] = transaction
           end
-          batch_get_args[:options] = call_options parent: database_path
 
-          execute do
-            firestore.batch_get_documents database_path, **batch_get_args
-          end
+          firestore.batch_get_documents batch_get_req, call_options(parent: database_path)
         end
 
         ##
@@ -96,81 +73,72 @@ module Google
         # method.
         def list_documents parent, collection_id, token: nil, max: nil
           mask = { field_paths: [] }
-          call_options = nil
-          call_options = Google::Gax::CallOptions.new page_token: token if token
-          execute do
-            paged_enum = firestore.list_documents \
-              parent, collection_id, mask: mask, show_missing: true,
-                                     page_size: max, options: call_options
-
-            paged_enum.page.response
-          end
-        end
-
-        def list_collections parent, transaction: nil
-          list_args = {}
-          if transaction.is_a? String
-            list_args[:transaction] = transaction
-          elsif transaction
-            list_args[:new_transaction] = transaction
-          end
-          list_args[:options] = call_options parent: database_path
-
-          execute do
-            firestore.list_collection_ids parent, **list_args
-          end
+          paged_enum = firestore.list_documents parent:        parent,
+                                                collection_id: collection_id,
+                                                page_size:     max,
+                                                page_token:    token,
+                                                mask:          mask,
+                                                show_missing:  true
+          paged_enum.response
+        end
+
+        def list_collections parent, token: nil, max: nil
+          firestore.list_collection_ids(
+            {
+              parent:     parent,
+              page_size:  max,
+              page_token: token
+            },
+            call_options(parent: database_path)
+          )
         end
 
         def run_query path, query_grpc, transaction: nil
-          run_query_args = { structured_query: query_grpc }
+          run_query_req = {
+            parent:           path,
+            structured_query: query_grpc
+          }
           if transaction.is_a? String
-            run_query_args[:transaction] = transaction
+            run_query_req[:transaction] = transaction
           elsif transaction
-            run_query_args[:new_transaction] = transaction
+            run_query_req[:new_transaction] = transaction
           end
-          run_query_args[:options] = call_options parent: database_path
 
-          execute do
-            firestore.run_query path, **run_query_args
-          end
+          firestore.run_query run_query_req, call_options(parent: database_path)
         end
 
         def listen enum
-          options = call_options parent: database_path
-
-          execute do
-            firestore.listen enum, options: options
-          end
+          firestore.listen enum, call_options(parent: database_path)
         end
 
         def begin_transaction transaction_opt
-          options = call_options parent: database_path
-
-          execute do
-            firestore.begin_transaction database_path,
-                                        options_: transaction_opt,
-                                        options:  options
-          end
+          firestore.begin_transaction(
+            {
+              database: database_path,
+              options:  transaction_opt
+            },
+            call_options(parent: database_path)
+          )
         end
 
         def commit writes, transaction: nil
-          commit_args = {
-            writes: writes
+          commit_req = {
+            database: database_path,
+            writes:   writes
           }
-          commit_args[:transaction] = transaction if transaction
-          commit_args[:options] = call_options parent: database_path
+          commit_req[:transaction] = transaction if transaction
 
-          execute do
-            firestore.commit database_path, **commit_args
-          end
+          firestore.commit commit_req, call_options(parent: database_path)
         end
 
         def rollback transaction
-          options = call_options parent: database_path
-
-          execute do
-            firestore.rollback database_path, transaction, options: options
-          end
+          firestore.rollback(
+            {
+              database:    database_path,
+              transaction: transaction
+            },
+            call_options(parent: database_path)
+          )
         end
 
         def database_path project_id: project, database_id: "(default)"
@@ -195,7 +163,7 @@ module Google
         end
 
         def call_options parent: nil, token: nil
-          Google::Gax::CallOptions.new(**{
+          Gapic::CallOptions.new(**{
             metadata:   default_headers(parent),
             page_token: token
           }.delete_if { |_, v| v.nil? })
@@ -207,16 +175,7 @@ module Google
           mask = Array(mask).map(&:to_s).reject(&:nil?).reject(&:empty?)
           return nil if mask.empty?
 
-          Google::Firestore::V1::DocumentMask.new field_paths: mask
-        end
-
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
-        rescue GRPC::BadStatus => e
-          raise Google::Cloud::Error.from_error(e)
+          Google::Cloud::Firestore::V1::DocumentMask.new field_paths: mask
         end
       end
     end

data/lib/google/cloud/firestore/transaction.rb

@@ -700,14 +700,14 @@ module Google
         # @private
         def transaction_opt
           read_write = \
-            Google::Firestore::V1::TransactionOptions::ReadWrite.new
+            Google::Cloud::Firestore::V1::TransactionOptions::ReadWrite.new
 
           if @previous_transaction
             read_write.retry_transaction = @previous_transaction
             @previous_transaction = nil
           end
 
-          Google::Firestore::V1::TransactionOptions.new(
+          Google::Cloud::Firestore::V1::TransactionOptions.new(
             read_write: read_write
           )
         end

data/lib/google/cloud/firestore/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Firestore
-      VERSION = "1.4.4".freeze
+      VERSION = "2.4.0".freeze
     end
   end
 end

data/lib/google/cloud/firestore/watch/inventory.rb

@@ -127,6 +127,8 @@ module Google
           end
 
           def current_docs
+            # Reverse the results for Query#limit_to_last queries since that method reversed the order_by directions.
+            return @tree.keys.reverse if @query&.limit_type == :last
             @tree.keys
           end
 

data/lib/google/cloud/firestore/watch/listener.rb

@@ -30,43 +30,44 @@ module Google
         class Listener
           include MonitorMixin
 
-          def self.for_doc_ref doc_ref, &callback
+          def self.for_doc_ref parent, doc_ref, &callback
             raise ArgumentError if doc_ref.nil?
             raise ArgumentError if callback.nil?
 
-            documents = Google::Firestore::V1::Target::DocumentsTarget.new(
+            documents = Google::Cloud::Firestore::V1::Target::DocumentsTarget.new(
               documents: [doc_ref.path]
             )
-            init_listen_req = Google::Firestore::V1::ListenRequest.new(
+            init_listen_req = Google::Cloud::Firestore::V1::ListenRequest.new(
               database:   doc_ref.client.path,
-              add_target: Google::Firestore::V1::Target.new(
+              add_target: Google::Cloud::Firestore::V1::Target.new(
                 documents: documents
               )
             )
 
-            new nil, doc_ref, doc_ref.client, init_listen_req, &callback
+            new parent, nil, doc_ref, doc_ref.client, init_listen_req, &callback
           end
 
-          def self.for_query query, &callback
+          def self.for_query parent, query, &callback
             raise ArgumentError if query.nil?
             raise ArgumentError if callback.nil?
 
-            init_listen_req = Google::Firestore::V1::ListenRequest.new(
+            init_listen_req = Google::Cloud::Firestore::V1::ListenRequest.new(
               database:   query.client.path,
-              add_target: Google::Firestore::V1::Target.new(
-                query: Google::Firestore::V1::Target::QueryTarget.new(
+              add_target: Google::Cloud::Firestore::V1::Target.new(
+                query: Google::Cloud::Firestore::V1::Target::QueryTarget.new(
                   parent:           query.parent_path,
                   structured_query: query.query
                 )
               )
             )
 
-            new query, nil, query.client, init_listen_req, &callback
+            new parent, query, nil, query.client, init_listen_req, &callback
           end
 
-          def initialize query, doc_ref, client, init_listen_req, &callback
+          def initialize parent, query, doc_ref, client, init_listen_req, &callback
             super() # to init MonitorMixin
 
+            @parent = parent
             @query = query
             @doc_ref = doc_ref
             @client = client
@@ -119,6 +120,8 @@ module Google
 
           def send_callback query_snp
             @callback.call query_snp
+          rescue StandardError => e
+            @parent.error! e
           end
 
           def start_listening!
@@ -223,7 +226,7 @@ module Google
                     raise RestartStream # Raise to restart the stream
                   end
                 when :document_change
-                  # A {Google::Firestore::V1::Document Document} has changed.
+                  # A {Google::Cloud::Firestore::V1::Document Document} has changed.
 
                   if response.document_change.removed_target_ids.any?
                     @inventory.delete response.document_change.document.name
@@ -231,12 +234,12 @@ module Google
                     @inventory.add response.document_change.document
                   end
                 when :document_delete
-                  # A {Google::Firestore::V1::Document Document} has been
+                  # A {Google::Cloud::Firestore::V1::Document Document} has been
                   # deleted.
 
                   @inventory.delete response.document_delete.document
                 when :document_remove
-                  # A {Google::Firestore::V1::Document Document} has been
+                  # A {Google::Cloud::Firestore::V1::Document Document} has been
                   # removed from a target (because it is no longer relevant to
                   # that target).
 
@@ -270,25 +273,29 @@ module Google
             @request_queue.push self
           rescue GRPC::Cancelled, GRPC::DeadlineExceeded, GRPC::Internal,
                  GRPC::ResourceExhausted, GRPC::Unauthenticated,
-                 GRPC::Unavailable, GRPC::Core::CallError
+                 GRPC::Unavailable, GRPC::Core::CallError => e
             # Restart the stream with an incremental back for a retriable error.
             # Also when GRPC raises the internal CallError.
 
-            # Re-raise if retried more than the max
-            raise err if @backoff[:current] > @backoff[:max]
-
-            # Sleep with incremental backoff before restarting
-            sleep @backoff[:delay]
+            # Raise if retried more than the max
+            if @backoff[:current] > @backoff[:max]
+              @parent.error! e
+              raise e
+            else
+              # Sleep with incremental backoff before restarting
+              sleep @backoff[:delay]
 
-            # Update increment backoff delay and retry counter
-            @backoff[:delay] *= @backoff[:mod]
-            @backoff[:current] += 1
+              # Update increment backoff delay and retry counter
+              @backoff[:delay] *= @backoff[:mod]
+              @backoff[:current] += 1
 
-            retry
+              retry
+            end
           rescue RestartStream
             retry
           rescue StandardError => e
-            raise Google::Cloud::Error.from_error(e)
+            @parent.error! e
+            raise e
           end
         end
       end

data/lib/google/cloud/firestore/watch/order.rb

@@ -77,7 +77,7 @@ module Google
               return value if value.is_a? String
               return value.string if value.is_a? StringIO
               if value.is_a? DocumentReference
-                return value.path.split "/".freeze
+                return value.path.split "/"
               end
               return value.map { |v| field_comparison v } if value.is_a? Array
               if value.is_a? Hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-firestore
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -16,68 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: google-gax
+  name: google-cloud-firestore-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -265,22 +225,10 @@ files:
 - TROUBLESHOOTING.md
 - lib/google-cloud-firestore.rb
 - lib/google/cloud/firestore.rb
-- lib/google/cloud/firestore/admin.rb
-- lib/google/cloud/firestore/admin/v1.rb
-- lib/google/cloud/firestore/admin/v1/credentials.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/firestore/admin/v1/field.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/firestore/admin/v1/firestore_admin.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/firestore/admin/v1/index.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/longrunning/operations.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/protobuf/any.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/protobuf/empty.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/protobuf/field_mask.rb
-- lib/google/cloud/firestore/admin/v1/doc/google/rpc/status.rb
-- lib/google/cloud/firestore/admin/v1/firestore_admin_client.rb
-- lib/google/cloud/firestore/admin/v1/firestore_admin_client_config.json
 - lib/google/cloud/firestore/batch.rb
 - lib/google/cloud/firestore/client.rb
 - lib/google/cloud/firestore/collection_reference.rb
+- lib/google/cloud/firestore/collection_reference_list.rb
 - lib/google/cloud/firestore/commit_response.rb
 - lib/google/cloud/firestore/convert.rb
 - lib/google/cloud/firestore/credentials.rb
@@ -297,57 +245,11 @@ files:
 - lib/google/cloud/firestore/query_snapshot.rb
 - lib/google/cloud/firestore/service.rb
 - lib/google/cloud/firestore/transaction.rb
-- lib/google/cloud/firestore/v1.rb
-- lib/google/cloud/firestore/v1/credentials.rb
-- lib/google/cloud/firestore/v1/doc/google/firestore/v1/common.rb
-- lib/google/cloud/firestore/v1/doc/google/firestore/v1/document.rb
-- lib/google/cloud/firestore/v1/doc/google/firestore/v1/firestore.rb
-- lib/google/cloud/firestore/v1/doc/google/firestore/v1/query.rb
-- lib/google/cloud/firestore/v1/doc/google/firestore/v1/write.rb
-- lib/google/cloud/firestore/v1/doc/google/protobuf/any.rb
-- lib/google/cloud/firestore/v1/doc/google/protobuf/empty.rb
-- lib/google/cloud/firestore/v1/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/firestore/v1/doc/google/protobuf/wrappers.rb
-- lib/google/cloud/firestore/v1/doc/google/rpc/status.rb
-- lib/google/cloud/firestore/v1/firestore_client.rb
-- lib/google/cloud/firestore/v1/firestore_client_config.json
-- lib/google/cloud/firestore/v1beta1.rb
-- lib/google/cloud/firestore/v1beta1/credentials.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/firestore/v1beta1/common.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/firestore/v1beta1/document.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/firestore/v1beta1/firestore.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/firestore/v1beta1/query.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/firestore/v1beta1/write.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/protobuf/any.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/protobuf/empty.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/protobuf/wrappers.rb
-- lib/google/cloud/firestore/v1beta1/doc/google/rpc/status.rb
-- lib/google/cloud/firestore/v1beta1/firestore_client.rb
-- lib/google/cloud/firestore/v1beta1/firestore_client_config.json
 - lib/google/cloud/firestore/version.rb
 - lib/google/cloud/firestore/watch/enumerator_queue.rb
 - lib/google/cloud/firestore/watch/inventory.rb
 - lib/google/cloud/firestore/watch/listener.rb
 - lib/google/cloud/firestore/watch/order.rb
-- lib/google/firestore/admin/v1/field_pb.rb
-- lib/google/firestore/admin/v1/firestore_admin_pb.rb
-- lib/google/firestore/admin/v1/firestore_admin_services_pb.rb
-- lib/google/firestore/admin/v1/index_pb.rb
-- lib/google/firestore/admin/v1/location_pb.rb
-- lib/google/firestore/admin/v1/operation_pb.rb
-- lib/google/firestore/v1/common_pb.rb
-- lib/google/firestore/v1/document_pb.rb
-- lib/google/firestore/v1/firestore_pb.rb
-- lib/google/firestore/v1/firestore_services_pb.rb
-- lib/google/firestore/v1/query_pb.rb
-- lib/google/firestore/v1/write_pb.rb
-- lib/google/firestore/v1beta1/common_pb.rb
-- lib/google/firestore/v1beta1/document_pb.rb
-- lib/google/firestore/v1beta1/firestore_pb.rb
-- lib/google/firestore/v1beta1/firestore_services_pb.rb
-- lib/google/firestore/v1beta1/query_pb.rb
-- lib/google/firestore/v1beta1/write_pb.rb
 homepage: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-firestore
 licenses:
 - Apache-2.0
@@ -367,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Firestore API