Build 0.41.0

RusticiSoftware · Nov 25, 2015 · 9a3d88c · 9a3d88c
1 parent 2065520
commit 9a3d88c
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tincan",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "homepage": "http://rusticisoftware.github.com/TinCanJS/",
   "authors": [
     "Brian J. Miller <brian.miller@rusticisoftware.com>"

diff --git a/build/tincan-min.js b/build/tincan-min.js
diff --git a/build/tincan-min.map b/build/tincan-min.map
diff --git a/build/tincan-node.js b/build/tincan-node.js
@@ -1,4 +1,4 @@
-"0.40.0";
+"0.41.0";
 /*
 CryptoJS v3.0.2
 code.google.com/p/crypto-js
@@ -2984,6 +2984,83 @@ TinCan client library
             return this.sendRequest(requestCfg);
         },
 
+        /**
+        Retrieve an activity, when used from a browser sends to the endpoint using the RESTful interface.
+
+        @method retrieveActivity
+        @param {String} activityId id of the Activity to retrieve
+        @param {Object} cfg Configuration options
+            @param {Function} [cfg.callback] Callback to execute on completion
+            @param {Object} [cfg.requestHeaders] Optional object containing additional headers to add to request
+        @return {Object} Value retrieved
+        */
+        retrieveActivity: function (activityId, cfg) {
+            this.log("retrieveActivity");
+            var requestCfg = {},
+                requestResult,
+                callbackWrapper,
+                requestHeaders;
+
+            requestHeaders = cfg.requestHeaders || {};
+
+            requestCfg = {
+                url: "activities",
+                method: "GET",
+                params: {
+                    activityId: activityId
+                },
+                ignore404: true,
+                headers: requestHeaders
+            };
+
+            if (typeof cfg.callback !== "undefined") {
+                callbackWrapper = function (err, xhr) {
+                    var result = xhr;
+
+                    if (err === null) {
+                        //
+                        // a 404 really shouldn't happen because the LRS can dynamically
+                        // build the response based on what has been passed to it, but
+                        // don't have the client fail in the condition that it does, because
+                        // we can do the same thing
+                        //
+                        if (xhr.status === 404) {
+                            result = new TinCan.Activity(
+                                {
+                                    id: activityId
+                                }
+                            );
+                        }
+                        else {
+                            result = TinCan.Activity.fromJSON(xhr.responseText);
+                        }
+                    }
+
+                    cfg.callback(err, result);
+                };
+                requestCfg.callback = callbackWrapper;
+            }
+
+            requestResult = this.sendRequest(requestCfg);
+            if (! callbackWrapper) {
+                requestResult.activity = null;
+                if (requestResult.err === null) {
+                    if (requestResult.xhr.status === 404) {
+                        requestResult.activity = new TinCan.Activity(
+                            {
+                                id: activityId
+                            }
+                        );
+                    }
+                    else {
+                        requestResult.activity = TinCan.Activity.fromJSON(requestResult.xhr.responseText);
+                    }
+                }
+            }
+
+            return requestResult;
+        },
+
         /**
         Retrieve an activity profile value, when used from a browser sends to the endpoint using the RESTful interface.
 

diff --git a/build/tincan.js b/build/tincan.js
@@ -1,4 +1,4 @@
-"0.40.0";
+"0.41.0";
 /*
 CryptoJS v3.0.2
 code.google.com/p/crypto-js
@@ -2984,6 +2984,83 @@ TinCan client library
             return this.sendRequest(requestCfg);
         },
 
+        /**
+        Retrieve an activity, when used from a browser sends to the endpoint using the RESTful interface.
+
+        @method retrieveActivity
+        @param {String} activityId id of the Activity to retrieve
+        @param {Object} cfg Configuration options
+            @param {Function} [cfg.callback] Callback to execute on completion
+            @param {Object} [cfg.requestHeaders] Optional object containing additional headers to add to request
+        @return {Object} Value retrieved
+        */
+        retrieveActivity: function (activityId, cfg) {
+            this.log("retrieveActivity");
+            var requestCfg = {},
+                requestResult,
+                callbackWrapper,
+                requestHeaders;
+
+            requestHeaders = cfg.requestHeaders || {};
+
+            requestCfg = {
+                url: "activities",
+                method: "GET",
+                params: {
+                    activityId: activityId
+                },
+                ignore404: true,
+                headers: requestHeaders
+            };
+
+            if (typeof cfg.callback !== "undefined") {
+                callbackWrapper = function (err, xhr) {
+                    var result = xhr;
+
+                    if (err === null) {
+                        //
+                        // a 404 really shouldn't happen because the LRS can dynamically
+                        // build the response based on what has been passed to it, but
+                        // don't have the client fail in the condition that it does, because
+                        // we can do the same thing
+                        //
+                        if (xhr.status === 404) {
+                            result = new TinCan.Activity(
+                                {
+                                    id: activityId
+                                }
+                            );
+                        }
+                        else {
+                            result = TinCan.Activity.fromJSON(xhr.responseText);
+                        }
+                    }
+
+                    cfg.callback(err, result);
+                };
+                requestCfg.callback = callbackWrapper;
+            }
+
+            requestResult = this.sendRequest(requestCfg);
+            if (! callbackWrapper) {
+                requestResult.activity = null;
+                if (requestResult.err === null) {
+                    if (requestResult.xhr.status === 404) {
+                        requestResult.activity = new TinCan.Activity(
+                            {
+                                id: activityId
+                            }
+                        );
+                    }
+                    else {
+                        requestResult.activity = TinCan.Activity.fromJSON(requestResult.xhr.responseText);
+                    }
+                }
+            }
+
+            return requestResult;
+        },
+
         /**
         Retrieve an activity profile value, when used from a browser sends to the endpoint using the RESTful interface.
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tincanjs",
   "description": "Tin Can API Library",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "private": false,
   "main": "build/tincan-node.js",
   "directories": {