Refactor

Author: mrjoelkemp

.travis.yml

@@ -1,6 +1,9 @@
 language: node_js
+
 node_js:
   - "0.10"
 
 notifications:
   email: false
+
+sudo: false

index.js

@@ -12,34 +12,57 @@ module.exports = function(dep, filename, directory) {
   if (!filename) { throw new Error('filename not given'); }
   if (!directory) { throw new Error('directory not given'); }
 
-  var depExt = path.extname(dep);
-  var fileExt = path.extname(filename);
-  var filepath;
+  var filepath = getDependencyPath(dep, filename, directory);
+  var ext = getDependencyExtension(dep, filename);
+
+  return filepath + ext;
+}
 
+/**
+ * @param  {String}  dep
+ * @return {Boolean}
+ */
+function isRelative(dep) {
+  return dep.indexOf('..') === 0 || dep.indexOf('.') === 0;
+}
+
+/**
+ * @param  {String} dep
+ * @param  {String} filename
+ * @param  {String} directory
+ * @return {String} Absolute path for the dependency
+ */
+function getDependencyPath(dep, filename, directory) {
   if (isRelative(dep)) {
-    filepath = path.resolve(path.dirname(filename), dep);
-  } else {
-    filepath = path.resolve(directory, dep);
+    return path.resolve(path.dirname(filename), dep);
   }
 
+  return path.resolve(directory, dep);
+}
+
+/**
+ * @param  {String} dep
+ * @param  {String} filename
+ * @return {String} The determined extension for the dependency (or empty if already supplied)
+ */
+function getDependencyExtension(dep, filename) {
+  var depExt = path.extname(dep);
+  var fileExt = path.extname(filename);
+
   if (!depExt) {
-    filepath += fileExt;
-  } else {
-    // If a dependency starts with a period AND it doesn't already end
-    // in .js AND doesn't use a custom plugin, add .js back to path.
-    if (fileExt === '.js' && depExt !== '.js' && dep.indexOf('!') < 0) {
-      filepath += fileExt;
-    } else {
-      // If using a SystemJS style plugin
-      if (depExt.indexOf('!') > -1) {
-        filepath += depExt.substring(0, depExt.indexOf('!'));
-      }
-    }
+    return fileExt;
   }
 
-  return filepath;
-}
+  // If a dependency starts with a period AND it doesn't already end
+  // in .js AND doesn't use a custom plugin, add .js back to path
+  if (fileExt === '.js' && depExt !== '.js' && dep.indexOf('!') < 0) {
+    return fileExt;
+  }
 
-function isRelative(dep) {
-  return dep.indexOf('..') === 0 || dep.indexOf('.') === 0;
+  // If using a SystemJS style plugin
+  if (depExt.indexOf('!') > -1) {
+    return depExt.substring(0, depExt.indexOf('!'));
+  }
+
+  return '';
 }