google-cloud-bigquery 1.21.2 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38543236358fc319ecfcc2058ffa499e24034027aa56644924d2cf496815550
-  data.tar.gz: 37196fa1c3db03e48df4cb0ae5ae5b9b1ee07b9d112063467ebc57d25b34551a
+  metadata.gz: 8c2f8d8d7a564df2c916cced8adf4c0b621a1e11250a3a04decfce08995a4a24
+  data.tar.gz: 57bbda27d4c54e0522b564b8cdc62fb5e9dce8b26c91d3f0604c624ff113f057
 SHA512:
-  metadata.gz: a234359fb8a04b42f22725f5540cf0378b7e51b3d847ddd4f24ba41f2a54b4de85068bb9aee10089995c29794c0a64694223ac6bf88202eda6a646ce02c85275
-  data.tar.gz: 99c6c915df70afde18de06907802c60d18df253238e6f3ab752827ea3cfc0aee0ab9bef8dc0816f5980db26334dd2b15ce0a2ecf7db3b026e2f0caa101dcafc8
+  metadata.gz: f445a86a5435cafc236d82faf91df46a06c6cee8612d8e6c4011450c93b73b61a883510909c6bb25e72516ae1a57c8a605736d82e0b63f0b10ad25cab90a1280
+  data.tar.gz: 43423f2bea5cea82c6c19bcf639bfb690f4718b0450140d299616ece59b147258ef877cafbc17b99c68274c310a0cd0123ae6b6db0b37bba2fb08be0395837f0

data/CHANGELOG.md

@@ -1,5 +1,59 @@
 # Release History
 
+### 1.26.0 / 2021-01-13
+
+#### Features
+
+* Add support for Hive Partitioning
+  * Add hive partitioning options to External::DataSource
+  * Add hive partitioning options to LoadJob and LoadJob::Updater
+* Replace google-api-client with google-apis-bigquery_v2
+
+### 1.25.0 / 2020-11-16
+
+#### Features
+
+* Add routine (UDF) to Dataset::Access
+* Add support for Table ACLS (IAM Policy)
+  * feat(bigquery): Add support for Table ACLS
+  * Add Bigquery::Policy
+  * Add Table#policy
+  * Add Table#test_iam_permissions
+  * Add Table#update_policy
+
+### 1.24.0 / 2020-10-29
+
+#### Features
+
+* Add iamMember to Dataset::Access
+
+#### Bug Fixes
+
+* Ensure dense encoding of JSON responses
+  * Set query param prettyPrint=false for all requests.
+  * Upgrade google-api-client to ~> 0.47
+
+#### Documentation
+
+* Update supported types for time partition type
+
+### 1.23.0 / 2020-09-17
+
+#### Features
+
+* quota_project can be set via library configuration ([#7627](https://www.github.com/googleapis/google-cloud-ruby/issues/7627))
+
+### 1.22.0 / 2020-09-10
+
+#### Features
+
+* Add support for ML model export
+  * Add model support to Project#extract and #extract_job
+  * Add ExtractJob#model?
+  * Add ExtractJob#ml_tf_saved_model?
+  * Add ExtractJob#ml_xgboost_booster?
+  * Add Model#extract and #extract_job
+
 ### 1.21.2 / 2020-07-21
 
 #### Documentation

data/CONTRIBUTING.md

@@ -45,7 +45,7 @@ there is a small amount of setup:
 
    ```sh
    $ cd google-cloud-bigquery/
-   $ bundle exec rake bundleupdate
+   $ bundle install
    ```
 
 ## Console

data/lib/google-cloud-bigquery.rb

@@ -133,6 +133,7 @@ Google::Cloud.configure.add_config! :bigquery do |config|
   config.add_field! :credentials, default_creds, match: [String, Hash, Google::Auth::Credentials], allow_nil: true
   config.add_alias! :keyfile, :credentials
   config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :quota_project, nil, match: String
   config.add_field! :retries, nil, match: Integer
   config.add_field! :timeout, nil, match: Integer
   config.add_field! :endpoint, nil, match: String

data/lib/google/cloud/bigquery.rb

@@ -84,7 +84,7 @@ module Google
         Bigquery::Project.new(
           Bigquery::Service.new(
             project_id, credentials,
-            retries: retries, timeout: timeout, host: endpoint
+            retries: retries, timeout: timeout, host: endpoint, quota_project: configure.quota_project
           )
         )
       end

data/lib/google/cloud/bigquery/convert.rb

@@ -318,7 +318,9 @@ module Google
             "parquet"                => "PARQUET",
             "datastore"              => "DATASTORE_BACKUP",
             "backup"                 => "DATASTORE_BACKUP",
-            "datastore_backup"       => "DATASTORE_BACKUP"
+            "datastore_backup"       => "DATASTORE_BACKUP",
+            "ml_tf_saved_model"      => "ML_TF_SAVED_MODEL",
+            "ml_xgboost_booster"     => "ML_XGBOOST_BOOSTER"
           }[format.to_s.downcase]
           return val unless val.nil?
           format

data/lib/google/cloud/bigquery/copy_job.rb

@@ -272,12 +272,21 @@ module Google
           # Sets the labels to use for the job.
           #
           # @param [Hash] value A hash of user-provided labels associated with
-          #   the job. You can use these to organize and group your jobs. Label
-          #   keys and values can be no longer than 63 characters, can only
-          #   contain lowercase letters, numeric characters, underscores and
-          #   dashes. International characters are allowed. Label values are
-          #   optional. Label keys must start with a letter and each label in
-          #   the list must have a different key.
+          #   the job. You can use these to organize and group your jobs.
+          #
+          #   The labels applied to a resource must meet the following requirements:
+          #
+          #   * Each resource can have multiple labels, up to a maximum of 64.
+          #   * Each label must be a key-value pair.
+          #   * Keys have a minimum length of 1 character and a maximum length of
+          #     63 characters, and cannot be empty. Values can be empty, and have
+          #     a maximum length of 63 characters.
+          #   * Keys and values can contain only lowercase letters, numeric characters,
+          #     underscores, and dashes. All characters must use UTF-8 encoding, and
+          #     international characters are allowed.
+          #   * The key portion of a label must be unique. However, you can use the
+          #     same key with multiple resources.
+          #   * Keys must start with a lowercase letter or international character.
           #
           # @!group Attributes
           def labels= value

data/lib/google/cloud/bigquery/dataset.rb

@@ -313,12 +313,19 @@ module Google
         # @param [Hash<String, String>] labels A hash containing key/value
         #   pairs.
         #
-        #   * Label keys and values can be no longer than 63 characters.
-        #   * Label keys and values can contain only lowercase letters, numbers,
-        #     underscores, hyphens, and international characters.
-        #   * Label keys and values cannot exceed 128 bytes in size.
-        #   * Label keys must begin with a letter.
-        #   * Label keys must be unique within a dataset.
+        #   The labels applied to a resource must meet the following requirements:
+        #
+        #   * Each resource can have multiple labels, up to a maximum of 64.
+        #   * Each label must be a key-value pair.
+        #   * Keys have a minimum length of 1 character and a maximum length of
+        #     63 characters, and cannot be empty. Values can be empty, and have
+        #     a maximum length of 63 characters.
+        #   * Keys and values can contain only lowercase letters, numeric characters,
+        #     underscores, and dashes. All characters must use UTF-8 encoding, and
+        #     international characters are allowed.
+        #   * The key portion of a label must be unique. However, you can use the
+        #     same key with multiple resources.
+        #   * Keys must start with a lowercase letter or international character.
         #
         # @example
         #   require "google/cloud/bigquery"
@@ -1171,13 +1178,21 @@ module Google
         #   is 1,024 characters. If `job_id` is provided, then `prefix` will not
         #   be used.
         # @param [Hash] labels A hash of user-provided labels associated with
-        #   the job. You can use these to organize and group your jobs. Label
-        #   keys and values can be no longer than 63 characters, can only
-        #   contain lowercase letters, numeric characters, underscores and
-        #   dashes. International characters are allowed. Label values are
-        #   optional. Label keys must start with a letter and each label in the
-        #   list must have a different key. See [Requirements for
-        #   labels](https://cloud.google.com/bigquery/docs/creating-managing-labels#requirements).
+        #   the job. You can use these to organize and group your jobs.
+        #
+        #   The labels applied to a resource must meet the following requirements:
+        #
+        #   * Each resource can have multiple labels, up to a maximum of 64.
+        #   * Each label must be a key-value pair.
+        #   * Keys have a minimum length of 1 character and a maximum length of
+        #     63 characters, and cannot be empty. Values can be empty, and have
+        #     a maximum length of 63 characters.
+        #   * Keys and values can contain only lowercase letters, numeric characters,
+        #     underscores, and dashes. All characters must use UTF-8 encoding, and
+        #     international characters are allowed.
+        #   * The key portion of a label must be unique. However, you can use the
+        #     same key with multiple resources.
+        #   * Keys must start with a lowercase letter or international character.
         # @param [Array<String>, String] udfs User-defined function resources
         #   used in a legacy SQL query. May be either a code resource to load from
         #   a Google Cloud Storage URI (`gs://bucket/path`), or an inline resource
@@ -1792,13 +1807,21 @@ module Google
         #   is 1,024 characters. If `job_id` is provided, then `prefix` will not
         #   be used.
         # @param [Hash] labels A hash of user-provided labels associated with
-        #   the job. You can use these to organize and group your jobs. Label
-        #   keys and values can be no longer than 63 characters, can only
-        #   contain lowercase letters, numeric characters, underscores and
-        #   dashes. International characters are allowed. Label values are
-        #   optional. Label keys must start with a letter and each label in the
-        #   list must have a different key. See [Requirements for
-        #   labels](https://cloud.google.com/bigquery/docs/creating-managing-labels#requirements).
+        #   the job. You can use these to organize and group your jobs.
+        #
+        #   The labels applied to a resource must meet the following requirements:
+        #
+        #   * Each resource can have multiple labels, up to a maximum of 64.
+        #   * Each label must be a key-value pair.
+        #   * Keys have a minimum length of 1 character and a maximum length of
+        #     63 characters, and cannot be empty. Values can be empty, and have
+        #     a maximum length of 63 characters.
+        #   * Keys and values can contain only lowercase letters, numeric characters,
+        #     underscores, and dashes. All characters must use UTF-8 encoding, and
+        #     international characters are allowed.
+        #   * The key portion of a label must be unique. However, you can use the
+        #     same key with multiple resources.
+        #   * Keys must start with a lowercase letter or international character.
         # @yield [updater] A block for setting the schema and other
         #   options for the destination table. The schema can be omitted if the
         #   destination table already exists, or if you're loading data from a

data/lib/google/cloud/bigquery/dataset/access.rb

@@ -48,16 +48,19 @@ module Google
 
           # @private
           SCOPES = {
-            "user"           => :user_by_email,
-            "user_by_email"  => :user_by_email,
-            "userByEmail"    => :user_by_email,
+            "domain"         => :domain,
             "group"          => :group_by_email,
             "group_by_email" => :group_by_email,
             "groupByEmail"   => :group_by_email,
-            "domain"         => :domain,
+            "iam_member"     => :iam_member,
+            "iamMember"      => :iam_member,
+            "routine"        => :routine,
             "special"        => :special_group,
             "special_group"  => :special_group,
             "specialGroup"   => :special_group,
+            "user"           => :user_by_email,
+            "user_by_email"  => :user_by_email,
+            "userByEmail"    => :user_by_email,
             "view"           => :view
           }.freeze
 
@@ -150,6 +153,26 @@ module Google
             add_access_role_scope_value :reader, :group, email
           end
 
+          ##
+          # Add reader access to some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   dataset.access do |access|
+          #     access.add_reader_iam_member "entity@example.com"
+          #   end
+          #
+          def add_reader_iam_member identity
+            add_access_role_scope_value :reader, :iam_member, identity
+          end
+
           ##
           # Add reader access to a domain.
           #
@@ -190,6 +213,33 @@ module Google
             add_access_role_scope_value :reader, :special, group
           end
 
+          ##
+          # Add access to a routine from a different dataset. Queries executed
+          # against that routine will have read access to views/tables/routines
+          # in this dataset. Only UDF is supported for now. The role field is
+          # not required when this field is set. If that routine is updated by
+          # any user, access to the routine needs to be granted again via an
+          # update operation.
+          #
+          # @param [Google::Cloud::Bigquery::Routine] routine A routine object.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   other_dataset = bigquery.dataset "my_other_dataset", skip_lookup: true
+          #
+          #   routine = other_dataset.routine "my_routine"
+          #
+          #   dataset.access do |access|
+          #     access.add_reader_routine routine
+          #   end
+          #
+          def add_reader_routine routine
+            add_access_routine routine
+          end
+
           ##
           # Add reader access to a view.
           #
@@ -205,9 +255,9 @@ module Google
           #
           #   bigquery = Google::Cloud::Bigquery.new
           #   dataset = bigquery.dataset "my_dataset"
-          #   other_dataset = bigquery.dataset "my_other_dataset"
+          #   other_dataset = bigquery.dataset "my_other_dataset", skip_lookup: true
           #
-          #   view = other_dataset.table "my_view"
+          #   view = other_dataset.table "my_view", skip_lookup: true
           #
           #   dataset.access do |access|
           #     access.add_reader_view view
@@ -255,6 +305,26 @@ module Google
             add_access_role_scope_value :writer, :group, email
           end
 
+          ##
+          # Add writer access to some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   dataset.access do |access|
+          #     access.add_writer_iam_member "entity@example.com"
+          #   end
+          #
+          def add_writer_iam_member identity
+            add_access_role_scope_value :writer, :iam_member, identity
+          end
+
           ##
           # Add writer access to a domain.
           #
@@ -333,6 +403,26 @@ module Google
             add_access_role_scope_value :owner, :group, email
           end
 
+          ##
+          # Add owner access to some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   dataset.access do |access|
+          #     access.add_owner_iam_member "entity@example.com"
+          #   end
+          #
+          def add_owner_iam_member identity
+            add_access_role_scope_value :owner, :iam_member, identity
+          end
+
           ##
           # Add owner access to a domain.
           #
@@ -411,6 +501,26 @@ module Google
             remove_access_role_scope_value :reader, :group, email
           end
 
+          ##
+          # Remove reader access from some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   dataset.access do |access|
+          #     access.remove_reader_iam_member "entity@example.com"
+          #   end
+          #
+          def remove_reader_iam_member identity
+            remove_access_role_scope_value :reader, :iam_member, identity
+          end
+
           ##
           # Remove reader access from a domain.
           #
@@ -451,6 +561,28 @@ module Google
             remove_access_role_scope_value :reader, :special, group
           end
 
+          ##
+          # Remove reader access from a routine from a different dataset.
+          #
+          # @param [Google::Cloud::Bigquery::Routine] routine A routine object.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   other_dataset = bigquery.dataset "my_other_dataset", skip_lookup: true
+          #
+          #   routine = other_dataset.routine "my_routine", skip_lookup: true
+          #
+          #   dataset.access do |access|
+          #     access.remove_reader_routine routine
+          #   end
+          #
+          def remove_reader_routine routine
+            remove_access_routine routine
+          end
+
           ##
           # Remove reader access from a view.
           #
@@ -466,9 +598,9 @@ module Google
           #
           #   bigquery = Google::Cloud::Bigquery.new
           #   dataset = bigquery.dataset "my_dataset"
-          #   other_dataset = bigquery.dataset "my_other_dataset"
+          #   other_dataset = bigquery.dataset "my_other_dataset", skip_lookup: true
           #
-          #   view = other_dataset.table "my_view"
+          #   view = other_dataset.table "my_view", skip_lookup: true
           #
           #   dataset.access do |access|
           #     access.remove_reader_view view
@@ -516,6 +648,26 @@ module Google
             remove_access_role_scope_value :writer, :group, email
           end
 
+          ##
+          # Remove writer access from some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   dataset.access do |access|
+          #     access.remove_writer_iam_member "entity@example.com"
+          #   end
+          #
+          def remove_writer_iam_member identity
+            remove_access_role_scope_value :writer, :iam_member, identity
+          end
+
           ##
           # Remove writer access from a domain.
           #
@@ -594,6 +746,26 @@ module Google
             remove_access_role_scope_value :owner, :group, email
           end
 
+          ##
+          # Remove owner access from some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   dataset.access do |access|
+          #     access.remove_owner_iam_member "entity@example.com"
+          #   end
+          #
+          def remove_owner_iam_member identity
+            remove_access_role_scope_value :owner, :iam_member, identity
+          end
+
           ##
           # Remove owner access from a domain.
           #
@@ -670,6 +842,25 @@ module Google
             lookup_access_role_scope_value :reader, :group, email
           end
 
+          ##
+          # Checks reader access for some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   access = dataset.access
+          #   access.reader_iam_member? "entity@example.com" #=> false
+          #
+          def reader_iam_member? identity
+            lookup_access_role_scope_value :reader, :iam_member, identity
+          end
+
           ##
           # Checks reader access for a domain.
           #
@@ -708,6 +899,32 @@ module Google
             lookup_access_role_scope_value :reader, :special, group
           end
 
+          ##
+          # Checks access for a routine from a different dataset. Queries executed
+          # against that routine will have read access to views/tables/routines
+          # in this dataset. Only UDF is supported for now. The role field is
+          # not required when this field is set. If that routine is updated by
+          # any user, access to the routine needs to be granted again via an
+          # update operation.
+          #
+          # @param [Google::Cloud::Bigquery::Routine] routine A routine object.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   other_dataset = bigquery.dataset "my_other_dataset", skip_lookup: true
+          #
+          #   routine = other_dataset.routine "my_routine", skip_lookup: true
+          #
+          #   access = dataset.access
+          #   access.reader_routine? routine #=> false
+          #
+          def reader_routine? routine
+            lookup_access_routine routine
+          end
+
           ##
           # Checks reader access for a view.
           #
@@ -723,9 +940,9 @@ module Google
           #
           #   bigquery = Google::Cloud::Bigquery.new
           #   dataset = bigquery.dataset "my_dataset"
-          #   other_dataset = bigquery.dataset "my_other_dataset"
+          #   other_dataset = bigquery.dataset "my_other_dataset", skip_lookup: true
           #
-          #   view = other_dataset.table "my_view"
+          #   view = other_dataset.table "my_view", skip_lookup: true
           #
           #   access = dataset.access
           #   access.reader_view? view #=> false
@@ -770,6 +987,25 @@ module Google
             lookup_access_role_scope_value :writer, :group, email
           end
 
+          ##
+          # Checks writer access for some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   access = dataset.access
+          #   access.writer_iam_member? "entity@example.com" #=> false
+          #
+          def writer_iam_member? identity
+            lookup_access_role_scope_value :writer, :iam_member, identity
+          end
+
           ##
           # Checks writer access for a domain.
           #
@@ -844,6 +1080,25 @@ module Google
             lookup_access_role_scope_value :owner, :group, email
           end
 
+          ##
+          # Checks owner access for some other type of member that appears in the IAM
+          # Policy but isn't a user, group, domain, or special group.
+          #
+          # @param [String] identity The identity reference.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #
+          #   access = dataset.access
+          #   access.owner_iam_member? "entity@example.com" #=> false
+          #
+          def owner_iam_member? identity
+            lookup_access_role_scope_value :owner, :iam_member, identity
+          end
+
           ##
           # Checks owner access for a domain.
           #
@@ -942,12 +1197,22 @@ module Google
             @rules << Google::Apis::BigqueryV2::Dataset::Access.new(opts)
           end
 
+          # @private
+          def add_access_routine routine
+            value = routine.routine_ref
+            # Remove existing routine rule, if any
+            @rules.reject!(&find_by_scope_and_resource_ref(:routine, value))
+            # Add new rule for this role, scope, and value
+            opts = { routine: 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))
+            @rules.reject!(&find_by_scope_and_resource_ref(:view, value))
             # Add new rule for this role, scope, and value
             opts = { view: value }
             @rules << Google::Apis::BigqueryV2::Dataset::Access.new(opts)
@@ -965,12 +1230,18 @@ module Google
             )
           end
 
+          # @private
+          def remove_access_routine routine
+            # Remove existing routine rule, if any
+            @rules.reject!(&find_by_scope_and_resource_ref(:routine, routine.routine_ref))
+          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))
+            @rules.reject!(&find_by_scope_and_resource_ref(:view, value))
           end
 
           # @private
@@ -983,12 +1254,18 @@ module Google
             !(!@rules.detect(&find_by_role_and_scope_and_value(role, scope, value)))
           end
 
+          # @private
+          def lookup_access_routine routine
+            # Detect routine rule, if any
+            !(!@rules.detect(&find_by_scope_and_resource_ref(:routine, routine.routine_ref)))
+          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)))
+            !(!@rules.detect(&find_by_scope_and_resource_ref(:view, value)))
           end
 
           # @private
@@ -1007,11 +1284,11 @@ module Google
             end
           end
 
-          # @private
-          def find_view value
+          # @private Compare hash representations to find table_ref, routine_ref.
+          def find_by_scope_and_resource_ref scope, value
             lambda do |a|
               h = a.to_h
-              h[:view].to_h == value.to_h
+              h[scope].to_h == value.to_h
             end
           end
         end