google-cloud-datastore 1.8.1 → 2.2.1

data/lib/google/cloud/datastore/entity.rb

@@ -293,7 +293,7 @@ module Google
         #   task.persisted? #=> true
         #
         def persisted?
-          @key && @key.frozen?
+          @key&.frozen?
         end
 
         ##
@@ -427,10 +427,10 @@ module Google
         end
 
         ##
-        # @private Convert the Entity to a Google::Datastore::V1::Entity
+        # @private Convert the Entity to a Google::Cloud::Datastore::V1::Entity
         # object.
         def to_grpc
-          grpc = Google::Datastore::V1::Entity.new(
+          grpc = Google::Cloud::Datastore::V1::Entity.new(
             properties: @properties.to_grpc
           )
           grpc.key = @key.to_grpc unless @key.nil?
@@ -439,7 +439,7 @@ module Google
         end
 
         ##
-        # @private Create a new Entity from a Google::Datastore::V1::Key
+        # @private Create a new Entity from a Google::Cloud::Datastore::V1::Key
         # object.
         def self.from_grpc grpc
           entity = Entity.new

data/lib/google/cloud/datastore/gql_query.rb

@@ -49,7 +49,7 @@ module Google
         #   gql_query = Google::Cloud::Datastore::GqlQuery.new
         #
         def initialize
-          @grpc = Google::Datastore::V1::GqlQuery.new
+          @grpc = Google::Cloud::Datastore::V1::GqlQuery.new
         end
 
         ##
@@ -157,17 +157,15 @@ module Google
         def named_bindings= new_named_bindings
           @grpc.named_bindings.clear
           new_named_bindings.map do |name, value|
-            if value.is_a? Google::Cloud::Datastore::Cursor
-              @grpc.named_bindings[name.to_s] = \
-                Google::Datastore::V1::GqlQueryParameter.new(
-                  cursor: value.to_grpc
-                )
-            else
-              @grpc.named_bindings[name.to_s] = \
-                Google::Datastore::V1::GqlQueryParameter.new(
-                  value: Convert.to_value(value)
-                )
-            end
+            @grpc.named_bindings[name.to_s] = if value.is_a? Google::Cloud::Datastore::Cursor
+                                                Google::Cloud::Datastore::V1::GqlQueryParameter.new(
+                                                  cursor: value.to_grpc
+                                                )
+                                              else
+                                                Google::Cloud::Datastore::V1::GqlQueryParameter.new(
+                                                  value: Convert.to_value(value)
+                                                )
+                                              end
           end
         end
 
@@ -208,17 +206,15 @@ module Google
         def positional_bindings= new_positional_bindings
           @grpc.positional_bindings.clear
           new_positional_bindings.map do |value|
-            if value.is_a? Google::Cloud::Datastore::Cursor
-              @grpc.positional_bindings << \
-                Google::Datastore::V1::GqlQueryParameter.new(
-                  cursor: value.to_grpc
-                )
-            else
-              @grpc.positional_bindings << \
-                Google::Datastore::V1::GqlQueryParameter.new(
-                  value: Convert.to_value(value)
-                )
-            end
+            @grpc.positional_bindings << if value.is_a? Google::Cloud::Datastore::Cursor
+                                           Google::Cloud::Datastore::V1::GqlQueryParameter.new(
+                                             cursor: value.to_grpc
+                                           )
+                                         else
+                                           Google::Cloud::Datastore::V1::GqlQueryParameter.new(
+                                             value: Convert.to_value(value)
+                                           )
+                                         end
           end
         end
 

data/lib/google/cloud/datastore/key.rb

@@ -268,20 +268,21 @@ module Google
         end
 
         ##
-        # @private Convert the Key to a Google::Datastore::V1::Key object.
+        # @private Convert the Key to a Google::Cloud::Datastore::V1::Key object.
         def to_grpc
           grpc_path = path.map do |pe_kind, pe_id_or_name|
             path_args = { kind: pe_kind }
-            if pe_id_or_name.is_a? Integer
+            case pe_id_or_name
+            when Integer
               path_args[:id] = pe_id_or_name
-            elsif pe_id_or_name.is_a? String
+            when String
               path_args[:name] = pe_id_or_name unless pe_id_or_name.empty?
             end
-            Google::Datastore::V1::Key::PathElement.new path_args
+            Google::Cloud::Datastore::V1::Key::PathElement.new path_args
           end
-          grpc = Google::Datastore::V1::Key.new path: grpc_path
+          grpc = Google::Cloud::Datastore::V1::Key.new path: grpc_path
           if project || namespace
-            grpc.partition_id = Google::Datastore::V1::PartitionId.new(
+            grpc.partition_id = Google::Cloud::Datastore::V1::PartitionId.new(
               project_id: project.to_s, namespace_id: namespace.to_s
             )
           end
@@ -289,7 +290,7 @@ module Google
         end
 
         ##
-        # @private Create a new Key from a Google::Datastore::V1::Key
+        # @private Create a new Key from a Google::Cloud::Datastore::V1::Key
         # object.
         def self.from_grpc grpc
           return nil if grpc.nil?
@@ -305,7 +306,7 @@ module Google
             key.project = key_grpc.partition_id.project_id
             key.namespace = key_grpc.partition_id.namespace_id
           end
-          key.parent = Key.from_grpc key_grpc if key_grpc.path.count > 0
+          key.parent = Key.from_grpc key_grpc if key_grpc.path.count.positive?
           # Freeze the key to make it immutable.
           key.freeze
           key

data/lib/google/cloud/datastore/properties.rb

@@ -73,7 +73,7 @@ module Google
         alias to_hash to_h
 
         def to_grpc
-          # Convert to Hash with Google::Datastore::V1::Value values.
+          # Convert to Hash with Google::Cloud::Datastore::V1::Value values.
           Hash[@hash.map { |k, v| [k.to_s, Convert.to_value(v)] }]
         end
 

data/lib/google/cloud/datastore/query.rb

@@ -61,7 +61,7 @@ module Google
         #   query = Google::Cloud::Datastore::Query.new
         #
         def initialize
-          @grpc = Google::Datastore::V1::Query.new
+          @grpc = Google::Cloud::Datastore::V1::Query.new
         end
 
         ##
@@ -83,7 +83,7 @@ module Google
         #
         def kind *kinds
           kinds.each do |kind|
-            grpc_kind = Google::Datastore::V1::KindExpression.new(
+            grpc_kind = Google::Cloud::Datastore::V1::KindExpression.new(
               name: kind
             )
             @grpc.kind << grpc_kind
@@ -177,15 +177,15 @@ module Google
         #   tasks = datastore.run query
         #
         def where name, operator, value
-          @grpc.filter ||= Google::Datastore::V1::Filter.new(
-            composite_filter: Google::Datastore::V1::CompositeFilter.new(
+          @grpc.filter ||= Google::Cloud::Datastore::V1::Filter.new(
+            composite_filter: Google::Cloud::Datastore::V1::CompositeFilter.new(
               op: :AND
             )
           )
           @grpc.filter.composite_filter.filters << \
-            Google::Datastore::V1::Filter.new(
-              property_filter: Google::Datastore::V1::PropertyFilter.new(
-                property: Google::Datastore::V1::PropertyReference.new(
+            Google::Cloud::Datastore::V1::Filter.new(
+              property_filter: Google::Cloud::Datastore::V1::PropertyFilter.new(
+                property: Google::Cloud::Datastore::V1::PropertyReference.new(
                   name: name
                 ),
                 op: Convert.to_prop_filter_op(operator),
@@ -273,8 +273,8 @@ module Google
         #   tasks = datastore.run query
         #
         def order name, direction = :asc
-          @grpc.order << Google::Datastore::V1::PropertyOrder.new(
-            property: Google::Datastore::V1::PropertyReference.new(
+          @grpc.order << Google::Cloud::Datastore::V1::PropertyOrder.new(
+            property: Google::Cloud::Datastore::V1::PropertyReference.new(
               name: name
             ),
             direction: prop_order_direction(direction)
@@ -340,9 +340,10 @@ module Google
         #   tasks = datastore.run query
         #
         def start cursor
-          if cursor.is_a? Cursor
+          case cursor
+          when Cursor
             @grpc.start_cursor = cursor.to_grpc
-          elsif cursor.is_a? String
+          when String
             @grpc.start_cursor = Convert.decode_bytes cursor
           else
             raise ArgumentError, "Can't set a cursor using a #{cursor.class}."
@@ -384,8 +385,8 @@ module Google
         #
         def select *names
           names.each do |name|
-            grpc_projection = Google::Datastore::V1::Projection.new(
-              property: Google::Datastore::V1::PropertyReference.new(
+            grpc_projection = Google::Cloud::Datastore::V1::Projection.new(
+              property: Google::Cloud::Datastore::V1::PropertyReference.new(
                 name: name
               )
             )
@@ -414,7 +415,7 @@ module Google
         #
         def group_by *names
           names.each do |name|
-            grpc_property = Google::Datastore::V1::PropertyReference.new(
+            grpc_property = Google::Cloud::Datastore::V1::PropertyReference.new(
               name: name
             )
             @grpc.distinct_on << grpc_property

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

@@ -17,7 +17,6 @@ require "google/cloud/errors"
 require "google/cloud/datastore/credentials"
 require "google/cloud/datastore/version"
 require "google/cloud/datastore/v1"
-require "google/gax/errors"
 
 module Google
   module Cloud
@@ -26,59 +25,38 @@ module Google
       # @private Represents the GAX Datastore service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :host, :timeout, :client_config
+        attr_accessor :project
+        attr_accessor :credentials
+        attr_accessor :host
+        attr_accessor :timeout
 
         ##
         # 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::DatastoreClient::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 service
           return mocked_service if mocked_service
-          @service ||= V1::DatastoreClient.new(
-            credentials: channel,
-            timeout: timeout,
-            client_config: client_config,
-            lib_name: "gccl",
-            lib_version: Google::Cloud::Datastore::VERSION
-          )
+          @service ||= V1::Datastore::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::Datastore::VERSION
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+          end
         end
         attr_accessor :mocked_service
 
-        def insecure?
-          credentials == :this_channel_is_insecure
-        end
-
         ##
         # Allocate IDs for incomplete keys.
         # (This is useful for referencing an entity before it is inserted.)
         def allocate_ids *incomplete_keys
-          execute do
-            service.allocate_ids project, incomplete_keys,
-                                 options: default_options
-          end
+          service.allocate_ids project_id: project, keys: incomplete_keys
         end
 
         ##
@@ -86,76 +64,61 @@ module Google
         def lookup *keys, consistency: nil, transaction: nil
           read_options = generate_read_options consistency, transaction
 
-          execute do
-            service.lookup project, keys,
-                           read_options: read_options, options: default_options
-          end
+          service.lookup project_id: project, keys: keys, read_options: read_options
         end
 
         # Query for entities.
         def run_query query, namespace = nil, consistency: nil, transaction: nil
           gql_query = nil
-          if query.is_a? Google::Datastore::V1::GqlQuery
+          if query.is_a? Google::Cloud::Datastore::V1::GqlQuery
             gql_query = query
             query = nil
           end
           read_options = generate_read_options consistency, transaction
           if namespace
-            partition_id = Google::Datastore::V1::PartitionId.new(
+            partition_id = Google::Cloud::Datastore::V1::PartitionId.new(
               namespace_id: namespace
             )
           end
 
-          execute do
-            service.run_query project, partition_id: partition_id,
-                                       read_options: read_options,
-                                       query: query,
-                                       gql_query: gql_query,
-                                       options: default_options
-          end
+          service.run_query project_id: project,
+                            partition_id: partition_id,
+                            read_options: read_options,
+                            query: query,
+                            gql_query: gql_query
         end
 
         ##
         # Begin a new transaction.
         def begin_transaction read_only: nil, previous_transaction: nil
           if read_only
-            transaction_options = Google::Datastore::V1::TransactionOptions.new
+            transaction_options = Google::Cloud::Datastore::V1::TransactionOptions.new
             transaction_options.read_only = \
-              Google::Datastore::V1::TransactionOptions::ReadOnly.new
+              Google::Cloud::Datastore::V1::TransactionOptions::ReadOnly.new
           end
           if previous_transaction
             transaction_options ||= \
-              Google::Datastore::V1::TransactionOptions.new
-            rw = Google::Datastore::V1::TransactionOptions::ReadWrite.new(
+              Google::Cloud::Datastore::V1::TransactionOptions.new
+            rw = Google::Cloud::Datastore::V1::TransactionOptions::ReadWrite.new(
               previous_transaction: previous_transaction.encode("ASCII-8BIT")
             )
             transaction_options.read_write = rw
           end
-          execute do
-            service.begin_transaction project,
-                                      transaction_options: transaction_options
-          end
+          service.begin_transaction project_id: project, transaction_options: transaction_options
         end
 
         ##
         # Commit a transaction, optionally creating, deleting or modifying
         # some entities.
         def commit mutations, transaction: nil
-          mode =  transaction.nil? ? :NON_TRANSACTIONAL : :TRANSACTIONAL
-          execute do
-            service.commit project, mode: mode,
-                                    mutations: mutations,
-                                    transaction: transaction,
-                                    options: default_options
-          end
+          mode = transaction.nil? ? :NON_TRANSACTIONAL : :TRANSACTIONAL
+          service.commit project_id: project, mode: mode, mutations: mutations, transaction: transaction
         end
 
         ##
         # Roll back a transaction.
         def rollback transaction
-          execute do
-            service.rollback project, transaction, options: default_options
-          end
+          service.rollback project_id: project, transaction: transaction
         end
 
         def inspect
@@ -166,35 +129,20 @@ module Google
 
         def generate_read_options consistency, transaction
           if consistency == :eventual
-            return Google::Datastore::V1::ReadOptions.new(
+            return Google::Cloud::Datastore::V1::ReadOptions.new(
               read_consistency: :EVENTUAL
             )
           elsif consistency == :strong
-            return Google::Datastore::V1::ReadOptions.new(
+            return Google::Cloud::Datastore::V1::ReadOptions.new(
               read_consistency: :STRONG
             )
           elsif transaction
-            return Google::Datastore::V1::ReadOptions.new(
+            return Google::Cloud::Datastore::V1::ReadOptions.new(
               transaction: transaction
             )
           end
           nil
         end
-
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
-        end
-
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        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)
-        end
       end
     end
   end

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

@@ -50,7 +50,7 @@ module Google
         # @private Creates a new Transaction instance.
         # Takes a Service instead of project and Credentials.
         def initialize service, previous_transaction: nil
-          @service = service
+          super service
           @previous_transaction = previous_transaction
           reset!
           start