fixed a bug causing to fail rekuiring coffee files without extensions…

… specified
nadav-dav · Aug 9, 2013 · 759d492 · 759d492
1 parent a16fe11
commit 759d492
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -49,16 +49,14 @@ function getModule(requirement){
     var modulePath = null;
     var error = "";
 
-    var requirementJs = hasKnownExtension( requirement ) ? requirement : requirement+".js";
-
     if (ambiguousFileNames[requirement] !== undefined){
         throw new Error('Ambiguity Error: There are more then one files that is named '+requirement);
     }
 
-    if ( filesInProject[requirementJs] !== undefined){
+    if ( filesInProject[requirement] !== undefined){
         // User typed in a relative path
-        retModule =  parentReq(filesInProject[requirementJs]);
-        modulePath = filesInProject[requirementJs];
+        retModule =  parentReq(filesInProject[requirement]);
+        modulePath = filesInProject[requirement];
     }else{
         // User typed in a module name
         modulePath =  path.normalize(calleePath+"/"+requirement);
@@ -84,8 +82,3 @@ function getModule(requirement){
     }
     return { module: retModule, path: modulePath};
 }
-
-function hasKnownExtension( requirement ){
-    return requirement.toLowerCase().match( new RegExp( extensions.join( "|" ) + "$" ) );
-}
-
diff --git a/test/rekuire.spec.js b/test/rekuire.spec.js
@@ -55,6 +55,14 @@ describe("Testing 'rekuire'",function(){
             expect(imported).toEqual({"someKey":"someValue"});
         });
 
+        it("should retrieve it according to the file name (*.coffee)",function(){
+            var rek = require('rekuire');
+            var withExt = rek('cup.coffee');
+            var withoutExt = rek('cup');
+            expect(withExt ).toEqual("cup of coffee")
+            expect(withExt ).toEqual(withoutExt );
+        });
+
         it("should get module by name even if extension not present",function(){
             var rek = require('rekuire');
             var jsModule = rek('someModule');

diff --git a/test/testResources/nestedPackage/cup.coffee b/test/testResources/nestedPackage/cup.coffee
@@ -0,0 +1 @@
+module.exports = "cup of coffee"