switch to rating based on co2e result

Author: fershad

src/helpers/index.js

@@ -17,7 +17,7 @@ import {
 
 const formatNumber = (num) => parseFloat(num.toFixed(2));
 
-const lessThan = (num, limit) => num < limit;
+const lessThanEqualTo = (num, limit) => num <= limit;
 
 function parseOptions(options) {
   // CHeck that it is an object
@@ -194,4 +194,4 @@ function getApiRequestHeaders(comment = "") {
   return { "User-Agent": `co2js/${process.env.CO2JS_VERSION} ${comment}` };
 }
 
-export { formatNumber, parseOptions, getApiRequestHeaders, lessThan };
+export { formatNumber, parseOptions, getApiRequestHeaders, lessThanEqualTo };

src/sustainable-web-design.js

@@ -21,7 +21,7 @@ import {
   RETURNING_VISITOR_PERCENTAGE,
   PERCENTAGE_OF_DATA_LOADED_ON_SUBSEQUENT_LOAD,
 } from "./constants/index.js";
-import { formatNumber, lessThan } from "./helpers/index.js";
+import { formatNumber, lessThanEqualTo } from "./helpers/index.js";
 
 class SustainableWebDesign {
   constructor(options) {
@@ -156,7 +156,7 @@ class SustainableWebDesign {
 
     let rating = null;
     if (ratingResults) {
-      rating = this.ratingScale(bytes);
+      rating = this.ratingScale(co2ValuesSum);
     }
 
     if (segmentResults) {
@@ -218,7 +218,7 @@ class SustainableWebDesign {
 
     let rating = null;
     if (ratingResults) {
-      rating = this.ratingScale(bytes);
+      rating = this.ratingScale(co2ValuesSum);
     }
 
     if (segmentResults) {
@@ -367,18 +367,18 @@ class SustainableWebDesign {
     };
   }
 
-  ratingScale(bytes) {
-    if (lessThan(bytes, 272510)) {
+  ratingScale(co2e) {
+    if (lessThanEqualTo(co2e, 0.095)) {
       return "A+";
-    } else if (lessThan(bytes, 531150)) {
+    } else if (lessThanEqualTo(co2e, 0.186)) {
       return "A";
-    } else if (lessThan(bytes, 975850)) {
+    } else if (lessThanEqualTo(co2e, 0.341)) {
       return "B";
-    } else if (lessThan(bytes, 1410390)) {
+    } else if (lessThanEqualTo(co2e, 0.493)) {
       return "C";
-    } else if (lessThan(bytes, 1875010)) {
+    } else if (lessThanEqualTo(co2e, 0.656)) {
       return "D";
-    } else if (lessThan(bytes, 2419560)) {
+    } else if (lessThanEqualTo(co2e, 0.846)) {
       return "E";
     } else {
       return "F";

src/sustainable-web-design.test.js

@@ -125,9 +125,10 @@ describe("sustainable web design model", () => {
     });
 
     it("returns ratings as expected", () => {
-      expect(swd.ratingScale(1000)).toBe("A+");
-      expect(swd.ratingScale(1000000)).toBe("C");
-      expect(swd.ratingScale(10000000)).toBe("F");
+      expect(swd.ratingScale(0.065)).toBe("A+");
+      expect(swd.ratingScale(0.342)).toBe("C");
+      expect(swd.ratingScale(0.341)).toBe("B");
+      expect(swd.ratingScale(0.9)).toBe("F");
     });
   });
 });