kura 0.5.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f06565ca49829ddf17062a4b3bc3a060a38e44c19d1d9f30636cec01aef67c3
-  data.tar.gz: d5a577529bbd9313f3923f91298fa5897af42c8cc50db8a82af13179a3fb129f
+  metadata.gz: 15a436e39cec7d1079d4b83e4deb84ce310c26ddc5798163f950cf3ab353d79b
+  data.tar.gz: 7f96eee9e1f02df06f0535b50dc188c8414f84a0e3f6ca28ab539cffe2f0eb9c
 SHA512:
-  metadata.gz: '08a14f0ec78b5e6635975cc5a9d39b5e85f9a25eca3041c6edd3e0034331284612bb4c4a869d413edee8f599f7b6b07a70d6958be2e82f493f8e7e2cc08a1136'
-  data.tar.gz: e2eb76c7c84f1585bc474b6d7f4f8825b3f6a545de9e110faa5b868818e50ff591b75b80cf47332636d62632d9b9b64d6df01c05559e1fe1e0edb4b33e5cd35b
+  metadata.gz: 3da32573e83e77d4268a5e4982aea642470222db5ee16ee61ea9708b1771784c651f76d68432158ab08fcddfd640d5f14123ba0dd1d23afdefb1e0895f1a61e4
+  data.tar.gz: 7e3f51be7307bcd248ffc4cedf9dfa45b0c37b4f4e490932f81bc0986e1e07e0386242a3f8b86579bb1bd3b44af1c3e1f4c06c8a66bfa369e61f809dba312aa1

data/ChangeLog.md

@@ -1,3 +1,31 @@
+# 0.6.3
+
+## Changes
+
+* Add `convert_numeric_to_float` keyword argument in `list_tabledata` method.
+  If `convert_numeric_to_float: true` is specified, the value from a NUMMERIC column will be converted to Float.
+  The default value for `convert_numeric_to_float` is true.
+
+# 0.6.2
+
+## Enhancements
+
+* Support ruby 3.0.
+* Support range partitioning and time partitioning parameter for load job configuration.
+
+# 0.6.1
+
+## Enhancements
+
+* `job` method now accept `fields` keyword argument.
+
+# 0.6.0
+
+## Changes
+
+* Replace runtime dependency "google-api-client.gem" -> "google-apis-bigquery_v2".
+  See https://github.com/groovenauts/gcs-ruby/pull/2://github.com/googleapis/google-api-ruby-client/blob/master/google-api-client/OVERVIEW.md for more details.
+
 # 0.5.0
 
 ## Changes

data/kura.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_runtime_dependency "google-api-client", [">= 0.28.6", "!= 0.29.1"]
+  spec.add_runtime_dependency "google-apis-bigquery_v2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/kura/client.rb

@@ -220,7 +220,7 @@ module Kura
         view: view,
         external_data_configuration: external_data_configuration)
       if time_partitioning
-        table.time_partitioning = Google::Apis::BigqueryV2::TimePartitioning.new(time_partitioning)
+        table.time_partitioning = Google::Apis::BigqueryV2::TimePartitioning.new(**time_partitioning)
       end
       @api.insert_table(project_id, dataset_id, table, &blk)
     rescue
@@ -247,7 +247,7 @@ module Kura
       process_error($!)
     end
 
-    def _convert_tabledata_field(x, field_info)
+    def _convert_tabledata_field(x, field_info, convert_numeric_to_float: true)
       if x.nil? and (field_info["mode"] == "NULLABLE" or field_info["mode"].nil?) # The tables created by New BigQuery Console could have schema without mode...
         return nil
       end
@@ -272,35 +272,41 @@ module Kura
       when "TIMESTAMP"
         Time.at(Float(x)).utc.iso8601(6)
       when "RECORD"
-        _convert_tabledata_row(x, field_info["fields"])
+        _convert_tabledata_row(x, field_info["fields"], convert_numeric_to_float: convert_numeric_to_float)
+      when "NUMERIC"
+        if convert_numeric_to_float
+          Float(x)
+        else
+          x
+        end
       else
         x
       end
     end
 
-    def _convert_tabledata_row(row, schema)
+    def _convert_tabledata_row(row, schema, convert_numeric_to_float: true)
       (row.respond_to?(:f) ? row.f : row["f"]).zip(schema).each_with_object({}) do |(v, s), tbl|
         v = JSON.parse(v.to_json)
         if s["mode"] == "REPEATED"
-          tbl[s["name"]] = v["v"].map{|c| _convert_tabledata_field(c["v"], s) }
+          tbl[s["name"]] = v["v"].map{|c| _convert_tabledata_field(c["v"], s, convert_numeric_to_float: convert_numeric_to_float) }
         else
-          tbl[s["name"]] = _convert_tabledata_field(v["v"], s)
+          tbl[s["name"]] = _convert_tabledata_field(v["v"], s, convert_numeric_to_float: convert_numeric_to_float)
         end
       end
     end
 
-    def format_tabledata(r, schema)
+    def format_tabledata(r, schema, convert_numeric_to_float: true)
       {
         total_rows: r.total_rows.to_i,
         next_token: r.page_token,
         rows: (r.rows || []).map do |row|
-          _convert_tabledata_row(row, schema)
+          _convert_tabledata_row(row, schema, convert_numeric_to_float: convert_numeric_to_float)
         end
       }
     end
     private :format_tabledata
 
-    def list_tabledata(dataset_id, table_id, project_id: @default_project_id, start_index: 0, max_result: 100, page_token: nil, schema: nil, &blk)
+    def list_tabledata(dataset_id, table_id, project_id: @default_project_id, start_index: 0, max_result: 100, page_token: nil, schema: nil, convert_numeric_to_float: true, &blk)
       if schema.nil?
         _t = table(dataset_id, table_id, project_id: project_id)
         if _t
@@ -314,13 +320,13 @@ module Kura
       if blk
         @api.list_table_data(project_id, dataset_id, table_id, max_results: max_result, start_index: start_index, page_token: page_token) do |r, err|
           if r
-            r = format_tabledata(r, schema)
+            r = format_tabledata(r, schema, convert_numeric_to_float: convert_numeric_to_float)
           end
           blk.call(r, err)
         end
       else
         r = @api.list_table_data(project_id, dataset_id, table_id, max_results: max_result, start_index: start_index, page_token: page_token)
-        format_tabledata(r, schema)
+        format_tabledata(r, schema, convert_numeric_to_float: convert_numeric_to_float)
       end
     rescue
       process_error($!)
@@ -494,6 +500,8 @@ module Kura
              quote: '"', skip_leading_rows: 0,
              source_format: "CSV",
              autodetect: false,
+             range_partitioning: nil,
+             time_partitioning: nil,
              project_id: @default_project_id,
              job_project_id: @default_project_id,
              job_id: nil,
@@ -502,6 +510,14 @@ module Kura
              &blk)
       write_disposition = mode_to_write_disposition(mode)
       source_uris = [source_uris] if source_uris.is_a?(String)
+      case range_partitioning
+      when Hash
+        range_partitioning = Google::Apis::BigqueryV2::RangePartitioning.new(**range_partitioning)
+      end
+      case time_partitioning
+      when Hash
+        time_partitioning = Google::Apis::BigqueryV2::TimePartitioning.new(**time_partitioning)
+      end
       configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
         load: Google::Apis::BigqueryV2::JobConfigurationLoad.new(
           destination_table: Google::Apis::BigqueryV2::TableReference.new(
@@ -514,6 +530,8 @@ module Kura
           max_bad_records: max_bad_records,
           ignore_unknown_values: normalize_parameter(ignore_unknown_values),
           source_format: source_format,
+          range_partitioning: range_partitioning,
+          time_partitioning: time_partitioning,
         )
       )
       if dry_run
@@ -626,14 +644,14 @@ module Kura
         state_filter: state_filter)
     end
 
-    def job(job_id, location: nil, project_id: @default_project_id, &blk)
+    def job(job_id, location: nil, project_id: @default_project_id, fields: nil, &blk)
       if blk
-        @api.get_job(project_id, job_id, location: location) do |j, e|
+        @api.get_job(project_id, job_id, location: location, fields: fields) do |j, e|
           j.kura_api = self if j
           blk.call(j, e)
         end
       else
-        @api.get_job(project_id, job_id, location: location).tap{|j| j.kura_api = self if j }
+        @api.get_job(project_id, job_id, location: location, fields: fields).tap{|j| j.kura_api = self if j }
       end
     rescue
       process_error($!)

data/lib/kura/version.rb

@@ -1,3 +1,3 @@
 module Kura
-  VERSION = "0.5.0"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kura
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Chikanaga Tomoyuki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-bigquery_v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.6
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.6
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Interface to BigQuery API v2.