Changeset 303 for Dev/branches/rest-dojo-ui/server

Timestamp:

03/04/12 15:48:42 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Server] Refactored model classes with some meta-programming. Specific classes only define their fields and inherit from class RdfObject?. Changes to handle the new model objects correctly.
[Client] Added rft/store module for uniform resource access. Removed dependencies on 'uid' field name. Added support for references without loading full object nor exposing uri.
[Client] Added reset() to QuestionWidget?.
[RDFAPI] Fixed PHP warning.

Location:

Dev/branches/rest-dojo-ui/server

Files:

• api.php (modified) (4 diffs)
• classes/Auth.php (modified) (3 diffs)
• classes/Marshaller.php (modified) (6 diffs)
• classes/Model.php (added)
• classes/master.php (modified) (1 diff)
• rdfapi/syntax/RdfSerializer.php (modified) (1 diff)

Dev/branches/rest-dojo-ui/server/api.php

@@ -4 +4 @@
 ini_set('display_errors', True);
 
+define("RDFAPI_INCLUDE_DIR", "rdfapi/");
 require_once 'tonic/lib/tonic.php';
+require_once 'classes/Model.php';
 require_once 'classes/master.php';
 
@@ -13 +15 @@
 
 function set_session_cookie($response, $user) {
-    $response->addHeader('Set-Cookie', 'rft_uid=' . $user->uid . '; Max-Age: 3600; Path=' . $response->request->baseUri);
+    $response->addHeader('Set-Cookie', 'rft_uid=' . $user->getUid() . '; Max-Age: 3600; Path=' . $response->request->baseUri);
 }
 
@@ -87 +89 @@
 class DataResource extends Resource {
 
-    function getTypeAndUid($request) {
+    private function getTypeAndUid($request) {
         $uri = get_clean_uri($request);
         $path = explode('/', $uri);
@@ -155 +157 @@
             $object->$key = $val;
         }
-        if (isset($object->creator)) {
-            $object->creator = $user;
-        }
-        if (!$object->save()) {
-            throw new ResponseException("Save failed", Response::INTERNALSERVERERROR);
-        }
+        $object->save();
 
         $response->body = $object;

Dev/branches/rest-dojo-ui/server/classes/Auth.php

@@ -7 +7 @@
     public static function register($email, $password) {
         $user_results = User::get(array("email" => $email));
-        if ( !empty($user_results) ) {
+        if (!empty($user_results)) {
             throw new Exception("User with email $email already exists.");
         }
         $salt = rand();
-        $user = new User(null,$email,sha1($password.$salt),$salt);
+        $user = new User(null, array(
+                    'email' => $email,
+                    'passwordHash' => sha1($password . $salt),
+                    'passwordSalt' => $salt));
         $user->save();
         return $user;
     }
-    
+
     public static function login($email, $password) {
         $user_results = User::get(array("email" => $email));
@@ -22 +25 @@
         }
         $user = $user_results[0];
-        if (sha1($password.$user->passwordSalt) != $user->passwordHash) {
+        if (sha1($password . $user->passwordSalt) != $user->passwordHash) {
             throw new Exception("Wrong password.");
         }
@@ -35 +38 @@
         return $user_results[0];
     }
-    
+
 }
 

Dev/branches/rest-dojo-ui/server/classes/Marshaller.php

@@ -4 +4 @@
 
     const OBJ_TYPE = '__objectType';
+    const OBJ_UID = '__objectUid';
+    const REF_TYPE = '__referenceType';
+    const REF_UID = '__referenceUid';
 
     private static function isWrappedObject($obj) {
@@ -9 +12 @@
     }
 
+    private static function isWrappedReference($obj) {
+        return isset($obj[self::REF_TYPE]);
+    }
+
     public static function marshall($obj) {
         switch (gettype($obj)) {
             case 'array':
-                return array_map(array('Marshaller','marshall'), $obj);
+                return array_map(array('Marshaller', 'marshall'), $obj);
             case 'object':
                 return static::wrapObject($obj);
@@ -24 +31 @@
         if ($objectType == 'DateTime') {
             return array(self::OBJ_TYPE => 'DateTime', 'timestamp' => $obj->getTimestamp());
+        } else if ($obj instanceof RdfObject) {
+            $array = array(
+                self::OBJ_TYPE => $obj->getType(),
+                self::OBJ_UID => $obj->getUid()
+            );
+            foreach ($obj as $prop => $val) {
+                $array[$prop] = static::marshall($val);
+            }
+            return $array;
+        } else if ($obj instanceof RdfPointer) {
+            return array(
+                self::REF_TYPE => $obj->getType(),
+                self::REF_UID => $obj->getUid()
+            );
         } else {
-            $newObj = static::marshall((array) $obj);
-            $newObj[self::OBJ_TYPE] = get_class($obj);
-            return $newObj;
+            return static::marshall((array) $obj);
         }
     }
@@ -38 +57 @@
                 if (static::isWrappedObject($obj)) {
                     return static::unwrapObject($obj);
+                } else if (static::isWrappedReference($obj)) {
+                    return static::unwrapReference($obj);
                 } else {
-                    return array_map(array('Marshaller','unmarshall'), $obj);
+                    return array_map(array('Marshaller', 'unmarshall'), $obj);
                 }
             default:
@@ -47 +68 @@
 
     private static function unwrapObject($obj) {
-        $objectType = $obj[self::OBJ_TYPE];
-        unset($obj[self::OBJ_TYPE]);
+        if (isset($obj[self::OBJ_TYPE])) {
+            $objectType = $obj[self::OBJ_TYPE];
+            unset($obj[self::OBJ_TYPE]);
+        }
+        if (isset($obj[self::OBJ_UID])) {
+            $objectUid = $obj[self::OBJ_UID];
+            unset($obj[self::OBJ_UID]);
+        }
         if ($objectType == 'DateTime') {
             $date = new DateTime();
             $date->setTimestamp($obj['timestamp']);
             return $date;
-        } else if (is_subclass_of($objectType, 'ResearchToolObjectInterface')) {
-            return $objectType::create((object)static::unmarshall($obj));
+        } else if (is_subclass_of($objectType, 'RdfObject')) {
+            $rdfObject = new $objectType($objectUid);
+            foreach ($obj as $prop => $val) {
+                $rdfObject->$prop = static::unmarshall($val);
+            }
+            return $rdfObject;
         } else {
             return $obj;
@@ -60 +91 @@
     }
 
+    private static function unwrapReference($ref) {
+        $refType = $ref[self::REF_TYPE];
+        $refUid = $ref[self::REF_UID];
+        return new RdfPointer(RdfObject::typeAndUidToResourceUri($refType, $refUid));
+    }
+    
 }
 

Dev/branches/rest-dojo-ui/server/classes/master.php

@@ -8 +8 @@
  * @author fpvanagthoven
  */
-// Determine our absolute document root
-define('DOC_ROOT', realpath(dirname(__FILE__) . '/../'));
 
 function __autoload($class_name) {
         if (file_exists('classes/' . $class_name . '.php'))
-                require 'classes/' . $class_name . '.php';
-        else if (file_exists('classes/models/' . $class_name . '.php'))
-                require 'classes/models/' . $class_name . '.php';
-        else if (file_exists('classes/widgets/' . $class_name . '.php'))
-                require 'classes/widgets/' . $class_name . '.php';
-        else if (file_exists('classes/styles/' . $class_name . '.php'))
-                require 'classes/styles/' . $class_name . '.php';
+                require_once 'classes/' . $class_name . '.php';
 }
 

Dev/branches/rest-dojo-ui/server/rdfapi/syntax/RdfSerializer.php

@@ -196 +196 @@
                 }
                 // check if model is empty
-                if ($model->size() == 0) return "<". $this->rdf_qname_prefix . RDF_RDF ." xmlns:rdf='".RDF_NAMESPACE_URI."' />";
+                if ($model->size() == 0) {
+            $elementStr = "<". $this->rdf_qname_prefix . RDF_RDF ." xmlns:rdf='".RDF_NAMESPACE_URI."' />";
+            return $elementStr;
+        }
 
                 foreach($nsps as $ns => $pre){