kura 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463e89c9692059ccb299e8eafd2ada9c12e41add
-  data.tar.gz: ce52cba62de2859367b0f47bb550a1bdbf3ae842
+  metadata.gz: d9aa09afac8e59350c4f5fb2ea7e348c877a84d9
+  data.tar.gz: 8f89772e36d77680832ce10e6a2d261dbfb8dc94
 SHA512:
-  metadata.gz: 0ac3e9c63ac16d69b6a49e76389b3d376f9ada68f8e07d9b74b8c0b5c7631f2ab65cc0349556950bc82c1334f26a631961977a3d559507e27a1443d80070cb00
-  data.tar.gz: 9009830f5ebae2cda5cca6ef02070e295fed8f781192e45b8fc348b9185672b7db749244941c0b6648f20d6cc1978bd7e76fcc76fac679152eaf0e4a799d2a1e
+  metadata.gz: de549701afd6b948b7e524148386ecc1e327ddfb6a7cb54078d5879ac6e6656939d207c6eaa33c86cbaf29ddbda7c911b004b6ef4da535bab0f92b39b5a50180
+  data.tar.gz: 472330c158606f51a0af6bf7d2930c75862735f171ed6bd8165f8ea38283b1d411008a6dc492b515d958b2ec4b2bf14e8353a1a65d5253fe22bcb6bc162a538b

data/ChangeLog.md

@@ -1,3 +1,9 @@
+# 0.2.25
+
+## Enhancements
+
+* `Kura::Client#list_tabledata` now support REPEATED/RECORD field and convert data into appropriate type of object.
+
 # 0.2.24
 
 ## Enhancements

data/lib/kura/client.rb

@@ -229,18 +229,43 @@ module Kura
       process_error($!)
     end
 
-    def format_tabledata(r, field_names)
+    def _convert_tabledata_field(x, field_info)
+      if x.nil? and field_info["mode"] == "NULLABLE"
+        return nil
+      end
+      case field_info["type"]
+      when "STRING"
+        x.to_s
+      when "INTEGER"
+        Integer(x)
+      when "FLOAT"
+        Float(x)
+      when "BOOLEAN"
+        x.to_s == "true"
+      when "RECORD"
+        _convert_tabledata_row(x, field_info["fields"])
+      else
+        x
+      end
+    end
+
+    def _convert_tabledata_row(row, schema)
+      (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) }
+        else
+          tbl[s["name"]] = _convert_tabledata_field(v["v"], s)
+        end
+      end
+    end
+
+    def format_tabledata(r, schema)
       {
         total_rows: r.total_rows.to_i,
         next_token: r.page_token,
         rows: (r.rows || []).map do |row|
-          row.f.zip(field_names).each_with_object({}) do |(v, fn), tbl|
-            if v.v.is_a?(Array)
-              tbl[fn] = v.v.map{|c| c["v"] }
-            else
-              tbl[fn] = v.v
-            end
-          end
+          _convert_tabledata_row(row, schema)
         end
       }
     end
@@ -248,18 +273,18 @@ module Kura
 
     def list_tabledata(dataset_id, table_id, project_id: @default_project_id, start_index: 0, max_result: 100, page_token: nil, schema: nil, &blk)
       schema ||= table(dataset_id, table_id, project_id: project_id).schema.fields
-      field_names = schema.map{|f| f.respond_to?(:[]) ? (f["name"] || f[:name]) : f.name }
+      schema = schema.map{|s| JSON.parse(s.to_json) }
 
       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, field_names)
+            r = format_tabledata(r, schema)
           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, field_names)
+        format_tabledata(r, schema)
       end
     rescue
       process_error($!)

data/lib/kura/version.rb

@@ -1,3 +1,3 @@
 module Kura
-  VERSION = "0.2.24"
+  VERSION = "0.2.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kura
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Chikanaga Tomoyuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client