RubyGems - pezza_action_push_web - Versions diffs - 0.1.1 → 0.1.2 - Mend

pezza_action_push_web 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/README.md +0 -1
data/app/assets/javascripts/action_push_web.js +13 -303
data/app/assets/javascripts/components/granted.js +10 -10
data/app/assets/javascripts/components/request.js +2 -12
data/app/helpers/action_push_web/application_helper.rb +3 -7
data/lib/action_push_web/version.rb +1 -1
data/lib/generators/action_push_web/install/install_generator.rb +0 -8
metadata +1 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6874f14504ef40025713d4b82b955e135845182a3629899a976ab3e665fe397
-  data.tar.gz: 4b2e90aefaafd63951bc527f86c122951c8a50704d2e0f9fca010d1630c25543
+  metadata.gz: eb9c4ebdcbd17365efb10ed10e722ddc65e1313c46904a2fefcab41e2a77d7b3
+  data.tar.gz: b470819fb3149a2a9b48d98ccdfce99aafa86bf7f7f153eb0019c33b15a2e9ac
 SHA512:
-  metadata.gz: 4b84140a676d8c9ced3c23b343bf0ff306c9a3619042a7ab23320111791011a8f20cfdc2438a51ed00be743b3eae2962d2a202db82cdd2496f3c83704534977a
-  data.tar.gz: 07df39534c92844a589e922fb017165e259f65f7d12b3ba0b21fc173de3243a36a1556a2866cedd5c9b0a1669d992fe5bf674b7c8e2cbd1d5880830c660095b7
+  metadata.gz: 3b550df8977bdd96661dd9cb96993697d409b0f6555a22e235429971b2e7cbd68a5800205526217b622a101774f1482b65fc60ef4a6ecd99467d8bc28cfb353b
+  data.tar.gz: 644ee1e71e8d4065e87fe9334078725b801ff3a9c2a7ea6f81de719e3e53ec139c4642c4d19852fbed0b798eb051854901a79f3f561189d2419971dd9b5eadef

data/README.md CHANGED Viewed

@@ -26,7 +26,6 @@ The installation will create:
 - `app/views/pwa/service_worker.js`
 - mount the subscriptions controllers
 - import action_push_web.js in your application.js
-- Add `<%= action_push_web_key_tag %>` to the <head> of your application's layout if it can find it. Otherwise, you'll need to add it manually.
 `app/models/application_push_web_notification.rb`:

data/app/assets/javascripts/action_push_web.js CHANGED Viewed

@@ -10,11 +10,6 @@ class Request extends HTMLElement {
     this.addEventListener("click", this.onClick);
   }
   #setState() {
-    if (this.isEnabled) {
-      this.removeAttribute("disabled");
-    } else {
-      this.setAttribute("disabled", true);
-    }
     this.hidden = !this.isEnabled;
   }
   disconnectedCallback() {
@@ -24,15 +19,12 @@ class Request extends HTMLElement {
     this.#setState();
   }
   get isEnabled() {
-    return navigator.serviceWorker && window.Notification && Notification.permission == "default" && this.getAttribute("href");
-  }
-  get #isDisabled() {
-    return this.hasAttribute("disabled");
+    return navigator.serviceWorker && window.Notification && Notification.permission == "default";
   }
   async onClick(event) {
     event.preventDefault();
     event.stopPropagation();
-    if (this.isEnabled && !this.isDisabled) {
+    if (this.isEnabled) {
       const permission = await Notification.requestPermission();
       if (permission === "granted") {
         document.dispatchEvent(new CustomEvent("action-push-web:granted", {}));
@@ -66,292 +58,6 @@ class Denied extends HTMLElement {
   }
 }
-// node_modules/@rails/request.js/src/fetch_response.js
-class FetchResponse {
-  constructor(response) {
-    this.response = response;
-  }
-  get statusCode() {
-    return this.response.status;
-  }
-  get redirected() {
-    return this.response.redirected;
-  }
-  get ok() {
-    return this.response.ok;
-  }
-  get unauthenticated() {
-    return this.statusCode === 401;
-  }
-  get unprocessableEntity() {
-    return this.statusCode === 422;
-  }
-  get authenticationURL() {
-    return this.response.headers.get("WWW-Authenticate");
-  }
-  get contentType() {
-    const contentType = this.response.headers.get("Content-Type") || "";
-    return contentType.replace(/;.*$/, "");
-  }
-  get headers() {
-    return this.response.headers;
-  }
-  get html() {
-    if (this.contentType.match(/^(application|text)\/(html|xhtml\+xml)$/)) {
-      return this.text;
-    }
-    return Promise.reject(new Error(`Expected an HTML response but got "${this.contentType}" instead`));
-  }
-  get json() {
-    if (this.contentType.match(/^application\/.*json$/)) {
-      return this.responseJson || (this.responseJson = this.response.json());
-    }
-    return Promise.reject(new Error(`Expected a JSON response but got "${this.contentType}" instead`));
-  }
-  get text() {
-    return this.responseText || (this.responseText = this.response.text());
-  }
-  get isTurboStream() {
-    return this.contentType.match(/^text\/vnd\.turbo-stream\.html/);
-  }
-  get isScript() {
-    return this.contentType.match(/\b(?:java|ecma)script\b/);
-  }
-  async renderTurboStream() {
-    if (this.isTurboStream) {
-      if (window.Turbo) {
-        await window.Turbo.renderStreamMessage(await this.text);
-      } else {
-        console.warn("You must set `window.Turbo = Turbo` to automatically process Turbo Stream events with request.js");
-      }
-    } else {
-      return Promise.reject(new Error(`Expected a Turbo Stream response but got "${this.contentType}" instead`));
-    }
-  }
-  async activeScript() {
-    if (this.isScript) {
-      const script = document.createElement("script");
-      const metaTag = document.querySelector("meta[name=csp-nonce]");
-      if (metaTag) {
-        const nonce = metaTag.nonce === "" ? metaTag.content : metaTag.nonce;
-        if (nonce) {
-          script.setAttribute("nonce", nonce);
-        }
-      }
-      script.innerHTML = await this.text;
-      document.body.appendChild(script);
-    } else {
-      return Promise.reject(new Error(`Expected a Script response but got "${this.contentType}" instead`));
-    }
-  }
-}
-// node_modules/@rails/request.js/src/request_interceptor.js
-class RequestInterceptor {
-  static register(interceptor) {
-    this.interceptor = interceptor;
-  }
-  static get() {
-    return this.interceptor;
-  }
-  static reset() {
-    this.interceptor = undefined;
-  }
-}
-// node_modules/@rails/request.js/src/lib/utils.js
-function getCookie(name) {
-  const cookies = document.cookie ? document.cookie.split("; ") : [];
-  const prefix = `${encodeURIComponent(name)}=`;
-  const cookie = cookies.find((cookie2) => cookie2.startsWith(prefix));
-  if (cookie) {
-    const value = cookie.split("=").slice(1).join("=");
-    if (value) {
-      return decodeURIComponent(value);
-    }
-  }
-}
-function compact(object) {
-  const result = {};
-  for (const key in object) {
-    const value = object[key];
-    if (value !== undefined) {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-function metaContent(name) {
-  const element = document.head.querySelector(`meta[name="${name}"]`);
-  return element && element.content;
-}
-function stringEntriesFromFormData(formData) {
-  return [...formData].reduce((entries, [name, value]) => {
-    return entries.concat(typeof value === "string" ? [[name, value]] : []);
-  }, []);
-}
-function mergeEntries(searchParams, entries) {
-  for (const [name, value] of entries) {
-    if (value instanceof window.File)
-      continue;
-    if (searchParams.has(name) && !name.includes("[]")) {
-      searchParams.delete(name);
-      searchParams.set(name, value);
-    } else {
-      searchParams.append(name, value);
-    }
-  }
-}
-// node_modules/@rails/request.js/src/fetch_request.js
-class FetchRequest {
-  constructor(method, url, options = {}) {
-    this.method = method;
-    this.options = options;
-    this.originalUrl = url.toString();
-  }
-  async perform() {
-    try {
-      const requestInterceptor = RequestInterceptor.get();
-      if (requestInterceptor) {
-        await requestInterceptor(this);
-      }
-    } catch (error) {
-      console.error(error);
-    }
-    const fetch = this.responseKind === "turbo-stream" && window.Turbo ? window.Turbo.fetch : window.fetch;
-    const response = new FetchResponse(await fetch(this.url, this.fetchOptions));
-    if (response.unauthenticated && response.authenticationURL) {
-      return Promise.reject(window.location.href = response.authenticationURL);
-    }
-    if (response.isScript) {
-      await response.activeScript();
-    }
-    const responseStatusIsTurboStreamable = response.ok || response.unprocessableEntity;
-    if (responseStatusIsTurboStreamable && response.isTurboStream) {
-      await response.renderTurboStream();
-    }
-    return response;
-  }
-  addHeader(key, value) {
-    const headers = this.additionalHeaders;
-    headers[key] = value;
-    this.options.headers = headers;
-  }
-  sameHostname() {
-    if (!this.originalUrl.startsWith("http:") && !this.originalUrl.startsWith("https:")) {
-      return true;
-    }
-    try {
-      return new URL(this.originalUrl).hostname === window.location.hostname;
-    } catch (_) {
-      return true;
-    }
-  }
-  get fetchOptions() {
-    return {
-      method: this.method.toUpperCase(),
-      headers: this.headers,
-      body: this.formattedBody,
-      signal: this.signal,
-      credentials: this.credentials,
-      redirect: this.redirect,
-      keepalive: this.keepalive
-    };
-  }
-  get headers() {
-    const baseHeaders = {
-      "X-Requested-With": "XMLHttpRequest",
-      "Content-Type": this.contentType,
-      Accept: this.accept
-    };
-    if (this.sameHostname()) {
-      baseHeaders["X-CSRF-Token"] = this.csrfToken;
-    }
-    return compact(Object.assign(baseHeaders, this.additionalHeaders));
-  }
-  get csrfToken() {
-    return getCookie(metaContent("csrf-param")) || metaContent("csrf-token");
-  }
-  get contentType() {
-    if (this.options.contentType) {
-      return this.options.contentType;
-    } else if (this.body == null || this.body instanceof window.FormData) {
-      return;
-    } else if (this.body instanceof window.File) {
-      return this.body.type;
-    }
-    return "application/json";
-  }
-  get accept() {
-    switch (this.responseKind) {
-      case "html":
-        return "text/html, application/xhtml+xml";
-      case "turbo-stream":
-        return "text/vnd.turbo-stream.html, text/html, application/xhtml+xml";
-      case "json":
-        return "application/json, application/vnd.api+json";
-      case "script":
-        return "text/javascript, application/javascript";
-      default:
-        return "*/*";
-    }
-  }
-  get body() {
-    return this.options.body;
-  }
-  get query() {
-    const originalQuery = (this.originalUrl.split("?")[1] || "").split("#")[0];
-    const params = new URLSearchParams(originalQuery);
-    let requestQuery = this.options.query;
-    if (requestQuery instanceof window.FormData) {
-      requestQuery = stringEntriesFromFormData(requestQuery);
-    } else if (requestQuery instanceof window.URLSearchParams) {
-      requestQuery = requestQuery.entries();
-    } else {
-      requestQuery = Object.entries(requestQuery || {});
-    }
-    mergeEntries(params, requestQuery);
-    const query = params.toString();
-    return query.length > 0 ? `?${query}` : "";
-  }
-  get url() {
-    return this.originalUrl.split("?")[0].split("#")[0] + this.query;
-  }
-  get responseKind() {
-    return this.options.responseKind || "html";
-  }
-  get signal() {
-    return this.options.signal;
-  }
-  get redirect() {
-    return this.options.redirect || "follow";
-  }
-  get credentials() {
-    return this.options.credentials || "same-origin";
-  }
-  get keepalive() {
-    return this.options.keepalive || false;
-  }
-  get additionalHeaders() {
-    return this.options.headers || {};
-  }
-  get formattedBody() {
-    const bodyIsAString = Object.prototype.toString.call(this.body) === "[object String]";
-    const contentTypeIsJson = this.headers["Content-Type"] === "application/json";
-    if (contentTypeIsJson && !bodyIsAString) {
-      return JSON.stringify(this.body);
-    }
-    return this.body;
-  }
-}
-// node_modules/@rails/request.js/src/verbs.js
-async function post(url, options) {
-  const request = new FetchRequest("post", url, options);
-  return request.perform();
-}
 // app/assets/javascripts/components/granted.js
 class Granted extends HTMLElement {
   constructor() {
@@ -376,22 +82,26 @@ class Granted extends HTMLElement {
     });
   }
   get #isEnabled() {
-    return !!navigator.serviceWorker && !!window.Notification && Notification.permission == "granted";
+    return !!navigator.serviceWorker && !!window.Notification && Notification.permission == "granted" && this.getAttribute("href") && this.getAttribute("public-key");
   }
   get #serviceWorkerRegistration() {
     return navigator.serviceWorker.getRegistration();
   }
   get #vapidPublicKey() {
-    const encodedVapidPublicKey = document.querySelector('meta[name="action-push-web-public-key"]').content;
-    return this.#urlBase64ToUint8Array(encodedVapidPublicKey);
+    return this.#urlBase64ToUint8Array(this.getAttribute("public-key"));
   }
   async#syncPushSubscription(subscription) {
-    const response = await post(this.getAttribute("href"), {
-      body: this.#extractJsonPayloadAsString(subscription)
+    const response = await fetch(this.getAttribute("href"), {
+      method: "POST",
+      body: this.#extractJsonPayloadAsString(subscription),
+      headers: {
+        Accept: "text/vnd.turbo-stream.html, text/html, application/xhtml+xml",
+        "Content-Type": "application/json",
+        "X-CSRF-Token": document.querySelector("meta[name=csrf-token]").content
+      }
     });
-    if (!response.ok) {
+    if (!response.ok)
       subscription.unsubscribe();
-    }
   }
   #extractJsonPayloadAsString(subscription) {
     const { endpoint, keys: { p256dh, auth } } = subscription.toJSON();

data/app/assets/javascripts/components/granted.js CHANGED Viewed

@@ -1,5 +1,3 @@
-import { post } from "@rails/request.js"
 export default class Granted extends HTMLElement {
   constructor() {
     super();
@@ -30,7 +28,7 @@ export default class Granted extends HTMLElement {
   }
   get #isEnabled() {
-    return !!navigator.serviceWorker && !!window.Notification && Notification.permission == "granted"
+    return !!navigator.serviceWorker && !!window.Notification && Notification.permission == "granted" && this.getAttribute('href') && this.getAttribute('public-key')
   }
   get #serviceWorkerRegistration() {
@@ -38,18 +36,20 @@ export default class Granted extends HTMLElement {
   }
   get #vapidPublicKey() {
-    const encodedVapidPublicKey = document.querySelector('meta[name="action-push-web-public-key"]').content
-    return this.#urlBase64ToUint8Array(encodedVapidPublicKey)
+    return this.#urlBase64ToUint8Array(this.getAttribute('public-key'))
   }
   async #syncPushSubscription(subscription) {
-    const response = await post(this.getAttribute('href'), {
+    const response = await fetch(this.getAttribute('href'), {
+      method: "POST",
       body: this.#extractJsonPayloadAsString(subscription),
+      headers: {
+        Accept: "text/vnd.turbo-stream.html, text/html, application/xhtml+xml",
+        "Content-Type": "application/json",
+        "X-CSRF-Token": document.querySelector("meta[name=csrf-token]").content
+      }
     })
-    if (!response.ok) {
-      subscription.unsubscribe()
-    }
+    if (!response.ok) subscription.unsubscribe()
   }
   #extractJsonPayloadAsString(subscription) {

data/app/assets/javascripts/components/request.js CHANGED Viewed

@@ -13,12 +13,6 @@ export default class Request extends HTMLElement {
   }
   #setState() {
-    if (this.isEnabled) {
-      this.removeAttribute('disabled')
-    } else {
-      this.setAttribute('disabled', true)
-    }
     this.hidden = !this.isEnabled;
   }
@@ -31,18 +25,14 @@ export default class Request extends HTMLElement {
   }
   get isEnabled() {
-    return navigator.serviceWorker && window.Notification && Notification.permission == "default" && this.getAttribute('href')
-  }
-  get #isDisabled() {
-    return this.hasAttribute('disabled')
+    return navigator.serviceWorker && window.Notification && Notification.permission == "default"
   }
   async onClick(event) {
     event.preventDefault();
     event.stopPropagation();
-    if (this.isEnabled && !this.isDisabled) {
+    if (this.isEnabled) {
       const permission = await Notification.requestPermission()
       if (permission === "granted") {
         document.dispatchEvent(new CustomEvent('action-push-web:granted', {}))

data/app/helpers/action_push_web/application_helper.rb CHANGED Viewed

@@ -1,18 +1,14 @@
 module ActionPushWeb
   module ApplicationHelper
-    def action_push_web_key_tag(application: nil)
-      tag.meta name: "action-push-web-public-key",
-        content: ActionPushWeb.config_for(application)[:public_key]
-    end
     def when_web_notifications_disabled(**attrs, &block)
       content_tag("action-push-web-denied", capture(&block), **attrs)
     end
     def when_web_notifications_allowed(href: action_push_web.subscriptions_path,
-      service_worker_url: pwa_service_worker_path(format: :js), **attrs, &block)
+      service_worker_url: pwa_service_worker_path(format: :js), application: nil, **attrs, &block)
       content_tag("action-push-web-granted", capture(&block),
-        href:, service_worker_url:, **attrs)
+        href:, "service-worker-url" => service_worker_url,
+        "public-key" => ActionPushWeb.config_for(application)[:public_key], **attrs)
     end
     def ask_for_web_notifications(**attrs, &block)

data/lib/action_push_web/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module ActionPushWeb
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/generators/action_push_web/install/install_generator.rb CHANGED Viewed

@@ -26,14 +26,6 @@ class ActionPushWeb::InstallGenerator < Rails::Generators::Base
       # run "yarn add action_push_web"
     end
-    if APPLICATION_LAYOUT_PATH.exist?
-      say "Add action push web meta tag in application layout"
-      insert_into_file APPLICATION_LAYOUT_PATH.to_s, "\n    <%= action_push_web_key_tag %>", before: /\s*<\/head>/
-    else
-      say "Default application.html.erb is missing!", :red
-      say "        Add <%= action_push_web_key_tag %> within the <head> tag in your custom layout."
-    end
     rails_command "railties:install:migrations FROM=action_push_web",
       inline: true

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pezza_action_push_web
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Pezza