Replace remaining instances of 'type' property with 'category'

Author: remi Taylor

datastore/index.yaml

@@ -48,7 +48,7 @@ indexes:
 - kind: Task
   ancestor: no
   properties:
-  - name: type
+  - name: category
     direction: asc
   - name: priority
     direction: asc
@@ -58,5 +58,5 @@ indexes:
   properties:
   - name: percent_complete
     direction: asc
-  - name: type
+  - name: category
     direction: asc

datastore/sample.rb

@@ -66,7 +66,7 @@ def entity_with_parent
   task_key = datastore.key [["TaskList", "default"], ["Task", "sampleTask"]]
 
   task = datastore.entity task_key do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 4
     t["description"] = "Learn Cloud Datastore"
@@ -82,7 +82,7 @@ def properties
 
   # [START properties]
   task = datastore.entity "Task" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["created"] = Time.now
     t["done"] = false
     t["priority"] = 4
@@ -113,7 +113,7 @@ def basic_entity
 
   # [START basic_entity]
   task = datastore.entity "Task" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 4
     t["description"] = "Learn Cloud Datastore"
@@ -129,7 +129,7 @@ def upsert
 
   # [START upsert]
   task = datastore.entity "Task", "sampleTask" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 4
     t["description"] = "Learn Cloud Datastore"
@@ -146,7 +146,7 @@ def insert
 
   # [START insert]
   task = datastore.entity "Task" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 4
     t["description"] = "Learn Cloud Datastore"
@@ -174,7 +174,7 @@ def update
   datastore = gcloud.datastore
 
   task = datastore.entity "Task", "sampleTask" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 4
     t["description"] = "Learn Cloud Datastore"
@@ -208,14 +208,14 @@ def batch_upsert
 
   # [START batch_upsert]
   task1 = datastore.entity "Task" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 4
     t["description"] = "Learn Cloud Datastore"
   end
 
   task2 = datastore.entity "Task" do |t|
-    t["type"] = "Personal"
+    t["category"] = "Personal"
     t["done"] = false
     t["priority"] = 5
     t["description"] = "Integrate Cloud Datastore"
@@ -397,9 +397,9 @@ def distinct_query
 
   # [START distinct_query]
   query = datastore.query("Task").
-          select("type", "priority").
-          distinct_on("type", "priority").
-          order("type").
+          select("category", "priority").
+          distinct_on("category", "priority").
+          order("category").
           order("priority")
   # [END distinct_query]
 end
@@ -410,9 +410,9 @@ def distinct_on_query
 
   # [START distinct_on_query]
   query = datastore.query("Task").
-          select("type", "priority").
-          distinct_on("type").
-          order("type").
+          select("category", "priority").
+          distinct_on("category").
+          order("category").
           order("priority")
   # [END distinct_on_query]
 end
@@ -604,7 +604,7 @@ def transactional_get_or_create task_key
     task = tx.find task_key
     if task.nil?
       task = datastore.entity task_key do |t|
-        t["type"] = "Personal"
+        t["category"] = "Personal"
         t["done"] = false
         t["priority"] = 4
         t["description"] = "Learn Cloud Datastore"

datastore/spec/sample_spec.rb

@@ -45,7 +45,7 @@
 
   def create_task task_key
     task = datastore.entity task_key do |t|
-      t["type"] = "Personal"
+      t["category"] = "Personal"
       t["created"] = Time.utc(1999, 12, 31)
       t["done"] = false
       t["priority"] = 4
@@ -175,7 +175,7 @@ def delete_accounts
 
     expect(task.persisted?).to be(true)
     expect(task.properties.to_h.size).to eq(4)
-    expect(task["type"]).to eq("Personal")
+    expect(task["category"]).to eq("Personal")
     expect(task["done"]).to be(false)
     expect(task["priority"]).to eq(5)
     expect(task["description"]).to eq("Learn Cloud Datastore")
@@ -307,7 +307,7 @@ def delete_accounts
 
     expect(tasks.empty?).to be(false)
     expect(tasks.first.key.kind).to eq("Task")
-    expect(tasks.first["type"]).to eq("Personal")
+    expect(tasks.first["category"]).to eq("Personal")
     expect(tasks.first["priority"]).to eq(4)
     expect(tasks.first.properties.to_h.size).to eq(2)
   end
@@ -318,7 +318,7 @@ def delete_accounts
 
     expect(tasks.empty?).to be(false)
     expect(tasks.first.key.kind).to eq("Task")
-    expect(tasks.first["type"]).to eq("Personal")
+    expect(tasks.first["category"]).to eq("Personal")
     expect(tasks.first["priority"]).to eq(4)
     expect(tasks.first.properties.to_h.size).to eq(2)
   end
@@ -506,16 +506,16 @@ def delete_accounts
     representations = property_by_kind_run_query
 
     expect(representations.empty?).to be(false)
-    expect(representations.first.first).to eq("created")
-    expect(representations.first.last).to eq(["INT64"])
+    expect(representations["created"]).to eq(["INT64"])
+    expect(representations["category"]).to eq(["STRING"])
   end
 
   it "supports property_filtering_run_query" do
     properties_by_kind = property_filtering_run_query
 
     expect(properties_by_kind.empty?).to be(false)
-    expect(properties_by_kind.first.first).to eq("Task")
-    expect(properties_by_kind.first.last).to eq(["priority", "tag", "type"])
+    expect(properties_by_kind["Task"]).to include "priority"
+    expect(properties_by_kind["Task"]).to include "tag"
   end
 
   it "supports gql_run_query" do
@@ -559,11 +559,8 @@ def delete_accounts
   end
 
   def expect_basic_task task
-    puts "expect_basic_task"
-    puts task
-    puts task.inspect
     expect(task.key.kind).to eq("Task")
-    expect(task["type"]).to eq("Personal")
+    expect(task["category"]).to eq("Personal")
     expect(task["done"]).to be(false)
   end
 end