salesforce_streamer 2.4.0.rc1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6ae6f1fa912c4ac13fca440f74cef9b7a5952f0f555d1c41a193d1ed3d338c1
-  data.tar.gz: 6c9d4655567a7373777b3d1d224488ecebc48fb046f98d930f05171e0199468c
+  metadata.gz: e2bf462cd8fca814d8d40e393aa0f42dcfdb41da4723a114cd5192d2d9501ff5
+  data.tar.gz: 0b99425e8dc09388a7d7fdc4c8e60e3621f9aaf24d8664c73e9c97262e9b0ca2
 SHA512:
-  metadata.gz: 9548b2f8f714b701c8055ba63be30bd5f5057f8e87420c59c7504f438ab3ef15b4f3c986768bb19f70f57310539a8e695636a7c4540f3f00dc1d73e8ff6eed77
-  data.tar.gz: 706ea71664fb1b7b9f28501f3525050d2d651f1189e4360c34df332cc71af01b79997b0aca144de0f6bce4a969837232982afcecb60d8378a3257264b2c39642
+  metadata.gz: af7e8f335e4955d6b4de0c699c3391d4df0e761dbcf23c94b0d48de210179f9f79b239b8c694ace8aefe553ae1fa33949d0df07b7b8ac6c081f08409c01510c1
+  data.tar.gz: efdaba381d66bbb79fe74ecd0441f6ac1a6a9f52523c0c990a7ef770663a1e020e8ca38dfb3bf237c90ea1c3926c114b52bc3fb8bf9a624133b47555d52c554e

data/.bundler-version

@@ -1 +1 @@
-2.2.16
+2.3.11

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,6 @@
-## Description
+## Description, motivation and context
 <!--- Describe your changes in detail -->
-
-## Related issue(s)
-<!--- GH issue number -->
-
-## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-
-## Screenshots (if appropriate):
-<!--- Please add any screenshots of the feature. -->
-
-## Related PRs
-<!--- Please add links to any related PRs (backend, component packages, etc). -->
+## Related issue(s) or PR(s)
+<!--- GH issue number -->

data/.github/workflows/auto-approve.yml

@@ -2,15 +2,13 @@
 # this will allow Dependabot to automatically merge dependency update PRs where CI passes
 # from: https://github.com/hmarr/auto-approve-action
 name: Auto approve dependency upgrades PRs
-
-on:
-  pull_request
+on: pull_request_target
 
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v2.0.0
+    - uses: hmarr/auto-approve-action@v2
       if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0', 3.1]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@bd94d6a504586da892a5753afdd1480096ed30df
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Run tests
+      run: bundle exec rake ci

data/Gemfile.lock

@@ -1,24 +1,26 @@
 PATH
   remote: .
   specs:
-    salesforce_streamer (2.4.0.rc1)
+    salesforce_streamer (2.6.0)
+      cookiejar (~> 0.3.0)
       dry-initializer (~> 3.0)
+      eventmachine (~> 1.2)
       faye (~> 1.4)
       restforce (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     byebug (11.1.3)
-    codecov (0.5.2)
+    codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     cookiejar (0.3.3)
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    dry-initializer (3.0.4)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    dry-initializer (3.1.1)
     em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
@@ -28,16 +30,26 @@ GEM
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
     eventmachine (1.2.7)
-    faraday (1.4.1)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     faye (1.4.0)
       cookiejar (>= 0.3.0)
@@ -47,73 +59,75 @@ GEM
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.11.0)
+    faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    hashie (4.1.0)
-    http_parser.rb (0.6.0)
-    jwt (2.2.3)
+    hashie (5.0.0)
+    http_parser.rb (0.8.0)
+    jwt (2.3.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    restforce (5.0.5)
-      faraday (>= 0.9.0, <= 2.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.3.0)
+    restforce (5.2.4)
+      faraday (>= 0.9.0, < 1.9.0)
       faraday_middleware (>= 0.8.8, <= 2.0)
-      hashie (>= 1.2.0, < 5.0)
+      hashie (>= 1.2.0, < 6.0)
       jwt (>= 1.5.6)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.14.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.10.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    unicode-display_width (2.0.0)
-    websocket-driver (0.7.3)
+    simplecov_json_formatter (0.1.4)
+    unicode-display_width (2.1.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
 
 PLATFORMS
+  aarch64-linux-musl
+  x86_64-darwin-18
   x86_64-darwin-19
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -127,4 +141,4 @@ DEPENDENCIES
   salesforce_streamer!
 
 BUNDLED WITH
-   2.2.16
+   2.2.29

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/salesforce_streamer.svg)](https://rubygems.org/gems/salesforce_streamer)
-[![Build Status](https://travis-ci.org/RenoFi/salesforce_streamer.svg?branch=master)](https://travis-ci.org/RenoFi/salesforce_streamer)
+[![Build Status](https://github.com/RenoFi/salesforce_streamer/actions/workflows/ci.yml/badge.svg)](https://github.com/RenoFi/salesforce_streamer/actions/workflows/ci.yml?query=branch%3Amain)
 
 # salesforce_streamer
 

data/Rakefile

@@ -5,4 +5,5 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
+task ci: %i[spec rubocop]
 task default: %i[spec rubocop:auto_correct]

data/lib/core_extensions/cookiejar/cookie_validation.rb

@@ -45,9 +45,10 @@ module CookieJar
               args[:expires_at] = Time.parse keyvalue
             rescue ArgumentError
               raise unless $ERROR_INFO.message == 'time out of range'
+
               args[:expires_at] = Time.at(0x7FFFFFFF)
             end
-          when :"max-age"
+          when :'max-age'
             args[:max_age] = keyvalue.to_i
           when :domain, :path
             args[key] = keyvalue

data/lib/salesforce_streamer/configuration.rb

@@ -54,7 +54,7 @@ module SalesforceStreamer
     def push_topic_data
       return @push_topic_data if @push_topic_data
 
-      data = YAML.safe_load(File.read(config_file), [], [], true)
+      data = YAML.safe_load(File.read(config_file), aliases: true)
       @push_topic_data = data[environment.to_s]
     end
 

data/lib/salesforce_streamer/launcher.rb

@@ -36,7 +36,7 @@ module SalesforceStreamer
       @push_topics = []
       Configuration.instance.push_topic_data.each_value do |topic_data|
         Log.debug topic_data.to_s
-        @push_topics << PushTopic.new(topic_data.transform_keys(&:to_sym))
+        @push_topics << PushTopic.new(**topic_data.transform_keys(&:to_sym))
       end
     end
   end

data/lib/salesforce_streamer/replay_id_error_extension.rb

@@ -1,6 +1,6 @@
 module SalesforceStreamer
   class ReplayIdErrorExtension
-    REPLAY_ERROR_REGEX = /^400::The replayId /.freeze
+    REPLAY_ERROR_REGEX = /^400::The replayId /
 
     def incoming(message, callback)
       if message['error']&.match?(REPLAY_ERROR_REGEX)

data/lib/salesforce_streamer/version.rb

@@ -1,3 +1,3 @@
 module SalesforceStreamer
-  VERSION = '2.4.0.rc1'.freeze
+  VERSION = '2.6.0'.freeze
 end

data/salesforce_streamer.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['documentation_uri'] = 'https://www.rubydoc.info/gems/salesforce_streamer'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
@@ -23,11 +24,15 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.0'
 
+  spec.add_dependency 'cookiejar', '~> 0.3.0'
   spec.add_dependency 'dry-initializer', '~> 3.0'
   spec.add_dependency 'faye', '~> 1.4'
   spec.add_dependency 'restforce', '~> 5.0'
+  # # When you have issues installing eventmachine on osx and ruby 3, try:
+  # gem install eventmachine -- --with-openssl-dir=/usr/local/opt/openssl@1.1
+  spec.add_dependency 'eventmachine', '~> 1.2'
 
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'codecov'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_streamer
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc1
+  version: 2.6.0
 platform: ruby
 authors:
 - Scott Serok
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -168,9 +196,9 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
 - ".github/workflows/auto-merge.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -199,6 +227,7 @@ metadata:
   homepage_uri: https://github.com/renofi/salesforce_streamer
   source_code_uri: https://github.com/renofi/salesforce_streamer
   documentation_uri: https://www.rubydoc.info/gems/salesforce_streamer
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -207,14 +236,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: A wrapper around the Restforce Streaming API with a built-in PushTopic manager.

data/.travis.yml

@@ -1,11 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6
-  - 2.7
-before_install: gem install bundler
-script:
-  - bundle exec rake spec
-  - bundle exec rake rubocop