rpush 6.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f8cbb341eafccf585f3967e5b1ef434a422f9a14175466060a978d2d4adbe4e
-  data.tar.gz: c8f767c447855b04a7e2d9e980a9408bdbafe11f6e84f711c0893122f2202cec
+  metadata.gz: 409c28bf9f63343232e1c7db56f8d7131acc70b4828032059f37eab3a4606e6c
+  data.tar.gz: 3f07d7e79828fa43ab5ed73a9b19183a9f4ac9e5a3d8891f1ecfec42c7375c03
 SHA512:
-  metadata.gz: 3e6997a5008122ca85fed5a5f4eab96e0c6e585aa8fc4ab305c394608c10fb6bfdec2b79077e3098e137e173e65b0e7804038b5230013a51446d980ed2d6bb95
-  data.tar.gz: 5e6b265e5e034bebe78a30cdd4f2af63a08933777a58d86d1f8c6a73a2f4783fad7cba6f4b2181a08a79def81879594544979642dae8c3326de407205c6c4852
+  metadata.gz: 400a7241c337ff9874767be4ee051d1494676665bd17e9b3acb2e3ce8efae236971a138888da6c0172e0c649276e97f4d639430733bad345e7980d408e8c3436
+  data.tar.gz: e81b66da807a2bc8a386a12825aed37c452672be899b69ff633d65b80548903669e7d63b3b1eec899633557a489157e8083ed562b2665c017566df9ad220c151

data/CHANGELOG.md

@@ -1,8 +1,42 @@
 # Changelog
 
+## [v7.0.1](https://github.com/rpush/rpush/tree/v7.0.1) (2022-03-02)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v7.0.0...v7.0.1)
+
+**Merged pull requests:**
+
+- Fix deprecation warnings from the redis gem [\#636](https://github.com/rpush/rpush/pull/636) ([sharang-d](https://github.com/sharang-d))
+
 ## [Unreleased](https://github.com/rpush/rpush/tree/HEAD)
 
-[Full Changelog](https://github.com/rpush/rpush/compare/v5.4.0...HEAD)
+[Full Changelog](https://github.com/rpush/rpush/compare/v7.0.0...HEAD)
+
+## [v7.0.0](https://github.com/rpush/rpush/tree/HEAD)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v6.0.1...v7.0.0)
+
+**Merged pull requests:**
+
+- Test with Ruby 3.1 [\#632](https://github.com/rpush/rpush/pull/632) ([aried3r](https://github.com/aried3r))
+- Resolves Rails 7 Time.now.to\_s deprecation warning [\#630](https://github.com/rpush/rpush/pull/630) ([gregblake](https://github.com/gregblake))
+- Adds Rails 7 Support [\#629](https://github.com/rpush/rpush/pull/629) ([gregblake](https://github.com/gregblake))
+- Test with Rails 7.0.0.alpha2 [\#626](https://github.com/rpush/rpush/pull/626) ([aried3r](https://github.com/aried3r))
+
+**Breaking:**
+
+- Drop support for Ruby 2.3 [\#631](https://github.com/rpush/rpush/pull/631) ([aried3r](https://github.com/aried3r))
+
+## [v6.0.1](https://github.com/rpush/rpush/tree/v6.0.1) (2021-10-08)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v6.0.0...v6.0.1)
+
+**Merged pull requests:**
+
+- Don't limit webpush registration keys [\#624](https://github.com/rpush/rpush/pull/624) ([treyrich](https://github.com/treyrich))
+- Add Prometheus Exporter plugin link to README [\#617](https://github.com/rpush/rpush/pull/617) ([maxsz](https://github.com/maxsz))
+- Reference current interface in config template [\#569](https://github.com/rpush/rpush/pull/569) ([benlangfeld](https://github.com/benlangfeld))
+- Default the Rails environment to RAILS\_ENV if set [\#562](https://github.com/rpush/rpush/pull/562) ([benlangfeld](https://github.com/benlangfeld))
 
 ## [v6.0.0](https://github.com/rpush/rpush/tree/v6.0.0) (2021-05-21)
 

data/README.md

@@ -24,7 +24,7 @@ Rpush aims to be the *de facto* gem for sending push notifications in Ruby. Its
 
 * Use [**ActiveRecord**](https://github.com/rpush/rpush/wiki/Using-ActiveRecord) or [**Redis**](https://github.com/rpush/rpush/wiki/Using-Redis) for storage.
 * Plugins for [**Bugsnag**](https://github.com/rpush/rpush-plugin-bugsnag),
-[**Sentry**](https://github.com/rpush/rpush-plugin-sentry), [**StatsD**](https://github.com/rpush/rpush-plugin-statsd) or [write your own](https://github.com/rpush/rpush/wiki/Writing-a-Plugin).
+[**Sentry**](https://github.com/rpush/rpush-plugin-sentry), [**StatsD**](https://github.com/rpush/rpush-plugin-statsd). Third party plugins: [**Prometheus Exporter**](https://github.com/equinux/rpush-plugin-prometheus-exporter). Or [write your own](https://github.com/rpush/rpush/wiki/Writing-a-Plugin).
 * Seamless integration with your projects, including **Rails**.
 * Run as a [daemon](https://github.com/rpush/rpush#as-a-daemon), inside a [job queue](https://github.com/rpush/rpush/wiki/Push-API), on the [command-line](https://github.com/rpush/rpush#on-the-command-line) or [embedded](https://github.com/rpush/rpush/wiki/Embedding-API) in another process.
 * Scales vertically (threading) and horizontally (multiple processes).

data/lib/generators/templates/rpush.rb

@@ -46,10 +46,7 @@ Rpush.reflect do |on|
   # Called when a notification is queued internally for delivery.
   # The internal queue for each app runner can be inspected:
   #
-  # Rpush::Daemon::AppRunner.runners.each do |app_id, runner|
-  #   runner.app
-  #   runner.queue_size
-  # end
+  # Rpush::Daemon::AppRunner.status
   #
   # on.notification_enqueued do |notification|
   # end

data/lib/generators/templates/rpush_2_0_0_updates.rb

@@ -58,7 +58,11 @@ class Rpush200Updates < ActiveRecord::Migration[5.0]
 
   def self.adapter_name
     env = (defined?(Rails) && Rails.env) ? Rails.env : 'development'
-    Hash[ActiveRecord::Base.configurations[env].map { |k,v| [k.to_sym,v] }][:adapter]
+    if ActiveRecord::VERSION::MAJOR > 6
+      ActiveRecord::Base.configurations.configs_for(env_name: env).first.configuration_hash[:adapter]
+    else
+      Hash[ActiveRecord::Base.configurations[env].map { |k,v| [k.to_sym,v] }][:adapter]
+    end
   end
 
   def self.postgresql?

data/lib/rpush/client/active_model/webpush/notification.rb

@@ -11,7 +11,7 @@ module Rpush
               return if record.registration_ids.size > 1
               reg = record.registration_ids.first
               unless reg.is_a?(Hash) &&
-                  reg.keys.sort == KEYS &&
+                  (KEYS-reg.keys).empty? &&
                   reg[:endpoint].is_a?(String) &&
                   reg[:keys].is_a?(Hash)
                 record.errors.add(:base, 'Registration must have :endpoint (String) and :keys (Hash) keys')

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

@@ -181,6 +181,17 @@ module Rpush
           id
         end
 
+        def adapter_name
+          env = (defined?(Rails) && Rails.env) ? Rails.env : 'development'
+          if ::ActiveRecord::VERSION::MAJOR > 6
+            ::ActiveRecord::Base.configurations.configs_for(env_name: env).first.configuration_hash[:adapter]
+          else
+            config = ::ActiveRecord::Base.configurations[env]
+            return '' unless config
+            Hash[config.map { |k, v| [k.to_sym, v] }][:adapter]
+          end
+        end
+
         private
 
         def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
@@ -199,13 +210,6 @@ module Rpush
           relation = Rpush::Client::ActiveRecord::Notification.where('processing = ? AND delivered = ? AND failed = ? AND (deliver_after IS NULL OR deliver_after < ?)', false, false, false, Time.now)
           relation.order('deliver_after ASC, created_at ASC')
         end
-
-        def adapter_name
-          env = (defined?(Rails) && Rails.env) ? Rails.env : 'development'
-          config = ::ActiveRecord::Base.configurations[env]
-          return '' unless config
-          Hash[config.map { |k, v| [k.to_sym, v] }][:adapter]
-        end
       end
     end
   end

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

@@ -152,10 +152,10 @@ module Rpush
           retryable_ns = Rpush::Client::Redis::Notification.absolute_retryable_namespace
 
           Modis.with_connection do |redis|
-            retryable_results = redis.multi do
+            retryable_results = redis.multi do |transaction|
               now = Time.now.to_i
-              redis.zrangebyscore(retryable_ns, 0, now)
-              redis.zremrangebyscore(retryable_ns, 0, now)
+              transaction.zrangebyscore(retryable_ns, 0, now)
+              transaction.zremrangebyscore(retryable_ns, 0, now)
             end
 
             retryable_results.first
@@ -167,9 +167,9 @@ module Rpush
           pending_ns = Rpush::Client::Redis::Notification.absolute_pending_namespace
 
           Modis.with_connection do |redis|
-            pending_results = redis.multi do
-              redis.zrange(pending_ns, 0, limit)
-              redis.zremrangebyrank(pending_ns, 0, limit)
+            pending_results = redis.multi do |transaction|
+              transaction.zrange(pending_ns, 0, limit)
+              transaction.zremrangebyrank(pending_ns, 0, limit)
             end
 
             pending_results.first

data/lib/rpush/logger.rb

@@ -69,7 +69,7 @@ module Rpush
         msg = "#{msg.class.name}, #{msg.message}\n#{formatted_backtrace}"
       end
 
-      formatted_msg = "[#{Time.now.to_s(:db)}] "
+      formatted_msg = "[#{Time.now.to_formatted_s(:db)}]"
       formatted_msg << '[rpush] ' if Rpush.config.embedded
       formatted_msg << "[#{prefix}] " if prefix
       formatted_msg << msg

data/lib/rpush/version.rb

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

data/spec/functional/webpush_spec.rb

@@ -8,6 +8,7 @@ describe 'Webpush' do
 
   let(:device_reg) {
     { endpoint: 'https://webpush-provider.example.org/push/some-id',
+      expirationTime: nil,
       keys: {'auth' => 'DgN9EBia1o057BdhCOGURA', 'p256dh' => 'BAtxJ--7vHq9IVm8utUB3peJ4lpxRqk1rukCIkVJOomS83QkCnrQ4EyYQsSaCRgy_c8XPytgXxuyAvRJdnTPK4A'} }
   }
   let(:notification) { Rpush::Webpush::Notification.create!(app: app, registration_ids: [device_reg], data: { message: 'test' }) }

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

@@ -66,4 +66,11 @@ describe Rpush::Daemon::Store::ActiveRecord do
       expect(store.deliverable_notifications(Rpush.config.batch_size)).to be_empty
     end
   end
+
+  describe "#adapter_name" do
+    it "should return the adapter name" do
+      adapter = ENV["ADAPTER"] || "postgresql"
+      expect(store.adapter_name).to eq(adapter)
+    end
+  end
 end if active_record?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -292,16 +292,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -693,6 +693,7 @@ metadata:
   bug_tracker_uri: https://github.com/rpush/rpush/issues
   changelog_uri: https://github.com/rpush/rpush/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rpush/rpush
+  rubygems_mfa_required: 'true'
 post_install_message: |
   When upgrading Rpush, don't forget to run `bundle exec rpush init` to get all the latest migrations.
 
@@ -705,14 +706,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: The push notification service for Ruby.