webhook_system 2.4.0 → 2.4.1

data/lib/webhook_system/job.rb

@@ -7,7 +7,7 @@ module WebhookSystem
 
     # Exception class around non 200 responses
     class RequestFailed < RuntimeError
-      def initialize(message, code, error_message=nil)
+      def initialize(message, code, error_message = nil)
         super(message)
         @code = code
         @error_message = error_message
@@ -59,8 +59,8 @@ module WebhookSystem
       response =
         begin
           client.builder.build_response(client, request)
-        rescue RuntimeError => exception
-          ErrorResponse.new(exception)
+        rescue RuntimeError => e
+          ErrorResponse.new(e)
         end
 
       log_response(subscription, event, request, response)
@@ -70,16 +70,17 @@ module WebhookSystem
     def self.ensure_success(response, http_method, subscription)
       url = subscription.url
       status = response.status
-      unless (200..299).cover? status
-        if subscription.respond_to?(:account_id)
-          account_info = subscription.account_info
-          inner = "failed for account #{account_info} with"
-        else
-          inner = "failed with"
-        end
-        text = "#{http_method} request to #{url} #{inner} code: #{status} and error #{response.body}"
-        raise RequestFailed.new(text, status, response.body)
+      return if (200..299).cover? status
+
+      if subscription.respond_to?(:account_id)
+        account_info = subscription.account_info
+        inner = "failed for account #{account_info} with"
+      else
+        inner = "failed with"
       end
+      text = "#{http_method} request to #{url} #{inner} code: #{status} and error #{response.body}"
+      raise RequestFailed.new(text, status, response.body)
+
     end
 
     def self.build_request(client, subscription, event)
@@ -104,7 +105,7 @@ module WebhookSystem
       # We want the even log record to always be created, so we check if we are running inside the transaction,
       # if we are - we create the record in a separate thread. New Thread means a new DB connection and
       # ActiveRecord transactions are per connection, which gives us the "transaction jailbreak".
-      if ActiveRecord::Base.connection.open_transactions == 0
+      if ActiveRecord::Base.connection.open_transactions.zero?
         event_log.save!
       else
         Thread.new { event_log.save! }.join

data/lib/webhook_system/subscription.rb

@@ -8,8 +8,8 @@ module WebhookSystem
 
     belongs_to :account if defined?(Account)
 
-    INLINE_JOB_REGEXP=/^inline:(.*)/
-    validates :url, presence: true, url: { no_local: true }, if: Proc.new { |a| !a.url.match?(INLINE_JOB_REGEXP) }
+    INLINE_JOB_REGEXP = /^inline:(.*)/.freeze
+    validates :url, presence: true, url: { no_local: true }, if: proc { |a| !a.url.match?(INLINE_JOB_REGEXP) }
     validates :secret, presence: true
 
     has_many :topics, class_name: 'WebhookSystem::SubscriptionTopic', dependent: :destroy
@@ -18,11 +18,11 @@ module WebhookSystem
     accepts_nested_attributes_for :topics, allow_destroy: true
 
     scope :active, -> { where(active: true) }
-    scope :for_topic, -> (topic) {
+    scope :for_topic, ->(topic) {
       joins(:topics).where(WebhookSystem::SubscriptionTopic.table_name => { name: topic })
     }
 
-    scope :interested_in_topic, -> (topic) { active.for_topic(topic) }
+    scope :interested_in_topic, ->(topic) { active.for_topic(topic) }
 
     # Main invocation point for dispatching events, can either be called on the class
     # or on a relation (ie a scoped down list of subs), will find applicable subs and dispatch to them
@@ -59,7 +59,7 @@ module WebhookSystem
         new_topics_attributes << {
           id: topic.id,
           name: topic.name,
-          _destroy: !new_topics.include?(topic.name),
+          _destroy: new_topics.exclude?(topic.name),
         }
       end
 

data/lib/webhook_system/version.rb

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

data/webhook_system.gemspec

@@ -36,15 +36,18 @@ Gem::Specification.new do |gem|
     ```
   }
 
-  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.required_ruby_version = '> 2.7.0'
+  gem.add_runtime_dependency 'activesupport', '> 5.0', '< 7.2'
+  gem.add_runtime_dependency 'activerecord', '> 5.0', '< 7.2'
+  gem.add_runtime_dependency 'activejob', '> 5.0', '< 7.2'
   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.17', '< 2.5'
+  gem.add_development_dependency 'bundler', '> 1.17', '< 2.6'
+  gem.add_development_dependency 'coveralls_reborn', '~> 0.25'
+  gem.add_development_dependency 'simplecov-lcov'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: webhook_system
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Piotr Banasik
 - Mykola Kyryk
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,60 +17,60 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ dependencies:
         version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -152,7 +152,35 @@ dependencies:
         version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: coveralls_reborn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -272,11 +300,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".github/workflows/build.yml"
+- ".coveralls.yml"
+- ".github/workflows/ci.yml"
 - ".github/workflows/rubocop-challenger.yml"
 - ".gitignore"
-- ".rubocop.hound.yml"
 - ".rubocop.yml"
+- ".rubocop_challenge.yml"
 - ".rubocop_todo.yml"
 - CHANGELOG.md
 - DEPLOYING.md
@@ -285,14 +314,13 @@ files:
 - README.md
 - Rakefile
 - gemfiles/.bundle/config
-- 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
+- gemfiles/rails_7.1.gemfile
 - lib/webhook_system.rb
 - lib/webhook_system/base_event.rb
 - lib/webhook_system/encoder.rb
@@ -318,17 +346,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Webhook system
 test_files: []

data/.rubocop.hound.yml

@@ -1,221 +0,0 @@
-AllCops:
-  Exclude:
-    - "vendor/**/*"
-    - "db/schema.rb"
-  UseCache: false
-Style/CollectionMethods:
-  Description: Preferred collection methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size
-  Enabled: true
-  PreferredMethods:
-    collect: map
-    collect!: map!
-    find: detect
-    find_all: select
-    reduce: inject
-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
-  EnforcedStyle: trailing
-  SupportedStyles:
-  - leading
-  - trailing
-
-Style/GuardClause:
-  Description: Check for conditionals that can be replaced with guard clauses
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
-  Enabled: false
-  MinBodyLength: 1
-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
-Style/OptionHash:
-  Description: Don't use option hashes when you can use keyword arguments.
-  Enabled: false
-Style/PercentLiteralDelimiters:
-  Description: Use `%`-literal delimiters consistently
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
-  Enabled: false
-  PreferredDelimiters:
-    "%": "()"
-    "%i": "()"
-    "%q": "()"
-    "%Q": "()"
-    "%r": "{}"
-    "%s": "()"
-    "%w": "()"
-    "%W": "()"
-    "%x": "()"
-Naming/PredicateName:
-  Description: Check the names of predicate methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
-  Enabled: true
-  NamePrefix:
-  - is_
-  - has_
-  - have_
-  ForbiddenPrefixes:
-  - is_
-  Exclude:
-  - spec/**/*
-Style/RaiseArgs:
-  Description: Checks the arguments passed to raise/fail.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#exception-class-messages
-  Enabled: false
-  EnforcedStyle: exploded
-  SupportedStyles:
-  - compact
-  - exploded
-Style/SignalException:
-  Description: Checks for proper usage of fail and raise.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
-  Enabled: false
-  EnforcedStyle: semantic
-  SupportedStyles:
-  - only_raise
-  - only_fail
-  - semantic
-Style/SingleLineBlockParams:
-  Description: Enforces the names of some block params.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#reduce-blocks
-  Enabled: false
-  Methods:
-  - reduce:
-    - a
-    - e
-  - inject:
-    - a
-    - e
-Style/SingleLineMethods:
-  Description: Avoid single-line methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods
-  Enabled: false
-  AllowIfMethodIsEmpty: true
-Style/StringLiterals:
-  Description: Checks if uses of quotes match the configured preference.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
-  Enabled: true
-  EnforcedStyle: double_quotes
-  SupportedStyles:
-  - single_quotes
-  - double_quotes
-Style/StringLiteralsInInterpolation:
-  Description: Checks if uses of quotes inside expressions in interpolated strings
-    match the configured preference.
-  Enabled: true
-  EnforcedStyle: single_quotes
-  SupportedStyles:
-  - single_quotes
-  - double_quotes
-
-
-
-Metrics/AbcSize:
-  Description: A calculated magnitude based on number of assignments, branches, and
-    conditions.
-  Enabled: false
-  Max: 15
-Metrics/ClassLength:
-  Description: Avoid classes longer than 100 lines of code.
-  Enabled: false
-  CountComments: false
-  Max: 100
-Metrics/ModuleLength:
-  CountComments: false
-  Max: 100
-  Description: Avoid modules longer than 100 lines of code.
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Description: A complexity metric that is strongly correlated to the number of test
-    cases needed to validate a method.
-  Enabled: false
-  Max: 6
-Metrics/MethodLength:
-  Description: Avoid methods longer than 10 lines of code.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods
-  Enabled: false
-  CountComments: false
-  Max: 10
-Metrics/ParameterLists:
-  Description: Avoid parameter lists longer than three or four parameters.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params
-  Enabled: false
-  Max: 5
-  CountKeywordArgs: true
-Metrics/PerceivedComplexity:
-  Description: A complexity metric geared towards measuring complexity for a human
-    reader.
-  Enabled: false
-  Max: 7
-Lint/AssignmentInCondition:
-  Description: Don't use assignment in conditions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition
-  Enabled: false
-  AllowSafeAssignment: true
-Style/InlineComment:
-  Description: Avoid inline comments.
-  Enabled: false
-Naming/AccessorMethodName:
-  Description: Check the naming of accessor methods for get_/set_.
-  Enabled: false
-Style/Alias:
-  Description: Use alias_method instead of alias.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method
-  Enabled: false
-Style/Documentation:
-  Description: Document classes and non-namespace modules.
-  Enabled: false
-Style/DoubleNegation:
-  Description: Checks for uses of double negation (!!).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-bang-bang
-  Enabled: false
-Style/EachWithObject:
-  Description: Prefer `each_with_object` over `inject` or `reduce`.
-  Enabled: false
-Style/EmptyLiteral:
-  Description: Prefer literals to Array.new/Hash.new/String.new.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash
-  Enabled: false
-Style/ModuleFunction:
-  Description: Checks for usage of `extend self` in modules.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function
-  Enabled: false
-Style/OneLineConditional:
-  Description: Favor the ternary operator(?:) over if/then/else/end constructs.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator
-  Enabled: false
-Style/PerlBackrefs:
-  Description: Avoid Perl-style regex back references.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers
-  Enabled: false
-Style/Send:
-  Description: Prefer `Object#__send__` or `Object#public_send` to `send`, as `send`
-    may overlap with existing methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#prefer-public-send
-  Enabled: false
-Style/SpecialGlobalVars:
-  Description: Avoid Perl-style global variables.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms
-  Enabled: false
-Style/VariableInterpolation:
-  Description: Don't interpolate global, instance and class variables directly in
-    strings.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate
-  Enabled: false
-Style/WhenThen:
-  Description: Use when x then ... for one-line cases.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases
-  Enabled: false
-Lint/EachWithObjectArgument:
-  Description: Check for immutable argument given to each_with_object.
-  Enabled: true
-Lint/SuppressedException:
-  Description: Don't suppress exception.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
-  Enabled: false
-
-Lint/LiteralInInterpolation:
-  Description: Checks for literals used in interpolation.
-  Enabled: false

data/gemfiles/rails_4.2.gemfile

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