gcloud 0.11.0 → 0.12.0

data/lib/gcloud/datastore/transaction.rb

@@ -201,8 +201,6 @@ module Gcloud
         lookup_res = service.lookup(*Array(keys).flatten.map(&:to_grpc),
                                     transaction: @id)
         LookupResults.from_grpc lookup_res, service, nil, @id
-      rescue GRPC::BadStatus => e
-        raise Gcloud::Error.from_error(e)
       end
       alias_method :lookup, :find_all
 
@@ -237,8 +235,6 @@ module Gcloud
         query_res = service.run_query query.to_grpc, namespace,
                                       transaction: @id
         QueryResults.from_grpc query_res, service, namespace, query.to_grpc.dup
-      rescue GRPC::BadStatus => e
-        raise Gcloud::Error.from_error(e)
       end
       alias_method :run_query, :run
 
@@ -251,8 +247,6 @@ module Gcloud
         ensure_service!
         tx_res = service.begin_transaction
         @id = tx_res.transaction
-      rescue GRPC::BadStatus => e
-        raise Gcloud::Error.from_error(e)
       end
       alias_method :begin_transaction, :start
 
@@ -319,8 +313,6 @@ module Gcloud
         # Make sure all entity keys are frozen so all show as persisted
         entities.each { |e| e.key.freeze unless e.persisted? }
         true
-      rescue GRPC::BadStatus => e
-        raise Gcloud::Error.from_error(e)
       end
 
       ##
@@ -356,8 +348,6 @@ module Gcloud
         ensure_service!
         service.rollback @id
         true
-      rescue GRPC::BadStatus => e
-        raise Gcloud::Error.from_error(e)
       end
 
       ##

data/lib/gcloud/dns.rb

@@ -36,6 +36,9 @@ module Gcloud
   #   The default scope is:
   #
   #   * `https://www.googleapis.com/auth/ndev.clouddns.readwrite`
+  # @param [Integer] retries Number of times to retry requests on server error.
+  #   The default value is `3`. Optional.
+  # @param [Integer] timeout Default timeout to use in requests. Optional.
   #
   # @return [Gcloud::Dns::Project]
   #
@@ -47,14 +50,21 @@ module Gcloud
   #
   #   zone = dns.zone "example-com"
   #
-  def self.dns project = nil, keyfile = nil, scope: nil
+  def self.dns project = nil, keyfile = nil, scope: nil, retries: nil,
+               timeout: nil
     project ||= Gcloud::Dns::Project.default_project
+    project = project.to_s # Always cast to a string
+    fail ArgumentError, "project is missing" if project.empty?
+
     if keyfile.nil?
       credentials = Gcloud::Dns::Credentials.default scope: scope
     else
       credentials = Gcloud::Dns::Credentials.new keyfile, scope: scope
     end
-    Gcloud::Dns::Project.new project, credentials
+
+    Gcloud::Dns::Project.new(
+      Gcloud::Dns::Service.new(
+        project, credentials, retries: retries, timeout: timeout))
   end
 
   ##
@@ -67,8 +77,8 @@ module Gcloud
   # relied upon by Google. To learn more, read [What is Google Cloud
   # DNS?](https://cloud.google.com/dns/what-is-cloud-dns).
   #
-  # Gcloud's goal is to provide an API that is familiar and comfortable to
-  # Rubyists. Authentication is handled by {Gcloud#dns}. You can provide the
+  # The goal of gcloud-ruby is to provide an API that is comfortable
+  # to Rubyists. Authentication is handled by {Gcloud#dns}. You can provide the
   # project and credential information to connect to the Cloud DNS service, or
   # if you are running on Google Compute Engine this configuration is taken care
   # of for you. You can read more about the options for connecting in the
@@ -164,9 +174,10 @@ module Gcloud
   #
   # Whenever you change the set of records belonging to a zone, the zone's start
   # of authority (SOA) record should be updated with a higher serial number. The
-  # gcloud library automates this update for you, deleting the old SOA record
-  # and adding an updated one, as shown in the example above. You can disable or
-  # modify this behavior, of course. See {Gcloud::Dns::Zone#update} for details.
+  # gcloud-ruby library automates this update for you, deleting the old SOA
+  # record and adding an updated one, as shown in the example above. You can
+  # disable or modify this behavior, of course. See {Gcloud::Dns::Zone#update}
+  # for details.
   #
   # You can retrieve records by name and type. The name argument can be a
   # subdomain (e.g., `www`) fragment for convenience, but notice that the
@@ -301,24 +312,23 @@ module Gcloud
   # zone.export "path/to/db.example.com"
   # ```
   #
-  # ## Configuring Backoff
+  # ## Configuring retries and timeout
   #
-  # The {Gcloud::Backoff} class allows users to globally configure how Cloud API
-  # requests are automatically retried in the case of some errors, such as a
-  # `500` or `503` status code, or a specific internal error code such as
-  # `rateLimitExceeded`.
+  # You can configure how many times API requests may be automatically retried.
+  # When an API request fails, the response will be inspected to see if the
+  # request meets criteria indicating that it may succeed on retry, such as
+  # `500` and `503` status codes or a specific internal error code such as
+  # `rateLimitExceeded`. If it meets the criteria, the request will be retried
+  # after a delay. If another error occurs, the delay will be increased before a
+  # subsequent attempt, until the `retries` limit is reached.
   #
-  # If an API call fails, the response will be inspected to see if the call
-  # should be retried. If the response matches the criteria, then the request
-  # will be retried after a delay. If another error occurs, the delay will be
-  # increased incrementally before a subsequent attempt. The first retry will be
-  # delayed one second, the second retry two seconds, and so on.
+  # You can also set the request `timeout` value in seconds.
   #
   # ```ruby
   # require "gcloud"
-  # require "gcloud/backoff"
   #
-  # Gcloud::Backoff.retries = 5 # Raise the maximum number of retries from 3
+  # gcloud = Gcloud.new
+  # dns = gcloud.dns retries: 10, timeout: 120
   # ```
   #
   module Dns

data/lib/gcloud/dns/change.rb

@@ -57,28 +57,28 @@ module Gcloud
       # Unique identifier for the resource; defined by the server.
       #
       def id
-        @gapi["id"]
+        @gapi.id
       end
 
       ##
       # The records added in this change request.
       #
       def additions
-        Array(@gapi["additions"]).map { |gapi| Record.from_gapi gapi }
+        Array(@gapi.additions).map { |gapi| Record.from_gapi gapi }
       end
 
       ##
       # The records removed in this change request.
       #
       def deletions
-        Array(@gapi["deletions"]).map { |gapi| Record.from_gapi gapi }
+        Array(@gapi.deletions).map { |gapi| Record.from_gapi gapi }
       end
 
       ##
       # Status of the operation. Values are `"done"` and `"pending"`.
       #
       def status
-        @gapi["status"]
+        @gapi.status
       end
 
       ##
@@ -99,7 +99,7 @@ module Gcloud
       # The time that this operation was started by the server.
       #
       def started_at
-        Time.parse @gapi["startTime"]
+        Time.parse @gapi.start_time
       rescue
         nil
       end
@@ -107,13 +107,8 @@ module Gcloud
       ##
       # Reloads the change with updated status from the DNS service.
       def reload!
-        ensure_connection!
-        resp = zone.connection.get_change @zone.id, id
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        @gapi = zone.service.get_change @zone.id, id
       end
       alias_method :refresh!, :reload!
 
@@ -154,9 +149,9 @@ module Gcloud
       protected
 
       ##
-      # Raise an error unless an active connection is available.
-      def ensure_connection!
-        fail "Must have active connection" unless zone && zone.connection
+      # Raise an error unless an active service is available.
+      def ensure_service!
+        fail "Must have active connection" unless zone && zone.service
       end
     end
   end

data/lib/gcloud/dns/change/list.rb

@@ -149,11 +149,11 @@ module Gcloud
 
         ##
         # @private New Changes::List from a response object.
-        def self.from_response resp, zone, max = nil, order = nil
-          changes = new(Array(resp.data["changes"]).map do |gapi_object|
-            Change.from_gapi gapi_object, zone
+        def self.from_gapi gapi, zone, max = nil, order = nil
+          changes = new(Array(gapi.changes).map do |g|
+            Change.from_gapi g, zone
           end)
-          changes.instance_variable_set "@token", resp.data["nextPageToken"]
+          changes.instance_variable_set "@token", gapi.next_page_token
           changes.instance_variable_set "@zone",  zone
           changes.instance_variable_set "@max",   max
           changes.instance_variable_set "@order", order

data/lib/gcloud/dns/importer.rb

@@ -83,7 +83,7 @@ module Gcloud
           type = r.first
           type = :aaaa if type == :a4
           r.last.each do |zf_record|
-            name = Connection.fqdn(zf_record[:name], @zonefile.origin)
+            name = Service.fqdn(zf_record[:name], @zonefile.origin)
             key = [name, type]
             (@merged_zf_records[key] ||= []) << zf_record
           end

data/lib/gcloud/dns/project.rb

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 
+require "gcloud/errors"
 require "gcloud/gce"
-require "gcloud/dns/connection"
+require "gcloud/dns/service"
 require "gcloud/dns/credentials"
 require "gcloud/dns/zone"
-require "gcloud/dns/errors"
 
 module Gcloud
   module Dns
@@ -41,21 +41,19 @@ module Gcloud
     # See {Gcloud#dns}
     class Project
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       ##
       # @private The Google API Client object.
       attr_accessor :gapi
 
       ##
-      # @private Creates a new Connection instance.
+      # @private Creates a new Service instance.
       #
       # See {Gcloud.dns}
-      def initialize project, credentials
-        project = project.to_s # Always cast to a string
-        fail ArgumentError, "project is missing" if project.empty?
-        @connection = Connection.new project, credentials
+      def initialize service
+        @service = service
         @gapi = nil
       end
 
@@ -71,7 +69,7 @@ module Gcloud
       #   dns.project #=> "my-todo-project"
       #
       def project
-        connection.project
+        service.project
       end
       alias_method :id, :project
 
@@ -79,49 +77,49 @@ module Gcloud
       # The project number.
       def number
         reload! if @gapi.nil?
-        @gapi["number"]
+        @gapi.number
       end
 
       ##
       # Maximum allowed number of zones in the project.
       def zones_quota
         reload! if @gapi.nil?
-        @gapi["quota"]["managedZones"] if @gapi["quota"]
+        @gapi.quota.managed_zones if @gapi.quota
       end
 
       ##
       # Maximum allowed number of data entries per record.
       def data_per_record
         reload! if @gapi.nil?
-        @gapi["quota"]["resourceRecordsPerRrset"] if @gapi["quota"]
+        @gapi.quota.resource_records_per_rrset if @gapi.quota
       end
 
       ##
       # Maximum allowed number of records to add per change.
       def additions_per_change
         reload! if @gapi.nil?
-        @gapi["quota"]["rrsetAdditionsPerChange"] if @gapi["quota"]
+        @gapi.quota.rrset_additions_per_change if @gapi.quota
       end
 
       ##
       # Maximum allowed number of records to delete per change.
       def deletions_per_change
         reload! if @gapi.nil?
-        @gapi["quota"]["rrsetDeletionsPerChange"] if @gapi["quota"]
+        @gapi.quota.rrset_deletions_per_change if @gapi.quota
       end
 
       ##
       # Maximum allowed number of records per zone in the project.
       def records_per_zone
         reload! if @gapi.nil?
-        @gapi["quota"]["rrsetsPerManagedZone"] if @gapi["quota"]
+        @gapi.quota.rrsets_per_managed_zone if @gapi.quota
       end
 
       ##
       # Maximum allowed total bytes size for all the data in one change.
       def total_data_per_change
         reload! if @gapi.nil?
-        @gapi["quota"]["totalRrdataSizePerChange"] if @gapi["quota"]
+        @gapi.quota.total_rrdata_size_per_change if @gapi.quota
       end
 
       ##
@@ -150,13 +148,11 @@ module Gcloud
       #   puts zone.name
       #
       def zone zone_id
-        ensure_connection!
-        resp = connection.get_zone zone_id
-        if resp.success?
-          Zone.from_gapi resp.data, connection
-        else
-          nil
-        end
+        ensure_service!
+        gapi = service.get_zone zone_id
+        Zone.from_gapi gapi, service
+      rescue Gcloud::NotFoundError
+        nil
       end
       alias_method :find_zone, :zone
       alias_method :get_zone, :zone
@@ -191,13 +187,9 @@ module Gcloud
       #   end
       #
       def zones token: nil, max: nil
-        ensure_connection!
-        resp = connection.list_zones token: token, max: max
-        if resp.success?
-          Zone::List.from_response resp, connection, max
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.list_zones token: token, max: max
+        Zone::List.from_gapi gapi, service, max
       end
       alias_method :find_zones, :zones
 
@@ -228,27 +220,18 @@ module Gcloud
       #
       def create_zone zone_name, zone_dns, description: nil,
                       name_server_set: nil
-        ensure_connection!
-        resp = connection.create_zone zone_name, zone_dns,
-                                      description: description,
-                                      name_server_set: name_server_set
-        if resp.success?
-          Zone.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.create_zone zone_name, zone_dns,
+                                   description: description,
+                                   name_server_set: name_server_set
+        Zone.from_gapi gapi, service
       end
 
       ##
       # Reloads the change with updated status from the DNS service.
       def reload!
-        ensure_connection!
-        resp = connection.get_project
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        @gapi = service.get_project
       end
       alias_method :refresh!, :reload!
 
@@ -256,8 +239,8 @@ module Gcloud
 
       ##
       # Raise an error unless an active connection is available.
-      def ensure_connection!
-        fail "Must have active connection" unless connection
+      def ensure_service!
+        fail "Must have active connection" unless service
       end
     end
   end

data/lib/gcloud/dns/record.rb

@@ -127,13 +127,19 @@ module Gcloud
       ##
       # @private New Record from a Google API Client object.
       def self.from_gapi gapi
-        new gapi["name"], gapi["type"], gapi["ttl"], gapi["rrdatas"]
+        new gapi.name, gapi.type, gapi.ttl, gapi.rrdatas
       end
 
       ##
       # @private Convert the record object to a Google API hash.
       def to_gapi
-        { "name" => name, "type" => type, "ttl" => ttl, "rrdatas" => data }
+        Google::Apis::DnsV1::ResourceRecordSet.new(
+          kind: "dns#resourceRecordSet",
+          name: name,
+          rrdatas: data,
+          ttl: ttl,
+          type: type
+        )
       end
 
       # @private

data/lib/gcloud/dns/record/list.rb

@@ -149,11 +149,11 @@ module Gcloud
 
         ##
         # @private New Records::List from a response object.
-        def self.from_response resp, zone, name = nil, type = nil, max = nil
-          records = new(Array(resp.data["rrsets"]).map do |gapi_object|
-            Record.from_gapi gapi_object
+        def self.from_gapi gapi, zone, name = nil, type = nil, max = nil
+          records = new(Array(gapi.rrsets).map do |g|
+            Record.from_gapi g
           end)
-          records.instance_variable_set "@token", resp.data["nextPageToken"]
+          records.instance_variable_set "@token", gapi.next_page_token
           records.instance_variable_set "@zone",  zone
           records.instance_variable_set "@name",  name
           records.instance_variable_set "@type",  type