Fix bug preventing import of files with dots in their name

Closes #11

Author: eppsilon

.eslintrc

@@ -152,4 +152,3 @@ rules:
     - always
     - propertyName: false
       singleValue: false
-

index.js

@@ -42,7 +42,7 @@ var importOnce = function importOnce(data, done) {
  * they leave off the partial prefix and the suffix.
  * This code creates the possible extensions, whether it is a partial
  * and whether it is a directory index file having those
- * same possible variations. If the import contains an extension,
+ * same possible variations. If the import contains a valid extension,
  * then it is left alone.
  *
 **/
@@ -51,6 +51,8 @@ var getFileNames = function getFileNames(abstractName) {
       directory,
       basename;
 
+  // If the name has a Sass extension, treat it as a path to a real file, and as a fallback
+  // look for the same file with a prefix.
   if ([ '.scss', '.sass' ].indexOf(path.extname(abstractName)) !== -1) {
     directory = path.dirname(abstractName);
     basename = path.basename(abstractName);
@@ -59,9 +61,11 @@ var getFileNames = function getFileNames(abstractName) {
       names.push(path.join(directory, prefix + basename));
     });
   }
-  else if (path.extname(abstractName)) {
+  // If the name has a different valid extension, treat it as a path to a real file.
+  else if ([ '.css', '.json', '.yaml' ].indexOf(path.extname(abstractName)) !== -1) {
     names.push(abstractName);
   }
+  // Otherwise, the name is abstract and all variants should be searched.
   else {
     directory = path.dirname(abstractName);
     basename = path.basename(abstractName);
@@ -308,7 +312,7 @@ var importer = function importer(uri, prev, done) {
     file = path.resolve(path.dirname(prev), makeFsPath(uri));
     raf(uri, file, function (err, data) {
       if (err) {
-        console.log(err.toString());
+        console.log(err.toString()); // eslint-disable-line no-console
         done({});
       }
       else {
@@ -319,7 +323,7 @@ var importer = function importer(uri, prev, done) {
   else {
     raf(uri, process.cwd(), function (err, data) {
       if (err) {
-        console.log(err.toString());
+        console.log(err.toString()); // eslint-disable-line no-console
         done({});
       }
       else {

test/css/import-with-dot.css

@@ -0,0 +1,2 @@
+.some-class-in-dotted-file {
+  color: blue; }

tests/css/imported-scss.css test/css/imported-scss.csstests/css/imported-scss.css renamed to test/css/imported-scss.css

@@ -38,28 +38,28 @@ describe('import-once', function () {
     });
   });
 
-  it.only('should resolve import with Sass extensions', function(done) {
+  it('should resolve import with Sass extensions', function(done) {
     var file = filePath('import-scss.scss'),
         expectedIncludes = [
           file,
           filePath('foo/_index.scss')
         ];
 
-        sass.render({
-          'file': file,
-          'importer': importer
-        }, function (err, result) {
-          if (err) {
-            throw err;
-          }
-          should.exist(result);
-          result.stats.includedFiles.should.eql(expectedIncludes);
-          String(result.css).should.equal(
-            fs.readFileSync(path.join(__dirname, 'css/imported-scss.css'), 'utf8')
-          );
-          done();
-        });
-  })
+    sass.render({
+      'file': file,
+      'importer': importer
+    }, function (err, result) {
+      if (err) {
+        throw err;
+      }
+      should.exist(result);
+      result.stats.includedFiles.should.eql(expectedIncludes);
+      String(result.css).should.equal(
+        fs.readFileSync(path.join(__dirname, 'css/imported-scss.css'), 'utf8')
+      );
+      done();
+    });
+  });
 
   it('should import `index` files from a folder', function (done) {
     var file = filePath('import-index.scss'),
@@ -290,4 +290,27 @@ describe('import-once', function () {
       done();
     });
   });
+
+  it('should import a file with dots in its name', function(done) {
+    var file = filePath('import-with-dot.scss'),
+        expectedIncludes = [
+          file,
+          filePath('file.with.dot.scss')
+        ];
+
+    sass.render({
+      'file': file,
+      'importer': importer
+    }, function(err, result) {
+      if (err) {
+        throw err;
+      }
+      should.exist(result);
+      result.stats.includedFiles.should.eql(expectedIncludes);
+      String(result.css).should.equal(
+        fs.readFileSync(path.join(__dirname, 'css/import-with-dot.css'), 'utf8')
+      );
+      done();
+    });
+  });
 });

test/main.js

@@ -0,0 +1,3 @@
+.some-class-in-dotted-file {
+  color: blue;
+}

test/sass/file.with.dot.scss

@@ -0,0 +1 @@
+@import "file.with.dot";