google-cloud-datastore 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f3d7ba920c420f0de58f98ef2b0be976680d865
-  data.tar.gz: 6e583306c876a131e9e148391e9b5b1b2ef029e7
+SHA256:
+  metadata.gz: 1a1da7c30b9ed87eedfb4abe77dac961faa9725cf37aa01a005801f5c61a8d1f
+  data.tar.gz: e0914a5d01fa98beabd730265ed7ad6b5d5ec82c03048f02ef8eea30176857ed
 SHA512:
-  metadata.gz: d2cc493dabe73949418a6d63976ef30558cf80af0dd677d39faf80edcca48fd76390d3f73a7a3ef666eaeb3062b8630cb743f77fdf25e3266035232d970398b5
-  data.tar.gz: 298e24737a0433365dae3c21d4af984540e8622620ed4c80b3413cdb7139db2f80719c9a167e84513f00238877f8a82dad361cb0a646fc661b6614cfb6a243cd
+  metadata.gz: ec12fe6cae19b6eef6be1adfa03443452126571eaf4dcd01e670d5311c308a1038315efa8071d81143c23e8dc1915a942c4848f5d847fb73986b433520bb32f3
+  data.tar.gz: 55779d36826b8e93f27a606687795d4d176409ab4854b9f0135207cf73364e333e7be7ff2485dc84fa058edee7fffbf24f1266388ca17e8fd277ada036a4852c

data/README.md

@@ -26,8 +26,8 @@ Instructions and configuration options are covered in the [Authentication Guide]
 require "google/cloud/datastore"
 
 datastore = Google::Cloud::Datastore.new(
-  project: "my-todo-project",
-  keyfile: "/path/to/keyfile.json"
+  project_id: "my-todo-project",
+  credentials: "/path/to/keyfile.json"
 )
 
 # Create a new task to demo datastore
@@ -55,8 +55,6 @@ This library is supported on Ruby 2.0+.
 
 This library follows [Semantic Versioning](http://semver.org/).
 
-It is currently in major version zero (0.y.z), which means that anything may change at any time and the public API should not be considered stable.
-
 ## Contributing
 
 Contributions to this library are always welcome and highly encouraged.

data/lib/google-cloud-datastore.rb

@@ -13,9 +13,9 @@
 # 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.datastore and Google::Cloud#datastore methods can be available,
+# but the library and all dependencies won't be loaded until required and used.
 
 
 gem "google-cloud-core"
@@ -79,10 +79,11 @@ module Google
     # For more information on connecting to Google Cloud see the [Authentication
     # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
     #
-    # @param [String] project Dataset identifier for the Datastore 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 Identifier for a Datastore project. 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 {Datastore::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
@@ -112,10 +113,11 @@ module Google
     #
     #   datastore.save task
     #
-    def self.datastore project = nil, keyfile = nil, scope: nil, timeout: nil,
-                       client_config: nil
+    def self.datastore project_id = nil, credentials = nil, scope: nil,
+                       timeout: nil, client_config: nil
       require "google/cloud/datastore"
-      Google::Cloud::Datastore.new project: project, keyfile: keyfile,
+      Google::Cloud::Datastore.new project_id: project_id,
+                                   credentials: credentials,
                                    scope: scope, timeout: timeout,
                                    client_config: client_config
     end

data/lib/google/cloud/datastore.rb

@@ -39,8 +39,8 @@ module Google
     # require "google/cloud/datastore"
     #
     # datastore = Google::Cloud::Datastore.new(
-    #   project: "my-todo-project",
-    #   keyfile: "/path/to/keyfile.json"
+    #   project_id: "my-todo-project",
+    #   credentials: "/path/to/keyfile.json"
     # )
     #
     # task = datastore.find "Task", "sampleTask"
@@ -537,6 +537,8 @@ module Google
     # ```
     #
     module Datastore
+      # rubocop:disable MethodLength
+
       ##
       # Creates a new object for connecting to the Datastore service.
       # Each call creates a new connection.
@@ -545,10 +547,11 @@ module Google
       # [Authentication
       # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
       #
-      # @param [String] project Dataset identifier for the Datastore 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 Identifier for a Datastore project. 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 {Datastore::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
@@ -562,6 +565,9 @@ module Google
       #   behavior of the API client. See Google::Gax::CallSettings. Optional.
       # @param [String] emulator_host Datastore emulator host. Optional.
       #   If the param is nil, ENV["DATASTORE_EMULATOR_HOST"] will be used.
+      # @param [String] project Alias for the `project_id` argument. Deprecated.
+      # @param [String] keyfile Alias for the `credentials` argument.
+      #   Deprecated.
       #
       # @return [Google::Cloud::Datastore::Dataset]
       #
@@ -569,8 +575,8 @@ module Google
       #   require "google/cloud/datastore"
       #
       #   datastore = Google::Cloud::Datastore.new(
-      #     project: "my-todo-project",
-      #     keyfile: "/path/to/keyfile.json"
+      #     project_id: "my-todo-project",
+      #     credentials: "/path/to/keyfile.json"
       #   )
       #
       #   task = datastore.entity "Task", "sampleTask" do |t|
@@ -582,36 +588,34 @@ module Google
       #
       #   datastore.save task
       #
-      def self.new project: nil, keyfile: nil, scope: nil, timeout: nil,
-                   client_config: nil, emulator_host: nil
-        project ||= Google::Cloud::Datastore::Dataset.default_project
-        project = project.to_s # Always cast to a string
-        fail ArgumentError, "project is missing" if project.empty?
+      def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
+                   client_config: nil, emulator_host: nil, project: nil,
+                   keyfile: nil
+        project_id ||= (project || Datastore::Dataset.default_project_id)
+        project_id = project_id.to_s # Always cast to a string
+        fail ArgumentError, "project_id is missing" if project_id.empty?
 
         emulator_host ||= ENV["DATASTORE_EMULATOR_HOST"]
         if emulator_host
-          return Google::Cloud::Datastore::Dataset.new(
-            Google::Cloud::Datastore::Service.new(
-              project, :this_channel_is_insecure,
-              host: emulator_host,
-              client_config: client_config))
+          return Datastore::Dataset.new(
+            Datastore::Service.new(
+              project_id, :this_channel_is_insecure,
+              host: emulator_host, client_config: client_config))
         end
-        credentials = credentials_with_scope keyfile, scope
-        Google::Cloud::Datastore::Dataset.new(
-          Google::Cloud::Datastore::Service.new(
-            project, credentials, timeout: timeout,
-                                  client_config: client_config))
-      end
 
-      ##
-      # @private
-      def self.credentials_with_scope keyfile, scope
-        if keyfile.nil?
-          Google::Cloud::Datastore::Credentials.default(scope: scope)
-        else
-          Google::Cloud::Datastore::Credentials.new(keyfile, scope: scope)
+        credentials ||= keyfile
+        credentials ||= Datastore::Credentials.default(scope: scope)
+        unless credentials.is_a? Google::Auth::Credentials
+          credentials = Datastore::Credentials.new credentials, scope: scope
         end
+
+        Datastore::Dataset.new(
+          Datastore::Service.new(
+            project_id, credentials,
+            timeout: timeout, client_config: client_config))
       end
+
+      # rubocop:enable MethodLength
     end
   end
 end

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

@@ -53,17 +53,6 @@ module Google
           end
         end
 
-        ##
-        # @private Convert a Google::Protobuf::Map to a Hash
-        def self.map_to_hash map
-          if map.respond_to? :to_h
-            map.to_h
-          else
-            # Enumerable doesn't have to_h on ruby 2.0...
-            Hash[map.to_a]
-          end
-        end
-
         PROP_FILTER_OPS = { "<"            => :LESS_THAN,
                             "lt"           => :LESS_THAN,
                             "<="           => :LESS_THAN_OR_EQUAL,

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

@@ -13,25 +13,44 @@
 # limitations under the License.
 
 
-require "google/cloud/credentials"
+require "googleauth"
 
 module Google
   module Cloud
     module Datastore
       ##
-      # @private
+      # # Credentials
       #
-      # Authentication credentials to Google Cloud.
-      # The most common way to create this object is to provide the path
-      # to the JSON keyfile downloaded from Google Cloud.
+      # Represents the authentication and authorization used to connect to the
+      # Datastore API.
       #
-      # @see https://developers.google.com/accounts/docs/application-default-credentials
-      class Credentials < Google::Cloud::Credentials
+      # @example
+      #   require "google/cloud/datastore"
+      #
+      #   keyfile = "/path/to/keyfile.json"
+      #   creds = Google::Cloud::Datastore::Credentials.new keyfile
+      #
+      #   datastore = Google::Cloud::Datastore.new(
+      #     project_id: "my-todo-project",
+      #     credentials: creds
+      #   )
+      #
+      #   datastore.project_id #=> "my-todo-project"
+      #
+      class Credentials < Google::Auth::Credentials
         SCOPE = ["https://www.googleapis.com/auth/datastore"]
-        PATH_ENV_VARS = %w(DATASTORE_KEYFILE GOOGLE_CLOUD_KEYFILE
+        PATH_ENV_VARS = %w(DATASTORE_CREDENTIALS
+                           DATASTORE_KEYFILE
+                           GOOGLE_CLOUD_CREDENTIALS
+                           GOOGLE_CLOUD_KEYFILE
                            GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(DATASTORE_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON
+        JSON_ENV_VARS = %w(DATASTORE_CREDENTIALS_JSON
+                           DATASTORE_KEYFILE_JSON
+                           GOOGLE_CLOUD_CREDENTIALS_JSON
+                           GOOGLE_CLOUD_KEYFILE_JSON
                            GCLOUD_KEYFILE_JSON)
+        DEFAULT_PATHS = \
+          ["~/.config/gcloud/application_default_credentials.json"]
       end
     end
   end

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

@@ -71,19 +71,20 @@ module Google
         #   require "google/cloud/datastore"
         #
         #   datastore = Google::Cloud::Datastore.new(
-        #     project: "my-todo-project",
-        #     keyfile: "/path/to/keyfile.json"
+        #     project_id: "my-todo-project",
+        #     credentials: "/path/to/keyfile.json"
         #   )
         #
-        #   datastore.project #=> "my-todo-project"
+        #   datastore.project_id #=> "my-todo-project"
         #
-        def project
+        def project_id
           service.project
         end
+        alias_method :project, :project_id
 
         ##
-        # @private Default project.
-        def self.default_project
+        # @private Default project_id.
+        def self.default_project_id
           ENV["DATASTORE_DATASET"] ||
             ENV["DATASTORE_PROJECT"] ||
             ENV["GOOGLE_CLOUD_PROJECT"] ||

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

@@ -64,6 +64,8 @@ module Google
         #   task.key.project #=> "my-todo-project"
         #
         attr_accessor :project
+        alias_method :project_id,  :project
+        alias_method :project_id=, :project=
         alias_method :dataset_id,  :project
         alias_method :dataset_id=, :project=
 

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

@@ -73,17 +73,13 @@ module Google
         alias_method :to_hash, :to_h
 
         def to_grpc
-          Hash[@hash.map { |(k, v)| [k.to_s, Convert.to_value(v)] }]
+          # Convert to Hash with Google::Datastore::V1::Value values.
+          Hash[@hash.map { |k, v| [k.to_s, Convert.to_value(v)] }]
         end
 
         def self.from_grpc grpc_map
-          # For some reason Google::Protobuf::Map#map isn't returning the value.
-          # It returns nil every time. COnvert to Hash to get actual objects.
-          grpc_hash = Convert.map_to_hash grpc_map
-          grpc_array = grpc_hash.map do |(k, v)|
-            [k.to_s, Convert.from_value(v)]
-          end
-          new Hash[grpc_array]
+          # Convert to Hash of string keys and raw values.
+          new Hash[grpc_map.map { |k, v| [k.to_s, Convert.from_value(v)] }]
         end
 
         protected

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

@@ -55,7 +55,7 @@ module Google
           return mocked_service if mocked_service
           @service ||= V1::DatastoreClient.new(
             service_path: host,
-            channel: channel,
+            credentials: channel,
             timeout: timeout,
             client_config: client_config,
             lib_name: "gccl",
@@ -83,7 +83,8 @@ module Google
           read_options = generate_read_options consistency, transaction
 
           execute do
-            service.lookup project, read_options, keys, options: default_options
+            service.lookup project, keys,
+                           read_options: read_options, options: default_options
           end
         end
 
@@ -101,7 +102,7 @@ module Google
           execute do
             service.run_query project,
                               partition_id,
-                              read_options,
+                              read_options: read_options,
                               query: query,
                               gql_query: gql_query,
                               options: default_options

data/lib/google/cloud/datastore/v1/datastore_client.rb

@@ -28,6 +28,7 @@ require "pathname"
 require "google/gax"
 
 require "google/datastore/v1/datastore_pb"
+require "google/cloud/datastore/credentials"
 
 module Google
   module Cloud
@@ -60,15 +61,24 @@ module Google
             "https://www.googleapis.com/auth/datastore"
           ].freeze
 
-          # @param service_path [String]
-          #   The domain name of the API remote host.
-          # @param port [Integer]
-          #   The port on which to connect to the remote host.
-          # @param channel [Channel]
-          #   A Channel object through which to make calls.
-          # @param chan_creds [Grpc::ChannelCredentials]
-          #   A ChannelCredentials for the setting up the RPC client.
-          # @param client_config[Hash]
+          # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+          #   Provides the means for authenticating requests made by the client. This parameter can
+          #   be many types.
+          #   A `Google::Auth::Credentials` uses a the properties of its represented keyfile for
+          #   authenticating requests made by this client.
+          #   A `String` will be treated as the path to the keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `GRPC::Core::Channel` will be used to make calls through.
+          #   A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+          #   should already be composed with a `GRPC::Core::CallCredentials` object.
+          #   A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+          #   metadata for requests, generally, to give OAuth credentials.
+          # @param scopes [Array<String>]
+          #   The OAuth scopes for this service. This parameter is ignored if
+          #   an updater_proc is supplied.
+          # @param client_config [Hash]
           #   A Hash for call options for each method. See
           #   Google::Gax#construct_settings for the structure of
           #   this data. Falls back to the default config if not specified
@@ -80,11 +90,11 @@ module Google
               port: DEFAULT_SERVICE_PORT,
               channel: nil,
               chan_creds: nil,
+              updater_proc: nil,
+              credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
-              app_name: nil,
-              app_version: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -93,14 +103,38 @@ module Google
             require "google/gax/grpc"
             require "google/datastore/v1/datastore_services_pb"
 
+            if channel || chan_creds || updater_proc
+              warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
+                "on 2017/09/08"
+              credentials ||= channel
+              credentials ||= chan_creds
+              credentials ||= updater_proc
+            end
+            if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
+              warn "`service_path` and `port` parameters are deprecated and will be removed"
+            end
+
+            credentials ||= Google::Cloud::Datastore::Credentials.default
 
-            if app_name || app_version
-              warn "`app_name` and `app_version` are no longer being used in the request headers."
+            if credentials.is_a?(String) || credentials.is_a?(Hash)
+              updater_proc = Google::Cloud::Datastore::Credentials.new(credentials).updater_proc
+            end
+            if credentials.is_a?(GRPC::Core::Channel)
+              channel = credentials
+            end
+            if credentials.is_a?(GRPC::Core::ChannelCredentials)
+              chan_creds = credentials
+            end
+            if credentials.is_a?(Proc)
+              updater_proc = credentials
+            end
+            if credentials.is_a?(Google::Auth::Credentials)
+              updater_proc = credentials.updater_proc
             end
 
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
             google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/0.6.8 gax/#{Google::Gax::VERSION}"
+            google_api_client << " gapic/0.1.0 gax/#{Google::Gax::VERSION}"
             google_api_client << " grpc/#{GRPC::VERSION}"
             google_api_client.freeze
 
@@ -124,6 +158,7 @@ module Google
               port,
               chan_creds: chan_creds,
               channel: channel,
+              updater_proc: updater_proc,
               scopes: scopes,
               &Google::Datastore::V1::Datastore::Stub.method(:new)
             )
@@ -152,6 +187,10 @@ module Google
               @datastore_stub.method(:allocate_ids),
               defaults["allocate_ids"]
             )
+            @reserve_ids = Google::Gax.create_api_call(
+              @datastore_stub.method(:reserve_ids),
+              defaults["reserve_ids"]
+            )
           end
 
           # Service calls
@@ -160,37 +199,38 @@ module Google
           #
           # @param project_id [String]
           #   The ID of the project against which to make the request.
-          # @param read_options [Google::Datastore::V1::ReadOptions]
-          #   The options for this lookup request.
-          # @param keys [Array<Google::Datastore::V1::Key>]
+          # @param keys [Array<Google::Datastore::V1::Key | Hash>]
           #   Keys of entities to look up.
+          #   A hash of the same form as `Google::Datastore::V1::Key`
+          #   can also be provided.
+          # @param read_options [Google::Datastore::V1::ReadOptions | Hash]
+          #   The options for this lookup request.
+          #   A hash of the same form as `Google::Datastore::V1::ReadOptions`
+          #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Datastore::V1::LookupResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/datastore/v1/datastore_client"
+          #   require "google/cloud/datastore/v1"
           #
-          #   DatastoreClient = Google::Cloud::Datastore::V1::DatastoreClient
-          #   ReadOptions = Google::Datastore::V1::ReadOptions
-          #
-          #   datastore_client = DatastoreClient.new
+          #   datastore_client = Google::Cloud::Datastore::V1.new
           #   project_id = ''
-          #   read_options = ReadOptions.new
           #   keys = []
-          #   response = datastore_client.lookup(project_id, read_options, keys)
+          #   response = datastore_client.lookup(project_id, keys)
 
           def lookup \
               project_id,
-              read_options,
               keys,
+              read_options: nil,
               options: nil
-            req = Google::Datastore::V1::LookupRequest.new({
+            req = {
               project_id: project_id,
-              read_options: read_options,
-              keys: keys
-            }.delete_if { |_, v| v.nil? })
+              keys: keys,
+              read_options: read_options
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::LookupRequest)
             @lookup.call(req, options)
           end
 
@@ -198,49 +238,53 @@ module Google
           #
           # @param project_id [String]
           #   The ID of the project against which to make the request.
-          # @param partition_id [Google::Datastore::V1::PartitionId]
+          # @param partition_id [Google::Datastore::V1::PartitionId | Hash]
           #   Entities are partitioned into subsets, identified by a partition ID.
           #   Queries are scoped to a single partition.
           #   This partition ID is normalized with the standard default context
           #   partition ID.
-          # @param read_options [Google::Datastore::V1::ReadOptions]
+          #   A hash of the same form as `Google::Datastore::V1::PartitionId`
+          #   can also be provided.
+          # @param read_options [Google::Datastore::V1::ReadOptions | Hash]
           #   The options for this query.
-          # @param query [Google::Datastore::V1::Query]
+          #   A hash of the same form as `Google::Datastore::V1::ReadOptions`
+          #   can also be provided.
+          # @param query [Google::Datastore::V1::Query | Hash]
           #   The query to run.
-          # @param gql_query [Google::Datastore::V1::GqlQuery]
+          #   A hash of the same form as `Google::Datastore::V1::Query`
+          #   can also be provided.
+          # @param gql_query [Google::Datastore::V1::GqlQuery | Hash]
           #   The GQL query to run.
+          #   A hash of the same form as `Google::Datastore::V1::GqlQuery`
+          #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Datastore::V1::RunQueryResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/datastore/v1/datastore_client"
+          #   require "google/cloud/datastore/v1"
           #
-          #   DatastoreClient = Google::Cloud::Datastore::V1::DatastoreClient
-          #   PartitionId = Google::Datastore::V1::PartitionId
-          #   ReadOptions = Google::Datastore::V1::ReadOptions
-          #
-          #   datastore_client = DatastoreClient.new
+          #   datastore_client = Google::Cloud::Datastore::V1.new
           #   project_id = ''
-          #   partition_id = PartitionId.new
-          #   read_options = ReadOptions.new
-          #   response = datastore_client.run_query(project_id, partition_id, read_options)
+          #   partition_id = {}
+          #   response = datastore_client.run_query(project_id, partition_id)
 
           def run_query \
               project_id,
               partition_id,
-              read_options,
+              read_options: nil,
               query: nil,
               gql_query: nil,
               options: nil
-            req = Google::Datastore::V1::RunQueryRequest.new({
+            req = {
               project_id: project_id,
               partition_id: partition_id,
               read_options: read_options,
               query: query,
               gql_query: gql_query
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::RunQueryRequest)
             @run_query.call(req, options)
           end
 
@@ -248,26 +292,31 @@ module Google
           #
           # @param project_id [String]
           #   The ID of the project against which to make the request.
+          # @param transaction_options [Google::Datastore::V1::TransactionOptions | Hash]
+          #   Options for a new transaction.
+          #   A hash of the same form as `Google::Datastore::V1::TransactionOptions`
+          #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Datastore::V1::BeginTransactionResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/datastore/v1/datastore_client"
-          #
-          #   DatastoreClient = Google::Cloud::Datastore::V1::DatastoreClient
+          #   require "google/cloud/datastore/v1"
           #
-          #   datastore_client = DatastoreClient.new
+          #   datastore_client = Google::Cloud::Datastore::V1.new
           #   project_id = ''
           #   response = datastore_client.begin_transaction(project_id)
 
           def begin_transaction \
               project_id,
+              transaction_options: nil,
               options: nil
-            req = Google::Datastore::V1::BeginTransactionRequest.new({
-              project_id: project_id
-            }.delete_if { |_, v| v.nil? })
+            req = {
+              project_id: project_id,
+              transaction_options: transaction_options
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::BeginTransactionRequest)
             @begin_transaction.call(req, options)
           end
 
@@ -278,38 +327,37 @@ module Google
           #   The ID of the project against which to make the request.
           # @param mode [Google::Datastore::V1::CommitRequest::Mode]
           #   The type of commit to perform. Defaults to +TRANSACTIONAL+.
-          # @param mutations [Array<Google::Datastore::V1::Mutation>]
+          # @param mutations [Array<Google::Datastore::V1::Mutation | Hash>]
           #   The mutations to perform.
           #
           #   When mode is +TRANSACTIONAL+, mutations affecting a single entity are
           #   applied in order. The following sequences of mutations affecting a single
           #   entity are not permitted in a single +Commit+ request:
           #
-          #   - +insert+ followed by +insert+
-          #   - +update+ followed by +insert+
-          #   - +upsert+ followed by +insert+
-          #   - +delete+ followed by +update+
+          #   * +insert+ followed by +insert+
+          #   * +update+ followed by +insert+
+          #   * +upsert+ followed by +insert+
+          #   * +delete+ followed by +update+
           #
           #   When mode is +NON_TRANSACTIONAL+, no two mutations may affect a single
           #   entity.
+          #   A hash of the same form as `Google::Datastore::V1::Mutation`
+          #   can also be provided.
           # @param transaction [String]
           #   The identifier of the transaction associated with the commit. A
           #   transaction identifier is returned by a call to
-          #   Datastore::BeginTransaction.
+          #   {Google::Datastore::V1::Datastore::BeginTransaction Datastore::BeginTransaction}.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Datastore::V1::CommitResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/datastore/v1/datastore_client"
-          #
-          #   DatastoreClient = Google::Cloud::Datastore::V1::DatastoreClient
-          #   Mode = Google::Datastore::V1::CommitRequest::Mode
+          #   require "google/cloud/datastore/v1"
           #
-          #   datastore_client = DatastoreClient.new
+          #   datastore_client = Google::Cloud::Datastore::V1.new
           #   project_id = ''
-          #   mode = Mode::MODE_UNSPECIFIED
+          #   mode = :MODE_UNSPECIFIED
           #   mutations = []
           #   response = datastore_client.commit(project_id, mode, mutations)
 
@@ -319,12 +367,13 @@ module Google
               mutations,
               transaction: nil,
               options: nil
-            req = Google::Datastore::V1::CommitRequest.new({
+            req = {
               project_id: project_id,
               mode: mode,
               mutations: mutations,
               transaction: transaction
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::CommitRequest)
             @commit.call(req, options)
           end
 
@@ -334,18 +383,16 @@ module Google
           #   The ID of the project against which to make the request.
           # @param transaction [String]
           #   The transaction identifier, returned by a call to
-          #   Datastore::BeginTransaction.
+          #   {Google::Datastore::V1::Datastore::BeginTransaction Datastore::BeginTransaction}.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Datastore::V1::RollbackResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/datastore/v1/datastore_client"
+          #   require "google/cloud/datastore/v1"
           #
-          #   DatastoreClient = Google::Cloud::Datastore::V1::DatastoreClient
-          #
-          #   datastore_client = DatastoreClient.new
+          #   datastore_client = Google::Cloud::Datastore::V1.new
           #   project_id = ''
           #   transaction = ''
           #   response = datastore_client.rollback(project_id, transaction)
@@ -354,10 +401,11 @@ module Google
               project_id,
               transaction,
               options: nil
-            req = Google::Datastore::V1::RollbackRequest.new({
+            req = {
               project_id: project_id,
               transaction: transaction
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::RollbackRequest)
             @rollback.call(req, options)
           end
 
@@ -366,20 +414,20 @@ module Google
           #
           # @param project_id [String]
           #   The ID of the project against which to make the request.
-          # @param keys [Array<Google::Datastore::V1::Key>]
+          # @param keys [Array<Google::Datastore::V1::Key | Hash>]
           #   A list of keys with incomplete key paths for which to allocate IDs.
           #   No key may be reserved/read-only.
+          #   A hash of the same form as `Google::Datastore::V1::Key`
+          #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Datastore::V1::AllocateIdsResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/datastore/v1/datastore_client"
-          #
-          #   DatastoreClient = Google::Cloud::Datastore::V1::DatastoreClient
+          #   require "google/cloud/datastore/v1"
           #
-          #   datastore_client = DatastoreClient.new
+          #   datastore_client = Google::Cloud::Datastore::V1.new
           #   project_id = ''
           #   keys = []
           #   response = datastore_client.allocate_ids(project_id, keys)
@@ -388,12 +436,52 @@ module Google
               project_id,
               keys,
               options: nil
-            req = Google::Datastore::V1::AllocateIdsRequest.new({
+            req = {
               project_id: project_id,
               keys: keys
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::AllocateIdsRequest)
             @allocate_ids.call(req, options)
           end
+
+          # Prevents the supplied keys' IDs from being auto-allocated by Cloud
+          # Datastore.
+          #
+          # @param project_id [String]
+          #   The ID of the project against which to make the request.
+          # @param keys [Array<Google::Datastore::V1::Key | Hash>]
+          #   A list of keys with complete key paths whose numeric IDs should not be
+          #   auto-allocated.
+          #   A hash of the same form as `Google::Datastore::V1::Key`
+          #   can also be provided.
+          # @param database_id [String]
+          #   If not empty, the ID of the database against which to make the request.
+          # @param options [Google::Gax::CallOptions]
+          #   Overrides the default settings for this call, e.g, timeout,
+          #   retries, etc.
+          # @return [Google::Datastore::V1::ReserveIdsResponse]
+          # @raise [Google::Gax::GaxError] if the RPC is aborted.
+          # @example
+          #   require "google/cloud/datastore/v1"
+          #
+          #   datastore_client = Google::Cloud::Datastore::V1.new
+          #   project_id = ''
+          #   keys = []
+          #   response = datastore_client.reserve_ids(project_id, keys)
+
+          def reserve_ids \
+              project_id,
+              keys,
+              database_id: nil,
+              options: nil
+            req = {
+              project_id: project_id,
+              keys: keys,
+              database_id: database_id
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Datastore::V1::ReserveIdsRequest)
+            @reserve_ids.call(req, options)
+          end
         end
       end
     end