gcloud 0.11.0 → 0.12.0

data/lib/gcloud/bigquery/insert_response.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 
+require "json"
+
 module Gcloud
   module Bigquery
     ##
@@ -29,28 +31,24 @@ module Gcloud
       end
 
       def insert_count
-        @insert_count ||= @rows.count - error_count
+        @rows.count - error_count
       end
 
       def error_count
-        @error_count ||= Array(@gapi["insertErrors"]).count
+        Array(@gapi.insert_errors).count
       end
 
       def insert_errors
-        @insert_errors ||= begin
-          Array(@gapi["insertErrors"]).map do |ie|
-            row = @rows[ie["index"]]
-            errors = ie["errors"]
-            InsertError.new row, errors
-          end
+        Array(@gapi.insert_errors).map do |ie|
+          row = @rows[ie.index]
+          errors = ie.errors.map { |e| JSON.parse e.to_json }
+          InsertError.new row, errors
         end
       end
 
       def error_rows
-        @error_rows ||= begin
-          Array(@gapi["insertErrors"]).map do |ie|
-            @rows[ie["index"]]
-          end
+        Array(@gapi.insert_errors).map do |ie|
+          @rows[ie.index]
         end
       end
 
@@ -60,9 +58,9 @@ module Gcloud
         []
       end
 
-      # @private
+      # @private New InsertResponse from the inserted rows and a
+      # Google::Apis::BigqueryV2::InsertAllTableDataResponse object.
       def self.from_gapi rows, gapi
-        gapi = gapi.to_hash if gapi.respond_to? :to_hash
         new rows, gapi
       end
 

data/lib/gcloud/bigquery/job.rb

@@ -13,9 +13,11 @@
 # limitations under the License.
 
 
+require "gcloud/errors"
+require "gcloud/bigquery/service"
 require "gcloud/bigquery/query_data"
 require "gcloud/bigquery/job/list"
-require "gcloud/bigquery/errors"
+require "json"
 
 module Gcloud
   module Bigquery
@@ -55,8 +57,8 @@ module Gcloud
     #
     class Job
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       ##
       # @private The Google API Client object.
@@ -65,20 +67,20 @@ module Gcloud
       ##
       # @private Create an empty Job object.
       def initialize
-        @connection = nil
+        @service = nil
         @gapi = {}
       end
 
       ##
       # The ID of the job.
       def job_id
-        @gapi["jobReference"]["jobId"]
+        @gapi.job_reference.job_id
       end
 
       ##
       # The ID of the project containing the job.
       def project_id
-        @gapi["jobReference"]["projectId"]
+        @gapi.job_reference.project_id
       end
 
       ##
@@ -87,8 +89,8 @@ module Gcloud
       # completed successfully. Use {#failed?} to discover if an error occurred
       # or if the job was successful.
       def state
-        return nil if @gapi["status"].nil?
-        @gapi["status"]["state"]
+        return nil if @gapi.status.nil?
+        @gapi.status.state
       end
 
       ##
@@ -124,9 +126,9 @@ module Gcloud
       ##
       # The time when the job was created.
       def created_at
-        return nil if @gapi["statistics"].nil?
-        return nil if @gapi["statistics"]["creationTime"].nil?
-        Time.at(@gapi["statistics"]["creationTime"] / 1000.0)
+        Time.at(Integer(@gapi.statistics.creation_time) / 1000.0)
+      rescue
+        nil
       end
 
       ##
@@ -134,18 +136,18 @@ module Gcloud
       # This field is present after the job's state changes from `PENDING`
       # to either `RUNNING` or `DONE`.
       def started_at
-        return nil if @gapi["statistics"].nil?
-        return nil if @gapi["statistics"]["startTime"].nil?
-        Time.at(@gapi["statistics"]["startTime"] / 1000.0)
+        Time.at(Integer(@gapi.statistics.start_time) / 1000.0)
+      rescue
+        nil
       end
 
       ##
       # The time when the job ended.
       # This field is present when the job's state is `DONE`.
       def ended_at
-        return nil if @gapi["statistics"].nil?
-        return nil if @gapi["statistics"]["endTime"].nil?
-        Time.at(@gapi["statistics"]["endTime"] / 1000.0)
+        Time.at(Integer(@gapi.statistics.end_time) / 1000.0)
+      rescue
+        nil
       end
 
       ##
@@ -154,9 +156,7 @@ module Gcloud
       # @see https://cloud.google.com/bigquery/docs/reference/v2/jobs Jobs API
       #   reference
       def configuration
-        hash = @gapi["configuration"] || {}
-        hash = hash.to_hash if hash.respond_to? :to_hash
-        hash
+        JSON.parse @gapi.configuration.to_json
       end
       alias_method :config, :configuration
 
@@ -166,9 +166,7 @@ module Gcloud
       # @see https://cloud.google.com/bigquery/docs/reference/v2/jobs Jobs API
       #   reference
       def statistics
-        hash = @gapi["statistics"] || {}
-        hash = hash.to_hash if hash.respond_to? :to_hash
-        hash
+        JSON.parse @gapi.statistics.to_json
       end
       alias_method :stats, :statistics
 
@@ -176,9 +174,7 @@ module Gcloud
       # The job's status. Returns a hash. The values contained in the hash are
       # also exposed by {#state}, {#error}, and {#errors}.
       def status
-        hash = @gapi["status"] || {}
-        hash = hash.to_hash if hash.respond_to? :to_hash
-        hash
+        JSON.parse @gapi.status.to_json
       end
 
       ##
@@ -196,38 +192,33 @@ module Gcloud
       #   }
       #
       def error
-        status["errorResult"]
+        return nil if @gapi.status.nil?
+        return nil if @gapi.status.error_result.nil?
+        JSON.parse @gapi.status.error_result.to_json
       end
 
       ##
       # The errors for the job, if any errors have occurred. Returns an array
       # of hash objects. See {#error}.
       def errors
-        Array status["errors"]
+        return [] if @gapi.status.nil?
+        Array(@gapi.status.errors).map { |e| JSON.parse e.to_json }
       end
 
       ##
       # Created a new job with the current configuration.
       def rerun!
-        ensure_connection!
-        resp = connection.insert_job configuration
-        if resp.success?
-          Job.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.insert_job @gapi.configuration
+        Job.from_gapi gapi, service
       end
 
       ##
       # Reloads the job with current data from the BigQuery service.
       def reload!
-        ensure_connection!
-        resp = connection.get_job job_id
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_job job_id
+        @gapi = gapi
       end
       alias_method :refresh!, :reload!
 
@@ -263,7 +254,7 @@ module Gcloud
         klass = klass_for gapi
         klass.new.tap do |f|
           f.gapi = gapi
-          f.connection = conn
+          f.service = conn
         end
       end
 
@@ -271,34 +262,31 @@ 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
 
       ##
       # Get the subclass for a job type
       def self.klass_for gapi
-        if gapi["configuration"]["copy"]
+        if gapi.configuration.copy
           return CopyJob
-        elsif gapi["configuration"]["extract"]
+        elsif gapi.configuration.extract
           return ExtractJob
-        elsif gapi["configuration"]["load"]
+        elsif gapi.configuration.load
           return LoadJob
-        elsif gapi["configuration"]["query"]
+        elsif gapi.configuration.query
           return QueryJob
         end
         Job
       end
 
       def retrieve_table project_id, dataset_id, table_id
-        ensure_connection!
-        resp = connection.get_project_table project_id, dataset_id, table_id
-        if resp.success?
-          Table.from_gapi resp.data, connection
-        else
-          return nil if resp.status == 404
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_project_table project_id, dataset_id, table_id
+        Table.from_gapi gapi, service
+      rescue Gcloud::NotFoundError
+        nil
       end
     end
   end

data/lib/gcloud/bigquery/job/list.rb

@@ -29,9 +29,6 @@ module Gcloud
         # A hash of this page of results.
         attr_accessor :etag
 
-        # Total number of jobs in this collection.
-        attr_accessor :total
-
         ##
         # @private Create a new Job::List with an array of jobs.
         def initialize arr = []
@@ -74,14 +71,10 @@ module Gcloud
         #   end
         def next
           return nil unless next?
-          ensure_connection!
+          ensure_service!
           options = { all: @hidden, token: token, max: @max, filter: @filter }
-          resp = @connection.list_jobs options
-          if resp.success?
-            self.class.from_response resp, @connection, @hidden, @max, @filter
-          else
-            fail ApiError.from_response(resp)
-          end
+          gapi = @service.list_jobs options
+          self.class.from_gapi gapi, @service, @hidden, @max, @filter
         end
 
         ##
@@ -150,27 +143,28 @@ module Gcloud
         end
 
         ##
-        # @private New Job::List from a response object.
-        def self.from_response resp, conn, hidden = nil, max = nil, filter = nil
-          jobs = List.new(Array(resp.data["jobs"]).map do |gapi_object|
-            Job.from_gapi gapi_object, conn
+        # @private New Job::List from a Google API Client
+        # Google::Apis::BigqueryV2::JobList object.
+        def self.from_gapi gapi_list, service, hidden = nil, max = nil,
+                           filter = nil
+          jobs = List.new(Array(gapi_list.jobs).map do |gapi_object|
+            Job.from_gapi gapi_object, service
           end)
-          jobs.instance_variable_set "@token", resp.data["nextPageToken"]
-          jobs.instance_variable_set "@etag",  resp.data["etag"]
-          jobs.instance_variable_set "@total", resp.data["totalItems"]
-          jobs.instance_variable_set "@connection", conn
-          jobs.instance_variable_set "@hidden",     hidden
-          jobs.instance_variable_set "@max",        max
-          jobs.instance_variable_set "@filter",     filter
+          jobs.instance_variable_set :@token,   gapi_list.next_page_token
+          jobs.instance_variable_set :@etag,    gapi_list.etag
+          jobs.instance_variable_set :@service, service
+          jobs.instance_variable_set :@hidden,  hidden
+          jobs.instance_variable_set :@max,     max
+          jobs.instance_variable_set :@filter,  filter
           jobs
         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/load_job.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 
+require "gcloud/bigquery/service"
+
 module Gcloud
   module Bigquery
     ##
@@ -31,39 +33,39 @@ module Gcloud
       # The URI or URIs representing the Google Cloud Storage files from which
       # the operation loads data.
       def sources
-        Array config["load"]["sourceUris"]
+        Array @gapi.configuration.load.source_uris
       end
 
       ##
       # The table into which the operation loads data. This is the table on
       # which {Table#load} was invoked. Returns a {Table} instance.
       def destination
-        table = config["load"]["destinationTable"]
+        table = @gapi.configuration.load.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
 
       ##
       # The delimiter used between fields in the source data. The default is a
       # comma (,).
       def delimiter
-        config["load"]["fieldDelimiter"] || ","
+        @gapi.configuration.load.field_delimiter || ","
       end
 
       ##
       # The number of header rows at the top of a CSV file to skip. The default
       # value is `0`.
       def skip_leading_rows
-        config["load"]["skipLeadingRows"] || 0
+        @gapi.configuration.load.skip_leading_rows || 0
       end
 
       ##
       # Checks if the character encoding of the data is UTF-8. This is the
       # default.
       def utf8?
-        val = config["load"]["encoding"]
+        val = @gapi.configuration.load.encoding
         return true if val.nil?
         val == "UTF-8"
       end
@@ -71,7 +73,7 @@ module Gcloud
       ##
       # Checks if the character encoding of the data is ISO-8859-1.
       def iso8859_1?
-        val = config["load"]["encoding"]
+        val = @gapi.configuration.load.encoding
         val == "ISO-8859-1"
       end
 
@@ -82,7 +84,7 @@ module Gcloud
       # contains quoted newline characters, {#quoted_newlines?} should return
       # `true`.
       def quote
-        val = config["load"]["quote"]
+        val = @gapi.configuration.load.quote
         val = "\"" if val.nil?
         val
       end
@@ -93,7 +95,7 @@ module Gcloud
       # returned. The default value is `0`, which requires that all records be
       # valid.
       def max_bad_records
-        val = config["load"]["maxBadRecords"]
+        val = @gapi.configuration.load.max_bad_records
         val = 0 if val.nil?
         val
       end
@@ -102,7 +104,7 @@ module Gcloud
       # Checks if quoted data sections may contain newline characters in a CSV
       # file. The default is `false`.
       def quoted_newlines?
-        val = config["load"]["allowQuotedNewlines"]
+        val = @gapi.configuration.load.allow_quoted_newlines
         val = true if val.nil?
         val
       end
@@ -111,14 +113,14 @@ module Gcloud
       # Checks if the format of the source data is
       # [newline-delimited JSON](http://jsonlines.org/). The default is `false`.
       def json?
-        val = config["load"]["sourceFormat"]
+        val = @gapi.configuration.load.source_format
         val == "NEWLINE_DELIMITED_JSON"
       end
 
       ##
       # Checks if the format of the source data is CSV. The default is `true`.
       def csv?
-        val = config["load"]["sourceFormat"]
+        val = @gapi.configuration.load.source_format
         return true if val.nil?
         val == "CSV"
       end
@@ -126,7 +128,7 @@ module Gcloud
       ##
       # Checks if the source data is a Google Cloud Datastore backup.
       def backup?
-        val = config["load"]["sourceFormat"]
+        val = @gapi.configuration.load.source_format
         val == "DATASTORE_BACKUP"
       end
 
@@ -137,7 +139,7 @@ module Gcloud
       # if there are too many bad records, an error is returned. The default
       # value is `false`. Only applicable to CSV, ignored for other formats.
       def allow_jagged_rows?
-        val = config["load"]["allowJaggedRows"]
+        val = @gapi.configuration.load.allow_jagged_rows
         val = false if val.nil?
         val
       end
@@ -149,45 +151,51 @@ module Gcloud
       # records, and if there are too many bad records, an invalid error is
       # returned. The default is `false`.
       def ignore_unknown_values?
-        val = config["load"]["ignoreUnknownValues"]
+        val = @gapi.configuration.load.ignore_unknown_values
         val = false if val.nil?
         val
       end
 
       ##
-      # The schema for the data. Returns a hash. Can be empty if the table
-      # has already has the correct schema (see {Table#schema=} and
-      # {Table#schema}), or if the schema can be inferred from the loaded data.
+      # The schema for the data. Returns a hash. Can be empty if the table has
+      # already has the correct schema (see {Table#schema}), or if the schema
+      # can be inferred from the loaded data.
       def schema
-        val = config["load"]["schema"]
-        val = {} if val.nil?
-        val
+        Schema.from_gapi(@gapi.configuration.load.schema).freeze
       end
 
       ##
       # The number of source files.
       def input_files
-        stats["load"]["inputFiles"]
+        Integer @gapi.statistics.load.input_files
+      rescue
+        nil
       end
 
       ##
       # The number of bytes of source data.
       def input_file_bytes
-        stats["load"]["inputFileBytes"]
+        Integer @gapi.statistics.load.input_file_bytes
+      rescue
+        nil
       end
 
       ##
       # The number of rows that have been loaded into the table. While an
       # import job is in the running state, this value may change.
       def output_rows
-        stats["load"]["outputRows"]
+        Integer @gapi.statistics.load.output_rows
+      rescue
+        nil
       end
 
       ##
       # The number of bytes that have been loaded into the table. While an
       # import job is in the running state, this value may change.
       def output_bytes
-        stats["load"]["outputBytes"]
+        Integer @gapi.statistics.load.output_bytes
+      rescue
+        nil
       end
     end
   end