webhook_system 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d7ec8477433ee2a5594c7c2ded3a1d21c3ab2fc64255ff006334e165749f82
-  data.tar.gz: cf0766758fe594dfa511fdce07f36d3ef934cf9be3ee5a7e0446670c7e8e2899
+  metadata.gz: afdbd7185d9cb4993052c2c5f7435d8b469f2d2623d31b63aadcd6aefd3e3c71
+  data.tar.gz: 05c32f9c6392d3fd9d3d9adf41fa8e21b21dafc8b87a9efd9b4236bf87137fbb
 SHA512:
-  metadata.gz: 8035bd08b0484bd420846eeaf9f308b627acb162be14078985a7a457227665477f69ee73a79915a913a1f0a41f3105fe059bb931fb75f17afc45293b8712ee20
-  data.tar.gz: 9ab8c7afd1949d755adb08996e0d0beabf890e6777c37d15cb76e104c58ae0ff6df764d6e2925c565ee048e1dba5a1fcf441b31996ed763fd8573b506067fff4
+  metadata.gz: 66c102424aae48aa1d133abf5cd88c5233227e1c6b3604bf0c89558736d361c376b2c046e73031bdf5f0a3689c128e26188eae4188961ec476b410cf6f4da061
+  data.tar.gz: d03f803f206adcc70022a603b9ef02ba9a634e238924fd2a4b6cdf2c003e21c0783e4182ab09d9c5c326e727b64274eeb48bc9e7fc9b241bcf8e25740492e4bc

data/.github/workflows/build.yml

@@ -15,30 +15,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - 2.7
-          - 2.6
-          - 2.5
-        gemfile:
-          - rails_4.2
-          - rails_5.0
-          - rails_5.1
-          - rails_5_2
-          - rails_6.0
-          - rails_6.1
-        exclude:
-        - gemfile: rails_4.2
-          ruby: 2.7
-        - gemfile: rails_4.2
-          ruby: 3.0
-        - gemfile: rails_5.0
-          ruby: 2.7
-        - gemfile: rails_5.0
-          ruby: 3.0
-        - gemfile: rails_5.1
-          ruby: 2.7
-        - gemfile: rails_5.1
-          ruby: 3.0
+        gemfile: ["rails_7.0"]
+        ruby: [2.7]
+        include:
+          - gemfile: rails_7.0
+            ruby: '3.1'
+          - gemfile: rails_6.1
+            ruby: '3.1'
+          - gemfile: rails_7.0
+            ruby: '3.0'
+          - gemfile: rails_6.1
+            ruby: '3.0'
+          - gemfile: rails_6.1
+            ruby: 2.7
+          - gemfile: rails_6.1
+            ruby: 2.6
+          - gemfile: rails_6.0
+            ruby: 2.7
+          - gemfile: rails_6.0
+            ruby: 2.6
+          - gemfile: rails_5.2
+            ruby: 2.6
+          - gemfile: rails_5.1
+            ruby: 2.6
+          - gemfile: rails_5.0
+            ruby: 2.6
+          - gemfile: rails_4.2
+            ruby: 2.6
+          - gemfile: rails_4.2
+            ruby: 2.5
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

data/.github/workflows/rubocop-challenger.yml

@@ -0,0 +1,26 @@
+name: "RuboCop Challenge"
+
+on:
+  schedule:
+    - cron: '30 23 * * 2,3,4' # この設定の場合、火水木のAM8:30に自動でPRが作られます。
+
+jobs:
+  create-pr:
+    name: Create Pull Request
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.5
+      - name: Install bundler
+        run: gem install bundler
+      - name: Install gems
+        run: bundle install --jobs 4 --retry 3
+      - name: Set git configuration
+        run: git config remote.origin.url "git@github.com:payrollhero/webhook_system.git" # プロジェクトごとに変わる値です。
+      - name: Create RuboCop challenge pull request
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bundle exec rubocop_challenger go --base-branch=master --email=rubocop-challenger@example.com --name="Rubocop Challenger"

data/.gitignore

@@ -1,8 +1,17 @@
+# we don't commit .lock files
 Gemfile.lock
+gemfiles/*.lock
+
 doc/
 pkg/
 *.db
 tmp/
+
+# this is a good file to apps, not for gems
 .ruby-version
-gemfiles/*.lock
+
+# don't want to be annoyed with gem builds
 webhook_system-*.gem
+
+# so rubocop-challenger does not complain about uncommited files
+.bundle/*

data/.rubocop.hound.yml

@@ -13,7 +13,7 @@ Style/CollectionMethods:
     find: detect
     find_all: select
     reduce: inject
-Style/DotPosition:
+Layout/DotPosition:
   Description: Checks the position of the dot in multi-line method calls.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
   Enabled: true
@@ -21,11 +21,7 @@ Style/DotPosition:
   SupportedStyles:
   - leading
   - trailing
-Style/FileName:
-  Description: Use snake_case for source file names.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
-  Enabled: false
-  Exclude: []
+
 Style/GuardClause:
   Description: Check for conditionals that can be replaced with guard clauses
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
@@ -35,7 +31,6 @@ Style/IfUnlessModifier:
   Description: Favor modifier if/unless usage when you have a single-line body.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
   Enabled: false
-  MaxLineLength: 80
 Style/OptionHash:
   Description: Don't use option hashes when you can use keyword arguments.
   Enabled: false
@@ -53,7 +48,7 @@ Style/PercentLiteralDelimiters:
     "%w": "()"
     "%W": "()"
     "%x": "()"
-Style/PredicateName:
+Naming/PredicateName:
   Description: Check the names of predicate methods.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
   Enabled: true
@@ -61,7 +56,7 @@ Style/PredicateName:
   - is_
   - has_
   - have_
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
   - is_
   Exclude:
   - spec/**/*
@@ -114,24 +109,9 @@ Style/StringLiteralsInInterpolation:
   SupportedStyles:
   - single_quotes
   - double_quotes
-Style/TrailingCommaInArguments:
-  Description: 'Checks for trailing comma in argument lists.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
-  Enabled: false
-  EnforcedStyleForMultiline: no_comma
-  SupportedStyles:
-  - comma
-  - consistent_comma
-  - no_comma
-Style/TrailingCommaInLiteral:
-  Description: 'Checks for trailing comma in array and hash literals.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
-  Enabled: false
-  EnforcedStyleForMultiline: no_comma
-  SupportedStyles:
-  - comma
-  - consistent_comma
-  - no_comma
+
+
+
 Metrics/AbcSize:
   Description: A calculated magnitude based on number of assignments, branches, and
     conditions.
@@ -177,7 +157,7 @@ Lint/AssignmentInCondition:
 Style/InlineComment:
   Description: Avoid inline comments.
   Enabled: false
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Description: Check the naming of accessor methods for get_/set_.
   Enabled: false
 Style/Alias:
@@ -231,13 +211,11 @@ Style/WhenThen:
 Lint/EachWithObjectArgument:
   Description: Check for immutable argument given to each_with_object.
   Enabled: true
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: false
-Lint/LiteralInCondition:
-  Description: Checks of literals used in conditions.
-  Enabled: false
+
 Lint/LiteralInInterpolation:
   Description: Checks for literals used in interpolation.
   Enabled: false

data/.rubocop.yml

@@ -1,7 +1,9 @@
 inherit_from:
- - .rubocop.hound.yml
+  - .rubocop_todo.yml
+  - .rubocop.hound.yml
 
 AllCops:
+  NewCops: enable
   Exclude:
     - '*.gemspec'
     - 'Gemfile'
@@ -9,13 +11,13 @@ AllCops:
 Style/Lambda:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
-Style/EmptyLinesAroundMethodBody:
+Layout/EmptyLinesAroundMethodBody:
   Enabled: false
 
 Style/ClassCheck:
@@ -25,7 +27,7 @@ Style/ClassCheck:
 Style/StringLiterals:
   Enabled: false
 
-Style/FileName:
+Naming/FileName:
   Enabled: false
 
 Style/RedundantException:
@@ -37,12 +39,8 @@ Style/SignalException:
 Style/BlockDelimiters:
   Enabled: false
 
-Style/CollectionMethods:
-  PreferredMethods:
-    detect: find
-
 # Github's PR width is 120 characters
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   AllowURI: true
   Exclude:

data/.rubocop_todo.yml

@@ -0,0 +1,177 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-04-27 12:05:35 UTC using RuboCop version 1.28.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'gemfiles/rails_6.1.gemfile'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'spec/encoder_spec.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/SpaceAroundEqualsInParameterDefault:
+  Exclude:
+    - 'lib/webhook_system/base_event.rb'
+    - 'lib/webhook_system/job.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'lib/webhook_system/subscription.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: require_no_space, require_space
+Layout/SpaceInLambdaLiteral:
+  Exclude:
+    - 'lib/webhook_system/subscription.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+Lint/DeprecatedOpenSSLConstant:
+  Exclude:
+    - 'lib/webhook_system/encoder.rb'
+
+# Offense count: 1
+# This cop supports unsafe auto-correction (--auto-correct-all).
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+Lint/UnreachableCode:
+  Exclude:
+    - 'lib/webhook_system/job.rb'
+
+# Offense count: 11
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
+Metrics/BlockLength:
+  Max: 112
+
+# Offense count: 1
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/webhook_system/encoder.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/webhook_system/job.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+Security/JSONLoad:
+  Exclude:
+    - 'lib/webhook_system/encoder.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/FileWrite:
+  Exclude:
+    - 'Rakefile'
+
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/webhook_system/subscription.rb'
+
+# Offense count: 1
+# This cop supports unsafe auto-correction (--auto-correct-all).
+# Configuration parameters: EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/webhook_system/job.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/Proc:
+  Exclude:
+    - 'lib/webhook_system/subscription.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/webhook_system/base_event.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'spec/dispatching_events_spec.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+Style/StderrPuts:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# This cop supports unsafe auto-correction (--auto-correct-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/webhook_system/encoder.rb'
+
+# Offense count: 4
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+# Offense count: 3
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArrayLiteral:
+  Exclude:
+    - 'spec/dispatching_events_spec.rb'
+    - 'spec/event_spec.rb'
+    - 'spec/integration_spec.rb'
+
+# Offense count: 14
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInHashLiteral:
+  Exclude:
+    - 'lib/webhook_system/base_event.rb'
+    - 'lib/webhook_system/encoder.rb'
+    - 'lib/webhook_system/event_log.rb'
+    - 'lib/webhook_system/subscription.rb'
+    - 'spec/encoder_spec.rb'
+    - 'spec/event_spec.rb'
+    - 'spec/integration_spec.rb'

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [v2.4.0](https://github.com/payrollhero/webhook_system/tree/v2.4.0) (2022-05-02)
+[Full Changelog](https://github.com/payrollhero/webhook_system/compare/v2.3.1...v2.4.0)
+
+* Rails 7.0 Official support.
+* Please read Upgrade notes, a migration is required to rename encrypt column to encrypted.
+
 ## [v2.3.1](https://github.com/payrollhero/webhook_system/tree/v2.3.1) (2022-04-27)
 [Full Changelog](https://github.com/payrollhero/webhook_system/compare/v2.3.0...v2.3.1)
 

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
+gem 'pr_comet', git: 'https://github.com/mathieujobin/pr_comet', branch: 'git-status'
 
 gemspec

data/README.md

@@ -21,6 +21,22 @@ Few Main points ..
 4. The webhook is delivered to the recipient as a JSON payload with a base64 encoded data component
 5. The recipient is meant to use their copy of this secret to decode that payload, and then action it as needed.
 
+## Upgrading
+
+If you are upgrading from <= 2.3.1 into >= 2.4, then you must run a migration to rename the `encrypt` column.
+This rename was required for adding support for Rails 7.
+
+You can use this migration.
+
+```ruby
+# db/migrate/20220427113942_rename_encrypt_on_webhook_subscriptions.rb
+class RenameEncryptOnWebhookSubscriptions < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :webhook_subscriptions, :encrypt, :encrypted
+  end
+end
+```
+
 ## Setup
 
 The webhook integration code runs on two tables. You need to create a new migration that adds these
@@ -30,7 +46,7 @@ tables first:
 create_table :webhook_subscriptions do |t|
   t.string :url, null: false
   t.boolean :active, null: false, index: true
-  t.boolean :encrypt, null: false, default: false
+  t.boolean :encrypted, null: false, default: false
   t.text :secret
 end
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 require 'rubygems/tasks'

data/gemfiles/rails_4.2.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "~> 4.2.11"

data/gemfiles/rails_4.2.gemfile.lock

@@ -2,9 +2,9 @@ PATH
   remote: ..
   specs:
     webhook_system (2.3.1)
-      activejob (> 4.2, < 7.0)
-      activerecord (> 4.2, < 7.0)
-      activesupport (> 4.2, < 7.0)
+      activejob (> 4.2, < 7.1)
+      activerecord (> 4.2, < 7.1)
+      activesupport (> 4.2, < 7.1)
       faraday (> 0.9)
       faraday-encoding (>= 0.0.2, < 1.0)
       ph_model
@@ -146,13 +146,16 @@ GEM
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parser (2.7.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     ph_model (1.1.3)
       active_attr (~> 0.8)
       activemodel (> 3.2)
       activesupport (> 3.2)
-    powerpack (0.1.3)
+    pr_comet (0.5.1)
+      octokit
+      rainbow
     protocol-hpack (1.4.2)
     protocol-http (0.22.5)
     protocol-http1 (0.14.2)
@@ -189,9 +192,9 @@ GEM
       activesupport (= 4.2.11.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.1.1)
     rake (13.0.6)
+    regexp_parser (2.3.1)
     reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
@@ -208,12 +211,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (1.28.2)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.14.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.10.0)
+      rubocop (~> 1.19)
+    rubocop_challenger (2.3.0)
+      pr_comet (~> 0.5.1)
+      rainbow
+      rubocop (>= 0.87)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+      thor
+      yard
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubygems-tasks (0.2.5)
@@ -234,7 +263,7 @@ GEM
     timers (4.3.3)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.1.0)
     validate_url (1.0.13)
       activemodel (>= 3.0.0)
       public_suffix
@@ -242,6 +271,9 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -253,7 +285,7 @@ DEPENDENCIES
   rails (~> 4.2.11)
   rake
   rspec (~> 3.0)
-  rubocop (~> 0.48.1)
+  rubocop_challenger
   rubygems-tasks (~> 0.2)
   sqlite3 (~> 1.3.6)
   webhook_system!

data/gemfiles/rails_5.0.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.7"

data/gemfiles/rails_5.1.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "~> 5.1.7"

data/gemfiles/{rails_5_2.gemfile → rails_5.2.gemfile}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2.6"

data/gemfiles/rails_6.0.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "~> 6.0.4"

data/gemfiles/rails_6.1.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "~> 6.1.4"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.2"
+gem "sqlite3"
+
+gemspec path: "../"

data/lib/webhook_system/base_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
 
   # This is the class meant to be used as the base class for any Events sent through the Webhook system

data/lib/webhook_system/encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
 
   # Class in charge of encoding and decoding encrypted payload

data/lib/webhook_system/event_log.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
 
   # This is the model holding on to all webhook responses

data/lib/webhook_system/job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
 
   # This is the ActiveJob in charge of actually sending each event
@@ -90,7 +92,7 @@ module WebhookSystem
     end
 
     def self.format_for_subscription(subscription)
-      subscription.encrypt ? 'base64+aes256' : 'json'
+      subscription.encrypted ? 'base64+aes256' : 'json'
     end
 
     def self.log_response(subscription, event, request, response)

data/lib/webhook_system/subscription.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
 
   # This is the model encompassing the actual record of a webhook subscription

data/lib/webhook_system/subscription_topic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
   class SubscriptionTopic < ActiveRecord::Base
     self.table_name = 'webhook_subscription_topics'

data/lib/webhook_system/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebhookSystem
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/lib/webhook_system.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/all'
 require 'active_record'
 require 'active_job'

data/webhook_system.gemspec

@@ -18,9 +18,27 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'activesupport', '> 4.2', '< 7.0'
-  gem.add_runtime_dependency 'activerecord', '> 4.2', '< 7.0'
-  gem.add_runtime_dependency 'activejob', '> 4.2', '< 7.0'
+  gem.post_install_message = %q{
+    ## Upgrading
+
+    If you are upgrading from <= 2.3.1 into >= 2.4, then you must run a migration to rename the `encrypt` column.
+    This rename was required for adding support for Rails 7.
+
+    You can use this migration.
+
+    ```ruby
+    # db/migrate/20220427113942_rename_encrypt_on_webhook_subscriptions.rb
+    class RenameEncryptOnWebhookSubscriptions < ActiveRecord::Migration[7.0]
+      def change
+        rename_column :webhook_subscriptions, :encrypt, :encrypted
+      end
+    end
+    ```
+  }
+
+  gem.add_runtime_dependency 'activesupport', '> 4.2', '< 7.1'
+  gem.add_runtime_dependency 'activerecord', '> 4.2', '< 7.1'
+  gem.add_runtime_dependency 'activejob', '> 4.2', '< 7.1'
   gem.add_runtime_dependency 'faraday', '> 0.9'
   gem.add_runtime_dependency 'faraday-encoding', '>= 0.0.2', '< 1.0'
   gem.add_runtime_dependency 'ph_model'
@@ -36,5 +54,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock'
 
   # static analysis gems
-  gem.add_development_dependency 'rubocop', '~> 0.48.1'
+  gem.add_development_dependency 'rubocop_challenger'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webhook_system
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Piotr Banasik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -20,7 +20,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -252,19 +252,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop_challenger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
 description: A pluggable webhook subscription system
 email: dev@payrollhero.com
 executables: []
@@ -273,9 +273,11 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".github/workflows/build.yml"
+- ".github/workflows/rubocop-challenger.yml"
 - ".gitignore"
 - ".rubocop.hound.yml"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - DEPLOYING.md
 - Gemfile
@@ -287,9 +289,10 @@ files:
 - gemfiles/rails_4.2.gemfile.lock
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/webhook_system.rb
 - lib/webhook_system/base_event.rb
 - lib/webhook_system/encoder.rb
@@ -303,7 +306,13 @@ homepage: https://github.com/payrollhero/webhook_system
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\n    ## Upgrading\n\n    If you are upgrading from <= 2.3.1
+  into >= 2.4, then you must run a migration to rename the `encrypt` column.\n    This
+  rename was required for adding support for Rails 7.\n\n    You can use this migration.\n\n
+  \   ```ruby\n    # db/migrate/20220427113942_rename_encrypt_on_webhook_subscriptions.rb\n
+  \   class RenameEncryptOnWebhookSubscriptions < ActiveRecord::Migration[7.0]\n      def
+  change\n        rename_column :webhook_subscriptions, :encrypt, :encrypted\n      end\n
+  \   end\n    ```\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -318,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Webhook system