@tgwf/co2 0.4.7 → 0.7.0

package/src/hosting.test.js

@@ -1,39 +1,49 @@
-'use strict';
+"use strict";
 
-const fs = require('fs');
-const path = require('path');
+const fs = require("fs");
+const path = require("path");
 
-const hosting = require('./hosting');
-const pagexray = require('pagexray');
+const hosting = require("./hosting");
+const pagexray = require("pagexray");
 
-describe('hosting', function () {
+const jsonPath = path.resolve(
+  __dirname,
+  "..",
+  "data",
+  "fixtures",
+  "url2green.test.json"
+);
+
+describe("hosting", function () {
   let har;
   beforeEach(function () {
-    har = JSON.parse(fs
-      .readFileSync(path.resolve(__dirname, '../data/fixtures/tgwf.har'), 'utf8'))
+    har = JSON.parse(
+      fs.readFileSync(
+        path.resolve(__dirname, "../data/fixtures/tgwf.har"),
+        "utf8"
+      )
+    );
   });
-  describe('checking all domains on a page object with #checkPage ', function () {
-    it('it returns a list of green domains, when passed a page object', async function () {
+  describe("checking all domains on a page object with #checkPage ", function () {
+    it("it returns a list of green domains, when passed a page object", async function () {
       const pages = pagexray.convert(har);
       const pageXrayRun = pages[0];
+      const db = await hosting.loadJSON(jsonPath);
+      const greenDomains = await hosting.checkPage(pageXrayRun, db);
 
-      // TODO find a way to not hit the API each time
-      const greenDomains = await hosting.checkPage(pageXrayRun);
-
-      expect(greenDomains)
-        .toHaveLength(10);
-
+      expect(greenDomains).toHaveLength(11);
       const expectedGreendomains = [
-        'thegreenwebfoundation.org',
-        'www.thegreenwebfoundation.org',
-        'fonts.googleapis.com',
-        'ajax.googleapis.com',
-        'assets.digitalclimatestrike.net',
-        'cdnjs.cloudflare.com',
-        'graphite.thegreenwebfoundation.org',
-        'analytics.thegreenwebfoundation.org',
-        'fonts.gstatic.com',
-        'api.thegreenwebfoundation.org'
+        "maxcdn.bootstrapcdn.com",
+        "thegreenwebfoundation.org",
+        "www.thegreenwebfoundation.org",
+        "fonts.googleapis.com",
+        "ajax.googleapis.com",
+        "assets.digitalclimatestrike.net",
+        "cdnjs.cloudflare.com",
+        "graphite.thegreenwebfoundation.org",
+        "analytics.thegreenwebfoundation.org",
+        "fonts.gstatic.com",
+        "api.thegreenwebfoundation.org",
       ];
       greenDomains.forEach(function (dom) {
         expect(expectedGreendomains).toContain(dom);
@@ -43,35 +53,26 @@ describe('hosting', function () {
     //   'it returns an empty list, when passed a page object with no green domains'
     // );
   });
-  describe('checking a single domain with #check', function () {
-    it("tries to use a local database", async function () {
-      const res = await hosting.check("google.com", path.resolve(__dirname, "..", "url2green.test.db"))
-      expect(res).toEqual(true)
-    })
+  describe("checking a single domain with #check", function () {
     it("use the API instead", async function () {
-      const res = await hosting.check("google.com")
-      expect(res).toEqual(true)
-    })
-
-  })
-  describe('implicitly checking multiple domains with #check', function () {
-    it("tries to use a local database if available", async function () {
-      const res = await hosting.check(["google.com", "kochindustries.com"], path.resolve(__dirname, "..", "url2green.test.db"))
-      expect(res).toContain("google.com")
-    })
+      const db = await hosting.loadJSON(jsonPath);
+      const res = await hosting.check("google.com", db);
+      expect(res).toEqual(true);
+    });
+  });
+  describe("implicitly checking multiple domains with #check", function () {
     it("Use the API", async function () {
-      const res = await hosting.check(["google.com", "kochindustries.com"])
-      expect(res).toContain("google.com")
-    })
-  })
-  describe('explicitly checking multiple domains with #checkMulti', function () {
-    it("tries to use a local database if available", async function () {
-      const res = await hosting.check(["google.com", "kochindustries.com"], path.resolve(__dirname, "..", "url2green.test.db"))
-      expect(res).toContain("google.com")
-    })
+      const db = await hosting.loadJSON(jsonPath);
+
+      const res = await hosting.check(["google.com", "kochindustries.com"], db);
+      expect(res).toContain("google.com");
+    });
+  });
+  describe("explicitly checking multiple domains with #checkMulti", function () {
     it("use the API", async function () {
-      const res = await hosting.check(["google.com", "kochindustries.com"])
-      expect(res).toContain("google.com")
-    })
-  })
-});
+      const db = await hosting.loadJSON(jsonPath);
+      const res = await hosting.check(["google.com", "kochindustries.com"], db);
+      expect(res).toContain("google.com");
+    });
+  });
+});

package/src/index.js

@@ -1,7 +1,7 @@
-const co2 = require("./co2")
-const hosting = require("./hosting")
+const co2 = require("./co2");
+const hosting = require("./hosting");
 
 module.exports = {
   co2,
-  hosting
-}
+  hosting,
+};

package/.travis.yml

@@ -1,11 +0,0 @@
-language: node_js
-node_js: 10
-matrix:
-  include:
-    - name: "Test on Linux"
-      dist: bionic
-    - name: "Test on OS X"
-      os: osx
-      osx_image: xcode11.3  
-    - name: "Test on Windows"
-      os: windows

package/src/hostingAPI.test.js

@@ -1,19 +0,0 @@
-'use strict';
-
-const hosting = require('./hostingAPI');
-
-describe('hostingAPI', function () {
-  describe('checking a single domain with #check', function () {
-    it("using the API", async function () {
-      const res = await hosting.check("google.com")
-      expect(res).toEqual(true)
-    })
-
-  })
-  describe('implicitly checking multiple domains with #check', function () {
-    it("using the API", async function () {
-      const res = await hosting.check(["google.com", "kochindustries.com"])
-      expect(res).toContain("google.com")
-    })
-  })
-});

package/src/hostingDatabase.js

@@ -1,80 +0,0 @@
-'use strict';
-
-const log = require('debug')('tgwf:hostingDatabase');
-const Database = require('better-sqlite3');
-
-function getQ(domains) {
-  const q = [];
-  for (let domain of domains) {
-    q.push('?')
-  }
-  return q.join(',');
-}
-
-function getDatabase(databaseFullPathAndName) {
-  log(`looking for db at ${databaseFullPathAndName}`)
-  return new Database(databaseFullPathAndName, { readonly: true, fileMustExist: true });
-}
-
-function check(domain, dbName) {
-  let db;
-
-  try {
-    db = getDatabase(dbName)
-  }
-  catch (SqliteError) {
-    log(`couldn't find SQlite database at path: ${dbName}`)
-    throw SqliteError
-  }
-
-  // is it a single domain or an array of them?
-  if (typeof domain === 'string') {
-    return checkInDB(domain, db)
-  }
-  else {
-    return checkDomainsInDB(domain, db)
-  }
-}
-
-function checkInDB(domain, db) {
-  try {
-    const stmt = db.prepare('SELECT * FROM green_presenting WHERE url = ?')
-    return !!stmt.get(domain).green
-  } finally {
-    if (db) {
-      db.close()
-    }
-  }
-}
-
-
-function greenDomainsFromResults(greenResults) {
-  const entries = Object.entries(greenResults);
-  let greenEntries = entries.filter(function ([key, val]) {
-    return val.green
-  });
-
-  return greenEntries.map(function ([key, val]) {
-    return val.url
-  });
-}
-
-function checkDomainsInDB(domains, db) {
-
-  try {
-    const stmt = db.prepare(`SELECT * FROM green_presenting WHERE url in (${getQ(domains)})`)
-
-    const res = stmt.all(domains)
-
-    return greenDomainsFromResults(res)
-
-  } finally {
-    if (db) {
-      db.close()
-    }
-  }
-}
-
-module.exports = {
-  check
-};

package/src/hostingDatabase.test.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const hosting = require('./hostingDatabase');
-const path = require('path');
-
-describe('hostingDatabase', function () {
- 
-  describe('checking a single domain with #check', function () {
-    it("tries to use a local database if available ", async function () {
-      const res = await hosting.check("google.com",  path.resolve(__dirname, "..", "url2green.test.db"))
-      expect(res).toEqual(true)
-    })
-  })
-  describe('implicitly checking multiple domains with #check', function () {
-    it("tries to use a local database if available", async function () {
-      const res = await hosting.check(["google.com", "kochindustries.com"], path.resolve(__dirname, "..", "url2green.test.db"))
-      expect(res).toContain("google.com")
-    })
-  })
-});