google-cloud-datastore 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee669c1788eabbeab4c54a4e3c70ef523eaf29ea39d67fff4b8907c128c06a86
-  data.tar.gz: e3ed585c57076f65a53901f1a02027ddeda91e54ec7a0526e85c1e74f15c63aa
+  metadata.gz: d5158282d2e12b211e22031224f6f4e18e48e621f824cf21411cf7d4283f3150
+  data.tar.gz: 88de52c6fab28a2e66ad66dc96867c19b08a665da4eb61d478538472ea83ff27
 SHA512:
-  metadata.gz: 4cb9965dda5f5255a7cafa68516a3a9dbbdd03c0ea00ce2a64d22acfcbfd2bca476adf03871c56508ace442d7fb0c58013ad35b2f3d02895f071cdc5fe9be030
-  data.tar.gz: ce4faf4d6a03e3cd9f952689a78b7a440076ec82fdbb1d1cb09278f8c2039fb5b56bbf92e9785e08599abaf1790c994700d52555808a9579c44447bd797c7276
+  metadata.gz: 38d06cae20a6f5ed9125af1aa2a2314d18290608fe0dbf810c3cdea855ca615fb1de64ccb05e04c16a5fc63acd3786fc4fc24c25d8cba5238c38137785662fda
+  data.tar.gz: 411b854b3f2f1f05d274da447b3779b79b19ba2831db349d52bf139bbdda1cc72750c530764ba586da9ae0ebe4b51ae0a040853494d3b327942a6e719a11e0dc

data/lib/google-cloud-datastore.rb

@@ -20,6 +20,8 @@
 
 gem "google-cloud-core"
 require "google/cloud"
+require "google/cloud/config"
+require "googleauth"
 
 module Google
   module Cloud
@@ -123,3 +125,31 @@ module Google
     end
   end
 end
+
+# Set the default bigquery configuration
+Google::Cloud.configure.add_config! :datastore do |config|
+  default_project = Google::Cloud::Config.deferred do
+    ENV["DATASTORE_DATASET"] || ENV["DATASTORE_PROJECT"]
+  end
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env(
+      "DATASTORE_CREDENTIALS", "DATASTORE_CREDENTIALS_JSON",
+      "DATASTORE_KEYFILE", "DATASTORE_KEYFILE_JSON"
+    )
+  end
+  default_emulator = Google::Cloud::Config.deferred do
+    ENV["DATASTORE_EMULATOR_HOST"]
+  end
+
+  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, nil, match: [String, Array]
+  config.add_field! :timeout, nil, match: Integer
+  config.add_field! :client_config, nil, match: Hash
+  config.add_field! :emulator_host, default_emulator,
+                    match: String, allow_nil: true
+end

data/lib/google/cloud/datastore.rb

@@ -18,6 +18,8 @@ require "google/cloud/datastore/errors"
 require "google/cloud/datastore/dataset"
 require "google/cloud/datastore/transaction"
 require "google/cloud/datastore/credentials"
+require "google/cloud/config"
+require "google/cloud/env"
 
 module Google
   module Cloud
@@ -29,11 +31,14 @@ module Google
     # relational databases, but there are some key differences to be aware of to
     # make the most of using Datastore.
     #
-    # The goal of google-cloud is to provide a API that is comfortable to
-    # Rubyists. Authentication is handled by {Google::Cloud#datastore}. You can
-    # provide the project and credential information to connect to the Datastore
-    # service, or if you are running on Google Compute Engine this configuration
-    # is taken care of for you.
+    # The goal of google-cloud is to provide an API that is comfortable to
+    # Rubyists. Your authentication credentials are detected automatically in
+    # Google Cloud Platform environments such as Google Compute Engine, Google
+    # App Engine and Google Kubernetes Engine. In other environments you can
+    # configure authentication easily, either directly in your code or via
+    # environment variables. Read more about the options for connecting in the
+    # [Authentication
+    # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
     #
     # ```ruby
     # require "google/cloud/datastore"
@@ -586,7 +591,7 @@ module Google
       # @param [Hash] client_config A hash of values to override the default
       #   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.
+      #   If the param is nil, uses the value of the `emulator_host` config.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
@@ -613,20 +618,24 @@ module Google
       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 || default_project_id)
         project_id = project_id.to_s # Always cast to a string
-        fail ArgumentError, "project_id is missing" if project_id.empty?
+        raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        emulator_host ||= ENV["DATASTORE_EMULATOR_HOST"]
+        scope ||= configure.scope
+        timeout ||= configure.timeout
+        client_config ||= configure.client_config
+        emulator_host ||= configure.emulator_host
         if emulator_host
           return Datastore::Dataset.new(
             Datastore::Service.new(
               project_id, :this_channel_is_insecure,
-              host: emulator_host, client_config: client_config))
+              host: emulator_host, client_config: client_config
+            )
+          )
         end
 
-        credentials ||= keyfile
-        credentials ||= Datastore::Credentials.default(scope: scope)
+        credentials ||= (keyfile || default_credentials(scope: scope))
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Datastore::Credentials.new credentials, scope: scope
         end
@@ -634,7 +643,53 @@ module Google
         Datastore::Dataset.new(
           Datastore::Service.new(
             project_id, credentials,
-            timeout: timeout, client_config: client_config))
+            timeout: timeout, client_config: client_config
+          )
+        )
+      end
+
+      ##
+      # Configure the Google Cloud Datastore library.
+      #
+      # The following Datastore configuration parameters are supported:
+      #
+      # * `project_id` - (String) Identifier for a Datastore project. (The
+      #   parameter `project` is considered deprecated, but may also be used.)
+      # * `credentials` - (String, Hash, Google::Auth::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}) (The
+      #   parameter `keyfile` is considered deprecated, but may also be used.)
+      # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
+      #   the set of resources and operations that the connection can access.
+      # * `timeout` - (Integer) Default timeout to use in requests.
+      # * `client_config` - (Hash) A hash of values to override the default
+      #   behavior of the API client.
+      # * `emulator_host` - (String) Host name of the emulator. Defaults to
+      #   `ENV["DATASTORE_EMULATOR_HOST"]`
+      #
+      # @return [Google::Cloud::Config] The configuration object the
+      #   Google::Cloud::Datastore library uses.
+      #
+      def self.configure
+        yield Google::Cloud.configure.datastore if block_given?
+
+        Google::Cloud.configure.datastore
+      end
+
+      ##
+      # @private Default project.
+      def self.default_project_id
+        Google::Cloud.configure.datastore.project_id ||
+          Google::Cloud.configure.project_id ||
+          Google::Cloud.env.project_id
+      end
+
+      ##
+      # @private Default credentials.
+      def self.default_credentials scope: nil
+        Google::Cloud.configure.datastore.credentials ||
+          Google::Cloud.configure.credentials ||
+          Datastore::Credentials.default(scope: scope)
       end
     end
   end

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

@@ -64,7 +64,7 @@ module Google
           # Do not save yet
           entities
         end
-        alias_method :upsert, :save
+        alias upsert save
 
         ##
         # Inserts entities to the Datastore.

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

@@ -146,7 +146,7 @@ module Google
             value.rewind
             v.blob_value = value.read.force_encoding("ASCII-8BIT")
           else
-            fail Google::Cloud::Datastore::PropertyError,
+            raise Google::Cloud::Datastore::PropertyError,
                  "A property of type #{value.class} is not supported."
           end
           v

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

@@ -38,19 +38,19 @@ module Google
       #   datastore.project_id #=> "my-todo-project"
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/datastore"]
-        PATH_ENV_VARS = %w(DATASTORE_CREDENTIALS
+        SCOPE = ["https://www.googleapis.com/auth/datastore"].freeze
+        PATH_ENV_VARS = %w[DATASTORE_CREDENTIALS
                            DATASTORE_KEYFILE
                            GOOGLE_CLOUD_CREDENTIALS
                            GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(DATASTORE_CREDENTIALS_JSON
+                           GCLOUD_KEYFILE].freeze
+        JSON_ENV_VARS = %w[DATASTORE_CREDENTIALS_JSON
                            DATASTORE_KEYFILE_JSON
                            GOOGLE_CLOUD_CREDENTIALS_JSON
                            GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON)
+                           GCLOUD_KEYFILE_JSON].freeze
         DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"]
+          ["~/.config/gcloud/application_default_credentials.json"].freeze
       end
     end
   end

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

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-require "google/cloud/env"
 require "google/cloud/datastore/convert"
 require "google/cloud/datastore/credentials"
 require "google/cloud/datastore/service"
@@ -82,17 +81,7 @@ module Google
         def project_id
           service.project
         end
-        alias_method :project, :project_id
-
-        ##
-        # @private Default project_id.
-        def self.default_project_id
-          ENV["DATASTORE_DATASET"] ||
-            ENV["DATASTORE_PROJECT"] ||
-            ENV["GOOGLE_CLOUD_PROJECT"] ||
-            ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud.env.project_id
-        end
+        alias project project_id
 
         ##
         # Generate IDs for a Key before creating an entity.
@@ -112,12 +101,11 @@ module Google
         #
         def allocate_ids incomplete_key, count = 1
           if incomplete_key.complete?
-            fail Google::Cloud::Datastore::KeyError,
-                 "An incomplete key must be provided."
+            raise Datastore::KeyError, "An incomplete key must be provided."
           end
 
           ensure_service!
-          incomplete_keys = count.times.map { incomplete_key.to_grpc }
+          incomplete_keys = Array.new(count) { incomplete_key.to_grpc }
           allocate_res = service.allocate_ids(*incomplete_keys)
           allocate_res.keys.map { |key| Key.from_grpc key }
         end
@@ -177,7 +165,7 @@ module Google
         def save *entities
           commit { |c| c.save(*entities) }
         end
-        alias_method :upsert, :save
+        alias upsert save
 
         ##
         # Insert one or more entities to the Datastore. An InvalidArgumentError
@@ -353,7 +341,7 @@ module Google
           end
           find_all(key, consistency: consistency).first
         end
-        alias_method :get, :find
+        alias get find
 
         ##
         # Retrieve the entities for the provided keys. The order of results is
@@ -387,7 +375,7 @@ module Google
                                       consistency: consistency)
           LookupResults.from_grpc lookup_res, service, consistency
         end
-        alias_method :lookup, :find_all
+        alias lookup find_all
 
         ##
         # Retrieve entities specified by a Query.
@@ -455,7 +443,7 @@ module Google
         def run query, namespace: nil, consistency: nil
           ensure_service!
           unless query.is_a?(Query) || query.is_a?(GqlQuery)
-            fail ArgumentError, "Cannot run a #{query.class} object."
+            raise ArgumentError, "Cannot run a #{query.class} object."
           end
           check_consistency! consistency
           query_res = service.run_query query.to_grpc, namespace,
@@ -463,7 +451,7 @@ module Google
           QueryResults.from_grpc query_res, service, namespace,
                                  query.to_grpc.dup
         end
-        alias_method :run_query, :run
+        alias run_query run
 
         ##
         # Creates a Datastore Transaction.
@@ -557,10 +545,10 @@ module Google
             # Create new transaction and retry the block
             tx = Transaction.new service, previous_transaction: tx.id
             retry
-          rescue
+          rescue StandardError
             begin
               tx.rollback
-            rescue
+            rescue StandardError
               raise TransactionError,
                     "Transaction failed to commit and rollback."
             end
@@ -614,17 +602,17 @@ module Google
           begin
             yield tx
             tx.commit
-          rescue
+          rescue StandardError
             begin
               tx.rollback
-            rescue
+            rescue StandardError
               raise TransactionError,
                     "Transaction failed to commit and rollback."
             end
             raise TransactionError, "Transaction failed to commit."
           end
         end
-        alias_method :snapshot, :read_only_transaction
+        alias snapshot read_only_transaction
 
         ##
         # Create a new Query instance. This is a convenience method to make the
@@ -868,11 +856,11 @@ module Google
           entity = Entity.new
 
           # Set the key
-          if key_or_path.flatten.first.is_a? Google::Cloud::Datastore::Key
-            entity.key = key_or_path.flatten.first
-          else
-            entity.key = key key_or_path, project: project, namespace: namespace
-          end
+          entity.key = if key_or_path.flatten.first.is_a? Datastore::Key
+                         key_or_path.flatten.first
+                       else
+                         key key_or_path, project: project, namespace: namespace
+                       end
 
           yield entity if block_given?
 
@@ -885,7 +873,7 @@ module Google
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
 
         def validate_deadline deadline
@@ -895,10 +883,12 @@ module Google
         end
 
         def check_consistency! consistency
-          fail(ArgumentError,
-               format("Consistency must be :eventual or :strong, not %s.",
-                      consistency.inspect)
-              ) unless [:eventual, :strong, nil].include? consistency
+          return if [:eventual, :strong, nil].include? consistency
+
+          error_msg = format("Consistency must be :eventual or :strong, " \
+                             "not %<bad_consistency>s.",
+                             bad_consistency: consistency.inspect)
+          raise ArgumentError, error_msg
         end
       end
     end

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

@@ -110,7 +110,8 @@ module Google
             ensure_service!
             lookup_res = @service.lookup(
               *Array(@deferred).flatten.map(&:to_grpc),
-              consistency: @consistency, transaction: @transaction)
+              consistency: @consistency, transaction: @transaction
+            )
             self.class.from_grpc lookup_res, @service, @consistency
           end
 
@@ -199,18 +200,8 @@ module Google
             end
           end
 
-          protected
-
-          ##
-          # @private Raise an error unless an active connection to the service
-          # is available.
-          def ensure_service!
-            msg = "Must have active connection to datastore service to get next"
-            fail msg if @service.nil?
-          end
-
           ##
-          # Convenience method to convert GRPC entities to google-cloud
+          # @private Convenience method to convert GRPC entities to google-cloud
           # entities.
           def self.to_gcloud_entities grpc_entity_results
             # Entities are nested in an object.
@@ -221,11 +212,22 @@ module Google
           end
 
           ##
-          # Convenience method to convert GRPC keys to google-cloud keys.
+          # @private Convenience method to convert GRPC keys to google-cloud
+          # keys.
           def self.to_gcloud_keys grpc_keys
             # Keys are not nested in an object like entities are.
             Array(grpc_keys).map { |key| Key.from_grpc key }
           end
+
+          protected
+
+          ##
+          # @private Raise an error unless an active connection to the service
+          # is available.
+          def ensure_service!
+            msg = "Must have active connection to datastore service to get next"
+            raise msg if @service.nil?
+          end
         end
       end
     end

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

@@ -59,7 +59,7 @@ module Google
           #
           # @return [Google::Cloud::Datastore::Cursor]
           attr_reader :end_cursor
-          alias_method :cursor, :end_cursor
+          alias cursor end_cursor
 
           ##
           # The state of the query after the current batch.
@@ -157,6 +157,7 @@ module Google
             return nil if end_cursor.nil?
             ensure_service!
             query.start_cursor = cursor.to_grpc # should always be a Cursor...
+            query.offset = 0 # Never carry an offset across batches
             query_res = service.run_query query, namespace
             self.class.from_grpc query_res, service, namespace, query
           end
@@ -378,7 +379,7 @@ module Google
           # is available.
           def ensure_service!
             msg = "Must have active connection to datastore service to get next"
-            fail msg if @service.nil? || @query.nil?
+            raise msg if @service.nil? || @query.nil?
           end
         end
       end

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

@@ -267,12 +267,14 @@ module Google
         #
         #   task = datastore.find "Task", "sampleTask"
         #   task.persisted? #=> true
-        #   task.key = datastore.key "Task" #=> raise RuntimeError
+        #   # Because the entity is persisted, the following would raise
+        #   # task.key = datastore.key "Task"
         #   task.key.frozen? #=> true
-        #   task.key.id = 9876543221 #=> raise RuntimeError
+        #   # Because the key is frozen, the following would raise
+        #   # task.key.id = 9876543221
         #
         def key= new_key
-          fail "This entity's key is immutable." if persisted?
+          raise "This entity's key is immutable." if persisted?
           @key = new_key
         end
 

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

@@ -160,11 +160,13 @@ module Google
             if value.is_a? Google::Cloud::Datastore::Cursor
               @grpc.named_bindings[name.to_s] = \
                 Google::Datastore::V1::GqlQueryParameter.new(
-                  cursor: value.to_grpc)
+                  cursor: value.to_grpc
+                )
             else
               @grpc.named_bindings[name.to_s] = \
                 Google::Datastore::V1::GqlQueryParameter.new(
-                  value: Convert.to_value(value))
+                  value: Convert.to_value(value)
+                )
             end
           end
         end
@@ -209,11 +211,13 @@ module Google
             if value.is_a? Google::Cloud::Datastore::Cursor
               @grpc.positional_bindings << \
                 Google::Datastore::V1::GqlQueryParameter.new(
-                  cursor: value.to_grpc)
+                  cursor: value.to_grpc
+                )
             else
               @grpc.positional_bindings << \
                 Google::Datastore::V1::GqlQueryParameter.new(
-                  value: Convert.to_value(value))
+                  value: Convert.to_value(value)
+                )
             end
           end
         end

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

@@ -64,10 +64,10 @@ 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=
+        alias project_id project
+        alias project_id= project=
+        alias dataset_id project
+        alias dataset_id= project=
 
         ##
         # The namespace of the Key.
@@ -282,7 +282,8 @@ module Google
           grpc = Google::Datastore::V1::Key.new(path: grpc_path)
           if project || namespace
             grpc.partition_id = Google::Datastore::V1::PartitionId.new(
-              project_id: project.to_s, namespace_id: namespace.to_s)
+              project_id: project.to_s, namespace_id: namespace.to_s
+            )
           end
           grpc
         end

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

@@ -38,14 +38,14 @@ module Google
           key = ensure_key_type key
           @hash[key]
         end
-        alias_method :read, :[]
+        alias read []
 
         def []= key, value
           key   = ensure_key_type key
           value = ensure_value_type value
           @hash[key] = value
         end
-        alias_method :write, :[]=
+        alias write []=
 
         def exist? key
           key = ensure_key_type key
@@ -70,7 +70,7 @@ module Google
         def to_h
           @hash.dup
         end
-        alias_method :to_hash, :to_h
+        alias to_hash to_h
 
         def to_grpc
           # Convert to Hash with Google::Datastore::V1::Value values.
@@ -89,7 +89,7 @@ module Google
         # otherwise a PropertyError is raised.
         def ensure_key_type key
           return key.to_s if key.respond_to? :to_s
-          fail "Property key #{key} must be a String."
+          raise "Property key #{key} must be a String."
         end
 
         # rubocop:disable all
@@ -120,7 +120,7 @@ module Google
           elsif defined?(BigDecimal) && BigDecimal === value
             return value
           end
-          fail PropertyError, "A property of type #{value.class} is not supported."
+          raise PropertyError, "A property of type #{value.class} is not supported."
         end
         # rubocop:enable all
       end

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

@@ -84,7 +84,8 @@ module Google
         def kind *kinds
           kinds.each do |kind|
             grpc_kind = Google::Datastore::V1::KindExpression.new(
-              name: kind)
+              name: kind
+            )
             @grpc.kind << grpc_kind
           end
 
@@ -185,7 +186,8 @@ module Google
             Google::Datastore::V1::Filter.new(
               property_filter: Google::Datastore::V1::PropertyFilter.new(
                 property: Google::Datastore::V1::PropertyReference.new(
-                  name: name),
+                  name: name
+                ),
                 op: Convert.to_prop_filter_op(operator),
                 value: Convert.to_value(value)
               )
@@ -193,7 +195,7 @@ module Google
 
           self
         end
-        alias_method :filter, :where
+        alias filter where
 
         ##
         # Add a filter for entities that inherit from a key.
@@ -273,7 +275,8 @@ module Google
         def order name, direction = :asc
           @grpc.order << Google::Datastore::V1::PropertyOrder.new(
             property: Google::Datastore::V1::PropertyReference.new(
-              name: name),
+              name: name
+            ),
             direction: prop_order_direction(direction)
           )
 
@@ -342,12 +345,12 @@ module Google
           elsif cursor.is_a? String
             @grpc.start_cursor = Convert.decode_bytes cursor
           else
-            fail ArgumentError, "Can't set a cursor using a #{cursor.class}."
+            raise ArgumentError, "Can't set a cursor using a #{cursor.class}."
           end
 
           self
         end
-        alias_method :cursor, :start
+        alias cursor start
 
         ##
         # Retrieve only select properties from the matched entities.
@@ -383,13 +386,15 @@ module Google
           names.each do |name|
             grpc_projection = Google::Datastore::V1::Projection.new(
               property: Google::Datastore::V1::PropertyReference.new(
-                name: name))
+                name: name
+              )
+            )
             @grpc.projection << grpc_projection
           end
 
           self
         end
-        alias_method :projection, :select
+        alias projection select
 
         ##
         # Group results by a list of properties.
@@ -410,13 +415,14 @@ module Google
         def group_by *names
           names.each do |name|
             grpc_property = Google::Datastore::V1::PropertyReference.new(
-              name: name)
+              name: name
+            )
             @grpc.distinct_on << grpc_property
           end
 
           self
         end
-        alias_method :distinct_on, :group_by
+        alias distinct_on group_by
 
         # @private
         def to_grpc

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

@@ -95,7 +95,7 @@ module Google
           end
           find_all(key).first
         end
-        alias_method :get, :find
+        alias get find
 
         ##
         # Retrieve the entities for the provided keys. The lookup is run within
@@ -123,7 +123,7 @@ module Google
                                       transaction: @id)
           Dataset::LookupResults.from_grpc lookup_res, service, nil, @id
         end
-        alias_method :lookup, :find_all
+        alias lookup find_all
 
         ##
         # Retrieve entities specified by a Query. The query is run within the
@@ -148,27 +148,27 @@ module Google
         def run query, namespace: nil
           ensure_service!
           unless query.is_a?(Query) || query.is_a?(GqlQuery)
-            fail ArgumentError, "Cannot run a #{query.class} object."
+            raise ArgumentError, "Cannot run a #{query.class} object."
           end
           query_res = service.run_query query.to_grpc, namespace,
                                         transaction: @id
           Dataset::QueryResults.from_grpc query_res, service, namespace,
                                           query.to_grpc.dup
         end
-        alias_method :run_query, :run
+        alias run_query run
 
         ##
         # Begins a transaction.
         # This method is run when a new ReadOnlyTransaction is created.
         #
         def start
-          fail TransactionError, "Transaction already opened." unless @id.nil?
+          raise TransactionError, "Transaction already opened." unless @id.nil?
 
           ensure_service!
           tx_res = service.begin_transaction read_only: true
           @id = tx_res.transaction
         end
-        alias_method :begin_transaction, :start
+        alias begin_transaction start
 
         ##
         # Commits the transaction.
@@ -190,8 +190,9 @@ module Google
         #   tx.commit
         #
         def commit
-          fail TransactionError,
-               "Cannot commit when not in a transaction." if @id.nil?
+          if @id.nil?
+            raise TransactionError, "Cannot commit when not in a transaction."
+          end
 
           ensure_service!
 
@@ -220,7 +221,7 @@ module Google
         #
         def rollback
           if @id.nil?
-            fail TransactionError, "Cannot rollback when not in a transaction."
+            raise TransactionError, "Cannot rollback when not in a transaction."
           end
 
           ensure_service!
@@ -241,7 +242,7 @@ module Google
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
       end
     end

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

@@ -58,7 +58,8 @@ module Google
             timeout: timeout,
             client_config: client_config,
             lib_name: "gccl",
-            lib_version: Google::Cloud::Datastore::VERSION)
+            lib_version: Google::Cloud::Datastore::VERSION
+          )
         end
         attr_accessor :mocked_service
 
@@ -95,8 +96,11 @@ module Google
             query = nil
           end
           read_options = generate_read_options consistency, transaction
-          partition_id = Google::Datastore::V1::PartitionId.new(
-            namespace_id: namespace) if namespace
+          if namespace
+            partition_id = Google::Datastore::V1::PartitionId.new(
+              namespace_id: namespace
+            )
+          end
 
           execute do
             service.run_query project,
@@ -158,13 +162,16 @@ module Google
         def generate_read_options consistency, transaction
           if consistency == :eventual
             return Google::Datastore::V1::ReadOptions.new(
-              read_consistency: :EVENTUAL)
+              read_consistency: :EVENTUAL
+            )
           elsif consistency == :strong
-            return  Google::Datastore::V1::ReadOptions.new(
-              read_consistency: :STRONG)
+            return Google::Datastore::V1::ReadOptions.new(
+              read_consistency: :STRONG
+            )
           elsif transaction
-            return  Google::Datastore::V1::ReadOptions.new(
-              transaction: transaction)
+            return Google::Datastore::V1::ReadOptions.new(
+              transaction: transaction
+            )
           end
           nil
         end

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

@@ -85,7 +85,7 @@ module Google
           # Do not save yet
           entities
         end
-        alias_method :upsert, :save
+        alias upsert save
 
         ##
         # Insert entities in a transaction. An InvalidArgumentError will raised
@@ -194,7 +194,7 @@ module Google
           end
           find_all(key).first
         end
-        alias_method :get, :find
+        alias get find
 
         ##
         # Retrieve the entities for the provided keys. The lookup is run within
@@ -219,7 +219,7 @@ module Google
                                       transaction: @id)
           LookupResults.from_grpc lookup_res, service, nil, @id
         end
-        alias_method :lookup, :find_all
+        alias lookup find_all
 
         ##
         # Retrieve entities specified by a Query. The query is run within the
@@ -254,27 +254,27 @@ module Google
         def run query, namespace: nil
           ensure_service!
           unless query.is_a?(Query) || query.is_a?(GqlQuery)
-            fail ArgumentError, "Cannot run a #{query.class} object."
+            raise ArgumentError, "Cannot run a #{query.class} object."
           end
           query_res = service.run_query query.to_grpc, namespace,
                                         transaction: @id
           QueryResults.from_grpc query_res, service, namespace,
                                  query.to_grpc.dup
         end
-        alias_method :run_query, :run
+        alias run_query run
 
         ##
         # Begins a transaction.
         # This method is run when a new Transaction is created.
         def start
-          fail TransactionError, "Transaction already opened." unless @id.nil?
+          raise TransactionError, "Transaction already opened." unless @id.nil?
 
           ensure_service!
           tx_res = service.begin_transaction \
             previous_transaction: @previous_transaction
           @id = tx_res.transaction
         end
-        alias_method :begin_transaction, :start
+        alias begin_transaction start
 
         ##
         # Commits a transaction.
@@ -320,8 +320,9 @@ module Google
         #   end
         #
         def commit
-          fail TransactionError,
-               "Cannot commit when not in a transaction." if @id.nil?
+          if @id.nil?
+            raise TransactionError, "Cannot commit when not in a transaction."
+          end
 
           yield @commit if block_given?
 
@@ -365,7 +366,7 @@ module Google
         #   end
         def rollback
           if @id.nil?
-            fail TransactionError, "Cannot rollback when not in a transaction."
+            raise TransactionError, "Cannot rollback when not in a transaction."
           end
 
           ensure_service!

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Datastore
-      VERSION = "1.3.0"
+      VERSION = "1.4.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-datastore
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: google-gax
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Datastore