pushpad 0.13.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 859e8674ef09ee84c2bb6ab00a837aef0d48b2039774625974aae32f2ca3a2ee
-  data.tar.gz: 71086f6109284229c8c02d01d48ca0980a4621065d43875a4131bc867b7c002a
+  metadata.gz: dccdac2f6334014fc3b1a7fa42b5cc0644135df02b3e58f9c44f17e7fe00a27e
+  data.tar.gz: 69c4ea4985bdd6c120445e36c58e8adf0f572874dd7fd3ef929ad90176c84b18
 SHA512:
-  metadata.gz: 2cd5ae106f55214c5c16a7fc2eae7d33ecb4e6fb0c9b2917d44c643a754b5a6b124630b356969d9a230a25ed89fe0726b900d001452c777dba677f629c52ce6d
-  data.tar.gz: f06eb68e6b96bbf6b6f59ab687c838fdc72a6a5f9df61a86e48772bd7f74d6990416d69ddbe8ea71855b8a42ba453e363c2fb4a1ae4b97268d437a545b9a0166
+  metadata.gz: b9ab88edcae1bcb44f8e6e1b388d25ee47459c81b6f2c72c9b450a1bf64b08dd874b019d518733a1cb4cf53c7f4f3c8feec7ffc418a144c81cc6b0864c1b67d2
+  data.tar.gz: 6540c56bb6cbaa46e496098669d081c7c66f35c20e1cc82bb4602510a696179c9fa71ba381dd1693c181fe32adf8a05ef5224ca9a2ea22f16648e35b2eca138b

data/.github/workflows/ci.yml

@@ -10,9 +10,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/README.md

@@ -3,13 +3,9 @@
 [![Gem Version](https://badge.fury.io/rb/pushpad.svg)](https://badge.fury.io/rb/pushpad)
 ![Build Status](https://github.com/pushpad/pushpad-ruby/workflows/CI/badge.svg)
 
-[Pushpad](https://pushpad.xyz) is a service for sending push notifications from your web app. It supports the **Push API** (Chrome, Firefox, Opera, Edge) and **APNs** (Safari).
+[Pushpad](https://pushpad.xyz) is a service for sending push notifications from websites and web apps. It uses the **Push API**, which is a standard supported by all major browsers (Chrome, Firefox, Opera, Edge, Safari).
 
-Features:
-
-- notifications are delivered even when the user is not on your website
-- users don't need to install any app or plugin
-- you can target specific users or send bulk notifications
+The notifications are delivered in real time even when the users are not on your website and you can target specific users or send bulk notifications.
 
 ## Installation
 
@@ -55,17 +51,40 @@ Pushpad.signature_for current_user.id
 
 ```ruby
 notification = Pushpad::Notification.new({
+  # required, the main content of the notification
   body: "Hello world!",
-  title: "Website Name", # optional, defaults to your project name
-  target_url: "https://example.com", # optional, defaults to your project website
-  icon_url: "https://example.com/assets/icon.png", # optional, defaults to the project icon
-  badge_url: "https://example.com/assets/badge.png" # optional, defaults to the project badge
-  image_url: "https://example.com/assets/image.png", # optional, an image to display in the notification content
-  ttl: 604800, # optional, drop the notification after this number of seconds if a device is offline
-  require_interaction: true, # optional, prevent Chrome on desktop from automatically closing the notification after a few seconds
-  silent: false, # optional, enable this option if you want a mute notification without any sound
-  urgent: false, # optional, enable this option only for time-sensitive alerts (e.g. incoming phone call)
-  custom_data: "123", # optional, a string that is passed as an argument to action button callbacks
+
+  # optional, the title of the notification (defaults to your project name)
+  title: "Website Name",
+
+  # optional, open this link on notification click (defaults to your project website)
+  target_url: "https://example.com",
+
+  # optional, the icon of the notification (defaults to the project icon)
+  icon_url: "https://example.com/assets/icon.png",
+
+  # optional, the small icon displayed in the status bar (defaults to the project badge)
+  badge_url: "https://example.com/assets/badge.png",
+
+  # optional, an image to display in the notification content
+  # see https://pushpad.xyz/docs/sending_images
+  image_url: "https://example.com/assets/image.png",
+
+  # optional, drop the notification after this number of seconds if a device is offline
+  ttl: 604800,
+
+  # optional, prevent Chrome on desktop from automatically closing the notification after a few seconds
+  require_interaction: true,
+
+  # optional, enable this option if you want a mute notification without any sound
+  silent: false,
+
+  # optional, enable this option only for time-sensitive alerts (e.g. incoming phone call)
+  urgent: false,
+
+  # optional, a string that is passed as an argument to action button callbacks
+  custom_data: "123",
+
   # optional, add some action buttons to the notification
   # see https://pushpad.xyz/docs/action_buttons
   actions: [
@@ -76,10 +95,14 @@ notification = Pushpad::Notification.new({
       action: "myActionName" # optional
     }
   ],
-  starred: true, # optional, bookmark the notification in the Pushpad dashboard (e.g. to highlight manual notifications)
+
+  # optional, bookmark the notification in the Pushpad dashboard (e.g. to highlight manual notifications)
+  starred: true,
+
   # optional, use this option only if you need to create scheduled notifications (max 5 days)
   # see https://pushpad.xyz/docs/schedule_notifications
   send_at: Time.utc(2016, 7, 25, 10, 9),
+
   # optional, add the notification to custom categories for stats aggregation
   # see https://pushpad.xyz/docs/monitoring
   custom_metrics: ['examples', 'another_metric'] # up to 3 metrics per notification
@@ -100,7 +123,8 @@ notification.deliver_to users, tags: ['events']
 notification.broadcast tags: ['segment1', 'segment2']
 
 # you can use boolean expressions 
-# they must be in the disjunctive normal form (without parenthesis)
+# they can include parentheses and the operators !, &&, || (from highest to lowest precedence)
+# https://pushpad.xyz/docs/tags
 notification.broadcast tags: ['zip_code:28865 && !optout:local_events || friend_of:Organizer123']
 notification.deliver_to users, tags: ['tag1 && tag2', 'tag3'] # equal to 'tag1 && tag2 || tag3'
 
@@ -138,22 +162,22 @@ notification = Pushpad::Notification.find(42)
 
 # get basic attributes
 notification.id # => 42
-notification.title # => "Foo Bar",
-notification.body # => "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
-notification.target_url # => "https://example.com",
-notification.ttl # => 604800,
-notification.require_interaction # => false,
-notification.silent # => false,
-notification.urgent # => false,
-notification.icon_url # => "https://example.com/assets/icon.png",
-notification.badge_url # => "https://example.com/assets/badge.png",
+notification.title # => "Foo Bar"
+notification.body # => "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+notification.target_url # => "https://example.com"
+notification.ttl # => 604800
+notification.require_interaction # => false
+notification.silent # => false
+notification.urgent # => false
+notification.icon_url # => "https://example.com/assets/icon.png"
+notification.badge_url # => "https://example.com/assets/badge.png"
 
 # `created_at` is a `Time` instance
-notification.created_at.utc.to_s # => "2016-07-06 10:09:14 UTC",
+notification.created_at.utc.to_s # => "2016-07-06 10:09:14 UTC"
 
 # get statistics
 notification.scheduled_count # => 1
-notification.successfully_sent_count # => 4,
+notification.successfully_sent_count # => 4
 notification.opened_count # => 2
 ```
 
@@ -164,7 +188,7 @@ notifications = Pushpad::Notification.find_all(project_id: 5)
 
 # same attributes as for single notification in example above
 notifications[0].id # => 42
-notifications[0].title # => "Foo Bar",
+notifications[0].title # => "Foo Bar"
 ```
 
 If `Pushpad.project_id` is defined, the `project_id` option can be
@@ -177,6 +201,26 @@ to get the full list in multiple requests.
 notifications = Pushpad::Notification.find_all(project_id: 5, page: 2)
 ```
 
+## Scheduled notifications
+
+You can create scheduled notifications that will be sent in the future:
+
+```ruby
+notification = Pushpad::Notification.new({
+  body: "This notification will be sent after 60 seconds",
+  send_at: Time.now.utc + 60
+})
+
+notification.broadcast
+```
+
+You can also cancel a scheduled notification:
+
+```ruby
+notification = Pushpad::Notification.find(5)
+notification.cancel
+```
+
 ## Getting subscription count
 
 You can retrieve the number of subscriptions for a given project,

data/lib/pushpad/notification.rb

@@ -8,6 +8,9 @@ module Pushpad
 
     class FindError < RuntimeError
     end
+    
+    class CancelError < RuntimeError
+    end
 
     class ReadonlyError < RuntimeError
     end
@@ -87,6 +90,14 @@ module Pushpad
       end
       deliver req_body(uids, options[:tags]), options
     end
+    
+    def cancel
+      response = Request.delete("https://pushpad.xyz/api/v1/notifications/#{id}/cancel")
+
+      unless response.code == "204"
+        raise CancelError, "Response #{response.code} #{response.message}: #{response.body}"
+      end
+    end
 
     private
 

data/lib/pushpad/request.rb

@@ -18,6 +18,10 @@ module Pushpad
         request.body = body
       end
     end
+    
+    def delete(endpoint, options = {})
+      perform(Net::HTTP::Delete, endpoint, options)
+    end
 
     private
 

data/lib/pushpad.rb

@@ -26,7 +26,7 @@ module Pushpad
 
   def self.signature_for(data)
     raise "You must set Pushpad.auth_token" unless Pushpad.auth_token
-    OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), self.auth_token, data.to_s)
+    OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), self.auth_token, data.to_s)
   end
 
 end

data/pushpad.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "pushpad"
-  spec.version       = '0.13.0'
+  spec.version       = '1.1.0'
   spec.authors       = ["Pushpad"]
   spec.email         = ["support@pushpad.xyz"]
   spec.summary       = "Web push notifications for Chrome, Firefox, Opera, Edge and Safari using Pushpad."

data/spec/pushpad/notification_spec.rb

@@ -28,7 +28,6 @@ module Pushpad
     end
 
     def stub_notification_post(project_id, params = {}, response_body = "{}")
-
       stub_request(:post, "https://pushpad.xyz/api/v1/projects/#{project_id}/notifications").
         with(body: hash_including(params)).
         to_return(status: 201, body: response_body)
@@ -38,6 +37,16 @@ module Pushpad
       stub_request(:post, "https://pushpad.xyz/api/v1/projects/#{project_id}/notifications").
         to_return(status: 403)
     end
+    
+    def stub_notification_delete(notification_id)
+      stub_request(:delete, "https://pushpad.xyz/api/v1/notifications/#{notification_id}/cancel").
+        to_return(status: 204)
+    end
+    
+    def stub_failing_notification_delete(notification_id)
+      stub_request(:delete, "https://pushpad.xyz/api/v1/notifications/#{notification_id}/cancel").
+        to_return(status: 404)
+    end
 
     describe ".new" do
       it "allows delivering notifications even if an id attribute is supplied" do
@@ -409,5 +418,27 @@ module Pushpad
         end
       end
     end
+    
+    describe "#cancel" do
+      it "cancels a scheduled notification" do
+        stub_notification_delete(5)
+        
+        notification = Notification.new(id: 5)
+        
+        res = notification.cancel
+        expect(res).to be_nil
+      end
+      
+      it "fails with CancelError if response status code is not 204" do
+        stub_failing_notification_delete(5)
+        
+        notification = Notification.new(id: 5)
+        
+        expect {
+          notification.cancel
+        }.to raise_error(Notification::CancelError)
+      end
+    end
+    
   end
 end

data/spec/pushpad_spec.rb

@@ -16,9 +16,9 @@ describe Pushpad do
   end
 
   describe "#signature_for" do
-    it "produces the hex-encoded HMAC-SHA1 signature for the data passed as argument" do
+    it "produces the hex-encoded HMAC-SHA256 signature for the data passed as argument" do
       signature = Pushpad.signature_for('myuid1')
-      expect(signature).to eq '27fbe136f5a4aa0b6be74c0e18fa8ce81ad91b60'
+      expect(signature).to eq 'd213a2f146dd9aae9cb935b5233d42fecc9414e2b0e98896af7a43e7fce3ef31'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushpad
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pushpad
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Web push notifications for Chrome, Firefox, Opera, Edge and Safari using