rpush 6.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f2b9e229e7ebe35f201483f6e959cb317ae7ca97f56b0084ee1543a9bb13b3
-  data.tar.gz: 23b0ae77b424a34db34eb823b265eedc696f8924216555cc0485cd3d8f4a6a99
+  metadata.gz: 92cd836109dce22fe3308276ba9dfef44eb2568199527f152beb848711ad6b07
+  data.tar.gz: bd276ebd3983b2f59a2382b02ecb1806bc3dc08996e565c097308abd2809b351
 SHA512:
-  metadata.gz: 106f87bc174864adaf3443933ae690312c7f2f16df946accb19c02bfeaff03d9f706a4e9f6f5f164e11a5e027663e46f547713b9ae8dd280e38b4f42ec77eb2b
-  data.tar.gz: 065b010d2f8af82d86fad787f6fa59441e120d3de987971f131f70d40680cc8c571247b78d25682b16a8e69b2587fa07fa1b91903340b2690565f6863826edae
+  metadata.gz: 8971bc32c3b3b9f17a3bfe6d1c4aeb80ca40238d0598061dc6f59eae2f453e3c2cd0cefb2f39092c4842ed220f8c424214d3ce37fa8828b7cd0085324164b061
+  data.tar.gz: f825acf76c812b53746c26829206d9c7641566820fb6abdcc1113493bedd0bfe9b511acb13d1175c9024e51c4435d535c2931c72545ec17edf797c62537f1e4e

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## [Unreleased](https://github.com/rpush/rpush/tree/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)

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/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/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 = 1
+    TINY = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

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.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2022-01-21 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.