Changeset 6523 for sandbox/2.4.1-3/prototype/api/datalayer.js

Timestamp:

06/15/12 14:49:24 (12 years ago)

Author:

acoutinho

Message:

Ticket #2766 - Melhorias e correcoes na api rest, criacao de novo cliente

File:

• sandbox/2.4.1-3/prototype/api/datalayer.js (modified) (10 diffs)

sandbox/2.4.1-3/prototype/api/datalayer.js

@@ -1 @@
-   internalUrl = /^([A-z0-9-_]+)(:[A-z0-9-_]+)?$/;
+
+(function($){$.parseQuery=function(options){var config={query:window.location.search||""},params={};if(typeof options==='string'){options={query:options};}
+$.extend(config,$.parseQuery,options);config.query=config.query.replace(/^\?/,'');$.each(config.query.split(config.separator),function(i,param){var pair=param.split('='),key=config.decode(pair.shift(),null).toString(),value=config.decode(pair.length?pair.join('='):null,key);if(config.array_keys(key)){params[key]=params[key]||[];params[key].push(value);}else{params[key]=value;}});return params;};$.parseQuery.decode=$.parseQuery.default_decode=function(string){return decodeURIComponent((string||"").replace('+',' '));};$.parseQuery.array_keys=function(){return false;};$.parseQuery.separator="&";}(jQuery));
+
+internalUrl = /^([A-z0-9-_]+)(:[A-z0-9-_]+)?$/;
 internalUri = /^([a-zA-Z0-9-_]+)\(([a-zA-Z0-9-_]+)\):\/\/(.*)|([a-zA-Z0-9-_]+):\/\/(.*)$/;
 isGeneratedId = /^\d+\(javascript\)$/;
@@ -57 +61 @@
 
           jqXHR.abort();
+          
+          if( typeof options.data === "string" )
+              options.data = $.parseQuery( options.data );
 
           switch( options.type.toUpperCase() )
@@ -195 +202 @@
     
     send: function( url, type, data, callback, sync, extraOptions ){
-
+      
           var result = false, fired = false;
       
@@ -213 +220 @@
 
                 },
-              'error': function( dt, textStatus, jqXHR ){
-
-                    if( callback )
-                    {
-                        fired = true;
-                        result = callback( $.parseJSON(dt.responseText), textStatus, jqXHR );
-                    }
-                    else
-                        result = $.parseJSON(dt.responseText);
-
-                },
               'complete': function( jqXHR, textStatus ){
 
@@ -243 +239 @@
 
           $.ajax( envelope );
+      
           return( result );
-    },
-    
-    /**
-    * This method is used to read resources from the server.
-    * 
-    * @param uri Uri of the resource that gonna be readed.
-    * @param callback A function that is called when the resource is loaded successfully. When the parameter is ignored the request is made synchrounsly.
-    * @param accept The attribute accept that is used to ask the target format to the server
-    * @return The target resource when the callback is ommitted ( made it synchronous )
-    */
-
-    read: function( uri, data, callback, accept ){
-        //return this.send( this.dispatchPath + 'rest' + uri, [ 'get', accept || 'json' ], false, callback );
-        //http://expressodev.prognus.com.br/cristiano/expresso-api/rest/maillast
-        //return this.send( ('rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback, 
-console.log(this.dispatchPath+'../rest'+uri);
-        return this.send( (this.dispatchPath + '../rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback, 
-        {'beforeSend' : function (xhr){ 
-            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
-        });
-      
-    },
-
-    /**
-    * This method is used to create resources from the server.
-    * 
-    * @param uri Uri of the resource that gonna be readed.
-    * @param callback A function that is called when the resource is created on the server successfully. When the parameter is ignored the request is made synchrounsly.
-    * @param accept The attribute accept that is used to ask the target format to the server.
-    * @return The result response of the create from the server when the callback is ommitted ( made it synchronous )
-    */
-    
-    create: function( uri, data, callback, accept ){
-        //return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
-        return this.send( (this.dispatchPath + '../rest' + uri), [ 'post', accept || 'json' ], data, callback, !!!callback, 
-        {'beforeSend' : function (xhr){ 
-                //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
-                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
-        });      
-    },
-
-    /**
-    * This method is used to update resources from the server.
-    * 
-    * @param uri Uri of the resource that gonna be readed.
-    * @param callback A function that is called when the resource is update on the server successfully. When the parameter is ignored the request is made synchrounsly.
-    * @param accept The attribute accept that is used to ask the target format to the server
-    * @return The result response of the update from the server when the callback is ommitted ( made it synchronous )
-    */
-
-    update: function( uri, data, callback, accept ){
-      
-        //return this.send( 'rest' + uri, [ 'put', accept || 'json' ], data, callback, !!!callback, 
-        return this.send( (this.dispatchPath + '../rest' + uri), [ 'put', accept || 'json' ], data, callback, !!!callback, 
-        {'beforeSend' : function (xhr){ 
-            //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
-                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
-        });
-      
-    },
-
-    /**
-    * This method is used to delete resources from the server.
-    * 
-    * @param uri Uri of the resource that gonna be readed.
-    * @param callback A function that is called when the resource is deleted successfully in the server. When the parameter is ignored the request is made synchrounsly.
-    * @param accept The attribute accept that is used to ask the target format to the server
-    * @return The result response of the delete from the server when the callback is ommitted ( made it synchronous )
-    */
-
-    delete: function( uri, callback, accept ){
-        //return this.send( 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback, 
-        return this.send( (this.dispatchPath + '../rest' + uri), [ 'delete', accept || 'json' ], false, callback, !!!callback, 
-        {'beforeSend' : function (xhr){ 
-            //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
-                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
-        });
-      
     },
     
@@ -646 +565 @@
     },
     
+    /*
+     * RemoveFilter = método para remoção de objetos por critério, funcionalidade não implementada no método remove
+     * TODO - A remoção é feira em tempo real, onde ainda o mesmo não suporta remoção apenas na camada do cliente
+     * caso necessária tao funcionalidade a mesma será implementada no futuro
+     **/
+    removeFilter: function( concept, filter, oneSide ){
+        //remover
+        oneSide = true;
+
+        if(filter)
+            filter = this.criteria(concept, filter);
+        else
+            return;
+        
+        if ( $.type(filter) === "array" )
+            filter = { filter: filter, criteria: false };
+
+        var toRemove = {};
+
+        toRemove[concept] = [];
+        
+        toRemove[concept][toRemove[concept].length] = {filter: filter.filter, criteria: filter.criteria, method: 'delete'};
+
+        this.dispatch( 'call', toRemove, false, true );
+
+        this.broadcast( concept, oneSide ? 'server' : bothSides ? 'serverclient' : 'client', false );
+    },
+    
     report: function( concept, id, data )
     {      
@@ -684 +631 @@
     
     rollback: function( concept, ids ){
-      
-        var queue = this.prepareQ( 'current', concept, ids );
-
-        ids = [];
-
-        for( var id in queue )
-        {
-             this.put( concept, id, queue[id], false );
-
-             ids[ ids.length ] = id;
+    if(!DataLayer.storage.cache[':diff'])
+                return false;
+        if(concept){
+                if(ids){
+                        ids = !$.isArray(ids) ? [ids] : ids;
+                        for (var i in ids)
+                                delete DataLayer.storage.cache[':diff'][concept][ids[i]];
+                }else
+                        delete DataLayer.storage.cache[':diff'][concept];
+        }else{
+
+                var queue = this.prepareQ( 'current', concept, ids );
+
+                ids = [];
+
+                for( var id in queue )
+                {
+                         this.put( concept, id, queue[id], false );
+
+                         ids[ ids.length ] = id;
+                }
+
+                for(var link in ids)
+                        delete DataLayer.storage.cache[':diff'][ids[link]];
+
         }
-
-        this.clearQ( concept, ( ids.length ? ids : false ) );
-
-        this.broadcast( concept, 'revert' );
-      
     },
     
@@ -1443 +1400 @@
           properties: criteria.properties || ''
 
-      } );
+      }, false, true );
     },
 
@@ -2127 +2084 @@
 
         if( !this.dispatchPath )
-            this.dispatchPath = "prototype/";
+            this.dispatchPath = "../../";
 
         if( !this.templatePath )
@@ -2142 +2099 @@
 
         this.start();
-        this.me = this.dispatch( "me" );
     }
 }