gcloud 0.11.0 → 0.12.0

data/lib/gcloud/bigquery/project.rb

@@ -14,9 +14,9 @@
 
 
 require "gcloud/gce"
-require "gcloud/bigquery/connection"
+require "gcloud/errors"
+require "gcloud/bigquery/service"
 require "gcloud/bigquery/credentials"
-require "gcloud/bigquery/errors"
 require "gcloud/bigquery/dataset"
 require "gcloud/bigquery/job"
 require "gcloud/bigquery/query_data"
@@ -46,17 +46,15 @@ module Gcloud
     #
     class Project
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       ##
-      # Creates a new Connection instance.
+      # Creates a new Service instance.
       #
       # See {Gcloud.bigquery}
-      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
       end
 
       ##
@@ -71,7 +69,7 @@ module Gcloud
       #   bigquery.project #=> "my-todo-project"
       #
       def project
-        connection.project
+        service.project
       end
 
       ##
@@ -148,16 +146,12 @@ module Gcloud
       def query_job query, priority: "INTERACTIVE", cache: true, table: nil,
                     create: nil, write: nil, large_results: nil, flatten: nil,
                     dataset: nil
-        ensure_connection!
+        ensure_service!
         options = { priority: priority, cache: cache, table: table,
                     create: create, write: write, large_results: large_results,
                     flatten: flatten, dataset: dataset }
-        resp = connection.query_job query, options
-        if resp.success?
-          Job.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.query_job query, options
+        Job.from_gapi gapi, service
       end
 
       ##
@@ -223,15 +217,11 @@ module Gcloud
       #
       def query query, max: nil, timeout: 10000, dryrun: nil, cache: true,
                 dataset: nil, project: nil
-        ensure_connection!
+        ensure_service!
         options = { max: max, timeout: timeout, dryrun: dryrun, cache: cache,
                     dataset: dataset, project: project }
-        resp = connection.query query, options
-        if resp.success?
-          QueryData.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.query query, options
+        QueryData.from_gapi gapi, service
       end
 
       ##
@@ -252,14 +242,11 @@ module Gcloud
       #   puts dataset.name
       #
       def dataset dataset_id
-        ensure_connection!
-        resp = connection.get_dataset dataset_id
-        if resp.success?
-          Dataset.from_gapi resp.data, connection
-        else
-          return nil if resp.status == 404
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_dataset dataset_id
+        Dataset.from_gapi gapi, service
+      rescue Gcloud::NotFoundError
+        nil
       end
 
       ##
@@ -273,11 +260,6 @@ module Gcloud
       # @param [Integer] expiration The default lifetime of all tables in the
       #   dataset, in milliseconds. The minimum value is 3600000 milliseconds
       #   (one hour).
-      # @param [Array<Hash>] access The access rules for a Dataset using the
-      #   Google Cloud Datastore API data structure of an array of hashes. See
-      #   [BigQuery Access
-      #   Control](https://cloud.google.com/bigquery/access-control) for more
-      #   information.
       # @param [String] location The geographic location where the dataset
       #   should reside. Possible values include `EU` and `US`. The default
       #   value is `US`.
@@ -324,20 +306,29 @@ module Gcloud
       #   end
       #
       def create_dataset dataset_id, name: nil, description: nil,
-                         expiration: nil, access: nil, location: nil
+                         expiration: nil, location: nil
+        ensure_service!
+
+        new_ds = Google::Apis::BigqueryV2::Dataset.new(
+          dataset_reference: Google::Apis::BigqueryV2::DatasetReference.new(
+            project_id: project, dataset_id: dataset_id))
+
+        # Can set location only on creation, no Dataset#location method
+        new_ds.update! location: location unless location.nil?
+
+        updater = Dataset::Updater.new(new_ds).tap do |b|
+          b.name = name unless name.nil?
+          b.description = description unless description.nil?
+          b.default_expiration = expiration unless expiration.nil?
+        end
+
         if block_given?
-          access_builder = Dataset::Access.new connection.default_access_rules,
-                                               "projectId" => project
-          yield access_builder
-          access = access_builder.access if access_builder.changed?
+          yield updater
+          updater.check_for_mutated_access!
         end
 
-        ensure_connection!
-        options = { name: name, description: description,
-                    expiration: expiration, access: access, location: location }
-        resp = connection.insert_dataset dataset_id, options
-        return Dataset.from_gapi(resp.data, connection) if resp.success?
-        fail ApiError.from_response(resp)
+        gapi = service.insert_dataset new_ds
+        Dataset.from_gapi gapi, service
       end
 
       ##
@@ -383,14 +374,10 @@ module Gcloud
       #   end
       #
       def datasets all: nil, token: nil, max: nil
-        ensure_connection!
+        ensure_service!
         options = { all: all, token: token, max: max }
-        resp = connection.list_datasets options
-        if resp.success?
-          Dataset::List.from_response resp, connection, all, max
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.list_datasets options
+        Dataset::List.from_gapi gapi, service, all, max
       end
 
       ##
@@ -410,14 +397,11 @@ module Gcloud
       #   job = bigquery.job "my_job"
       #
       def job job_id
-        ensure_connection!
-        resp = connection.get_job job_id
-        if resp.success?
-          Job.from_gapi resp.data, connection
-        else
-          return nil if resp.status == 404
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_job job_id
+        Job.from_gapi gapi, service
+      rescue Gcloud::NotFoundError
+        nil
       end
 
       ##
@@ -473,22 +457,18 @@ module Gcloud
       #   end
       #
       def jobs all: nil, token: nil, max: nil, filter: nil
-        ensure_connection!
+        ensure_service!
         options = { all: all, token: token, max: max, filter: filter }
-        resp = connection.list_jobs options
-        if resp.success?
-          Job::List.from_response resp, connection, all, max, filter
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.list_jobs options
+        Job::List.from_gapi gapi, service, all, max, filter
       end
 
       protected
 
       ##
-      # Raise an error unless an active connection is available.
-      def ensure_connection!
-        fail "Must have active connection" unless connection
+      # Raise an error unless an active service is available.
+      def ensure_service!
+        fail "Must have active connection" unless service
       end
     end
   end

data/lib/gcloud/bigquery/query_data.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 
+require "gcloud/bigquery/service"
 require "gcloud/bigquery/data"
 
 module Gcloud
@@ -23,8 +24,8 @@ module Gcloud
     # Represents Data returned from a query a a list of name/value pairs.
     class QueryData < Data
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       # @private
       def initialize arr = []
@@ -34,33 +35,32 @@ module Gcloud
 
       # The total number of bytes processed for this query.
       def total_bytes
-        @gapi["totalBytesProcessed"]
+        Integer @gapi.total_bytes_processed
+      rescue
+        nil
       end
 
       # Whether the query has completed or not. When data is present this will
       # always be `true`. When `false`, `total` will not be available.
       def complete?
-        @gapi["jobComplete"]
+        @gapi.job_complete
       end
 
       # Whether the query result was fetched from the query cache.
       def cache_hit?
-        @gapi["cacheHit"]
+        @gapi.cache_hit
       end
 
       ##
       # The schema of the data.
       def schema
-        s = @gapi["schema"]
-        s = s.to_hash if s.respond_to? :to_hash
-        s = {} if s.nil?
-        s
+        Schema.from_gapi(@gapi.schema).freeze
       end
 
       ##
       # The fields of the data.
       def fields
-        f = schema["fields"]
+        f = schema.fields
         f = f.to_hash if f.respond_to? :to_hash
         f = [] if f.nil?
         f
@@ -69,7 +69,7 @@ module Gcloud
       ##
       # The name of the columns in the data.
       def headers
-        fields.map { |f| f["name"] }
+        fields.map(&:name)
       end
 
       ##
@@ -112,13 +112,9 @@ module Gcloud
       #
       def next
         return nil unless next?
-        ensure_connection!
-        resp = connection.job_query_results job_id, token: token
-        if resp.success?
-          QueryData.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.job_query_results job_id, token: token
+        QueryData.from_gapi gapi, service
       end
 
       ##
@@ -195,29 +191,26 @@ module Gcloud
       def job
         return @job if @job
         return nil unless job?
-        ensure_connection!
-        resp = connection.get_job job_id
-        if resp.success?
-          @job = Job.from_gapi resp.data, connection
-        else
-          return nil if resp.status == 404
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_job job_id
+        @job = Job.from_gapi gapi, service
+      rescue Gcloud::NotFoundError
+        nil
       end
 
       ##
       # @private New Data from a response object.
-      def self.from_gapi gapi, connection
-        if gapi["schema"].nil?
+      def self.from_gapi gapi, service
+        if gapi.schema.nil?
           formatted_rows = []
         else
-          formatted_rows = format_rows gapi["rows"],
-                                       gapi["schema"]["fields"]
+          formatted_rows = format_rows gapi.rows,
+                                       gapi.schema.fields
         end
 
         data = new formatted_rows
         data.gapi = gapi
-        data.connection = connection
+        data.service = service
         data
       end
 
@@ -225,16 +218,16 @@ 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
 
       def job?
-        @gapi["jobReference"] && @gapi["jobReference"]["jobId"]
+        @gapi.job_reference && @gapi.job_reference.job_id
       end
 
       def job_id
-        @gapi["jobReference"]["jobId"]
+        @gapi.job_reference.job_id
       end
     end
   end

data/lib/gcloud/bigquery/query_job.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 
+require "gcloud/bigquery/service"
+
 module Gcloud
   module Bigquery
     ##
@@ -30,14 +32,14 @@ module Gcloud
       ##
       # Checks if the priority for the query is `BATCH`.
       def batch?
-        val = config["query"]["priority"]
+        val = @gapi.configuration.query.priority
         val == "BATCH"
       end
 
       ##
       # Checks if the priority for the query is `INTERACTIVE`.
       def interactive?
-        val = config["query"]["priority"]
+        val = @gapi.configuration.query.priority
         return true if val.nil?
         val == "INTERACTIVE"
       end
@@ -46,7 +48,7 @@ module Gcloud
       # Checks if the the query job allows arbitrarily large results at a slight
       # cost to performance.
       def large_results?
-        val = config["query"]["allowLargeResults"]
+        val = @gapi.configuration.query.allow_large_results
         return false if val.nil?
         val
       end
@@ -56,7 +58,7 @@ module Gcloud
       # For more information, see [Query
       # Caching](https://cloud.google.com/bigquery/querying-data#querycaching).
       def cache?
-        val = config["query"]["useQueryCache"]
+        val = @gapi.configuration.query.use_query_cache
         return false if val.nil?
         val
       end
@@ -66,7 +68,7 @@ module Gcloud
       # results. The default is `true`. If the value is `false`, #large_results?
       # should return `true`.
       def flatten?
-        val = config["query"]["flattenResults"]
+        val = @gapi.configuration.query.flatten_results
         return true if val.nil?
         val
       end
@@ -74,23 +76,25 @@ module Gcloud
       ##
       # Checks if the query results are from the query cache.
       def cache_hit?
-        stats["query"]["cacheHit"]
+        @gapi.statistics.query.cache_hit
       end
 
       ##
       # The number of bytes processed by the query.
       def bytes_processed
-        stats["query"]["totalBytesProcessed"]
+        Integer @gapi.statistics.query.total_bytes_processed
+      rescue
+        nil
       end
 
       ##
       # The table in which the query results are stored.
       def destination
-        table = config["query"]["destinationTable"]
+        table = @gapi.configuration.query.destination_table
         return nil unless table
-        retrieve_table table["projectId"],
-                       table["datasetId"],
-                       table["tableId"]
+        retrieve_table table.project_id,
+                       table.dataset_id,
+                       table.table_id
       end
 
       ##
@@ -123,14 +127,10 @@ module Gcloud
       #   data = data.next if data.next?
       #
       def query_results token: nil, max: nil, start: nil, timeout: nil
-        ensure_connection!
+        ensure_service!
         options = { token: token, max: max, start: start, timeout: timeout }
-        resp = connection.job_query_results job_id, options
-        if resp.success?
-          QueryData.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.job_query_results job_id, options
+        QueryData.from_gapi gapi, service
       end
     end
   end