web-push 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a165b29c06bb5d9a9aab0b65de25bd913ef7926909773485e97f0778bda4299d
-  data.tar.gz: c3f9727392a4049e27ac6bf83718749d5110cd290fa37718ee5b988d2c9c16e3
+  metadata.gz: 0ce88ebd076b697f1933784607d0e7d743e66c0fe2a3522b2d91fbf8f7d674b4
+  data.tar.gz: b8eede6dba32f1933ab8ea706dd27dcc7d54fcc2a1bafb6c63249accc2e335f5
 SHA512:
-  metadata.gz: ca5db1201aa140ed1abe235d217183270b8b171d8b368ea7b5392c9cb04a2bf923c1c0e468788e1c2846dbd5c38bc32af53d427dbf307193ccaa00efbf6dd7d6
-  data.tar.gz: 8f179fd84cc0bd0f9e4899353d95af62e9e716552ae0bec86cdc7be2782056fcfb08b06a7efd3297e7468f1bb72ab6f5b16a29e31fc5ed0eb615117e790b8885
+  metadata.gz: 8cfedadf6aa0335ac451df3b47358b801802aed8e81f49ab869826eef67ff64bb06950095fd8764c259b37165dd5cdd7537521f23957cde359bb41e14661f53d
+  data.tar.gz: 8cb1d4e8711c0356dd22b10befaf535cbe9fbc3878bb18414f708dfa378472f2728d576641831822c63928320c10b79ded83cc888542280a9161eb83b194df86

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.0', '3.1']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rspec

data/.gitignore

@@ -1,10 +1,2 @@
-/.bundle/
-/.yardoc
 /Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-.idea/
+/coverage

data/README.md

@@ -1,45 +1,35 @@
 # WebPush
 
-[![Code Climate](https://codeclimate.com/github/zaru/webpush/badges/gpa.svg)](https://codeclimate.com/github/zaru/webpush)
-[![Test Coverage](https://codeclimate.com/github/zaru/webpush/badges/coverage.svg)](https://codeclimate.com/github/zaru/webpush/coverage)
-[![Build Status](https://travis-ci.org/zaru/webpush.svg?branch=master)](https://travis-ci.org/zaru/webpush)
-[![Gem Version](https://badge.fury.io/rb/webpush.svg)](https://badge.fury.io/rb/webpush)
+[![Gem Version](https://badge.fury.io/rb/web-push.svg)](https://badge.fury.io/rb/web-push)
+![Build Status](https://github.com/pushpad/web-push/workflows/CI/badge.svg)
 
-This gem makes it possible to send push messages to web browsers from Ruby backends using the [Web Push Protocol](https://tools.ietf.org/html/draft-ietf-webpush-protocol-10). It supports [Message Encryption for Web Push](https://tools.ietf.org/html/draft-ietf-webpush-encryption) to send messages securely from server to user agent.
-
-Payload is supported by Chrome 50+, Firefox 48+, Edge 79+.
-
-[webpush Demo app here (building by Sinatra app).](https://github.com/zaru/webpush_demo_ruby)
+This gem makes it possible to send push messages to web browsers from Ruby backends using the [Web Push Protocol](https://datatracker.ietf.org/doc/html/rfc8030). It supports [Message Encryption for Web Push](https://datatracker.ietf.org/doc/html/rfc8291) and [VAPID](https://datatracker.ietf.org/doc/html/rfc8292).
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to the Gemfile:
 
 ```ruby
 gem 'web-push'
 ```
 
-And then execute:
-
-    $ bundle
+Or install the gem:
 
-Or install it yourself as:
-
-    $ gem install web-push
+```console
+$ gem install web-push
+```
 
 ## Usage
 
 Sending a web push message to a visitor of your website requires a number of steps:
 
-1. Your server has (optionally) generated (one-time) a set of [Voluntary Application server Identification (VAPID)](https://tools.ietf.org/html/draft-ietf-webpush-vapid-01) keys. Otherwise, to send messages through Chrome, you have registered your site through the [Google Developer Console](https://console.developers.google.com/) and have obtained a GCM sender id and GCM API key from your app settings.
-2. A `manifest.json` file, linked from your user's page, identifies your app settings.
-3. Also in the user's web browser, a `serviceWorker` is installed and activated and its `pushManager` property is subscribed to push events with your VAPID public key, with creates a `subscription` JSON object on the client side.
-4. Your server uses the `web-push` gem to send a notification with the `subscription` obtained from the client and an optional payload (the message).
-5. Your service worker is set up to receive `'push'` events. To trigger a desktop notification, the user has accepted the prompt to receive notifications from your site.
+1. In the user's web browser, a `serviceWorker` is installed and activated and its `pushManager` property is subscribed to push events with your VAPID public key, which creates a `subscription` JSON object on the client side.
+2. Your server uses the `web-push` gem to send a notification with the `subscription` obtained from the client and an optional payload (the message).
+3. Your service worker is set up to receive `'push'` events. To trigger a desktop notification, the user has accepted the prompt to receive notifications from your site.
 
 ### Generating VAPID keys
 
-Use `web-push` to generate a VAPID key that has both a `public_key` and `private_key` attribute to be saved on the server side.
+Use `web-push` to generate a VAPID key pair (that has both a `public_key` and `private_key`) and save it on the server side.
 
 ```ruby
 # One-time, on the server
@@ -53,64 +43,25 @@ vapid_key.private_key
 vapid_key.to_pem
 ```
 
-### Declaring manifest.json
-
-Check out the [Web Manifest docs](https://developer.mozilla.org/en-US/docs/Web/Manifest) for details on what to include in your `manifest.json` file. If using VAPID, no app credentials are needed.
-
-```javascript
-{
-  "name": "My Website"
-}
-```
-For Chrome web push, add the GCM sender id to a `manifest.json`.
-
-```javascript
-{
-  "name": "My Website",
-  "gcm_sender_id": "1006629465533"
-}
-```
-
-The file is served within the scope of your service worker script, like at the root, and link to it somewhere in the `<head>` tag:
-
-```html
-<!-- index.html -->
-<link rel="manifest" href="/manifest.json" />
-```
-
 ### Installing a service worker
 
-Your application javascript must register a service worker script at an appropriate scope (we're sticking with the root).
+Your application must use JavaScript to register a service worker script at an appropriate scope (root is recommended).
 
 ```javascript
-// application.js
-// Register the serviceWorker script at /serviceworker.js from your server if supported
-if (navigator.serviceWorker) {
-  navigator.serviceWorker.register('/serviceworker.js')
-  .then(function(reg) {
-     console.log('Service worker change, registered the service worker');
-  });
-}
-// Otherwise, no push notifications :(
-else {
-  console.error('Service worker is not supported in this browser');
-}
+navigator.serviceWorker.register('/service-worker.js')
 ```
 
 ### Subscribing to push notifications
 
-#### With VAPID
-
-The VAPID public key you generated earlier is made available to the client as a `UInt8Array`. To do this, one way would be to expose the urlsafe-decoded bytes from Ruby to JavaScript when rendering the HTML template. (Global variables used here for simplicity).
+The VAPID public key you generated earlier is made available to the client as a `UInt8Array`. To do this, one way would be to expose the urlsafe-decoded bytes from Ruby to JavaScript when rendering the HTML template.
 
 ```javascript
 window.vapidPublicKey = new Uint8Array(<%= Base64.urlsafe_decode64(ENV['VAPID_PUBLIC_KEY']).bytes %>);
 ```
 
-Your application javascript uses the `navigator.serviceWorker.pushManager` to subscribe to push notifications, passing the VAPID public key to the subscription settings.
+Your JavaScript code uses the `pushManager` interface to subscribe to push notifications, passing the VAPID public key to the subscription settings.
 
 ```javascript
-// application.js
 // When serviceWorker is supported, installed, and activated,
 // subscribe the pushManager property with the vapidPublicKey
 navigator.serviceWorker.ready.then((serviceWorkerRegistration) => {
@@ -122,120 +73,49 @@ navigator.serviceWorker.ready.then((serviceWorkerRegistration) => {
 });
 ```
 
-#### Without VAPID
-
-If you will not be sending VAPID details, then there is no need generate VAPID keys, and the `applicationServerKey` parameter may be omitted from the `pushManager.subscribe` call.
-
-```javascript
-// application.js
-// When serviceWorker is supported, installed, and activated,
-// subscribe the pushManager property with the vapidPublicKey
-navigator.serviceWorker.ready.then((serviceWorkerRegistration) => {
-  serviceWorkerRegistration.pushManager
-  .subscribe({
-    userVisibleOnly: true
-  });
-});
-```
-
 ### Triggering a web push notification
 
-Hook into an client-side or backend event in your app to deliver a push message. The server must be made aware of the `subscription`. In the example below, we send the JSON generated subscription object to our backend at the "/push" endpoint with a message.
-
-```javascript
-// application.js
-// Send the subscription and message from the client for the backend
-// to set up a push notification
-$(".web-push-button").on("click", (e) => {
-  navigator.serviceWorker.ready
-  .then((serviceWorkerRegistration) => {
-    serviceWorkerRegistration.pushManager.getSubscription()
-    .then((subscription) => {
-      $.post("/push", { subscription: subscription.toJSON(), message: "You clicked a button!" });
-    });
-  });
-});
-```
+In order to send web push notifications, the push subscription must be stored in the backend. Get the subscription with `pushManager.getSubscription()` and store it in your database.
 
-Imagine a Ruby app endpoint that responds to the request by triggering notification through the `web-push` gem.
+Then you can use this gem to send web push messages:
 
 ```ruby
-# app.rb
-# Use the web-push gem API to deliver a push notiifcation merging
-# the message, subscription values, and vapid options
-post "/push" do
-  WebPush.payload_send(
-    message: params[:message],
-    endpoint: params[:subscription][:endpoint],
-    p256dh: params[:subscription][:keys][:p256dh],
-    auth: params[:subscription][:keys][:auth],
-    vapid: {
-      subject: "mailto:sender@example.com",
-      public_key: ENV['VAPID_PUBLIC_KEY'],
-      private_key: ENV['VAPID_PRIVATE_KEY']
-    },
-    ssl_timeout: 5, # value for Net::HTTP#ssl_timeout=, optional
-    open_timeout: 5, # value for Net::HTTP#open_timeout=, optional
-    read_timeout: 5 # value for Net::HTTP#read_timeout=, optional
-  )
-end
+WebPush.payload_send(
+  message: message,
+  endpoint: subscription['endpoint'],
+  p256dh: subscription['keys']['p256dh'],
+  auth: subscription['keys']['auth'],
+  vapid: {
+    subject: "mailto:sender@example.com",
+    public_key: ENV['VAPID_PUBLIC_KEY'],
+    private_key: ENV['VAPID_PRIVATE_KEY']
+  },
+  ssl_timeout: 5, # optional value for Net::HTTP#ssl_timeout=
+  open_timeout: 5, # optional value for Net::HTTP#open_timeout=
+  read_timeout: 5 # optional value for Net::HTTP#read_timeout=
+)
 ```
 
-Note: the VAPID options should be omitted if the client-side subscription was
-generated without the `applicationServerKey` parameter described earlier. You
-would instead pass the GCM api key along with the api request as shown in the
-Usage section below.
-
 ### Receiving the push event
 
-Your `/serviceworker.js` script may respond to `'push'` events. One action it can take is to trigger desktop notifications by calling `showNotification` on the `registration` property.
+Your `service-worker.js` script should respond to `'push'` events. One action it can take is to trigger desktop notifications by calling `showNotification` on the `registration` property.
 
 ```javascript
-// serviceworker.js
-// The serviceworker context can respond to 'push' events and trigger
-// notifications on the registration property
-self.addEventListener("push", (event) => {
-  let title = (event.data && event.data.text()) || "Yay a message";
-  let body = "We have received a push message";
-  let tag = "push-simple-demo-notification-tag";
-  let icon = '/assets/my-logo-120x120.png';
-
-  event.waitUntil(
-    self.registration.showNotification(title, { body, icon, tag })
-  )
+self.addEventListener('push', (event) => {
+  // Get the push message
+  var message = event.data;
+  // Display a notification
+  event.waitUntil(self.registration.showNotification('Example'));
 });
 ```
 
-Before the notifications can be displayed, the user must grant permission for [notifications](https://developer.mozilla.org/en-US/docs/Web/API/notification) in a browser prompt, using something like the example below.
+Before the notifications can be displayed, the user must grant permission for [notifications](https://developer.mozilla.org/en-US/docs/Web/API/notification) in a browser prompt. Use something like this in your JavaScript code:
 
 ```javascript
-// application.js
-
-// Let's check if the browser supports notifications
-if (!("Notification" in window)) {
-  console.error("This browser does not support desktop notification");
-}
-
-// Let's check whether notification permissions have already been granted
-else if (Notification.permission === "granted") {
-  console.log("Permission to receive notifications has been granted");
-}
-
-// Otherwise, we need to ask the user for permission
-else if (Notification.permission !== 'denied') {
-  Notification.requestPermission(function (permission) {
-    // If the user accepts, let's create a notification
-    if (permission === "granted") {
-      console.log("Permission to receive notifications has been granted");
-    }
-  });
-}
+Notification.requestPermission();
 ```
 
-If everything worked, you should see a desktop notification triggered via web
-push. Yay!
-
-Note: if you're using Rails, check out [serviceworker-rails](https://github.com/rossta/serviceworker-rails), a gem that makes it easier to host serviceworker scripts and manifest.json files at canonical endpoints (i.e., non-digested URLs) while taking advantage of the asset pipeline.
+If everything worked, you should see a desktop notification triggered via web push. Yay!
 
 ## API
 
@@ -243,9 +123,9 @@ Note: if you're using Rails, check out [serviceworker-rails](https://github.com/
 
 ```ruby
 message = {
-  title: "title",
-  body: "body",
-  icon: "http://example.com/icon.pn"
+  title: "Example",
+  body: "Hello, world!",
+  icon: "https://example.com/icon.png"
 }
 
 WebPush.payload_send(
@@ -304,53 +184,10 @@ WebPush.payload_send(
 )
 ```
 
-### With GCM api key
-
-```ruby
-WebPush.payload_send(
-  endpoint: "https://fcm.googleapis.com/gcm/send/eah7hak....",
-  message: "A message",
-  p256dh: "BO/aG9nYXNkZmFkc2ZmZHNmYWRzZmFl...",
-  auth: "aW1hcmthcmFpa3V6ZQ==",
-  api_key: "<GCM API KEY>"
-)
-```
-
-### ServiceWorker sample
-
-see. https://github.com/zaru/web-push-sample
-
-p256dh and auth generate sample code.
-
-```javascript
-navigator.serviceWorker.ready.then(function(sw) {
-  Notification.requestPermission(function(permission) {
-    if(permission !== 'denied') {
-      sw.pushManager.subscribe({userVisibleOnly: true}).then(function(s) {
-        var data = {
-          endpoint: s.endpoint,
-          p256dh: btoa(String.fromCharCode.apply(null, new Uint8Array(s.getKey('p256dh')))).replace(/\+/g, '-').replace(/\//g, '_'),
-          auth: btoa(String.fromCharCode.apply(null, new Uint8Array(s.getKey('auth')))).replace(/\+/g, '-').replace(/\//g, '_')
-        }
-        console.log(data);
-      });
-    }
-  });
-});
-```
+## Contributing
 
-payloads received sample code.
+Bug reports and pull requests are welcome on GitHub at https://github.com/pushpad/web-push.
 
-```javascript
-self.addEventListener("push", function(event) {
-  var json = event.data.json();
-  self.registration.showNotification(json.title, {
-    body: json.body,
-    icon: json.icon
-  });
-});
-```
-
-## Contributing
+## Credits
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/zaru/webpush.
+This library is a fork of [zaru/webpush](https://github.com/zaru/webpush) actively maintained by [Pushpad](https://pushpad.xyz) with many improvements, bug fixes and frequent updates.

data/lib/web_push/encryption.rb

@@ -4,7 +4,6 @@ module WebPush
   module Encryption
     extend self
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def encrypt(message, p256dh, auth)
       assert_arguments(message, p256dh, auth)
 
@@ -27,11 +26,11 @@ module WebPush
       content_encryption_key_info = "Content-Encoding: aes128gcm\0"
       nonce_info = "Content-Encoding: nonce\0"
 
-      prk = HKDF.new(shared_secret, salt: client_auth_token, algorithm: 'SHA256', info: info).next_bytes(32)
+      prk = HKDF.new(shared_secret, salt: client_auth_token, algorithm: 'SHA256', info: info).read(32)
 
-      content_encryption_key = HKDF.new(prk, salt: salt, info: content_encryption_key_info).next_bytes(16)
+      content_encryption_key = HKDF.new(prk, salt: salt, info: content_encryption_key_info).read(16)
 
-      nonce = HKDF.new(prk, salt: salt, info: nonce_info).next_bytes(12)
+      nonce = HKDF.new(prk, salt: salt, info: nonce_info).read(12)
 
       ciphertext = encrypt_payload(message, content_encryption_key, nonce)
 
@@ -43,7 +42,6 @@ module WebPush
 
       aes128gcmheader + ciphertext
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     private
 

data/lib/web_push/request.rb

@@ -1,25 +1,16 @@
 # frozen_string_literal: true
 
-require 'uri'
-require 'jwt'
-require 'base64'
-
 module WebPush
-  # It is temporary URL until supported by the GCM server.
-  GCM_URL = 'https://android.googleapis.com/gcm/send'.freeze
-  TEMP_GCM_URL = 'https://fcm.googleapis.com/fcm'.freeze
 
-  # rubocop:disable Metrics/ClassLength
   class Request
     def initialize(message: '', subscription:, vapid:, **options)
       endpoint = subscription.fetch(:endpoint)
-      @endpoint = endpoint.gsub(GCM_URL, TEMP_GCM_URL)
+      @endpoint = endpoint
       @payload = build_payload(message, subscription)
       @vapid_options = vapid
       @options = default_options.merge(options)
     end
 
-    # rubocop:disable Metrics/AbcSize
     def perform
       http = Net::HTTP.new(uri.host, uri.port, *proxy_options)
       http.use_ssl = true
@@ -35,7 +26,6 @@ module WebPush
 
       resp
     end
-    # rubocop:enable Metrics/AbcSize
 
     def proxy_options
       return [] unless @options[:proxy]
@@ -45,7 +35,6 @@ module WebPush
       [proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password]
     end
 
-    # rubocop:disable Metrics/MethodLength
     def headers
       headers = {}
       headers['Content-Type'] = 'application/octet-stream'
@@ -57,24 +46,18 @@ module WebPush
         headers["Content-Length"] = @payload.length.to_s
       end
 
-      if api_key?
-        headers['Authorization'] = "key=#{api_key}"
-      elsif vapid?
+      if vapid?
         headers["Authorization"] = build_vapid_header
       end
 
       headers
     end
-    # rubocop:enable Metrics/MethodLength
 
     def build_vapid_header
-      # https://tools.ietf.org/id/draft-ietf-webpush-vapid-03.html
-
       vapid_key = vapid_pem ? VapidKey.from_pem(vapid_pem) : VapidKey.from_keys(vapid_public_key, vapid_private_key)
       jwt = JWT.encode(jwt_payload, vapid_key.curve, 'ES256', jwt_header_fields)
       p256ecdsa = vapid_key.public_key_for_push_header
-
-       "vapid t=#{jwt},k=#{p256ecdsa}"
+      "vapid t=#{jwt},k=#{p256ecdsa}"
     end
 
     def body
@@ -112,11 +95,11 @@ module WebPush
     end
 
     def expiration
-      @vapid_options.fetch(:expiration, 24 * 60 * 60)
+      @vapid_options.fetch(:expiration, 12 * 60 * 60)
     end
 
     def subject
-      @vapid_options.fetch(:subject, 'sender@example.com')
+      @vapid_options.fetch(:subject, 'mailto:sender@example.com')
     end
 
     def vapid_public_key
@@ -148,14 +131,6 @@ module WebPush
       Encryption.encrypt(message, p256dh, auth)
     end
 
-    def api_key
-      @options.fetch(:api_key, nil)
-    end
-
-    def api_key?
-      !(api_key.nil? || api_key.empty?) && @endpoint =~ %r{\Ahttps://(android|gcm-http|fcm)\.googleapis\.com}
-    end
-
     def vapid?
       @vapid_options.any?
     end
@@ -164,7 +139,6 @@ module WebPush
       WebPush.encode64(bin).delete('=')
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Style/GuardClause
     def verify_response(resp)
       if resp.is_a?(Net::HTTPGone) # 410
         raise ExpiredSubscription.new(resp, uri.host)
@@ -183,7 +157,5 @@ module WebPush
         raise ResponseError.new(resp, uri.host)
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Style/GuardClause
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/web_push/vapid_key.rb

@@ -78,10 +78,15 @@ module WebPush
     alias to_hash to_h
 
     def to_pem
-      public_key = OpenSSL::PKey::EC.new curve
-      public_key.private_key = nil
+      private_key_to_pem + public_key_to_pem
+    end
+
+    def private_key_to_pem
+      curve.to_pem
+    end
 
-      curve.to_pem + public_key.to_pem
+    def public_key_to_pem
+      curve.public_to_pem
     end
 
     def inspect

data/lib/web_push/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebPush
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/web_push.rb

@@ -3,6 +3,8 @@
 require 'openssl'
 require 'base64'
 require 'hkdf'
+require 'jwt'
+require 'uri'
 require 'net/http'
 require 'json'
 
@@ -11,7 +13,6 @@ require 'web_push/errors'
 require 'web_push/vapid_key'
 require 'web_push/encryption'
 require 'web_push/request'
-require 'web_push/railtie' if defined?(Rails)
 
 # Push API implementation
 #
@@ -34,7 +35,6 @@ module WebPush
     # @param options [Hash<Symbol,String>] additional options for the notification
     # @option options [#to_s] :ttl Time-to-live in seconds
     # @option options [#to_s] :urgency Urgency can be very-low, low, normal, high
-    # rubocop:disable Metrics/ParameterLists
     def payload_send(message: '', endpoint:, p256dh: '', auth: '', vapid: {}, **options)
       WebPush::Request.new(
         message: message,
@@ -43,7 +43,6 @@ module WebPush
         **options
       ).perform
     end
-    # rubocop:enable Metrics/ParameterLists
 
     # Generate a VapidKey instance to obtain base64 encoded public and private keys
     # suitable for VAPID protocol JSON web token signing

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
-require 'pry'
 require 'web_push'
 require 'webmock/rspec'
 require 'simplecov'
+
 WebMock.disable_net_connect!(allow_localhost: true)
 SimpleCov.start
 

data/spec/web_push/encryption_spec.rb

@@ -67,10 +67,10 @@ describe WebPush::Encryption do
       content_encryption_key_info = "Content-Encoding: aes128gcm\0"
       nonce_info = "Content-Encoding: nonce\0"
 
-      prk = HKDF.new(shared_secret, salt: client_auth_token, algorithm: 'SHA256', info: info).next_bytes(32)
+      prk = HKDF.new(shared_secret, salt: client_auth_token, algorithm: 'SHA256', info: info).read(32)
 
-      content_encryption_key = HKDF.new(prk, salt: salt, info: content_encryption_key_info).next_bytes(16)
-      nonce = HKDF.new(prk, salt: salt, info: nonce_info).next_bytes(12)
+      content_encryption_key = HKDF.new(prk, salt: salt, info: content_encryption_key_info).read(16)
+      nonce = HKDF.new(prk, salt: salt, info: nonce_info).read(12)
 
       decrypt_ciphertext(ciphertext, content_encryption_key, nonce)
     end

data/spec/web_push/request_spec.rb

@@ -18,51 +18,6 @@ describe WebPush::Request do
       end
     end
 
-    describe 'from :api_key' do
-      def build_request_with_api_key(endpoint, options = {})
-        subscription = {
-          endpoint: endpoint,
-          keys: {
-            p256dh: 'p256dh',
-            auth: 'auth'
-          }
-        }
-        WebPush::Request.new(message: '', subscription: subscription, vapid: {}, **options)
-      end
-
-      it 'inserts Authorization header when api_key present, and endpoint is for Chrome\'s non-standards-compliant GCM endpoints' do
-        request = build_request_with_api_key('https://gcm-http.googleapis.com/gcm/xyz', api_key: 'api_key')
-
-        expect(request.headers['Authorization']).to eq('key=api_key')
-      end
-
-      it 'insert Authorization header for Chrome\'s new standards-compliant endpoints, even if api_key is present' do
-        request = build_request_with_api_key('https://fcm.googleapis.com/fcm/send/ABCD1234', api_key: 'api_key')
-
-        expect(request.headers['Authorization']).to eq('key=api_key')
-      end
-
-      it 'does not insert Authorization header when endpoint is not for Chrome, even if api_key is present' do
-        request = build_request_with_api_key('https://some.random.endpoint.com/xyz', api_key: 'api_key')
-
-        expect(request.headers['Authorization']).to be_nil
-      end
-
-      it 'does not insert Authorization header when api_key blank' do
-        request = build_request_with_api_key('endpoint', api_key: nil)
-
-        expect(request.headers['Authorization']).to be_nil
-
-        request = build_request_with_api_key('endpoint', api_key: '')
-
-        expect(request.headers['Authorization']).to be_nil
-
-        request = build_request_with_api_key('endpoint')
-
-        expect(request.headers['Authorization']).to be_nil
-      end
-    end
-
     describe 'from :ttl' do
       it 'can override Ttl with :ttl option with string' do
         request = build_request(ttl: '300')
@@ -91,7 +46,7 @@ describe WebPush::Request do
       time = Time.at(1_476_150_897)
       jwt_payload = {
         aud: 'https://fcm.googleapis.com',
-        exp: time.to_i + 24 * 60 * 60,
+        exp: time.to_i + 12 * 60 * 60,
         sub: 'mailto:sender@example.com'
       }
       jwt_header_fields = { "typ": "JWT", "alg": "ES256" }

data/spec/web_push/vapid_key_spec.rb

@@ -43,6 +43,35 @@ describe WebPush::VapidKey do
     expect(pem).to include('-----BEGIN PUBLIC KEY-----')
   end
 
+  it 'returns the correct public and private keys in pem format' do
+    public_key_base64 = 'BMA-wciFTkEq2waVGB2hg8cSyiRiMcsIvIYQb3LkLOmBheh3YC6NB2GtE9t6YgaXt428rp7bC9JjuPtAY9AQaR8='
+    private_key_base64 = '4MwLvN1Cpxe43AV9fa4BiS-SPp51gWlhv9c6bb_XSJ4='
+    key = WebPush::VapidKey.from_keys(public_key_base64, private_key_base64)
+    pem = key.to_pem
+    expected_pem = <<~PEM
+      -----BEGIN EC PRIVATE KEY-----
+      MHcCAQEEIODMC7zdQqcXuNwFfX2uAYkvkj6edYFpYb/XOm2/10ieoAoGCCqGSM49
+      AwEHoUQDQgAEwD7ByIVOQSrbBpUYHaGDxxLKJGIxywi8hhBvcuQs6YGF6HdgLo0H
+      Ya0T23piBpe3jbyuntsL0mO4+0Bj0BBpHw==
+      -----END EC PRIVATE KEY-----
+      -----BEGIN PUBLIC KEY-----
+      MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwD7ByIVOQSrbBpUYHaGDxxLKJGIx
+      ywi8hhBvcuQs6YGF6HdgLo0HYa0T23piBpe3jbyuntsL0mO4+0Bj0BBpHw==
+      -----END PUBLIC KEY-----
+    PEM
+    expect(pem).to eq(expected_pem)
+  end
+
+  it 'can return the private key in pem format' do
+    pem = WebPush::VapidKey.new.private_key_to_pem
+    expect(pem).to include('-----BEGIN EC PRIVATE KEY-----')
+  end
+
+  it 'can return the public key in pem format' do
+    pem = WebPush::VapidKey.new.public_key_to_pem
+    expect(pem).to include('-----BEGIN PUBLIC KEY-----')
+  end
+
   it 'imports pem of public and private keys' do
     pem = WebPush::VapidKey.new.to_pem
     key = WebPush::VapidKey.from_pem pem

data/spec/web_push_spec.rb

@@ -194,8 +194,8 @@ describe WebPush do
     include_examples 'request headers with VAPID'
   end
 
-  context 'chrome GCM endpoint: request headers with GCM api key' do
-    let(:endpoint) { 'https://android.googleapis.com/gcm/send/subscription-id' }
+  context 'chrome endpoint: request headers without VAPID' do
+    let(:endpoint) { 'https://fcm.googleapis.com/fcm/subscription-id' }
     let(:expected_endpoint) { 'https://fcm.googleapis.com/fcm/subscription-id' }
 
     let(:message) { JSON.generate(body: 'body') }
@@ -221,7 +221,7 @@ describe WebPush do
       allow(WebPush::Encryption).to receive(:encrypt).and_return(payload)
     end
 
-    subject { WebPush.payload_send(message: message, endpoint: endpoint, p256dh: p256dh, auth: auth, api_key: 'GCM_API_KEY') }
+    subject { WebPush.payload_send(message: message, endpoint: endpoint, p256dh: p256dh, auth: auth) }
 
     it 'calls the relevant service with the correct headers' do
       expect(WebPush::Encryption).to receive(:encrypt).and_return(payload)
@@ -247,7 +247,7 @@ describe WebPush do
         .with(body: nil, headers: expected_headers)
         .to_return(status: 201, body: '', headers: {})
 
-      WebPush.payload_send(endpoint: endpoint, api_key: 'GCM_API_KEY')
+      WebPush.payload_send(endpoint: endpoint)
     end
   end
 end

data/web-push.gemspec

@@ -3,6 +3,7 @@ require_relative 'lib/web_push/version'
 Gem::Specification.new do |spec|
   spec.name = 'web-push'
   spec.version = WebPush::VERSION
+  spec.license = 'MIT'
   spec.authors = ['zaru', 'collimarco']
   spec.email = ['support@pushpad.xyz']
 
@@ -11,15 +12,13 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files`.split("\n")
 
-  spec.required_ruby_version = '>= 2.2'
+  spec.required_ruby_version = '>= 3.0'
 
-  spec.add_dependency 'hkdf', '~> 0.2'
+  spec.add_dependency 'hkdf', '~> 1.0'
   spec.add_dependency 'jwt', '~> 2.0'
+  spec.add_dependency 'openssl', '~> 2.2'
 
-  spec.add_development_dependency 'bundler', '>= 1.17.3'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-push
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - zaru
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -40,47 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '2.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +71,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -130,25 +102,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
-- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/rake
-- bin/rspec
-- bin/setup
-- lib/tasks/web_push.rake
 - lib/web-push.rb
 - lib/web_push.rb
 - lib/web_push/encryption.rb
 - lib/web_push/errors.rb
-- lib/web_push/railtie.rb
 - lib/web_push/request.rb
 - lib/web_push/vapid_key.rb
 - lib/web_push/version.rb
@@ -159,7 +121,8 @@ files:
 - spec/web_push_spec.rb
 - web-push.gemspec
 homepage: https://github.com/pushpad/web-push
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -169,14 +132,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Web Push library for Ruby (RFC8030)

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.rubocop.yml

@@ -1,30 +0,0 @@
-require: rubocop-performance
-
-AllCops:
-  Exclude:
-    - 'bin/**/*'
-
-Metrics/AbcSize:
-  Max: 20
-
-Metrics/ClassLength:
-  Max: 100
-
-Metrics/ModuleLength:
-  Max: 100
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*_spec.rb
-
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/IndentHeredoc:
-  Enabled: false

data/.travis.yml

@@ -1,24 +0,0 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=155202524386dfebe0c3267a5c868b5417ff4cc2cde8ed301fb36b177d46a458
-language: ruby
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v 1.17.3
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script: "bundle exec rake spec"
-after_script:
-- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-addons:
-  code_climate:
-    repo_token: 155202524386dfebe0c3267a5c868b5417ff4cc2cde8ed301fb36b177d46a458

data/CHANGELOG.md

@@ -1,183 +0,0 @@
-# Changelog
-
-## [v1.1.0](https://github.com/zaru/webpush/tree/v1.1.0) (2020-11-16)
-
-[Full Changelog](https://github.com/zaru/webpush/compare/v1.0.0...v1.1.0)
-
-**Merged pull requests:**
-
-- Eliminate Ruby 2.7 warnings. [\#95](https://github.com/zaru/webpush/pull/95) ([morgoth](https://github.com/morgoth))
-- set minimum ruby version is 2.2 [\#94](https://github.com/zaru/webpush/pull/94) ([Wolfer](https://github.com/Wolfer))
-- Add proxy support [\#93](https://github.com/zaru/webpush/pull/93) ([Bugagazavr](https://github.com/Bugagazavr))
-- fix syntax error [\#91](https://github.com/zaru/webpush/pull/91) ([tonytonyjan](https://github.com/tonytonyjan))
-- change dependency gem versions [\#88](https://github.com/zaru/webpush/pull/88) ([zaru](https://github.com/zaru))
-
-## [v1.0.0](https://github.com/zaru/webpush/tree/v1.0.0) (2019-08-15)
-
-A stable version 1.0.0 has been released.
-
-Thanks @mohamedhafez, @mplatov and @MedetaiAkaru for everything!
-
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0)
-
-**Merged pull requests:**
-
-- switch to aes128gcm encoding [\#84](https://github.com/zaru/webpush/pull/84) ([mohamedhafez](https://github.com/mohamedhafez))
-- Fixed fcm spec [\#77](https://github.com/zaru/webpush/pull/77) ([zaru](https://github.com/zaru))
-- add fcm endpoints [\#76](https://github.com/zaru/webpush/pull/76) ([MedetaiAkaru](https://github.com/MedetaiAkaru))
-- Add Rubocop and fix [\#74](https://github.com/zaru/webpush/pull/74) ([zaru](https://github.com/zaru))
-- Fix TravisCI bundler version [\#73](https://github.com/zaru/webpush/pull/73) ([zaru](https://github.com/zaru))
-
-## [v0.3.8](https://github.com/zaru/webpush/tree/v0.3.8) (2019-04-16)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8)
-
-**Merged pull requests:**
-
-- Fix authorization header [\#72](https://github.com/zaru/webpush/pull/72) ([xronos-i-am](https://github.com/xronos-i-am))
-
-## [v0.3.7](https://github.com/zaru/webpush/tree/v0.3.7) (2019-03-06)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7)
-
-**Merged pull requests:**
-
-- Add PEM support to import / export keys [\#65](https://github.com/zaru/webpush/pull/65) ([collimarco](https://github.com/collimarco))
-
-## [v0.3.6](https://github.com/zaru/webpush/tree/v0.3.6) (2019-01-09)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.5...v0.3.6)
-
-**Merged pull requests:**
-
-- Added a error class to arguments of raise\_error [\#62](https://github.com/zaru/webpush/pull/62) ([zaru](https://github.com/zaru))
-- Fix TravisCI bundler version [\#61](https://github.com/zaru/webpush/pull/61) ([zaru](https://github.com/zaru))
-- Raise Webpush::Unauthorized on HTTP 403 [\#59](https://github.com/zaru/webpush/pull/59) ([collimarco](https://github.com/collimarco))
-
-## [v0.3.5](https://github.com/zaru/webpush/tree/v0.3.5) (2019-01-02)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.4...v0.3.5)
-
-**Merged pull requests:**
-
-- Fix \#55 and \#51: raise the proper error based on the HTTP status code [\#58](https://github.com/zaru/webpush/pull/58) ([collimarco](https://github.com/collimarco))
-- Add urgency option [\#57](https://github.com/zaru/webpush/pull/57) ([collimarco](https://github.com/collimarco))
-- Add Rake task to generate VAPID keys [\#54](https://github.com/zaru/webpush/pull/54) ([stevenharman](https://github.com/stevenharman))
-
-## [v0.3.4](https://github.com/zaru/webpush/tree/v0.3.4) (2018-05-25)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.3...v0.3.4)
-
-**Merged pull requests:**
-
-- add http timeout options [\#50](https://github.com/zaru/webpush/pull/50) ([aishek](https://github.com/aishek))
-
-## [v0.3.3](https://github.com/zaru/webpush/tree/v0.3.3) (2017-11-06)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.2...v0.3.3)
-
-**Merged pull requests:**
-
-- Add typ to JWT header fields [\#46](https://github.com/zaru/webpush/pull/46) ([ykzts](https://github.com/ykzts))
-- Specify the version of JWT strictly [\#45](https://github.com/zaru/webpush/pull/45) ([ykzts](https://github.com/ykzts))
-
-## [v0.3.2](https://github.com/zaru/webpush/tree/v0.3.2) (2017-07-01)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.1...v0.3.2)
-
-**Merged pull requests:**
-
-- feat: improve response error codes [\#39](https://github.com/zaru/webpush/pull/39) ([glennr](https://github.com/glennr))
-- Update README.md [\#38](https://github.com/zaru/webpush/pull/38) ([kitaindia](https://github.com/kitaindia))
-- Fix code example: Add close bracket [\#37](https://github.com/zaru/webpush/pull/37) ([kuranari](https://github.com/kuranari))
-- fix code in README [\#36](https://github.com/zaru/webpush/pull/36) ([kuranari](https://github.com/kuranari))
-- Minor fix in README: Close code blocks [\#32](https://github.com/zaru/webpush/pull/32) ([nicolas-fricke](https://github.com/nicolas-fricke))
-- Copy edits for README clarifying GCM requirements [\#30](https://github.com/zaru/webpush/pull/30) ([rossta](https://github.com/rossta))
-- Adding VAPID documentation [\#28](https://github.com/zaru/webpush/pull/28) ([rossta](https://github.com/rossta))
-
-## [v0.3.1](https://github.com/zaru/webpush/tree/v0.3.1) (2016-10-24)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.0...v0.3.1)
-
-**Merged pull requests:**
-
-- Bug fix invalid base64 [\#29](https://github.com/zaru/webpush/pull/29) ([rossta](https://github.com/rossta))
-- Clarify VAPID usage further in README [\#27](https://github.com/zaru/webpush/pull/27) ([rossta](https://github.com/rossta))
-
-## [v0.3.0](https://github.com/zaru/webpush/tree/v0.3.0) (2016-10-14)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.2.5...v0.3.0)
-
-**Merged pull requests:**
-
-- Implement VAPID authorization [\#26](https://github.com/zaru/webpush/pull/26) ([rossta](https://github.com/rossta))
-
-## [v0.2.5](https://github.com/zaru/webpush/tree/v0.2.5) (2016-09-14)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.2.4...v0.2.5)
-
-**Merged pull requests:**
-
-- api key only needed for old google apis [\#24](https://github.com/zaru/webpush/pull/24) ([mohamedhafez](https://github.com/mohamedhafez))
-
-## [v0.2.4](https://github.com/zaru/webpush/tree/v0.2.4) (2016-08-29)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.2.3...v0.2.4)
-
-**Merged pull requests:**
-
-- VERIFY\_PEER by default - no need for a cert\_store option [\#20](https://github.com/zaru/webpush/pull/20) ([mohamedhafez](https://github.com/mohamedhafez))
-
-## [v0.2.3](https://github.com/zaru/webpush/tree/v0.2.3) (2016-06-19)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.2.2...v0.2.3)
-
-**Merged pull requests:**
-
-- detect and handle response errors [\#18](https://github.com/zaru/webpush/pull/18) ([mohamedhafez](https://github.com/mohamedhafez))
-
-## [v0.2.2](https://github.com/zaru/webpush/tree/v0.2.2) (2016-06-13)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.2.1...v0.2.2)
-
-**Merged pull requests:**
-
-- Don't include API key for firefox or other browsers [\#16](https://github.com/zaru/webpush/pull/16) ([mohamedhafez](https://github.com/mohamedhafez))
-- Option to specify a cert store [\#15](https://github.com/zaru/webpush/pull/15) ([mohamedhafez](https://github.com/mohamedhafez))
-- show ttl option in README [\#14](https://github.com/zaru/webpush/pull/14) ([mohamedhafez](https://github.com/mohamedhafez))
-
-## [v0.2.1](https://github.com/zaru/webpush/tree/v0.2.1) (2016-05-23)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.2.0...v0.2.1)
-
-**Merged pull requests:**
-
-- Make the response more detailed. [\#10](https://github.com/zaru/webpush/pull/10) ([kevinjom](https://github.com/kevinjom))
-
-## [v0.2.0](https://github.com/zaru/webpush/tree/v0.2.0) (2016-05-16)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.6...v0.2.0)
-
-**Merged pull requests:**
-
-- Make message payload optional [\#8](https://github.com/zaru/webpush/pull/8) ([rossta](https://github.com/rossta))
-- Add specs [\#7](https://github.com/zaru/webpush/pull/7) ([rossta](https://github.com/rossta))
-
-## [v0.1.6](https://github.com/zaru/webpush/tree/v0.1.6) (2016-05-12)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.5...v0.1.6)
-
-**Merged pull requests:**
-
-- Add rake binstub [\#6](https://github.com/zaru/webpush/pull/6) ([rossta](https://github.com/rossta))
-- Add syntax highlighting to README snippets [\#5](https://github.com/zaru/webpush/pull/5) ([rossta](https://github.com/rossta))
-- Extract encryption module [\#4](https://github.com/zaru/webpush/pull/4) ([rossta](https://github.com/rossta))
-- Add some happy case specs [\#3](https://github.com/zaru/webpush/pull/3) ([waheedel](https://github.com/waheedel))
-
-## [v0.1.5](https://github.com/zaru/webpush/tree/v0.1.5) (2016-04-29)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.4...v0.1.5)
-
-**Merged pull requests:**
-
-- add Ttl header parameter [\#1](https://github.com/zaru/webpush/pull/1) ([shouta-dev](https://github.com/shouta-dev))
-
-## [v0.1.4](https://github.com/zaru/webpush/tree/v0.1.4) (2016-04-27)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.3...v0.1.4)
-
-## [v0.1.3](https://github.com/zaru/webpush/tree/v0.1.3) (2016-04-13)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.2...v0.1.3)
-
-## [v0.1.2](https://github.com/zaru/webpush/tree/v0.1.2) (2016-04-12)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.1...v0.1.2)
-
-## [v0.1.1](https://github.com/zaru/webpush/tree/v0.1.1) (2016-03-31)
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.1.0...v0.1.1)
-
-## [v0.1.0](https://github.com/zaru/webpush/tree/v0.1.0) (2016-03-31)
-
-
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Rakefile

@@ -1,8 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
-
-import './lib/tasks/web_push.rake'

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "web_push"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/tasks/web_push.rake

@@ -1,14 +0,0 @@
-namespace :web_push do
-  desc 'Generate VAPID public/private key pair'
-  task :generate_keys do
-    require 'web_push'
-
-    WebPush.generate_key.tap do |keypair|
-      puts <<-KEYS
-Generated VAPID keypair:
-Public  -> #{keypair.public_key}
-Private -> #{keypair.private_key}
-      KEYS
-    end
-  end
-end

data/lib/web_push/railtie.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module WebPush
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load 'tasks/web_push.rake'
-    end
-  end
-end