gcloud 0.11.0 → 0.12.0

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

@@ -78,14 +78,10 @@ module Gcloud
         #
         def next
           return nil unless next?
-          ensure_connection!
+          ensure_service!
           options = { token: token, max: @max }
-          resp = @connection.list_tables @dataset_id, options
-          if resp.success?
-            self.class.from_response resp, @connection, @dataset_id, @max
-          else
-            fail ApiError.from_response(resp)
-          end
+          gapi = @service.list_tables @dataset_id, options
+          self.class.from_gapi gapi, @service, @dataset_id, @max
         end
 
         ##
@@ -158,25 +154,25 @@ module Gcloud
 
         ##
         # @private New Table::List from a response object.
-        def self.from_response resp, conn, dataset_id = nil, max = nil
-          tables = List.new(Array(resp.data["tables"]).map do |gapi_object|
-            Table.from_gapi gapi_object, conn
+        def self.from_gapi gapi_list, service, dataset_id = nil, max = nil
+          tables = List.new(Array(gapi_list.tables).map do |gapi_object|
+            Table.from_gapi gapi_object, service
           end)
-          tables.instance_variable_set "@token", resp.data["nextPageToken"]
-          tables.instance_variable_set "@etag",  resp.data["etag"]
-          tables.instance_variable_set "@total", resp.data["totalItems"]
-          tables.instance_variable_set "@connection", conn
-          tables.instance_variable_set "@dataset_id", dataset_id
-          tables.instance_variable_set "@max",        max
+          tables.instance_variable_set :@token,      gapi_list.next_page_token
+          tables.instance_variable_set :@etag,       gapi_list.etag
+          tables.instance_variable_set :@total,      gapi_list.total_items
+          tables.instance_variable_set :@service,    service
+          tables.instance_variable_set :@dataset_id, dataset_id
+          tables.instance_variable_set :@max,        max
           tables
         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/view.rb

@@ -13,9 +13,11 @@
 # limitations under the License.
 
 
+require "gcloud/errors"
+require "gcloud/bigquery/service"
 require "gcloud/bigquery/data"
 require "gcloud/bigquery/table/list"
-require "gcloud/bigquery/errors"
+require "google/apis/bigquery_v2"
 
 module Gcloud
   module Bigquery
@@ -41,8 +43,8 @@ module Gcloud
     #
     class View
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       ##
       # @private The Google API Client object.
@@ -51,8 +53,8 @@ module Gcloud
       ##
       # @private Create an empty Table object.
       def initialize
-        @connection = nil
-        @gapi = {}
+        @service = nil
+        @gapi = Google::Apis::BigqueryV2::Table.new
       end
 
       ##
@@ -63,7 +65,7 @@ module Gcloud
       # @!group Attributes
       #
       def table_id
-        @gapi["tableReference"]["tableId"]
+        @gapi.table_reference.table_id
       end
 
       ##
@@ -72,7 +74,7 @@ module Gcloud
       # @!group Attributes
       #
       def dataset_id
-        @gapi["tableReference"]["datasetId"]
+        @gapi.table_reference.dataset_id
       end
 
       ##
@@ -81,7 +83,7 @@ module Gcloud
       # @!group Attributes
       #
       def project_id
-        @gapi["tableReference"]["projectId"]
+        @gapi.table_reference.project_id
       end
 
       ##
@@ -89,27 +91,63 @@ module Gcloud
       # The gapi fragment containing the Project ID, Dataset ID, and Table ID as
       # a camel-cased hash.
       def table_ref
-        table_ref = @gapi["tableReference"]
+        table_ref = @gapi.table_reference
         table_ref = table_ref.to_hash if table_ref.respond_to? :to_hash
         table_ref
       end
 
+      ##
+      # The combined Project ID, Dataset ID, and Table ID for this table, in the
+      # format specified by the [Query
+      # Reference](https://cloud.google.com/bigquery/query-reference#from):
+      # `project_name:datasetId.tableId`. To use this value in queries see
+      # {#query_id}.
+      #
+      # @!group Attributes
+      #
+      def id
+        @gapi.id
+      end
+
+      ##
+      # The value returned by {#id}, wrapped in square brackets if the Project
+      # ID contains dashes, as specified by the [Query
+      # Reference](https://cloud.google.com/bigquery/query-reference#from).
+      # Useful in queries.
+      #
+      # @example
+      #   require "gcloud"
+      #
+      #   gcloud = Gcloud.new
+      #   bigquery = gcloud.bigquery
+      #   dataset = bigquery.dataset "my_dataset"
+      #   table = dataset.table "my_table"
+      #
+      #   data = bigquery.query "SELECT name FROM #{table.query_id}"
+      #
+      # @!group Attributes
+      #
+      def query_id
+        project_id["-"] ? "[#{id}]" : id
+      end
+
       ##
       # The name of the table.
       #
       # @!group Attributes
       #
       def name
-        @gapi["friendlyName"]
+        @gapi.friendly_name
       end
 
       ##
       # Updates the name of the table.
       #
-      # @!group Lifecycle
+      # @!group Attributes
       #
       def name= new_name
-        patch_gapi! name: new_name
+        @gapi.update! friendly_name: new_name
+        patch_gapi! :friendly_name
       end
 
       ##
@@ -119,7 +157,7 @@ module Gcloud
       #
       def etag
         ensure_full_data!
-        @gapi["etag"]
+        @gapi.etag
       end
 
       ##
@@ -129,7 +167,7 @@ module Gcloud
       #
       def api_url
         ensure_full_data!
-        @gapi["selfLink"]
+        @gapi.self_link
       end
 
       ##
@@ -139,16 +177,17 @@ module Gcloud
       #
       def description
         ensure_full_data!
-        @gapi["description"]
+        @gapi.description
       end
 
       ##
       # Updates the description of the table.
       #
-      # @!group Lifecycle
+      # @!group Attributes
       #
       def description= new_description
-        patch_gapi! description: new_description
+        @gapi.update! description: new_description
+        patch_gapi! :description
       end
 
       ##
@@ -158,7 +197,11 @@ module Gcloud
       #
       def created_at
         ensure_full_data!
-        Time.at(@gapi["creationTime"] / 1000.0)
+        begin
+          Time.at(Integer(@gapi.creation_time) / 1000.0)
+        rescue
+          nil
+        end
       end
 
       ##
@@ -170,8 +213,11 @@ module Gcloud
       #
       def expires_at
         ensure_full_data!
-        return nil if @gapi["expirationTime"].nil?
-        Time.at(@gapi["expirationTime"] / 1000.0)
+        begin
+          Time.at(Integer(@gapi.expiration_time) / 1000.0)
+        rescue
+          nil
+        end
       end
 
       ##
@@ -181,7 +227,11 @@ module Gcloud
       #
       def modified_at
         ensure_full_data!
-        Time.at(@gapi["lastModifiedTime"] / 1000.0)
+        begin
+          Time.at(Integer(@gapi.last_modified_time) / 1000.0)
+        rescue
+          nil
+        end
       end
 
       ##
@@ -190,7 +240,7 @@ module Gcloud
       # @!group Attributes
       #
       def table?
-        @gapi["type"] == "TABLE"
+        @gapi.type == "TABLE"
       end
 
       ##
@@ -199,7 +249,7 @@ module Gcloud
       # @!group Attributes
       #
       def view?
-        @gapi["type"] == "VIEW"
+        @gapi.type == "VIEW"
       end
 
       ##
@@ -210,41 +260,35 @@ module Gcloud
       #
       def location
         ensure_full_data!
-        @gapi["location"]
+        @gapi.location
       end
 
       ##
-      # The schema of the table.
+      # The schema of the view.
       #
       # @!group Attributes
       #
       def schema
         ensure_full_data!
-        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 table.
+      # The fields of the view.
       #
       # @!group Attributes
       #
       def fields
-        f = schema["fields"]
-        f = f.to_hash if f.respond_to? :to_hash
-        f = [] if f.nil?
-        f
+        schema.fields
       end
 
       ##
-      # The names of the columns in the table.
+      # The names of the columns in the view.
       #
       # @!group Attributes
       #
       def headers
-        fields.map { |f| f["name"] }
+        fields.map(&:name)
       end
 
       ##
@@ -253,7 +297,7 @@ module Gcloud
       # @!group Attributes
       #
       def query
-        @gapi["view"]["query"] if @gapi["view"]
+        @gapi.view.query if @gapi.view
       end
 
       ##
@@ -277,7 +321,9 @@ module Gcloud
       # @!group Lifecycle
       #
       def query= new_query
-        patch_gapi! query: new_query
+        @gapi.view ||= Google::Apis::BigqueryV2::ViewDefinition.new
+        @gapi.view.update! query: new_query
+        patch_view_gapi! :query
       end
 
       ##
@@ -323,16 +369,12 @@ module Gcloud
       #
       # @!group Data
       #
-      def data max: nil, timeout: nil, cache: nil, dryrun: nil
-        sql = "SELECT * FROM #{@gapi['id']}"
-        ensure_connection!
+      def data max: nil, timeout: 10000, cache: true, dryrun: nil
+        sql = "SELECT * FROM #{query_id}"
+        ensure_service!
         options = { max: max, timeout: timeout, cache: cache, dryrun: dryrun }
-        resp = connection.query sql, options
-        if resp.success?
-          QueryData.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.query sql, options
+        QueryData.from_gapi gapi, service
       end
 
       ##
@@ -353,13 +395,9 @@ module Gcloud
       # @!group Lifecycle
       #
       def delete
-        ensure_connection!
-        resp = connection.delete_table dataset_id, table_id
-        if resp.success?
-          true
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        service.delete_table dataset_id, table_id
+        true
       end
 
       ##
@@ -368,13 +406,9 @@ module Gcloud
       # @!group Lifecycle
       #
       def reload!
-        ensure_connection!
-        resp = connection.get_table dataset_id, table_id
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_table dataset_id, table_id
+        @gapi = gapi
       end
       alias_method :refresh!, :reload!
 
@@ -383,26 +417,41 @@ module Gcloud
       def self.from_gapi gapi, conn
         new.tap do |f|
           f.gapi = gapi
-          f.connection = conn
+          f.service = conn
         end
       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
 
-      def patch_gapi! options = {}
-        ensure_connection!
-        resp = connection.patch_table dataset_id, table_id, options
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+      def patch_gapi! *attributes
+        return if attributes.empty?
+        patch_args = Hash[attributes.map do |attr|
+          [attr, @gapi.send(attr)]
+        end]
+        patch_table_gapi patch_args
+      end
+
+      def patch_view_gapi! *attributes
+        return if attributes.empty?
+        patch_args = Hash[attributes.map do |attr|
+          [attr, @gapi.view.send(attr)]
+        end]
+        patch_view_args = Google::Apis::BigqueryV2::ViewDefinition.new(
+          patch_args
+        )
+        patch_table_gapi view: patch_view_args
+      end
+
+      def patch_table_gapi patch_args
+        ensure_service!
+        patch_gapi = Google::Apis::BigqueryV2::Table.new patch_args
+        @gapi = service.patch_table dataset_id, table_id, patch_gapi
       end
 
       ##
@@ -413,17 +462,13 @@ module Gcloud
       end
 
       def reload_gapi!
-        ensure_connection!
-        resp = connection.get_table dataset_id, table_id
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.get_table dataset_id, table_id
+        @gapi = gapi
       end
 
       def data_complete?
-        !@gapi["creationTime"].nil?
+        @gapi.is_a? Google::Apis::BigqueryV2::Table
       end
     end
   end