bring together development with master

CREDITS.txt

@@ -1,13 +1,11 @@
-// JayData 1.0.4
+// JayData-RESO 1.0.0
 // Dual licensed under MIT and GPL v2
-// Copyright JayStack Technologies (http://jaydata.org/licensing)
+// Copyright JayStack Technologies (http://jaydata.org/licensing) and National Association of REALTORS
 //
 // JayData is a standards-based, cross-platform Javascript library and a set of
 // practices to access and manipulate data from various online and offline sources.
 //
 // Credits:
-//     Hajnalka Battancs, D�niel J�zsef, J�nos Roden, L�szl� Horv�th, P�ter Nochta
-//     P�ter Zentai, R�bert B�nay, Szabolcs Czinege, Viktor Borza, Viktor L�z�r,
-//     Zolt�n Gyebrovszki, G�bor Dolla
+//     Original Jaydata development Team, Mark Lesswing
 //
-// More info: http://jaydata.org
+// More info: http://jaydata.org and http://crt.blogs.realtor.org

JayDataModules/angular.js

@@ -44,6 +44,40 @@ angular.module('jaydata', ['ng', ['$provide', function ($provide) {
             return Object.prototype.hasOwnProperty.apply(this, arguments);
         }
 
+        $data.Queryable.prototype.toLiveArrayEx = function (options, resultHolder) {
+            if (Array.isArray(options)) {
+                resultHolder = options;
+                otions = undefined;
+            }
+            resultHolder = resultHolder || [];
+            options = options || {};
+            var self = this, scope = options.scope || $rootScope;
+
+            function thunk(newDefer) {
+                self.toArray()
+                    .then(function (items) {
+                        resultHolder.length = 0;
+                        items.forEach(function (item) {
+                            resultHolder.push(item);
+                        })
+                        newDefer.resolve(resultHolder);
+                    })
+                    .fail(newDefer.reject)
+                    .then(function () {
+                        scope.$apply();
+                    });
+            }
+
+            function refresh() {
+                var defer = $.Deferred(thunk);
+                defer.promise(resultHolder);
+                return resultHolder;
+            }
+            resultHolder.refresh = refresh;
+
+            return refresh();
+        }
+
         $data.Queryable.prototype.toLiveArray = function (cb) {
             var _this = this;
 

JayDataModules/kendo.js

@@ -7,6 +7,10 @@
             kendo.data.Model.fn.init.call(this, data);
         }
     });
+    $data.kendo.attachMode = true;
+    if ($data.EntityAttachMode) {
+        $data.kendo.attachMode = $data.EntityAttachMode.KeepChanges;
+    }
 
     var kendoTypeMap = {
         "$data.Blob": "string",
@@ -91,11 +95,9 @@
                 //}
             }
 
-            //console.dir(memberDefinitions.getPublicMappedMethods());
             var modelDefinition = {
                 fields: fields,
                 init: function (data) {
-                    //console.dir(arguments);
                     var ctxType = options && options.owningContextType || undefined;
 
                     var contextSetTypes = [];
@@ -514,7 +516,6 @@
 
                     $data.Trace.log(promises);
                     jQuery.when.apply(this, promises).then(function (items, total) {
-                        console.dir(arguments);
                         //var result = items.map(function (item) { return item instanceof $data.Entity ? new model(item.initData) : item; });
                         var result = items.map(function (item) {
                             var d = (item instanceof $data.Entity) ? item.initData : item;
@@ -555,7 +556,6 @@
                         });
                     }
                     else {
-                        console.dir(ctx.storeToken);
                         model[0]
 						.innerInstance()
 						.save(ctx.storeToken)
@@ -577,7 +577,7 @@
                             return item.innerInstance()
                         });
                         items.forEach(function (item) {
-                            ctx.attach(item, true);
+                            ctx.attach(item, $data.kendo.attachMode);
                         });
                         ctx.saveChanges().then(function () {
                             options.success();
@@ -588,7 +588,7 @@
                         });
                     }
                     else {
-                        model[0].innerInstance().save().then(function (item) {
+                        model[0].innerInstance().save(undefined, undefined, $data.kendo.attachMode).then(function (item) {
                             options.success();
                         }).fail(function () {
                             //alert("error in update")
@@ -677,9 +677,9 @@
         ds = ds || {};
         //unless user explicitly opts out server side logic
         //we just force it.
-        ds.serverPaging = ds.serverPaging || true;
-        ds.serverFiltering = ds.serverFiltering || true;
-        ds.serverSorting = ds.serverSorting || true;
+        ds.serverPaging = ds.serverPaging === undefined ? true : ds.serverPaging;
+        ds.serverFiltering = ds.serverFiltering === undefined ? true : ds.serverFiltering;
+        ds.serverSorting = ds.serverSorting === undefined ? true : ds.serverSorting;
         ds.pageSize = ds.pageSize === undefined ? $data.kendo.defaultPageSize : ds.pageSize;
 
         var TransportClass = self.asKendoRemoteTransportClass(model);
@@ -708,4 +708,4 @@
         refresh: function () {
         }
     });
-})($data);
+})($data);

JayService/JSObjectAdapter.js

@@ -57,6 +57,10 @@ $data.Class.define("$data.JSObjectAdapter", null, null, {
                 var methodArgs = self.resolveArguments(req, serviceInstance, memberInfo);
 
                 if (memberInfo.method instanceof Array ? memberInfo.method.indexOf(req.method) >= 0 : memberInfo.method === req.method){
+
+                    req.reso.memberName = memberName;
+                    req.reso.namespace = "System";
+
                     oDataBuilderCfg = {
 	                    version: 'V2',
 	                    baseUrl: req.fullRoute,
@@ -78,6 +82,9 @@ $data.Class.define("$data.JSObjectAdapter", null, null, {
                 if (member) {
                     var esProc = new $data.JayService.OData.EntitySetProcessor(memberName, serviceInstance, { top: serviceInstance.storageProvider.providerConfiguration.responseLimit || $data.JayService.OData.Defaults.defaultResponseLimit });
 
+                    req.reso.memberName = memberName;
+                    req.reso.namespace = member.elementType.namespace;
+
                     oDataBuilderCfg = {
 	                    version: 'V2',
 	                    baseUrl: req.fullRoute,
@@ -344,6 +351,9 @@ $data.Class.define("$data.JSObjectAdapter", null, null, {
                     defer.resolve(new $data.EmptyServiceResult(404));
                 }
             } else {
+
+                request.reso.resultSize = 1;
+
                 defer.resolve(result);
             }
 

JayService/JayService.js

@@ -74,7 +74,7 @@ $data.Class.define("$data.JayService", null, null, {
                 if (req.connection.encrypted || req.headers['X-Forwarded-Protocol'] === 'https' || req.headers['x-forwarded-protocol'] === 'https')
                     schema += 's';
 
-                req.fullRoute = (req.baseRoute || (schema + '://' + req.headers.host)) + app.route;
+                req.fullRoute = (req.baseRoute || (schema + '://' + req.headers.host)) + (app.route || req.baseUrl || req.originalUrl.replace(req.url, '')); 
             }
         }
     },

JayService/OData/BatchProcessor.js

@@ -179,7 +179,11 @@
                     this._discoverNavigations(changeRequest, referenceData, itemType);
                     var entity = new itemType(changeRequest.data, { converters: $data.oDataConverter.fromDb });
                     referenceData[refId].resultObject = entity;
-                    setInfo.set.add(entity);
+
+                    request.reso.memberName = setInfo.set.name;
+                    request.reso.namespace = itemType.namespace;
+                    setInfo.set.add(entity, request);
+
                     break;
                 case 'MERGE':
                 case 'PATCH':
@@ -188,6 +192,10 @@
                     var entity = new itemType(changeRequest.data, { converters: $data.oDataConverter.fromDb });
                     referenceData[refId].resultObject = entity;
 
+                    request.reso.memberName = setInfo.set.name;
+                    request.reso.namespace = itemType.namespace;
+                    setInfo.set.attach(entity, false, request);
+
                     setInfo.set.attach(entity);
                     entity.changedProperties = entity.getType().memberDefinitions.getPublicMappedProperties().filter(function(p){
                             if (entity[p.name] === undefined) return false;
@@ -199,7 +207,11 @@
                 case 'DELETE':
                     var entity = new itemType(setInfo.idObj);
                     referenceData[refId].resultObject = entity;
-                    setInfo.set.remove(entity);
+
+                    request.reso.memberName = setInfo.set.name;
+                    request.reso.namespace = itemType.namespace;
+                    setInfo.set.remove(entity, request);
+
                     break;
                 default:
                     break;

JayService/OData/EntitySetProcessor.js

@@ -53,13 +53,15 @@
                                     var parsed = $data.JayService.OData.Utils.parseUrlPart(uri, this.context);
                                     var entity = new parsed.set.createNew(parsed.idObj);
                                     bodyData[i] = entity;
-                                    parsed.set.attach(entity);
+                                    parsed.set.attach(entity, false, req);
                                 }
                             }
                         }
 
                         var entity = new this.entitySet.createNew(bodyData, { converters: $data.oDataConverter.fromDb });
-                        this.entitySet.add(entity);
+
+                        this.entitySet.add(entity, req);
+
                         this.context.saveChanges({
                             success: function () {
                                 res.statusCode = 201;
@@ -98,13 +100,13 @@
                                     var parsed = $data.JayService.OData.Utils.parseUrlPart(uri, this.context);
                                     var entity = new parsed.set.createNew(parsed.idObj);
                                     bodyData[i] = entity;
-                                    parsed.set.attach(entity);
+                                    parsed.set.attach(entity, false, req);
                                 }
                             }
                         }
 
                         var entity = new this.entitySet.createNew(bodyData, { converters: $data.oDataConverter.fromDb });
-                        this.entitySet.attach(entity);
+                        this.entitySet.attach(entity, false, req);
                         entity.changedProperties = entity.getType().memberDefinitions.getPublicMappedProperties().filter(function(p){
                             if (entity[p.name] === undefined) return false;
                             if (p.computed) return false;
@@ -127,7 +129,9 @@
                         self.BatchDeleteFromEntitySet(req, config, cbWrapper);
                     } else {
                         if (this.member.idObject) {
-                            this.entitySet.remove(this.member.idObject);
+
+                            this.entitySet.remove(this.member.idObject, req);
+
                             this.context.saveChanges({
                                 success: function () {
                                 //return with no content
@@ -191,6 +195,9 @@
         config.includes = result.includes;
         this.context.executeQuery(new $data.Queryable(this.entitySet, result.expression), {
             success: function (contextResult) {
+
+                req.reso.resultSize = contextResult.length;
+
                 if (self.member.valueRequeset) {
                     // request pattern: /EntitySet(key)/Field/$value
                     self.prepareSimpleResponse(contextResult, self.member.selectedField, self.entitySet, callback);

JaySvcUtil/JaySvcUtil.js

@@ -612,7 +612,8 @@ $data.Class.define('$data.MetadataLoaderClass', null, null, {
             "http://schemas.microsoft.com/ado/2008/09/edm": "V2",
             "http://schemas.microsoft.com/ado/2009/11/edm": "V3",
             "http://schemas.microsoft.com/ado/2007/05/edm": "V11",
-            "http://schemas.microsoft.com/ado/2009/08/edm": "V22"
+            "http://schemas.microsoft.com/ado/2009/08/edm": "V22",
+            "http://docs.oasis-open.org/odata/ns/edm": "V4"
         }
     },
     _maxDataServiceVersions: {
@@ -621,7 +622,8 @@ $data.Class.define('$data.MetadataLoaderClass', null, null, {
             "http://schemas.microsoft.com/ado/2008/09/edm": "2.0",
             "http://schemas.microsoft.com/ado/2009/11/edm": "3.0",
             "http://schemas.microsoft.com/ado/2007/05/edm": "2.0",
-            "http://schemas.microsoft.com/ado/2009/08/edm": "2.0"
+            "http://schemas.microsoft.com/ado/2009/08/edm": "2.0",
+            "http://docs.oasis-open.org/odata/ns/edm": "4.0"
         }
     },
     _supportedODataVersionXSLT: {
@@ -1109,6 +1111,7 @@ $data.Class.define('$data.MetadataLoaderClass', null, null, {
             "    <xsl:variable name=\"memberDefinition\">\r\n" +
             "      <xsl:if test=\"parent::edm:EntityType/edm:Key/edm:PropertyRef[@Name = current()/@Name]\"><attribute name=\"key\">true</attribute></xsl:if>\r\n" +
             "      <xsl:apply-templates select=\"@*[local-name() != 'Name']\" mode=\"render-field\" />\r\n" +
+            "      <xsl:if test=\"local-name() = 'NavigationProperty' and current()[not(@Partner) and current()/@Type]\"><attribute name=\"inverseProperty\">'$$unbound'</attribute></xsl:if>\r\n" +
             "    </xsl:variable>'<xsl:value-of select=\"@Name\"/>': { <xsl:choose><xsl:when test=\"function-available('msxsl:node-set')\"><xsl:for-each select=\"msxsl:node-set($memberDefinition)/*\">'<xsl:if test=\"@extended = 'true'\">$</xsl:if><xsl:value-of select=\"@name\"/>':<xsl:value-of select=\".\"/>\r\n" +
             "      <xsl:if test=\"position() != last()\">,<xsl:text> </xsl:text>\r\n" +
             "    </xsl:if> </xsl:for-each></xsl:when>\r\n" +
@@ -1121,6 +1124,10 @@ $data.Class.define('$data.MetadataLoaderClass', null, null, {
             "  <xsl:template match=\"@Name\" mode=\"render-field\">\r\n" +
             "  </xsl:template>\r\n" +
             "\r\n" +
+            "  <xsl:template match=\"@Partner\" mode=\"render-field\">\r\n" +
+            "    <attribute name=\"inverseProperty\">'<xsl:value-of select=\".\"/>'</attribute>\r\n" +
+            "  </xsl:template>\r\n" +
+            "\r\n" +
             "  <xsl:template match=\"@Type\" mode=\"render-field\">\r\n" +
             "    <xsl:choose>\r\n" +
             "      <xsl:when test=\"starts-with(., 'Collection')\">\r\n" +

MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 JayStack Technologies LLC. http://jaydata.org/licensing
+Copyright (c) 2014 National Association of REALTORS. http://crt.blogs.realtor.org
 
 
 Permission is hereby granted, free of charge, to any person obtaining