archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Phil Gates-Idem 2014-07-17 00:22:28 -04:00
parent 9ceded3078
commit f45d89b18c
4 changed files with 95 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.jshintrc
View File

@ -36,6 +36,5 @@
"unused": "vars",
"strict": false,
/* Relaxing options: */
"eqnull": true
}

53
taglibs/caching/cached-fragment-tag.js
View File

@ -1,29 +1,35 @@
'use strict';
var promiseUtil = require('raptor-promises/util');
var FRAGMENT_CACHE_CONFIG = {
store: 'memory'
};
var raptorCache;
module.exports = {
render: function (input, context) {
var attributes = context.attributes;
var cacheProvider = attributes.cacheProvider;
var cache;
if (raptorCache === undefined) {
try {
raptorCache = require('raptor-cache');
}
catch(e) {
throw new Error('The "raptor-cache" module should be installed as an application-level dependency when using caching tags');
}
}
var cacheKey = input.cacheKey;
if (!cacheKey) {
throw new Error('cache-key is required for <cached-fragment>');
}
if (!cacheProvider) {
var raptorCacheModulePath;
try {
raptorCacheModulePath = require.resolve('raptor-cache');
}
catch(e) {
throw new Error('The "raptor-cache" module should be installed as an application-level dependency when using caching tags');
}
cacheProvider = require(raptorCacheModulePath).getDefaultProvider();
}
cache = cacheProvider.getCache(input.cacheName);
var cachePromise = cache.get(
cacheKey,
// use the default cache manager
var cacheManager = raptorCache.getDefaultCacheManager(context);
var cache = cacheManager.getCache(input.cacheName, FRAGMENT_CACHE_CONFIG);
var asyncContext = context.beginAsync();
cache.get(cacheKey,
{
builder: function() {
var result = context.captureString(function () {
@ -33,17 +39,12 @@ module.exports = {
});
return result;
}
});
}, function(err, result) {
if (err) {
return asyncContext.error(err);
}
var asyncContext = context.beginAsync();
promiseUtil.immediateThen(
cachePromise,
function (result) {
asyncContext.end(result);
},
function (e) {
asyncContext.error(e);
});
}
};

1
test/.jshintrc
View File

@ -47,6 +47,5 @@
"latedef": true,
"unused": "vars",
/* Relaxing options: */
"eqnull": true
}

3
test/render-rhtml-tests.js
View File

@ -158,7 +158,7 @@ describe('raptor-templates/rhtml' , function() {
testRender("test-project/rhtml-templates/looping-props.rhtml", {}, done);
});
it.only("should allow for looping over ranges", function(done) {
it("should allow for looping over ranges", function(done) {
testRender("test-project/rhtml-templates/looping-range.rhtml", {}, done);
});
@ -394,4 +394,3 @@ describe('raptor-templates/rhtml' , function() {
});
});