Changeset 6230

Timestamp:

05/18/12 11:12:43 (11 years ago)

Author:

acoutinho

Message:

Ticket #2758 - Implementacao dos recursos de contatos dinamicos no modelo de rest

Location:

sandbox/2.4-expresso-api/prototype

Files:

• api/datalayer.js (modified) (4 diffs)
• config/PostgreSQL.srv (modified) (1 diff)
• config/Tonic.srv (modified) (1 diff)
• config/dynamicContact.ini (added)
• library/oauth2/lib/OAuth2.php (modified) (1 diff)
• library/tonic/lib/tonic.php (modified) (3 diffs)
• rest/calendar/CalendarLastResource.php (modified) (1 diff)
• rest/contact (added)
• rest/contact/ContactGeralResource.php (added)
• rest/contact/DynamicContactDeleteResource.php (added)
• rest/contact/DynamicContactResource.php (added)
• rest/contact/DynamicContactsResource.php (added)
• rest/dispatch.php (modified) (1 diff)
• rest/hypermedia (added)
• rest/hypermedia/collection.php (added)
• rest/hypermedia/data.php (added)
• rest/hypermedia/error.php (added)
• rest/hypermedia/hypermedia.php (added)
• rest/hypermedia/item.php (added)
• rest/hypermedia/link.php (added)
• rest/hypermedia/query.php (added)
• rest/hypermedia/template.php (added)
• tests/rest/contact (added)
• tests/rest/contact/DynamicContactResourceTest.php (added)
• tests/rest/contact/DynamicContactsResourceTest.php (added)

sandbox/2.4-expresso-api/prototype/api/datalayer.js

@@ -198 +198 @@
                     else
                         result = dt;
+
+                },
+              'error': function( dt, textStatus, jqXHR ){
+
+                    if( callback )
+                    {
+                        fired = true;
+                        result = callback( $.parseJSON(dt.responseText), textStatus, jqXHR );
+                    }
+                    else
+                        result = $.parseJSON(dt.responseText);
 
                 },
@@ -254 +265 @@
     create: function( uri, data, callback, accept ){
       
-        return this.send( this.dispatchPath + 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
+        return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
             xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
@@ -272 +283 @@
     update: function( uri, data, callback, accept ){
       
-        return this.send( this.dispatchPath + 'rest' + uri, [ 'put', accept || 'json' ], data, callback, !!!callback, 
+        return this.send( 'rest' + uri, [ 'put', accept || 'json' ], data, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
             xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
@@ -290 +301 @@
     "delete": function( uri, callback, accept ){
       
-        return this.send( this.dispatchPath + 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback, 
+        return this.send( 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
             xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 

sandbox/2.4-expresso-api/prototype/config/PostgreSQL.srv

@@ -3 +3 @@
 [config]
 port = 5432
-dbname= expresso24cristianoAPI
+dbname= expressoApiCoutinho
 user=postgres
 host = /tmp

sandbox/2.4-expresso-api/prototype/config/Tonic.srv

@@ -9 +9 @@
 NewsLastResource = /news/NewsLastResource.php
 
+[/dynamiccontacts]
+DynamicContactsResource = /contact/DynamicContactsResource.php
+
+[/oi]
+DynamicContactDeleteResource = /contact/DynamicContactDeleteResource.php
+
+[/dynamiccontacts/:id]
+DynamicContactResource = /contact/DynamicContactResource.php
+
 [/token]
 TokenResource = /oauth/TokenResource.php

sandbox/2.4-expresso-api/prototype/library/oauth2/lib/OAuth2.php

@@ -459 +459 @@
                 session_write_close(); //Fecha session anterior
                 session_id($token['refresh_token']); //Define o id da session o mesmo do resfresh token
-                session_start();
-                
+                @session_start();
+                
+                /* TODO - Verificar melhor solução para verificação de tratamento para sessions já startadas
+                if(!isset($_SESSION))
+                    session_start();
+                */
                 return $token;
         }

sandbox/2.4-expresso-api/prototype/library/tonic/lib/tonic.php

@@ -126 +126 @@
     
     /**
+     * Body data of incoming request
+     * @var array
+     */
+    public $dataDecoded;
+    
+    /**
      * Array of if-match etags
      * @var str[]
@@ -298 +304 @@
         $this->method = strtoupper($this->getConfig($config, 'method', 'REQUEST_METHOD', $this->method));
         
-        // get HTTP request data
-        $this->data = $this->getConfig($config, 'data', NULL, file_get_contents("php://input"));
-        
+        // get HTTP request data
+        $this->data = $this->getConfig($config, 'data', NULL, file_get_contents("php://input"));
+
+        // get HTTP request dataDecode into array
+        $this->dataDecoded  = $this->__decodeData( $this->data );
+        
         // conditional requests
         if ($config['ifMatch']) {
@@ -415 +424 @@
     
     }
-    
+
+     /**
+     * Convert the string data into a array data
+     * @return array
+     * @codeCoverageIgnore
+     */
+    function __decodeData($data) {
+        $arrayData = array();
+        if($data){
+            $arrayIndex = explode('&', $data);
+            foreach($arrayIndex as $key => $value){
+                list($i,$val) = explode ('=', $value);
+                $arrayData[$i] = $val;
+            }
+        }
+        return $arrayData;
+    }
+
     /**
      * Convert the object into a string suitable for printing

sandbox/2.4-expresso-api/prototype/rest/calendar/CalendarLastResource.php

@@ -16 +16 @@
     function GET($request){
         $this->secured();
-        
+
         $calendar = Controller::find( array( 'concept' => 'calendarSignature' ), array('calendar'), array( 'filter' => array( '=', 'user',  Config::me("uidNumber") ) ) );
 

sandbox/2.4-expresso-api/prototype/rest/dispatch.php

@@ -37 +37 @@
 // handle request, passing the current env baseUri and autoload mapping;
 $request = new Request(array(
-        'baseUri'=> '/cristiano/expresso-api/rest',
+        'baseUri'=> '/acoutinho/expressoAPI/rest',
         'autoload' => $autoload,
 ));