salesforce_streamer 2.6.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bf462cd8fca814d8d40e393aa0f42dcfdb41da4723a114cd5192d2d9501ff5
-  data.tar.gz: 0b99425e8dc09388a7d7fdc4c8e60e3621f9aaf24d8664c73e9c97262e9b0ca2
+  metadata.gz: 37ecb05f56dfcbd08975ebc0817052aea8a7277df49c557367538ad74aa16ed9
+  data.tar.gz: 7717a73fd3099d82113a5017974323fb20785d12da0bd74ad7f9937bb03c24f9
 SHA512:
-  metadata.gz: af7e8f335e4955d6b4de0c699c3391d4df0e761dbcf23c94b0d48de210179f9f79b239b8c694ace8aefe553ae1fa33949d0df07b7b8ac6c081f08409c01510c1
-  data.tar.gz: efdaba381d66bbb79fe74ecd0441f6ac1a6a9f52523c0c990a7ef770663a1e020e8ca38dfb3bf237c90ea1c3926c114b52bc3fb8bf9a624133b47555d52c554e
+  metadata.gz: 34f17dfc6ea550a8417783a505129d94546a09b94b1828e3df9ccf30ebf9d8a8f0b62bada15faeb3e98db46c9bbebdde66950f2368bbeee7ba7d7b2b33e86353
+  data.tar.gz: 58edcf243d803c25ff545a3ae90da695c030b5e140a17ffdbf6f914926528f6e7cad794a7d5c7d5472490ed5494baea47ae1bca2607d463615d5d88be4e84605

data/.bundler-version

@@ -1 +1 @@
-2.3.11
+2.4.17

data/.dependabot/config.yml

@@ -14,3 +14,6 @@ update_configs:
       - match:
           dependency_type: "all"
           update_type: "security:patch"
+    labels:
+      - "automerge"
+      - "dependencies"

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

@@ -1,14 +1,13 @@
-# automatically approve PRs submitted by Dependabot or Renofidev
-# 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_target
+name: Auto approve dependency upgrades and hot-fix PRs
+on:
+  pull_request_target:
+    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
 
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - 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 }}"
+      - uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge-dependencies.yml

@@ -0,0 +1,24 @@
+name: automerge-dependencies
+on:
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  label:
+    types:
+      - created
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge-dependencies
+        uses: pascalgn/automerge-action@v0.15.6
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: dependencies
+          MERGE_REMOVE_LABELS: ""

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

@@ -6,13 +6,16 @@ on:
   check_suite:
     types:
       - completed
+  label:
+    types:
+      - created
   status: {}
 jobs:
   automerge:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.12.0"
+        uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -11,15 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', 3.1]
+        ruby-version: [3.1, 3.2]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - 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
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 Sorted so that the most recent change logs are near the top. Only significant
 changes are logged in the change log.
 
+## 2023-07-26 Krzysztof Knapik
+
+v2.9 take default api version from `SALESFORCE_API_VERSION` env var
+
+## 2023-02-14 Krzysztof Knapik
+
+v2.8 bump dependency constraints, restforce 6.2+
+
+## 2022-08-01 Krzysztof Knapik
+
+v2.7 bump dependency constraints
+
+## 2022-04-10 Krzysztof Knapik
+
+v2.6 drops ruby 2.7 support and adds ruby 3.1 support
+
 ## 2020-08-17 Scott Serok [scott@renofi.com](mailto:scott@renofi.com)
 
 v2.1 changes the expected interface of `Configuration#replay_adapter`.

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in salesforce_streamer.gemspec
 gemspec
+
+gem 'byebug'
+gem 'codecov'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    salesforce_streamer (2.6.0)
-      cookiejar (~> 0.3.0)
-      dry-initializer (~> 3.0)
+    salesforce_streamer (2.9.0)
+      cookiejar (~> 0.3)
+      dry-initializer (~> 3.1)
       eventmachine (~> 1.2)
       faye (~> 1.4)
-      restforce (~> 5.0)
+      restforce (~> 6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     byebug (11.1.3)
     codecov (0.6.0)
@@ -30,27 +30,14 @@ GEM
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
     eventmachine (1.2.7)
-    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)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
       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.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.0.2)
     faye (1.4.0)
       cookiejar (>= 0.3.0)
       em-http-request (>= 1.1.6)
@@ -59,57 +46,71 @@ GEM
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.11.1)
+    faye-websocket (0.11.3)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hashie (5.0.0)
     http_parser.rb (0.8.0)
-    jwt (2.3.0)
+    json (2.6.3)
+    jwt (2.7.1)
+    language_server-protocol (3.17.0.3)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    multipart-post (2.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    public_suffix (4.0.7)
-    rack (2.2.3)
+      racc
+    public_suffix (5.0.3)
+    racc (1.7.1)
+    rack (3.0.8)
     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)
+    regexp_parser (2.8.1)
+    restforce (6.2.3)
+      faraday (>= 1.1.0, < 2.8.0)
+      faraday-follow_redirects (<= 0.3.0, < 1.0.0)
+      faraday-multipart (>= 1.0.0, < 2.0.0)
+      faraday-net_http (< 4.0.0)
       hashie (>= 1.2.0, < 6.0)
       jwt (>= 1.5.6)
     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)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.27.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.55.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.10.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -117,18 +118,13 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.1.0)
-    websocket-driver (0.7.5)
+    unicode-display_width (2.4.2)
+    websocket-driver (0.7.6)
       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
+  ruby
 
 DEPENDENCIES
   byebug
@@ -141,4 +137,4 @@ DEPENDENCIES
   salesforce_streamer!
 
 BUNDLED WITH
-   2.2.29
+   2.4.12

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Scott Serok
+Copyright (c) 2023 RenoFi Engineering Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -6,4 +6,4 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 task ci: %i[spec rubocop]
-task default: %i[spec rubocop:auto_correct]
+task default: %i[spec rubocop:autocorrect]

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), aliases: true)
+      data = YAML.safe_load_file(config_file, aliases: true)
       @push_topic_data = data[environment.to_s]
     end
 

data/lib/salesforce_streamer/push_topic.rb

@@ -3,11 +3,13 @@ module SalesforceStreamer
   class PushTopic
     extend Dry::Initializer
 
+    DEFAULT_API_VERSION = ENV.fetch('SALESFORCE_API_VERSION', '58.0')
+
     option :name
     option :query, ->(v) { v.gsub(/\s+/, ' ') }
     option :handler, ->(v) { prepare_handler_proc(Object.const_get(v)) }
     option :replay, ->(v) { v.to_i }, default: -> { -1 }
-    option :api_version, proc(&:to_s), default: -> { '49.0' }
+    option :api_version, proc(&:to_s), default: -> { DEFAULT_API_VERSION }
     option :notify_for_fields, default: -> { 'Referenced' }
     option :id, optional: true
     option :description, optional: true

data/lib/salesforce_streamer/version.rb

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

data/salesforce_streamer.gemspec

@@ -26,19 +26,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.0'
 
-  spec.add_dependency 'cookiejar', '~> 0.3.0'
-  spec.add_dependency 'dry-initializer', '~> 3.0'
+  spec.add_dependency 'cookiejar', '~> 0.3'
+  spec.add_dependency 'dry-initializer', '~> 3.1'
   spec.add_dependency 'faye', '~> 1.4'
-  spec.add_dependency 'restforce', '~> 5.0'
-  # # When you have issues installing eventmachine on osx and ruby 3, try:
+  spec.add_dependency 'restforce', '~> 6.2'
+  # When you have issues installing eventmachine on osx and ruby 3, try:
+  # export LDFLAGS="-L/opt/homebrew/opt/openssl@1.1/lib"
+  # export CPPFLAGS="-I/opt/homebrew/opt/openssl@1.1/include"
+  # export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@1.1/lib/pkgconfig"
   # 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'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_streamer
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Scott Serok
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cookiejar
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -81,104 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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: codecov
-  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
-    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: rspec
-  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: rubocop
-  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: rubocop-rake
-  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: rubocop-rspec
-  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'
 description:
 email:
 - scott@renofi.com
@@ -195,6 +97,7 @@ files:
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge-dependencies.yml"
 - ".github/workflows/auto-merge.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -202,7 +105,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - exe/streamer
@@ -243,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: A wrapper around the Restforce Streaming API with a built-in PushTopic manager.