Merge branch 'master' into master

Author: layoutanalysis

.gitignore

@@ -1 +1,3 @@
 node_modules
+package-lock.json
+.DS_Store

index.js

@@ -1,39 +1,37 @@
-'use strict';
-
-var q = require('q');
-var isCss = require('is-css');
-var isPresent = require('is-present');
-var isBlank = require('is-blank');
-var isUrl = require('is-url-superb');
-var request = require('requestretry');
-var cheerio = require('cheerio');
-var normalizeUrl = require('normalize-url');
-var stripHtmlComments = require('strip-html-comments');
-var stripWaybackToolbar = require('strip-wayback-toolbar')
-var resolveCssImportUrls = require('resolve-css-import-urls');
-var ua = require('ua-string');
-
-var getLinkContents = require('./utils/get-link-contents');
-var createLink = require('./utils/create-link');
+var q = require("q");
+var isCss = require("is-css");
+var isPresent = require("is-present");
+var isBlank = require("is-blank");
+var isUrl = require("is-url-superb");
+var request = require("requestretry");
+var cheerio = require("cheerio");
+var normalizeUrl = require("normalize-url");
+var stripHtmlComments = require("strip-html-comments");
+var stripWaybackToolbar = require("strip-wayback-toolbar")
+var resolveCssImportUrls = require("resolve-css-import-urls");
+var ua = require("ua-string");
+
+var getLinkContents = require("./utils/get-link-contents");
+var createLink = require("./utils/create-link");
 
 module.exports = function(url, options){
   var deferred = q.defer();
   var options = options || {};
   options.headers = options.headers || {};
-  options.headers['User-Agent'] = options.headers['User-Agent'] || ua;
+  options.headers["User-Agent"] = options.headers["User-Agent"] || ua;
   options.timeout = options.timeout || 5000;
   options.stripWayback = options.stripWayback || false;
   options.gzip = true;
 
-  if (typeof url !== 'string' || isBlank(url) || !isUrl(url)) {
-    throw new TypeError('get-css expected a url as a string')
+  if (typeof url !== "string" || isBlank(url) || !isUrl(url)) {
+    throw new TypeError("get-css expected a url as a string");
   }
 
   url = normalizeUrl(url, { stripWWW: false });
   options.url = url;
 
   if (options.ignoreCerts) {
-    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
   }
 
   var status = {
@@ -44,7 +42,7 @@ module.exports = function(url, options){
   var result = {
     links: [],
     styles: [],
-    css: ''
+    css: ""
   };
 
   function handleResolve() {
@@ -58,19 +56,19 @@ module.exports = function(url, options){
       html = stripWaybackToolbar(html);
     }
     var $ = cheerio.load(html);
-    result.pageTitle = $('head > title').text();
+    result.pageTitle = $("head > title").text();
     result.html = html;
 
-    $('[rel=stylesheet]').each(function() {
-        var link = $(this).attr('href');
-        if(isPresent(link)) {
+    $("[rel=stylesheet]").each(function() {
+        var link = $(this).attr("href");
+        if (isPresent(link)) {
             result.links.push(createLink(link, url));
-        }else{
+        } else{
             result.styles.push(stripHtmlComments($(this).text()));
         }
     });
 
-    $('style').each(function() {
+    $("style").each(function() {
       result.styles.push(stripHtmlComments($(this).text()));
     });
 
@@ -129,27 +127,36 @@ module.exports = function(url, options){
     });
   }
 
-  request(options, function(error, response, body) {
-    if (error) {
-      if (options.verbose) console.log('Error from ' + url + ' ' + error);
-      deferred.reject(error);
-      return;
-    }
-
-    if (response && response.statusCode != 200) {
-      if (options.verbose) console.log('Received a ' + response.statusCode + ' from: ' + url);
-      deferred.reject({ url: url, statusCode: response.code });
-      return;
-    }
-
+  function handleBody(body) {
     if (isCss(url)) {
       var link = createLink(url, url);
       result.links.push(link);
       handleCssFromLink(link, body);
     } else {
       parseHtml(body);
     }
-  });
+  }
+
+  if (html) {
+    handleBody(html);
+  } else {
+    request(options, function(error, response, body) {
+      if (error) {
+        if (options.verbose) console.log("Error from " + url + " " + error);
+        deferred.reject(error);
+        return;
+      }
+
+      if (response && response.statusCode != 200) {
+        if (options.verbose)
+          console.log("Received a " + response.statusCode + " from: " + url);
+        deferred.reject({ url: url, statusCode: response.code });
+        return;
+      }
+
+      handleBody(body);
+    });
+  }
 
   return deferred.promise;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "get-css",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Get CSS from a URL",
   "main": "index.js",
   "scripts": {

test/results.json

@@ -0,0 +1,13 @@
+var assert = require("assert");
+var getCss = require("../../");
+
+var css = "h1 { color: tomato; }";
+var html = "<style>" + css + "</style><h1>Hello, world!</h1>";
+
+describe("html", function() {
+  it("should correctly extract css from raw html", function() {
+    getCss("http://example.com/", null, html).then(function(response) {
+      asset.deepEqual(css, response.css);
+    });
+  });
+});