Add project_id (returned by API) to notifications and subscriptions

Author: collimarco

lib/pushpad/notification.rb

@@ -16,10 +16,11 @@ class ReadonlyError < RuntimeError
     end
 
     attr_accessor :body, :title, :target_url, :icon_url, :badge_url, :image_url, :ttl, :require_interaction, :silent, :urgent, :custom_data, :custom_metrics, :actions, :starred, :send_at
-    attr_reader :id, :created_at, :scheduled_count, :successfully_sent_count, :opened_count
+    attr_reader :id, :project_id, :created_at, :scheduled_count, :successfully_sent_count, :opened_count
 
     def initialize(options)
       @id = options[:id]
+      @project_id = options[:project_id]
       @created_at = options[:created_at] && Time.parse(options[:created_at])
       @scheduled_count = options[:scheduled_count]
       @successfully_sent_count = options[:successfully_sent_count]

lib/pushpad/subscription.rb

@@ -15,10 +15,11 @@ class FindError < RuntimeError
     class DeleteError < RuntimeError
     end
 
-    attr_reader :id, :endpoint, :p256dh, :auth, :uid, :tags, :last_click_at, :created_at
+    attr_reader :id, :project_id, :endpoint, :p256dh, :auth, :uid, :tags, :last_click_at, :created_at
 
     def initialize(options)
       @id = options[:id]
+      @project_id = options[:project_id]
       @endpoint = options[:endpoint]
       @p256dh = options[:p256dh]
       @auth = options[:auth]
@@ -89,7 +90,7 @@ def self.find_all(options = {})
     end
 
     def update(attributes, options = {})
-      project_id = options[:project_id] || Pushpad.project_id
+      project_id = project_id || options[:project_id] || Pushpad.project_id
       raise "You must set project_id" unless project_id
 
       raise "You must set id" unless id
@@ -109,7 +110,7 @@ def update(attributes, options = {})
     end
 
     def delete(options = {})
-      project_id = options[:project_id] || Pushpad.project_id
+      project_id = project_id || options[:project_id] || Pushpad.project_id
       raise "You must set project_id" unless project_id
 
       raise "You must set id" unless id

pushpad.gemspec

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

spec/pushpad/notification_spec.rb

@@ -62,6 +62,7 @@ def stub_failing_notification_delete(notification_id)
       it "returns notification with attributes from json response" do
         attributes = {
           id: 5,
+          project_id: 123,
           title: "Foo Bar",
           body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
           target_url: "https://example.com",
@@ -118,6 +119,7 @@ def stub_failing_notification_delete(notification_id)
       it "returns notifications of project with attributes from json response" do
         attributes = {
           id: 5,
+          project_id: 123,
           title: "Foo Bar",
           body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
           target_url: "https://example.com",

spec/pushpad/subscription_spec.rb

@@ -164,6 +164,7 @@ def stub_failing_subscription_delete(project_id, id)
       it "returns subscription with attributes from json response" do
         attributes = {
           id: 5,
+          project_id: 123,
           endpoint: "https://example.com/push/f7Q1Eyf7EyfAb1", 
           p256dh: "BCQVDTlYWdl05lal3lG5SKr3VxTrEWpZErbkxWrzknHrIKFwihDoZpc_2sH6Sh08h-CacUYI-H8gW4jH-uMYZQ4=",
           auth: "cdKMlhgVeSPzCXZ3V7FtgQ==",
@@ -204,6 +205,7 @@ def stub_failing_subscription_delete(project_id, id)
       it "returns subscriptions of project with attributes from json response" do
         attributes = {
           id: 1169,
+          project_id: 123,
           endpoint: "https://example.com/push/f7Q1Eyf7EyfAb1", 
           p256dh: "BCQVDTlYWdl05lal3lG5SKr3VxTrEWpZErbkxWrzknHrIKFwihDoZpc_2sH6Sh08h-CacUYI-H8gW4jH-uMYZQ4=",
           auth: "cdKMlhgVeSPzCXZ3V7FtgQ==",