webhook_system 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70d2874b3a9be03c3c1c99c39a2aafd7c84a3df03204ca2c97bc94bba2da812
-  data.tar.gz: 7d3aa6e608f9fc0d650fd0a9562d2055deb77906b26d99284f25927cb13920a2
+  metadata.gz: afdbd7185d9cb4993052c2c5f7435d8b469f2d2623d31b63aadcd6aefd3e3c71
+  data.tar.gz: 05c32f9c6392d3fd9d3d9adf41fa8e21b21dafc8b87a9efd9b4236bf87137fbb
 SHA512:
-  metadata.gz: afd6da24afebdb56a4549b567feed01ab0e23f6f7e172202017101748aa272cf2ce553b60493a46fddef38516766cfbc40333404eb26ef9594b88ffb06da68ee
-  data.tar.gz: be103c12b745ce57f92fc1be610866d4e702c09472e84e467fc4214219a14ca506cd06358d445f3635f45b20bc568768ea1d84d85ea200c7255598b1ed3367be
+  metadata.gz: 66c102424aae48aa1d133abf5cd88c5233227e1c6b3604bf0c89558736d361c376b2c046e73031bdf5f0a3689c128e26188eae4188961ec476b410cf6f4da061
+  data.tar.gz: d03f803f206adcc70022a603b9ef02ba9a634e238924fd2a4b6cdf2c003e21c0783e4182ab09d9c5c326e727b64274eeb48bc9e7fc9b241bcf8e25740492e4bc

data/.github/workflows/build.yml

@@ -0,0 +1,56 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        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
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

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,7 +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,21 @@
 # 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)
+
+* Rails 6.1 Official support.
+
+## [v2.3.0](https://github.com/payrollhero/webhook_system/tree/v2.3.0) (2021-08-xx)
+[Full Changelog](https://github.com/payrollhero/webhook_system/compare/v2.2.0...v2.3.0)
+
+* Add ability to launch inline jobs instead of making external HTTP calls to another service.
+
 ## [v2.2.0](https://github.com/payrollhero/webhook_system/tree/v2.2.0) (2019-11-07)
 [Full Changelog](https://github.com/payrollhero/webhook_system/compare/v2.1.6...v2.2.0)
 

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.gemfile → rails_4.2.gemfile}

@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+# frozen_string_literal: true
 
 source "https://rubygems.org"
 

data/gemfiles/rails_4.2.gemfile.lock

@@ -0,0 +1,295 @@
+PATH
+  remote: ..
+  specs:
+    webhook_system (2.3.1)
+      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
+      validate_url (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      actionview (= 4.2.11.3)
+      activejob (= 4.2.11.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.3)
+      actionview (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active_attr (0.15.4)
+      actionpack (>= 3.0.2, < 7.1)
+      activemodel (>= 3.0.2, < 7.1)
+      activesupport (>= 3.0.2, < 7.1)
+    activejob (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      builder (~> 3.1)
+    activerecord (4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      arel (~> 6.0)
+    activesupport (4.2.11.3)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    arel (6.0.4)
+    ast (2.4.2)
+    async (1.30.1)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.56.5)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.22.0)
+      protocol-http1 (~> 0.14.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.11.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.33.0)
+      async
+    async-pool (0.3.9)
+      async (>= 1.25)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    console (1.15.0)
+      fiber-local
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    erubis (2.7.0)
+    factory_bot (5.2.0)
+      activesupport (>= 4.2.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-encoding (0.0.5)
+      faraday
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    fiber-local (1.0.0)
+    github_changelog_generator (1.16.4)
+      activesupport
+      async (>= 1.25.0)
+      async-http-faraday
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    hashdiff (1.0.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.5.9)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    loofah (2.16.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    octokit (4.22.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    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)
+    pr_comet (0.5.1)
+      octokit
+      rainbow
+    protocol-hpack (1.4.2)
+    protocol-http (0.22.5)
+    protocol-http1 (0.14.2)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (1.6.13)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.11.3)
+      actionmailer (= 4.2.11.3)
+      actionpack (= 4.2.11.3)
+      actionview (= 4.2.11.3)
+      activejob (= 4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activerecord (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.4)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    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)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.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.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)
+      irb (~> 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    sprockets (4.0.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    timers (4.3.3)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unicode-display_width (2.1.0)
+    validate_url (1.0.13)
+      activemodel (>= 3.0.0)
+      public_suffix
+    webmock (3.14.0)
+      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
+
+DEPENDENCIES
+  bundler (> 1.17, < 2.5)
+  factory_bot
+  github_changelog_generator (~> 1.6)
+  rails (~> 4.2.11)
+  rake
+  rspec (~> 3.0)
+  rubocop_challenger
+  rubygems-tasks (~> 0.2)
+  sqlite3 (~> 1.3.6)
+  webhook_system!
+  webmock
+
+BUNDLED WITH
+   1.17.3

data/gemfiles/{rails_5.gemfile → rails_5.0.gemfile}

@@ -1,8 +1,8 @@
-# This file was generated by Appraisal
+# frozen_string_literal: true
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.1"
+gem "rails", "~> 5.0.7"
 gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.7"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

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

@@ -1,8 +1,8 @@
-# This file was generated by Appraisal
+# frozen_string_literal: true
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.1"
+gem "rails", "~> 5.2.6"
 gem "sqlite3", "~> 1.4.1"
 
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.4"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.4"
+gem "sqlite3"
+gem "minitest"
+
+gemspec path: "../"

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
@@ -32,7 +34,22 @@ module WebhookSystem
     end
 
     def perform(subscription, event)
-      self.class.post(subscription, event)
+      if subscription.url.match?(/^https?:/)
+        self.class.post(subscription, event)
+      elsif (match_data = subscription.url.match(/^inline:(.*)/)).present?
+        self.class.call_inline(match_data[1], subscription, event)
+      else
+        raise RuntimeError, "unknown prefix url for subscription"
+        ensure_success(ErrorResponse.new(exception), :INVALID, subscription)
+      end
+    end
+
+    def self.call_inline(job_name, subscription, event)
+      # subscription url could contain a job name, or a ruby class/method call
+      # how do we sanitize this not to be allowing hackers to call arbitrary code via
+      # a subscription? maybe a prefix is enough?
+      job_class = const_get("WebhookSystem::Inline#{job_name}Job")
+      job_class.perform_now(subscription, event)
     end
 
     def self.post(subscription, event)
@@ -75,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
@@ -6,7 +8,8 @@ module WebhookSystem
 
     belongs_to :account if defined?(Account)
 
-    validates :url, presence: true, url: { no_local: true }
+    INLINE_JOB_REGEXP=/^inline:(.*)/
+    validates :url, presence: true, url: { no_local: true }, if: Proc.new { |a| !a.url.match?(INLINE_JOB_REGEXP) }
     validates :secret, presence: true
 
     has_many :topics, class_name: 'WebhookSystem::SubscriptionTopic', dependent: :destroy
@@ -33,7 +36,11 @@ module WebhookSystem
 
     # Just a helper to get a nice representation of the subscription
     def url_domain
-      URI.parse(url).host
+      if data = url.match(INLINE_JOB_REGEXP)
+        data[1]
+      else
+        URI.parse(url).host
+      end
     end
 
     # Abstraction around the topics relation, returns an array of the subscribed topic names

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.2.0'
+  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

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.name = 'webhook_system'
   gem.version = WebhookSystem::VERSION
   gem.authors = ['Piotr Banasik', 'Mykola Kyryk']
-  gem.email = 'piotr@payrollhero.com'
+  gem.email = 'dev@payrollhero.com'
 
   gem.summary = 'Webhook system'
   gem.description = 'A pluggable webhook subscription system'
@@ -18,25 +18,41 @@ 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', '> 3.2'#, '< 5.0' # have to drop support for ruby 2.1 if we enable 5.0
-  gem.add_runtime_dependency 'activerecord', '> 3.2'#, '< 5.0' # have to drop support for ruby 2.1 if we enable 5.0
-  gem.add_runtime_dependency 'activejob'
-  gem.add_runtime_dependency 'faraday', '~> 0.9'
+  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'
   gem.add_runtime_dependency 'validate_url', '~> 1.0'
 
-  gem.add_development_dependency 'bundler', '> 1.0', '< 2.5'
+  gem.add_development_dependency 'bundler', '> 1.17', '< 2.5'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
-  gem.add_development_dependency 'pry'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'github_changelog_generator', '~> 1.6'
-  gem.add_development_dependency 'factory_girl'
+  gem.add_development_dependency 'factory_bot'
   gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'appraisal'
 
   # 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.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Piotr Banasik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,54 +17,72 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -121,7 +139,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.5'
@@ -131,7 +149,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.5'
@@ -177,20 +195,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +224,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,7 +252,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rubocop_challenger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -261,32 +265,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.48.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.48.1
 description: A pluggable webhook subscription system
-email: piotr@payrollhero.com
+email: dev@payrollhero.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/build.yml"
+- ".github/workflows/rubocop-challenger.yml"
 - ".gitignore"
 - ".rubocop.hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
-- Appraisals
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - DEPLOYING.md
 - Gemfile
@@ -294,9 +285,14 @@ files:
 - README.md
 - Rakefile
 - gemfiles/.bundle/config
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2.gemfile.lock
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.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
@@ -310,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
@@ -325,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Webhook system

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - 2.5.3
-  - 2.6.3
-
-gemfile:
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_5_2.gemfile
-
-matrix:
-  exclude:
-  - rvm: 2.5.3
-    gemfile: gemfiles/rails_4.gemfile
-  - rvm: 2.1.8
-    gemfile: gemfiles/rails_5.gemfile
-  - rvm: 2.1.8
-    gemfile: gemfiles/rails_5_2.gemfile
-
-script: "bundle exec rspec"

data/Appraisals

@@ -1,14 +0,0 @@
-appraise 'rails-4' do
-  gem 'rails', '~> 4.2.11'
-  gem 'sqlite3', '~> 1.3.6'
-end
-
-appraise 'rails-5' do
-  gem 'rails', '~> 5.0.1'
-  gem 'sqlite3', '~> 1.3.6'
-end
-
-appraise 'rails-5-2' do
-  gem 'rails', '~> 5.2.1'
-  gem 'sqlite3', '~> 1.4.1'
-end