webhook_system 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdbd7185d9cb4993052c2c5f7435d8b469f2d2623d31b63aadcd6aefd3e3c71
-  data.tar.gz: 05c32f9c6392d3fd9d3d9adf41fa8e21b21dafc8b87a9efd9b4236bf87137fbb
+  metadata.gz: de4c38dac5024e7faf9075fa7d08458c23742609626569b61c376c941ba701d0
+  data.tar.gz: 80aec1c6d60554d14e54e4e922e6389aa0dec26bced551bec63c0aa684ae3886
 SHA512:
-  metadata.gz: 66c102424aae48aa1d133abf5cd88c5233227e1c6b3604bf0c89558736d361c376b2c046e73031bdf5f0a3689c128e26188eae4188961ec476b410cf6f4da061
-  data.tar.gz: d03f803f206adcc70022a603b9ef02ba9a634e238924fd2a4b6cdf2c003e21c0783e4182ab09d9c5c326e727b64274eeb48bc9e7fc9b241bcf8e25740492e4bc
+  metadata.gz: 55b2362374a9683a4c920b507d68e0c70b1c79aad11003315a6fae1bb417cfa568cde6621418dffc196f8ffb1863f82edd01fda9591e6c9bfcd8679b67d0e0ea
+  data.tar.gz: 3d03fe8f357631ff856a09c50b98fea1cb5096954413283d5367f5be6eda5c20f3cddf60f870e9f4ccdbe073d707c61a2ccd0716f555929246f33f8ed0792e74

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: github

data/.github/workflows/{build.yml → ci.yml}

@@ -5,9 +5,11 @@
 # 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
+name: ci
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
@@ -15,42 +17,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: ["rails_7.0"]
-        ruby: [2.7]
+        gemfile: ['rails_7.0', 'rails_7.1']
+        ruby: [3.3, 3.2, 3.1]
         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
+          - gemfile: rails_7.0
             ruby: 2.7
           - gemfile: rails_6.1
-            ruby: 2.6
-          - gemfile: rails_6.0
             ruby: 2.7
           - gemfile: rails_6.0
-            ruby: 2.6
+            ruby: 2.7
           - gemfile: rails_5.2
-            ruby: 2.6
+            ruby: 2.7
           - gemfile: rails_5.1
-            ruby: 2.6
+            ruby: 2.7
           - gemfile: rails_5.0
-            ruby: 2.6
-          - gemfile: rails_4.2
-            ruby: 2.6
-          - gemfile: rails_4.2
-            ruby: 2.5
+            ruby: 2.7
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      CI: true
+      COVERALLS_REPO_TOKEN: izk0cvqAVqD2Vdews2UjsnOZHLgzocyQL
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
-    - run: bundle exec rake
+    - name: RSpec and Rubocop
+      run: |
+        bundle exec rubocop -c .rubocop.yml
+        bundle exec rspec

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

@@ -23,4 +23,4 @@ jobs:
       - 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"
+        run: bundle exec rubocop_challenger go --exclude-limit=180 --base-branch=master --email=rubocop@payrollhero.com --name="Rubocop Challenger" --mode=random

data/.rubocop.yml

@@ -1,12 +1,30 @@
+require:
+  - rubocop-rails
+  - rubocop-rspec
+  - rubocop-performance
+
 inherit_from:
   - .rubocop_todo.yml
-  - .rubocop.hound.yml
+
+Rails:
+  Enabled: true
 
 AllCops:
   NewCops: enable
   Exclude:
     - '*.gemspec'
     - 'Gemfile'
+    - vendor/bundle/ruby/**/*
+
+RSpec/NotToNot:
+  SupportedStyles: to_not
+  # disable because an error is being raised
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
 
 Style/Lambda:
   Enabled: false
@@ -55,3 +73,24 @@ Metrics/AbcSize:
     conditions.
   Enabled: true
   Max: 30
+
+Metrics/BlockLength:
+  Max: 25
+  AllowedMethods:
+    - context
+    - describe
+    - define
+
+Rails/RakeEnvironment:
+  Exclude:
+    - 'Rakefile'
+
+Rails/ApplicationJob:
+  Exclude:
+    - 'lib/webhook_system/job.rb'
+
+Rails/ApplicationRecord:
+  Exclude:
+    - 'lib/webhook_system/event_log.rb'
+    - 'lib/webhook_system/subscription.rb'
+    - 'lib/webhook_system/subscription_topic.rb'

data/.rubocop_challenge.yml

@@ -0,0 +1,4 @@
+---
+Ignore:
+- Style/RegexpLiteral
+

data/.rubocop_todo.yml

@@ -1,61 +1,29 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2022-04-27 12:05:35 UTC using RuboCop version 1.28.2.
+# `rubocop --auto-gen-config --exclude-limit 180`
+# on 2023-10-30 03:57:18 UTC using RuboCop version 1.57.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).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
   Exclude:
-    - 'gemfiles/rails_6.1.gemfile'
+    - 'gemfiles/rails_7.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:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
   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:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Lint/RedundantDirGlobSort:
   Exclude:
     - 'spec/spec_helper.rb'
 
@@ -64,114 +32,183 @@ 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: 3
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 18
 
 # Offense count: 1
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+# AllowedNames: as, at, by, cc, db, id, if, 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).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredName.
 Naming/RescuedExceptionsVariableName:
   Exclude:
-    - 'lib/webhook_system/job.rb'
+    - 'spec/support/rails_seven_one.rb'
 
-# Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
-Security/JSONLoad:
+# Offense count: 9
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
   Exclude:
-    - 'lib/webhook_system/encoder.rb'
+    - 'spec/encoder_spec.rb'
+    - 'spec/event_log_spec.rb'
+    - 'spec/event_spec.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-Style/FileWrite:
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
   Exclude:
-    - 'Rakefile'
+    - 'spec/dispatching_events_spec.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
+# Offense count: 7
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 24
+
+# Offense count: 4
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
   Exclude:
-    - 'lib/webhook_system/subscription.rb'
+    - 'spec/encoder_spec.rb'
+    - 'spec/event_log_spec.rb'
+    - 'spec/event_spec.rb'
+    - 'spec/models_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe auto-correction (--auto-correct-all).
-# Configuration parameters: EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
+# Offense count: 11
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
+RSpec/IndexedLet:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/webhook_system/job.rb'
+    - 'spec/dispatching_events_spec.rb'
+    - 'spec/encoder_spec.rb'
+    - 'spec/event_spec.rb'
+    - 'spec/integration_spec.rb'
+    - 'spec/models_spec.rb'
 
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-Style/Proc:
+# Offense count: 3
+RSpec/LetSetup:
   Exclude:
-    - 'lib/webhook_system/subscription.rb'
+    - 'spec/dispatching_events_spec.rb'
+    - 'spec/integration_spec.rb'
 
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-Style/RedundantSelf:
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/MatchArray:
   Exclude:
-    - 'lib/webhook_system/base_event.rb'
+    - 'spec/models_spec.rb'
 
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: hash, symbol
+RSpec/MetadataStyle:
   Exclude:
     - 'spec/dispatching_events_spec.rb'
+    - 'spec/encoder_spec.rb'
+    - 'spec/event_log_spec.rb'
+    - 'spec/event_spec.rb'
+    - 'spec/integration_spec.rb'
+    - 'spec/models_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 15
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 8
+
+# Offense count: 9
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/event_log_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 4
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ScatteredSetup:
+  Exclude:
+    - 'spec/models_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - 'spec/encoder_spec.rb'
+    - 'spec/event_log_spec.rb'
+    - 'spec/event_spec.rb'
+    - 'spec/models_spec.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
-Style/StderrPuts:
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
   Exclude:
-    - 'Rakefile'
+    - 'spec/event_log_spec.rb'
 
 # Offense count: 1
-# This cop supports unsafe auto-correction (--auto-correct-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/RedundantPresenceValidationOnBelongsTo:
   Exclude:
+    - 'lib/webhook_system/event_log.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Exclude:
+    - 'lib/webhook_system.rb'
     - 'lib/webhook_system/encoder.rb'
+    - 'lib/webhook_system/subscription_topic.rb'
+    - 'spec/support/rails_seven_one.rb'
 
-# Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: MinSize.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: brackets
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'spec/support/rails_seven_one.rb'
 
-# Offense count: 3
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowedCompactTypes.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
+  Exclude:
+    - 'spec/support/rails_seven_one.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantConstantBase:
   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:
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantFreeze:
   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'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'spec/dispatching_events_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'spec/support/rails_seven_one.rb'

data/Gemfile

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

data/Rakefile

@@ -20,23 +20,21 @@ task :styleguide do
   require 'faraday'
   require 'pry'
   base = "https://raw.githubusercontent.com/payrollhero/styleguide/master/"
-  files = %w{
+  files = %w[
     .rubocop.hound.yml
     .rubocop.yml
     .codeclimate.yml
-  }
+  ]
   files.each do |file|
     puts "Fetching #{file} ..."
     url = "#{base}#{file}"
     rsp = Faraday.get(url)
     unless rsp.status == 200
-      $stderr.puts "failing fetching: #{url}"
-      $stderr.puts "  response: #{rsp.status}: #{rsp.body}"
+      warn "failing fetching: #{url}"
+      warn "  response: #{rsp.status}: #{rsp.body}"
       exit 1
     end
-    File.open(file, "w") do |fh|
-      fh.write(rsp.body)
-    end
+    File.write(file, rsp.body)
   end
 end
 

data/gemfiles/rails_6.1.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "minitest"
 gem "rails", "~> 6.1.4"
 gem "sqlite3"
-gem "minitest"
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

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

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "active_attr", "~> 0.16" # git: "https://github.com/mathieujobin/active_attr", branch: "rails-7.1-support"
+gem "rails", "~> 7.1.1"
+gem "sqlite3"
+
+gemspec path: "../"

data/lib/webhook_system/base_event.rb

@@ -14,13 +14,17 @@ module WebhookSystem
     attr_reader :event_id
 
     def event_name
+      # :nocov:
       mesg = "class #{self.class.name} must implement abstract method `#{self.class.name}#event_name()'."
       raise with_caller_backtrace(RuntimeError.new(mesg), 2)
+      # :nocov:
     end
 
     def payload_attributes
+      # :nocov:
       mesg = "class #{self.class.name} must implement abstract method `#{self.class.name}#payload_attributes()'."
       raise with_caller_backtrace(RuntimeError.new(mesg), 2)
+      # :nocov:
     end
 
     def as_json
@@ -36,25 +40,28 @@ module WebhookSystem
     end
 
     def self.key_is_reserved?(key)
-      key.to_s.in? %w(event event_id)
+      key.to_s.in? %w[event event_id]
     end
 
     def self.dispatch(args)
-      WebhookSystem::Subscription.global.dispatch self.build(args)
+      WebhookSystem::Subscription.global.dispatch build(args)
     end
 
     private
 
-    def with_caller_backtrace(exception, backtrack=2)
-      exception.set_backtrace(caller[backtrack..-1])
+    def with_caller_backtrace(exception, backtrack = 2)
+      # :nocov:
+      exception.set_backtrace(caller[backtrack..])
       exception
+      # :nocov:
     end
 
     def validate_attribute_name(key)
-      if self.class.key_is_reserved?(key)
-        message = "#{self.class.name} should not be defining an attribute named #{key} since its reserved"
-        raise ArgumentError, message
-      end
+      return unless self.class.key_is_reserved?(key)
+
+      message = "#{self.class.name} should not be defining an attribute named #{key} since its reserved"
+      raise ArgumentError, message
+
     end
 
     def each_attribute(&block)
@@ -66,7 +73,9 @@ module WebhookSystem
       when Hash
         payload_attributes.each(&block)
       else
+        # :nocov:
         raise ArgumentError, "don't know how to deal with payload_attributes: #{payload_attributes.inspect}"
+        # :nocov:
       end
     end
   end

data/lib/webhook_system/encoder.rb

@@ -28,9 +28,7 @@ module WebhookSystem
       format = format_for_content_type(headers.fetch('Content-Type'))
 
       payload_signature = hub_signature(payload_string, secret_string)
-      if signature && signature != payload_signature
-        raise DecodingError, 'signature mismatch'
-      end
+      raise DecodingError, 'signature mismatch' if signature && signature != payload_signature
 
       Payload.decode(payload_string, secret: secret_string, format: format)
     end
@@ -41,7 +39,7 @@ module WebhookSystem
       def content_type_format_map
         {
           'base64+aes256' => 'application/json; base64+aes256',
-          'json' => 'application/json'
+          'json' => 'application/json',
         }
       end
 
@@ -54,7 +52,7 @@ module WebhookSystem
       end
 
       def hub_signature(payload_string, secret)
-        'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), secret, payload_string)
+        "sha1=#{OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), secret, payload_string)}"
       end
     end
   end
@@ -73,7 +71,7 @@ module WebhookSystem
       end
 
       def decode(response_body, secret:, format:)
-        payload = JSON.load(response_body)
+        payload = JSON.parse(response_body)
 
         case format
         when 'base64+aes256'
@@ -88,7 +86,7 @@ module WebhookSystem
       private
 
       def encode_aes(payload, secret)
-        cipher = OpenSSL::Cipher::AES256.new(:CBC)
+        cipher = OpenSSL::Cipher.new('aes-256-cbc')
         cipher.encrypt
         iv = cipher.random_iv
         cipher.key = key_from_secret(iv, secret)
@@ -105,13 +103,13 @@ module WebhookSystem
         encoded = Base64.decode64(payload['payload'])
         iv = Base64.decode64(payload['iv'])
 
-        cipher = OpenSSL::Cipher::AES256.new(:CBC)
+        cipher = OpenSSL::Cipher.new('aes-256-cbc')
         cipher.decrypt
         cipher.iv = iv
         cipher.key = key_from_secret(iv, secret)
         decoded = cipher.update(encoded) + cipher.final
 
-        JSON.load(decoded)
+        JSON.parse(decoded)
       rescue OpenSSL::Cipher::CipherError
         raise DecodingError, 'Decoding Failed, probably mismatched secret'
       end