gcloud 0.11.0 → 0.12.0

data/lib/gcloud/bigquery/dataset/access.rb

@@ -46,17 +46,17 @@ module Gcloud
                   "owner"  => "OWNER" }
 
         # @private
-        SCOPES = { "user"           => "userByEmail",
-                   "user_by_email"  => "userByEmail",
-                   "userByEmail"    => "userByEmail",
-                   "group"          => "groupByEmail",
-                   "group_by_email" => "groupByEmail",
-                   "groupByEmail"   => "groupByEmail",
-                   "domain"         => "domain",
-                   "special"        => "specialGroup",
-                   "special_group"  => "specialGroup",
-                   "specialGroup"   => "specialGroup",
-                   "view"           => "view" }
+        SCOPES = { "user"           => :user_by_email,
+                   "user_by_email"  => :user_by_email,
+                   "userByEmail"    => :user_by_email,
+                   "group"          => :group_by_email,
+                   "group_by_email" => :group_by_email,
+                   "groupByEmail"   => :group_by_email,
+                   "domain"         => :domain,
+                   "special"        => :special_group,
+                   "special_group"  => :special_group,
+                   "specialGroup"   => :special_group,
+                   "view"           => :view }
 
         # @private
         GROUPS = { "owners"                  => "projectOwners",
@@ -72,22 +72,37 @@ module Gcloud
                    "all_authenticated_users" => "allAuthenticatedUsers",
                    "allAuthenticatedUsers"   => "allAuthenticatedUsers" }
 
-        # @private
-        attr_reader :access
-
         ##
         # @private
         # Initialized a new Access object.
-        # Must provide a valid Dataset object.
-        def initialize access, context
-          @original   = access.dup
-          @access     = access.dup
-          @context    = context
+        # Must provide a valid Google::Apis::BigqueryV2::Dataset object.
+        # Access will mutate the gapi object.
+        def initialize
+          @rules = [] # easiest to do this in the constructor
+          @original_rules_hashes = @rules.map(&:to_h)
         end
 
         # @private
         def changed?
-          @original != @access
+          @original_rules_hashes != @rules.map(&:to_h)
+        end
+
+        # @private
+        def empty?
+          @rules.empty?
+        end
+
+        # @private
+        def freeze
+          @rules = @rules.map(&:dup).map(&:freeze)
+          @rules.freeze
+          super
+        end
+
+        ##
+        # @private View the access rules as an array of hashes.
+        def to_a
+          @rules.map(&:to_h)
         end
 
         ##
@@ -123,7 +138,7 @@ module Gcloud
         # Reference](https://cloud.google.com/bigquery/query-reference#from):
         # +project_name:datasetId.tableId+.
         def add_reader_view view
-          add_access_role_scope_value :reader, :view, view
+          add_access_view view
         end
 
         ##
@@ -151,17 +166,6 @@ module Gcloud
           add_access_role_scope_value :writer, :special, group
         end
 
-        ##
-        # Add writer access to a view.
-        # The view can be a Gcloud::Bigquery::View object,
-        # or a string identifier as specified by the
-        # [Query
-        # Reference](https://cloud.google.com/bigquery/query-reference#from):
-        # +project_name:datasetId.tableId+.
-        def add_writer_view view
-          add_access_role_scope_value :writer, :view, view
-        end
-
         ##
         # Add owner access to a user.
         def add_owner_user email
@@ -187,17 +191,6 @@ module Gcloud
           add_access_role_scope_value :owner, :special, group
         end
 
-        ##
-        # Add owner access to a view.
-        # The view can be a Gcloud::Bigquery::View object,
-        # or a string identifier as specified by the
-        # [Query
-        # Reference](https://cloud.google.com/bigquery/query-reference#from):
-        # +project_name:datasetId.tableId+.
-        def add_owner_view view
-          add_access_role_scope_value :owner, :view, view
-        end
-
         ##
         # Remove reader access from a user.
         def remove_reader_user email
@@ -231,7 +224,7 @@ module Gcloud
         # Reference](https://cloud.google.com/bigquery/query-reference#from):
         # +project_name:datasetId.tableId+.
         def remove_reader_view view
-          remove_access_role_scope_value :reader, :view, view
+          remove_access_view view
         end
 
         ##
@@ -259,17 +252,6 @@ module Gcloud
           remove_access_role_scope_value :writer, :special, group
         end
 
-        ##
-        # Remove writer access from a view.
-        # The view can be a Gcloud::Bigquery::View object,
-        # or a string identifier as specified by the
-        # [Query
-        # Reference](https://cloud.google.com/bigquery/query-reference#from):
-        # +project_name:datasetId.tableId+.
-        def remove_writer_view view
-          remove_access_role_scope_value :writer, :view, view
-        end
-
         ##
         # Remove owner access from a user.
         def remove_owner_user email
@@ -295,17 +277,6 @@ module Gcloud
           remove_access_role_scope_value :owner, :special, group
         end
 
-        ##
-        # Remove owner access from a view.
-        # The view can be a Gcloud::Bigquery::View object,
-        # or a string identifier as specified by the
-        # [Query
-        # Reference](https://cloud.google.com/bigquery/query-reference#from):
-        # +project_name:datasetId.tableId+.
-        def remove_owner_view view
-          remove_access_role_scope_value :owner, :view, view
-        end
-
         ##
         # Checks reader access for a user.
         def reader_user? email
@@ -339,7 +310,7 @@ module Gcloud
         # Reference](https://cloud.google.com/bigquery/query-reference#from):
         # +project_name:datasetId.tableId+.
         def reader_view? view
-          lookup_access_role_scope_value :reader, :view, view
+          lookup_access_view view
         end
 
         ##
@@ -367,17 +338,6 @@ module Gcloud
           lookup_access_role_scope_value :writer, :special, group
         end
 
-        ##
-        # Checks writer access for a view.
-        # The view can be a Gcloud::Bigquery::View object,
-        # or a string identifier as specified by the
-        # [Query
-        # Reference](https://cloud.google.com/bigquery/query-reference#from):
-        # +project_name:datasetId.tableId+.
-        def writer_view? view
-          lookup_access_role_scope_value :writer, :view, view
-        end
-
         ##
         # Checks owner access for a user.
         def owner_user? email
@@ -403,15 +363,21 @@ module Gcloud
           lookup_access_role_scope_value :owner, :special, group
         end
 
-        ##
-        # Checks owner access for a view.
-        # The view can be a Gcloud::Bigquery::View object,
-        # or a string identifier as specified by the
-        # [Query
-        # Reference](https://cloud.google.com/bigquery/query-reference#from):
-        # +project_name:datasetId.tableId+.
-        def owner_view? view
-          lookup_access_role_scope_value :owner, :view, view
+        # @private
+        def self.from_gapi gapi
+          rules = Array gapi.access
+          new.tap do |s|
+            s.instance_variable_set :@rules, rules
+            s.instance_variable_set :@original_rules_hashes,
+                                    rules.map(&:to_h)
+            s.instance_variable_set :@dataset_reference,
+                                    gapi.dataset_reference
+          end
+        end
+
+        # @private
+        def to_gapi
+          @rules
         end
 
         protected
@@ -446,46 +412,94 @@ module Gcloud
           if view.respond_to? :table_ref
             view.table_ref
           else
-            Connection.table_ref_from_s view, @context
+            Service.table_ref_from_s view, @dataset_reference
           end
         end
 
         # @private
         def add_access_role_scope_value role, scope, value
-          role = validate_role role
+          role = validate_role(role)
           scope = validate_scope scope
           # If scope is special group, make sure value is in the list
-          value = validate_special_group(value) if scope == "specialGroup"
-          # If scope is view, make sure value is in the right format
-          value = validate_view(value) if scope == "view"
+          value = validate_special_group(value) if scope == :special_group
           # Remove any rules of this scope and value
-          access.reject! { |h| h[scope] == value }
+          @rules.reject!(&find_by_scope_and_value(scope, value))
+          # Add new rule for this role, scope, and value
+          opts = { role: role, scope => value }
+          @rules << Google::Apis::BigqueryV2::Dataset::Access.new(opts)
+        end
+
+        # @private
+        def add_access_view value
+          # scope is view, make sure value is in the right format
+          value = validate_view(value)
+          # Remove existing view rule, if any
+          @rules.reject!(&find_view(value))
           # Add new rule for this role, scope, and value
-          access << { "role" => role, scope => value }
+          opts = { view: value }
+          @rules << Google::Apis::BigqueryV2::Dataset::Access.new(opts)
         end
 
         # @private
         def remove_access_role_scope_value role, scope, value
-          role = validate_role role
+          role = validate_role(role)
           scope = validate_scope scope
           # If scope is special group, make sure value is in the list
-          value = validate_special_group(value) if scope == "specialGroup"
-          # If scope is view, make sure value is in the right format
-          value = validate_view(value) if scope == "view"
+          value = validate_special_group(value) if scope == :special_group
           # Remove any rules of this role, scope, and value
-          access.reject! { |h| h["role"] == role && h[scope] == value }
+          @rules.reject!(
+            &find_by_role_and_scope_and_value(role, scope, value))
+        end
+
+        # @private
+        def remove_access_view value
+          # scope is view, make sure value is in the right format
+          value = validate_view(value)
+          # Remove existing view rule, if any
+          @rules.reject!(&find_view(value))
         end
 
         # @private
         def lookup_access_role_scope_value role, scope, value
-          role = validate_role role
+          role = validate_role(role)
           scope = validate_scope scope
           # If scope is special group, make sure value is in the list
-          value = validate_special_group(value) if scope == "specialGroup"
-          # If scope is view, make sure value is in the right format
-          value = validate_view(value) if scope == "view"
+          value = validate_special_group(value) if scope == :special_group
           # Detect any rules of this role, scope, and value
-          !(!access.detect { |h| h["role"] == role && h[scope] == value })
+          !(!@rules.detect(
+            &find_by_role_and_scope_and_value(role, scope, value)))
+        end
+
+        # @private
+        def lookup_access_view value
+          # scope is view, make sure value is in the right format
+          value = validate_view(value)
+          # Detect view rule, if any
+          !(!@rules.detect(&find_view(value)))
+        end
+
+        # @private
+        def find_by_role_and_scope_and_value role, scope, value
+          lambda do |a|
+            h = a.to_h
+            h[:role] == role && h[scope] == value
+          end
+        end
+
+        # @private
+        def find_by_scope_and_value scope, value
+          lambda do |a|
+            h = a.to_h
+            h[scope] == value
+          end
+        end
+
+        # @private
+        def find_view value
+          lambda do |a|
+            h = a.to_h
+            h[:view].to_h == value.to_h
+          end
         end
       end
     end

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

@@ -71,14 +71,10 @@ module Gcloud
         #   end
         def next
           return nil unless next?
-          ensure_connection!
+          ensure_service!
           options = { all: @hidden, token: token, max: @max }
-          resp = @connection.list_datasets options
-          if resp.success?
-            self.class.from_response resp, @connection
-          else
-            fail ApiError.from_response(resp)
-          end
+          gapi = @service.list_datasets options
+          self.class.from_gapi gapi, @service, @hidden, @max
         end
 
         ##
@@ -148,24 +144,24 @@ module Gcloud
 
         ##
         # @private New Dataset::List from a response object.
-        def self.from_response resp, conn, hidden = nil, max = nil
-          datasets = List.new(Array(resp.data["datasets"]).map do |gapi_object|
-            Dataset.from_gapi gapi_object, conn
+        def self.from_gapi gapi_list, service, hidden = nil, max = nil
+          datasets = List.new(Array(gapi_list.datasets).map do |gapi_object|
+            Dataset.from_gapi gapi_object, service
           end)
-          datasets.instance_variable_set "@token", resp.data["nextPageToken"]
-          datasets.instance_variable_set "@etag",  resp.data["etag"]
-          datasets.instance_variable_set "@connection", conn
-          datasets.instance_variable_set "@hidden",     hidden
-          datasets.instance_variable_set "@max",        max
+          datasets.instance_variable_set :@token,   gapi_list.next_page_token
+          datasets.instance_variable_set :@etag,    gapi_list.etag
+          datasets.instance_variable_set :@service, service
+          datasets.instance_variable_set :@hidden,  hidden
+          datasets.instance_variable_set :@max,     max
           datasets
         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/extract_job.rb

@@ -32,25 +32,25 @@ module Gcloud
       # The URI or URIs representing the Google Cloud Storage files to which
       # the data is exported.
       def destinations
-        Array config["extract"]["destinationUris"]
+        Array @gapi.configuration.extract.destination_uris
       end
 
       ##
       # The table from which the data is exported. This is the table upon
       # which {Table#extract} was called. Returns a {Table} instance.
       def source
-        table = config["extract"]["sourceTable"]
+        table = @gapi.configuration.extract.source_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
 
       ##
       # Checks if the export operation compresses the data using gzip. The
       # default is `false`.
       def compression?
-        val = config["extract"]["compression"]
+        val = @gapi.configuration.extract.compression
         val == "GZIP"
       end
 
@@ -58,7 +58,7 @@ module Gcloud
       # Checks if the destination format for the data is [newline-delimited
       # JSON](http://jsonlines.org/). The default is `false`.
       def json?
-        val = config["extract"]["destinationFormat"]
+        val = @gapi.configuration.extract.destination_format
         val == "NEWLINE_DELIMITED_JSON"
       end
 
@@ -66,7 +66,7 @@ module Gcloud
       # Checks if the destination format for the data is CSV. Tables with nested
       # or repeated fields cannot be exported as CSV. The default is `true`.
       def csv?
-        val = config["extract"]["destinationFormat"]
+        val = @gapi.configuration.extract.destination_format
         return true if val.nil?
         val == "CSV"
       end
@@ -75,7 +75,7 @@ module Gcloud
       # Checks if the destination format for the data is
       # [Avro](http://avro.apache.org/). The default is `false`.
       def avro?
-        val = config["extract"]["destinationFormat"]
+        val = @gapi.configuration.extract.destination_format
         val == "AVRO"
       end
 
@@ -83,7 +83,7 @@ module Gcloud
       # The symbol the operation uses to delimit fields in the exported data.
       # The default is a comma (,).
       def delimiter
-        val = config["extract"]["fieldDelimiter"]
+        val = @gapi.configuration.extract.field_delimiter
         val = "," if val.nil?
         val
       end
@@ -92,7 +92,7 @@ module Gcloud
       # Checks if the exported data contains a header row. The default is
       # `true`.
       def print_header?
-        val = config["extract"]["printHeader"]
+        val = @gapi.configuration.extract.print_header
         val = true if val.nil?
         val
       end
@@ -102,7 +102,7 @@ module Gcloud
       # {#destinations}. Returns an Array of values in the same order as the URI
       # patterns.
       def destinations_file_counts
-        Array stats["extract"]["destinationUriFileCounts"]
+        Array @gapi.statistics.extract.destination_uri_file_counts
       end
 
       ##