Get exp report creation actually working.

docs/examples/expenses/expenses-20140901.csv

@@ -1,3 +1,3 @@
 "Date","Vendor","Type","Quantity","Price","Memo"
 "2014-08-26","United Airlines","Travel",1,425.00,"Airfaire, IAD <-> SFO"
-"2014-08-27","Yellow Cab","Travel",32.00,"Taxi to IAD"
+"2014-08-27","Yellow Cab","Travel",1,32.00,"Taxi to IAD"

docs/examples/expenses/expenses/__init__.py

@@ -1,16 +1,17 @@
 # package
 import os
 
-from gcloud import dataset
-from gcloud.dataset.key import Key
-from gcloud.dataset.query import Query
+from gcloud import datastore
+from gcloud.datastore.key import Key
+from gcloud.datastore.entity import Entity
+from gcloud.datastore.query import Query
 
 def get_dataset():
     client_email = os.environ['EXPENSES_CLIENT_EMAIL']
     private_key_path = os.environ['EXPENSES_PRIVATE_KEY_PATH']
     dataset_id = os.environ['EXPENSES_DATASET_ID']
-    conn = dataset.get_connection(client_email, private_key_path)
-    return conn.dataset_id(dataset_id)
+    conn = datastore.get_connection(client_email, private_key_path)
+    return conn.dataset(dataset_id)
 
 def get_employee(dataset, employee_id):
     key = Key(dataset, path=[{'kind': 'Employee', 'name': employee_id}])
@@ -36,15 +37,16 @@ def upsert_report(employee_id, report_id, rows):
     with dataset.transaction():
         employee = get_employee(dataset, employee_id)
         report = get_report(dataset, employee_id, report_id)
-        query = Query('Expense Item', dataset.connection())
+        query = Query('Expense Item', dataset)
         # Delete any existing items.
         for existing in query.ancestor(report.key()).fetch():
             existing.delete()
         # Add items based on rows.
+        report_path = report.key().path()
         for i, row in enumerate(rows):
-            path = report.key.path() + [{'kind': 'Expense Item', 'id': i}]
+            path = report_path + [{'kind': 'Expense Item', 'id': i + 1}]
             key = Key(dataset, path=path)
-            item = dataset.entity('Expense Item').key(key)
-            for k, v in rows.items():
+            item = Entity(dataset, 'Expense Item').key(key)
+            for k, v in row.items():
                 item[k] = v
             item.save()

docs/examples/expenses/expenses/scripts/submit_expenses.py

@@ -5,6 +5,9 @@
 import sys
 
 
+from .. import upsert_report
+
+
 class InvalidCommandLine(ValueError):
     pass
 
@@ -67,13 +70,14 @@ def __init__(self, submitter, *args):
         if self.report_id is None:
             fn = os.path.basename(self.filename)
             base, ext = os.path.splitext(fn)
-            self.report_id = "%s/%s" % (self.employee_id, base)
+            self.report_id = base
 
 
 class CreateReport(_Command):
     """Create an expense report from a CSV file.
     """
     def __call__(self):
+        upsert_report(self.employee_id, self.report_id, self.rows)
         self.submitter.blather("Processed %d rows." % len(self.rows))
         self.submitter.blather("Created, report ID: %s" % self.report_id)