rpush 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf4ad12d47bddf231b3ea0ff7992cf8feab0816fc301cc43b4a41b9edeaa41e
-  data.tar.gz: 93a513bc8f4ab37880fb353044ad4c3349bded12906e71ffa1605380d920b2b1
+  metadata.gz: c92f2053a81534384b1439e958afc67fe51913fb4144abe0e0a60edda626f37f
+  data.tar.gz: fb6d691def9b053fd6eba40244dd84adebfbb549a5d02d4310381bfadbb06bc9
 SHA512:
-  metadata.gz: 0a2165bea0a8f1f1d7f60e8a62693a0a3fce40acb00baba990578beb965d5c258fbe231305edfa04d9c83329e5f7b1da71d0772b6399f7f9ec6359ca5fb7a2c5
-  data.tar.gz: 6831ddac685c0f6264242d2ccfa6be41b4a6c4a414dfa4c84734134f911df756f7e6350ca13a54a25becfc6106426feae6ef4d372e36ff72537e5d9300bde836
+  metadata.gz: 980046a8d527a44066937d54e32fea017d8afbd0177a027ec78a21fe31ddaf28bc075c8ddcb9ce2785b453e0d16fe011473de985bb4155882957e11067fd305a
+  data.tar.gz: 99cac2e5c9e4d06e190f27eef97adf41f388d4e9a9116dd9e7beb8b013fe853138c1ef55fa92ea9a82ad9297db544d3d7ead18c568f43a5ced72d6ebacc2e487

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 4.0.1 (2019-04-04)
+
+### Fixed
+
+- Fail gracefully when a Modis notification no longer exists [#486](https://github.com/rpush/rpush/pull/486) (by [@rofreg](https://github.com/rofreg)).
+
 ## 4.0.0 (2019-02-14)
 
 ### Changed

data/lib/rpush/daemon/store/redis.rb

@@ -17,7 +17,7 @@ module Rpush
           limit -= retryable_ids.size
           pending_ids = limit > 0 ? pending_notification_ids(limit) : []
           ids = retryable_ids + pending_ids
-          ids.map { |id| Rpush::Client::Redis::Notification.find(id) }
+          ids.map { |id| find_notification_by_id(id) }.compact
         end
 
         def mark_delivered(notification, time, opts = {})
@@ -49,7 +49,12 @@ module Rpush
         end
 
         def mark_ids_failed(ids, code, description, time)
-          ids.each { |id| mark_failed(Rpush::Client::Redis::Notification.find(id), code, description, time) }
+          ids.each do |id|
+            notification = find_notification_by_id(id)
+            next unless notification
+
+            mark_failed(notification, code, description, time)
+          end
         end
 
         def mark_retryable(notification, deliver_after, opts = {})
@@ -75,7 +80,12 @@ module Rpush
         end
 
         def mark_ids_retryable(ids, deliver_after)
-          ids.each { |id| mark_retryable(Rpush::Client::Redis::Notification.find(id), deliver_after) }
+          ids.each do |id|
+            notification = find_notification_by_id(id)
+            next unless notification
+
+            mark_retryable(notification, deliver_after)
+          end
         end
 
         def create_apns_feedback(failed_at, device_token, app)
@@ -121,6 +131,13 @@ module Rpush
 
         private
 
+        def find_notification_by_id(id)
+          Rpush::Client::Redis::Notification.find(id)
+        rescue Modis::RecordNotFound
+          Rpush.logger.warn("Couldn't find Rpush::Client::Redis::Notification with id=#{id}")
+          nil
+        end
+
         def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
           notification.assign_attributes(attrs)
           notification.data = data

data/lib/rpush/version.rb

@@ -2,7 +2,7 @@ module Rpush
   module VERSION
     MAJOR = 4
     MINOR = 0
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

data/spec/unit/daemon/store/redis_spec.rb

@@ -116,6 +116,14 @@ describe Rpush::Daemon::Store::Redis do
         notification.reload
       end.to change { notification.deliver_after.try(:utc).to_s }.to(deliver_after.utc.to_s)
     end
+
+    it 'ignores IDs that do not exist without throwing an exception' do
+      notification.destroy
+      expect(logger).to receive(:warn).with("Couldn't find Rpush::Client::Redis::Notification with id=#{notification.id}")
+      expect do
+        store.mark_ids_retryable([notification.id], deliver_after)
+      end.not_to raise_exception
+    end
   end
 
   describe 'mark_batch_retryable' do
@@ -239,6 +247,14 @@ describe Rpush::Daemon::Store::Redis do
         notification.reload
       end.to change(notification, :failed).to(true)
     end
+
+    it 'ignores IDs that do not exist without throwing an exception' do
+      notification.destroy
+      expect(logger).to receive(:warn).with("Couldn't find Rpush::Client::Redis::Notification with id=#{notification.id}")
+      expect do
+        store.mark_ids_failed([notification.id], nil, '', Time.now)
+      end.not_to raise_exception
+    end
   end
 
   describe 'mark_batch_failed' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -240,20 +240,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cane
-  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: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -529,7 +515,6 @@ files:
 - lib/rpush/reflection_collection.rb
 - lib/rpush/reflection_public_methods.rb
 - lib/rpush/version.rb
-- lib/tasks/quality.rake
 - lib/tasks/test.rake
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
@@ -625,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The push notification service for Ruby.

data/lib/tasks/quality.rake

@@ -1,35 +0,0 @@
-begin
-  require 'cane/rake_task'
-
-  desc 'Run cane to check quality metrics'
-  Cane::RakeTask.new(:cane_quality) do |cane|
-    cane.add_threshold 'coverage/covered_percent', :>=, 80
-    cane.no_style = false
-    cane.style_measure = 1000
-    cane.no_doc = true
-    cane.abc_max = 22
-  end
-
-  namespace :spec do
-    task cane: %w(spec cane_quality)
-  end
-rescue LoadError
-  warn "cane not available."
-
-  namespace :spec do
-    task cane: ['spec']
-  end
-end
-
-begin
-  require 'rubocop/rake_task'
-  t = RuboCop::RakeTask.new
-  t.options << '-D'
-rescue LoadError
-  warn 'rubocop not available.'
-  task rubocop: ['spec']
-end
-
-namespace :spec do
-  task quality: %w(cane rubocop)
-end