Merge pull request rpush#586 from andreaslillebo/ruby-3.0

.travis.yml

@@ -12,6 +12,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
 
 # Build only commits on master for the "Build pushed branches" feature. This
 # prevents building twice on PRs originating from our repo ("Build pushed pull
@@ -27,6 +28,7 @@ gemfile:
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
 
 services:
   - postgresql
@@ -47,10 +49,20 @@ env:
 matrix:
   fast_finish: true
   exclude:
+    - gemfile: gemfiles/rails_5.0.gemfile
+      rvm: 3.0
+    - gemfile: gemfiles/rails_5.1.gemfile
+      rvm: 3.0
+    - gemfile: gemfiles/rails_5.2.gemfile
+      rvm: 3.0
     - gemfile: gemfiles/rails_6.0.gemfile
       rvm: 2.3
     - gemfile: gemfiles/rails_6.0.gemfile
       rvm: 2.4
+    - gemfile: gemfiles/rails_6.1.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/rails_6.1.gemfile
+      rvm: 2.4
 
 jobs:
   include:

Appraisals

@@ -42,3 +42,11 @@ appraise "rails-6.0" do
     gem 'rails', '~> 6.0.0'
   end
 end
+
+appraise "rails-6.1" do
+  gem 'activesupport', '~> 6.1.0'
+
+  group :development do
+    gem 'rails', '~> 6.1.0'
+  end
+end

Gemfile.lock

@@ -45,7 +45,7 @@ GEM
     codeclimate-test-reporter (1.0.7)
       simplecov
     concurrent-ruby (1.1.7)
-    connection_pool (2.2.2)
+    connection_pool (2.2.3)
     crass (1.0.6)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
@@ -75,7 +75,7 @@ GEM
     msgpack (1.3.1)
     multi_json (1.15.0)
     mysql2 (0.5.2)
-    net-http-persistent (4.0.0)
+    net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     net-http2 (0.18.3)
       http-2 (~> 0.10.1)
@@ -171,4 +171,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

gemfiles/rails_6.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.1.0"
+
+group :development do
+  gem "rails", "~> 6.1.0"
+end
+
+gemspec path: "../"

lib/generators/templates/add_gcm.rb

@@ -19,8 +19,8 @@ def self.up
 
     change_column :rapns_notifications, :type, :string, null: false
     change_column :rapns_apps, :type, :string, null: false
-    change_column :rapns_notifications, :device_token, :string, { null: true, limit: 64 }
-    change_column :rapns_notifications, :expiry, :integer, { null: true, default: 1.day.to_i }
+    change_column :rapns_notifications, :device_token, :string, null: true, limit: 64
+    change_column :rapns_notifications, :expiry, :integer, null: true, default: 1.day.to_i
     change_column :rapns_apps, :environment, :string, null: true
     change_column :rapns_apps, :certificate, :text, null: true, default: nil
 
@@ -73,8 +73,8 @@ def self.down
     remove_column :rapns_notifications, :type
     remove_column :rapns_apps, :type
 
-    change_column :rapns_notifications, :device_token, :string, { null: false, limit: 64 }
-    change_column :rapns_notifications, :expiry, :integer, { null: false, default: 1.day.to_i }
+    change_column :rapns_notifications, :device_token, :string, null: false, limit: 64
+    change_column :rapns_notifications, :expiry, :integer, null: false, default: 1.day.to_i
     change_column :rapns_apps, :environment, :string, null: false
     change_column :rapns_apps, :certificate, :text, null: false
 

lib/generators/templates/add_rpush.rb

@@ -164,8 +164,8 @@ def self.up
 
       change_column :rapns_notifications, :type, :string, null: false
       change_column :rapns_apps, :type, :string, null: false
-      change_column :rapns_notifications, :device_token, :string, { null: true, limit: 64 }
-      change_column :rapns_notifications, :expiry, :integer, { null: true, default: 1.day.to_i }
+      change_column :rapns_notifications, :device_token, :string, null: true, limit: 64
+      change_column :rapns_notifications, :expiry, :integer, null: true, default: 1.day.to_i
       change_column :rapns_apps, :environment, :string, null: true
       change_column :rapns_apps, :certificate, :text, null: true, default: nil
 
@@ -218,8 +218,8 @@ def self.down
       remove_column :rapns_notifications, :type
       remove_column :rapns_apps, :type
 
-      change_column :rapns_notifications, :device_token, :string, { null: false, limit: 64 }
-      change_column :rapns_notifications, :expiry, :integer, { null: false, default: 1.day.to_i }
+      change_column :rapns_notifications, :device_token, :string, null: false, limit: 64
+      change_column :rapns_notifications, :expiry, :integer, null: false, default: 1.day.to_i
       change_column :rapns_apps, :environment, :string, null: false
       change_column :rapns_apps, :certificate, :text, null: false
 

lib/generators/templates/rpush_3_3_1_updates.rb

@@ -5,7 +5,7 @@ def self.up
   end
 
   def self.down
-    change_column :rpush_notifications, :device_token, :string, { null: true, limit: 64 }
-    change_column :rpush_feedback, :device_token, :string, { null: true, limit: 64 }
+    change_column :rpush_notifications, :device_token, :string, null: true, limit: 64
+    change_column :rpush_feedback, :device_token, :string, null: true, limit: 64
   end
 end

spec/unit/daemon/pushy/delivery_spec.rb

@@ -61,10 +61,12 @@
       it_behaves_like 'process notification'
     end
 
-    shared_examples 'retry delivery' do |response_code:|
-      let(:response_code) { response_code }
+    shared_examples 'retry delivery' do |options|
+      let(:response_code) { options[:response_code] }
+
+      shared_examples 'logs' do |log_options|
+        let(:deliver_after) { log_options[:deliver_after] }
 
-      shared_examples 'logs' do |deliver_after:|
         let(:expected_log_message) do
           "Pushy responded with a #{response_code} error. Notification #{notification.id} " \
           "will be retried after #{deliver_after} (retry 1)."

spec/unit/daemon/webpush/delivery_spec.rb

@@ -50,10 +50,12 @@
       it_behaves_like 'process notification'
     end
 
-    shared_examples 'retry delivery' do |response_code:|
-      let(:response_code) { response_code }
+    shared_examples 'retry delivery' do |options|
+      let(:response_code) { options[:response_code] }
+
+      shared_examples 'logs' do |log_options|
+        let(:deliver_after) { log_options[:deliver_after] }
 
-      shared_examples 'logs' do |deliver_after:|
         let(:expected_log_message) do
           "[MyApp] Webpush endpoint responded with a #{response_code} error. Notification #{notification.id} will be retried after #{deliver_after} (retry 1)."
         end