Fix several errors.

Author: mrstegeman

gateway_addon/action.py

@@ -49,14 +49,9 @@ def as_dict(self):
 
         Returns a dictionary describing the action.
         """
-        return {
-            'id': self.id,
-            'name': self.name,
-            'input': self.input,
-            'status': self.status,
-            'timeRequested': self.time_requested,
-            'timeCompleted': self.time_completed,
-        }
+        d = self.as_action_description()
+        d['id'] = self.id
+        return d
 
     def start(self):
         """Start performing the action."""

gateway_addon/device.py

@@ -75,11 +75,13 @@ def as_thing(self):
             '@context': self._context,
             '@type': self._type,
             'properties': self.get_property_descriptions(),
+            'actions': self.actions,
+            'events': self.events,
             'links': self.links,
             'baseHref': self.base_href,
             'pin': {
                 'required': self.pin_required,
-                'pattern': self.pin_regex,
+                'pattern': self.pin_pattern,
             },
             'credentialsRequired': self.credentials_required,
         }

gateway_addon/event.py

@@ -41,8 +41,4 @@ def as_dict(self):
 
         Returns a dictionary describing the event.
         """
-        return {
-            'name': self.name,
-            'data': self.data,
-            'timestamp': self.timestamp,
-        }
+        return self.as_event_description()