salesforce_streamer 1.1.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f626431375e34ca6523e657667bcf1121589bc801925608a91df81f5a052b916
-  data.tar.gz: 9c53ea7736694cb86d992fcbb81f5660321b8917f81deaa723f3b0d921ed3e1c
+  metadata.gz: 980626b26a53a56e8fb6fd2028e538ffd667cbe938a1aa1011c4184813d2936d
+  data.tar.gz: b6ece556e2e34186b9ad77f445c26ebf6532170e4a9f7a8d0662e309775c9427
 SHA512:
-  metadata.gz: f6b94d4f6c2da921d21aed7fa4319c40a2c55b8067e8e940194444b8bdf034faee048222e922a41090e7967461b01c7682c22c8e59df1c6fa6e6f8b5b03aa65a
-  data.tar.gz: 90d7af5c35d8e2e624051269f07de481f975788a9f6c4448a707f71f65d3b2c6e500bb0caef83c21ea401feb56f804b70a1f48223bfa774a1ddde03bd9e9ac4c
+  metadata.gz: 1920656978db1b707ba61bd90c7026988b99c9dfbb2c7489f4a8554df97f1ad9000885fa619bff884257fd5794225ba3c3ab23b3172b6753ea57ec8f76e6bb05
+  data.tar.gz: '0099d97a9cb7774c0fe274b0ee46bb68da87dca38f6113310539248f309111341a4a3e917476e4ca686413cf8cd22e5551f6c917a774a60ffab6541f9ad04889'

data/.dependabot/config.yml

@@ -9,10 +9,3 @@ update_configs:
     allowed_updates:
       - match:
           update_type: "all"
-    automerged_updates:
-      - match:
-          dependency_type: "development"
-          update_type: "all"
-      - match:
-          dependency_type: "production"
-          update_type: "all"

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to track an issue that has been identified
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Mutation/Query**
+
+**URL and HTTP method (for non-GQL):**
+
+**Sentry or Logs URL:**
+
+**User/authentication details**
+Impacted user name or service account
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

data/.github/ISSUE_TEMPLATE/story.md

@@ -0,0 +1,22 @@
+---
+name: New story
+about: Add a new story for implementation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the solution**
+A clear and concise description of what you want to happen.
+When will this feature be done?
+
+**Describe the users**
+Who are we building this feature for?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+Link to any applicable documents describing the feature.
+
+**Designs**
+Link to any applicable designs on Invision.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Description
+<!--- 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). -->

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

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

data/.travis.yml

@@ -3,8 +3,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5
   - 2.6
+  - 2.7
 before_install: gem install bundler
 script:
-  - bundle exec rake
+  - bundle exec rake spec
+  - bundle exec rake rubocop

data/CHANGELOG.md

@@ -0,0 +1,67 @@
+# Changelog
+
+Sorted so that the most recent change logs are near the top. Only significant
+changes are logged in the change log.
+
+## 2020-08-04 Scott Serok [scott@renofi.com](mailto:scott@renofi.com)
+
+v2.0 is released as a major simplification of this library. There are 2
+significant differences from a user's perspective.
+
+1. The YAML configuration requires minor edits to be compatible in v2.0.
+2. The built-in Redis persistance of the replayId field has been removed. You
+   should add a custom middleware and configure the new replay_adapter option.
+
+### PushTopic configuration changes
+
+After upgrading to v2, the YAML configuration should be modified. Shift the
+nested "salesforce" block to the left and remove the "salesforce" key.
+
+Before v2:
+
+    name: "TopicName"
+    handler: "MyConstant"
+    salesforce:
+      query: "SELECT Id FROM Lead"
+
+As of v2:
+
+    name: "TopicName"
+    handler: "MyConstant"
+    query: "SELECT Id FROM Lead"
+
+### Redis Persistance removed
+
+The original intention of this library is to manage PushTopic definitions
+and run an event machine that subscribes to the Salesforce Streaming API based
+on those PushTopics.
+
+The addition of managing the Replay ID adds unecessary complexity that can be
+incorporated through customization, and so it's been removed. You might use a
+recent commit of v1 of this library for reference how to implement Redis as the
+persistence layer.
+
+To record the replayId on every message we can add a piece of middleware
+
+    class RecordReplayIdMiddleware
+      def initialize(handler)
+        @handler = handler
+      end
+
+      def call(message)
+        @handler.call(message)
+        replay_id = message['event']['replayId']
+        topic_name = message['topic']
+        MyStore.record_replay_id(replay_id, topic_name)
+      end
+    end
+    SalesforceStreamer.config.use_middleware RecordReplayIdMiddleware
+
+To retrieve the replayId before subscribing to a PushTopic,
+configure an adapter that returns an integer.
+
+    SalesforceStreamer.config.replay_adapter = proc { |topic|
+      MyStore.fetch_replay_id(topic.name) || -1
+    }
+
+This will be used to set the replayId value when subscribing to the PushTopic.

data/Gemfile.lock

@@ -1,25 +1,28 @@
 PATH
   remote: .
   specs:
-    salesforce_streamer (1.1.1)
-      faye (= 0.8.9)
-      restforce (~> 4.2)
+    salesforce_streamer (2.0.0.rc1)
+      dry-initializer (~> 3.0)
+      faye (~> 1.4)
+      restforce (>= 4.2, < 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    byebug (11.1.1)
-    codecov (0.1.16)
+    ast (2.4.1)
+    byebug (11.1.3)
+    codecov (0.2.3)
+      colorize
       json
       simplecov
-      url
+    colorize (0.8.1)
     cookiejar (0.3.3)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    em-http-request (1.1.5)
+    dry-initializer (3.0.3)
+    em-http-request (1.1.6)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -28,76 +31,78 @@ GEM
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
     eventmachine (1.2.7)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
-    faye (0.8.9)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    faye (1.4.0)
       cookiejar (>= 0.3.0)
-      em-http-request (>= 0.3.0)
+      em-http-request (>= 1.1.6)
       eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.4.0)
+      faye-websocket (>= 0.11.0)
+      multi_json (>= 1.0.0)
       rack (>= 1.0.0)
-      yajl-ruby (>= 1.0.0)
-    faye-websocket (0.10.9)
+      websocket-driver (>= 0.5.1)
+    faye-websocket (0.11.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hashie (4.1.0)
     http_parser.rb (0.6.0)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
+    json (2.3.1)
     jwt (2.2.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    parallel (1.19.1)
-    parser (2.7.0.3)
-      ast (~> 2.4.0)
-    public_suffix (4.0.3)
-    rack (2.2.2)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    public_suffix (4.0.5)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
-    restforce (4.2.2)
-      faraday (>= 0.9.0, <= 1.0)
-      faraday_middleware (>= 0.8.8, <= 1.0)
+    regexp_parser (1.7.1)
+    restforce (5.0.0)
+      faraday (>= 0.9.0, <= 2.0)
+      faraday_middleware (>= 0.8.8, <= 2.0)
       hashie (>= 1.2.0, < 5.0)
-      json (>= 1.7.5)
       jwt (>= 1.5.6)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.42.0)
+      rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    unicode-display_width (1.6.1)
-    url (0.3.2)
-    websocket-driver (0.7.1)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    yajl-ruby (1.4.1)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,8 +1,7 @@
+[![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)
 
-[![codecov](https://codecov.io/gh/RenoFi/salesforce_streamer/branch/master/graph/badge.svg)](https://codecov.io/gh/RenoFi/salesforce_streamer)
-
-# SalesforceStreamer
+# salesforce_streamer
 
 A wrapper around the Restforce Streaming API to receive real time updates from
 your Salesforce instance with a built-in PushTopic manager.
@@ -21,6 +20,26 @@ And then execute:
 
 ## Usage
 
+### Middleware
+
+You can initialize the streamer server with any number of middleware classes.
+When a message is received by a PushTopic subscription, the chain of middleware
+classes are executed before the message handler is called.
+
+```ruby
+# config/initializers/streamer.rb
+class MySimpleMiddleware
+  def initialize(handler)
+    @handler = handler
+  end
+  def call(message)
+    @handler.call(message)
+  end
+end
+
+SalesforceStreamer.config.use_middleware MySimpleMiddleware
+```
+
 ### Configure Push Topics
 
 Create a YAML file to configure your server subscriptions.  The configuration
@@ -36,12 +55,11 @@ base: &DEFAULT
   accounts:
     handler: "AccountChangeHandler"
     replay: -1
-    salesforce:
-      name: "AllAccounts"
-      api_version: "41.0"
-      description: "Sync Accounts"
-      notify_for_fields: "Referenced"
-      query: "Select Id, Name From Account"
+    name: "AllAccounts"
+    api_version: "49.0"
+    description: "Sync Accounts"
+    notify_for_fields: "Referenced"
+    query: "Select Id, Name From Account"
 
 development:
   <<: *DEFAULT
@@ -95,12 +113,12 @@ Configure the `SalesforceStreamer` module.
 ```ruby
 # config/initializers/salesforce_streamer.rb
 
-require 'redis'
-require 'connection_pool'
-
-SalesforceStreamer.config.redis_connection = ConnectionPool.new(size: 5, timeout: 5) { Redis.new }
 SalesforceStreamer.config.logger = Logger.new(STDERR, level: 'INFO')
 SalesforceStreamer.config.exception_adapter = proc { |e| puts e }
+SalesforceStreamer.config.replay_adapter = proc { |topic|
+  topic.id || Store.get(topic.name) || topic.replay
+}
+SalesforceStreamer.config.use_middleware AfterMessageReceived
 SalesforceStreamer.config.manage_topics = true
 ```
 
@@ -153,7 +171,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/renofi
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the SalesforceStreamer project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/renofi/salesforce_streamer/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

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

data/lib/core_extensions/cookiejar/cookie_validation.rb

@@ -9,7 +9,7 @@ module CoreExtensions
       def self.extended(base)
         base.class_eval do
           def self.domains_match(tested_domain, base_domain)
-            return true if tested_domain[-15..-1].eql?('.salesforce.com')
+            return true if tested_domain[-15..].eql?('.salesforce.com')
 
             # original implementation
             base = effective_host base_domain

data/lib/salesforce_streamer.rb

@@ -4,17 +4,15 @@ require 'optparse'
 require 'restforce'
 require 'yaml'
 require 'forwardable'
+require 'dry-initializer'
 
 require 'salesforce_streamer/configuration'
 require 'salesforce_streamer/errors'
 require 'salesforce_streamer/replay_id_error_extension'
 require 'salesforce_streamer/log'
 require 'salesforce_streamer/push_topic'
-require 'salesforce_streamer/topic_manager'
+require 'salesforce_streamer/salesforce_topic_manager'
 require 'salesforce_streamer/salesforce_client'
-require 'salesforce_streamer/replay_persistence'
-require 'salesforce_streamer/redis_replay'
-require 'salesforce_streamer/message_receiver'
 require 'salesforce_streamer/server'
 require 'salesforce_streamer/version'
 require 'salesforce_streamer/launcher'
@@ -60,10 +58,4 @@ module SalesforceStreamer
   def self.config
     Configuration.instance
   end
-
-  class RedisConnectionError < StandardError
-    def initialize
-      super 'SalesforceStreamer.config.redis_connection not set'
-    end
-  end
 end

data/lib/salesforce_streamer/configuration.rb

@@ -1,7 +1,9 @@
 module SalesforceStreamer
   # Manages server configuration.
   class Configuration
-    attr_accessor :environment, :logger, :require_path, :config_file, :manage_topics, :server, :exception_adapter, :persistence_adapter, :redis_connection
+    attr_accessor :environment, :logger, :require_path, :config_file,
+      :manage_topics, :exception_adapter, :replay_adapter
+    attr_reader :middleware
 
     class << self
       attr_writer :instance
@@ -15,16 +17,30 @@ module SalesforceStreamer
       @environment = ENV['RACK_ENV'] || :development
       @logger = Logger.new(IO::NULL)
       @exception_adapter = proc { |exc| fail(exc) }
-      @persistence_adapter = RedisReplay.new
+      @replay_adapter = proc { |topic| topic.id || topic.replay }
       @manage_topics = false
       @config_file = './config/streamer.yml'
       @require_path = './config/environment'
+      @middleware = []
     end
 
     def manage_topics?
       @manage_topics
     end
 
+    # adds a setup proc to the middleware array
+    def use_middleware(klass, *args, &block)
+      @middleware << [klass, args, block]
+    end
+
+    # returns a ready to use chain of middleware
+    def middleware_runner(last_handler)
+      @middleware.reduce(last_handler) do |next_handler, current_handler|
+        klass, args, block = current_handler
+        klass.new(next_handler, *args, &block)
+      end
+    end
+
     def push_topic_data
       return @push_topic_data if @push_topic_data
 

data/lib/salesforce_streamer/errors.rb

@@ -3,13 +3,13 @@ module SalesforceStreamer
 
   class MissingCLIFlagError < StandardError
     def initialize(flag)
-      super 'Missing required command line flag: ' + flag.to_s
+      super "Missing required command line flag: #{flag}"
     end
   end
 
   class NilQueryError < StandardError
     def initialize(name)
-      super 'Query not defined for ' + name.to_s
+      super "Query not defined for #{name}"
     end
   end
 
@@ -21,7 +21,13 @@ module SalesforceStreamer
 
   class PushTopicNameTooLongError < StandardError
     def initialize(name)
-      super 'PushTopic name: ' + name.to_s + ' (' + name.size.to_s + '/25)'
+      super "PushTopic name: #{name} (#{name.size}/25)"
+    end
+  end
+
+  class UnprocessableHandlerError < StandardError
+    def initialize(constant)
+      super "#{constant} does not repond to .call or .perform_async"
     end
   end
 end

data/lib/salesforce_streamer/launcher.rb

@@ -5,14 +5,14 @@ module SalesforceStreamer
   class Launcher
     def initialize
       load_server_configuration
-      @manager = TopicManager.new push_topics: @push_topics
+      @manager = SalesforceTopicManager.new push_topics: @push_topics
       @server = Server.new push_topics: @push_topics
     end
 
     # Manages each PushTopic configured and starts the Streaming API listener.
     def run
       Log.info 'Launching Streamer Services'
-      @manager.run
+      @manager.upsert_topics!
       @server.push_topics = @manager.push_topics
       @server.run
     end
@@ -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(data: topic_data)
+        @push_topics << PushTopic.new(topic_data.transform_keys(&:to_sym))
       end
     end
   end

data/lib/salesforce_streamer/push_topic.rb

@@ -1,29 +1,29 @@
 module SalesforceStreamer
   # Models the PushTopic object for both Restforce and Streamer
   class PushTopic
-    attr_accessor :id
-    attr_reader :name, :description, :notify_for_fields, :query,
-      :handler, :handler_constant, :api_version
-
-    def initialize(data:)
-      @handler = data['handler']
-      @static_replay = data.dig('replay')&.to_i || -1
-      @name = data.dig('salesforce', 'name')
-      @api_version = data.dig('salesforce', 'api_version') || '41.0'
-      @description = data.dig('salesforce', 'description') || @name
-      @notify_for_fields = data.dig('salesforce', 'notify_for_fields') || 'Referenced'
-      @query = strip_spaces(data.dig('salesforce', 'query'))
-      validate!
+    extend Dry::Initializer
+
+    option :name
+    option :query, proc { |str| str.gsub(/\s+/, ' ') }
+    option :handler, proc { |str| prepare_handler_proc Object.const_get(str) }
+    option :replay, proc(&:to_i), default: proc { -1 }
+    option :api_version, proc(&:to_s), default: proc { '49.0' }
+    option :notify_for_fields, default: proc { 'Referenced' }
+    option :id, optional: true
+    option :description, optional: true
+
+    attr_writer :id
+
+    def handle(message)
+      message['topic'] = @name
+      message_middleware.call(message)
+    rescue StandardError => e
+      Log.error e
+      Configuration.instance.exception_adapter.call e
     end
 
-    def replay
-      ReplayPersistence.retrieve(name) || @static_replay
-    end
-
-    def to_s
-      "PushTopic id=#{id} name=#{name} handler=#{handler} " \
-        "replay=#{replay} notify_for_fields=#{notify_for_fields} " \
-        "description=#{description} api_version=#{api_version} query=#{query}"
+    def attributes
+      self.class.dry_initializer.public_attributes self
     end
 
     private
@@ -31,17 +31,33 @@ module SalesforceStreamer
     def validate!
       fail(PushTopicNameTooLongError, @name) if @name.size > 25
 
-      @handler_constant = Object.const_get(@handler)
+      @handler = Object.const_get(@handler)
       true
     rescue NameError, TypeError => e
       message = 'handler=' + @handler.to_s + ' exception=' + e.to_s
       raise(PushTopicHandlerMissingError, message)
     end
 
-    def strip_spaces(str)
-      fail(NilQueryError, @name) unless str
+    def message_middleware
+      Configuration.instance.middleware_runner(handler)
+    end
 
-      str.gsub(/\s+/, ' ')
+    class << self
+      def strip_spaces(str)
+        fail(NilQueryError, @name) unless str
+
+        str.gsub(/\s+/, ' ')
+      end
+
+      def prepare_handler_proc(constant)
+        if constant.respond_to? :call
+          constant
+        elsif constant.respond_to? :perform_async
+          proc { |message| handler_constant.perform_async message }
+        else
+          fail(UnprocessableHandlerError, constant)
+        end
+      end
     end
   end
 end

data/lib/salesforce_streamer/{topic_manager.rb → salesforce_topic_manager.rb}

@@ -1,5 +1,5 @@
 module SalesforceStreamer
-  class TopicManager
+  class SalesforceTopicManager
     attr_reader :push_topics
 
     def initialize(push_topics:)
@@ -7,10 +7,11 @@ module SalesforceStreamer
       @client = SalesforceClient.new
     end
 
-    def run
-      Log.info 'Running Topic Manager'
+    def upsert_topics!
+      Log.info 'Starting to upsert PushTopic definitions into Salesforce'
       @push_topics.each do |push_topic|
-        Log.debug push_topic.to_s
+        Log.info push_topic.name
+        Log.debug push_topic.attributes.to_json
         upsert(push_topic) if diff?(push_topic)
       end
     end
@@ -29,12 +30,12 @@ module SalesforceStreamer
       return true unless push_topic.notify_for_fields.eql?(hashie.NotifyForFields)
       return true unless push_topic.api_version.to_s.eql?(hashie.ApiVersion.to_s)
 
-      Log.debug 'No differences detected'
+      Log.info 'No differences detected'
       false
     end
 
     def upsert(push_topic)
-      Log.info "Upsert PushTopic #{push_topic.name}"
+      Log.info "Upserting PushTopic"
       if Configuration.instance.manage_topics?
         @client.upsert_push_topic(push_topic)
       else

data/lib/salesforce_streamer/server.rb

@@ -34,9 +34,12 @@ module SalesforceStreamer
     def start_em
       EM.run do
         @push_topics.map do |topic|
-          client.subscribe topic.name, replay: topic.replay.to_i do |msg|
-            Log.info "Message received from topic #{topic.name}"
-            MessageReceiver.call topic.name, topic.handler_constant, msg
+          replay_id = Configuration.instance.replay_adapter.call(topic)
+          client.subscribe topic.name, replay: replay_id.to_i do |message|
+            replay_id = message.dig('event', 'replayId')
+            Log.info "Message #{replay_id} received from topic #{topic.name}"
+            topic.handle message
+            topic.id = replay_id
           end
         end
       end

data/lib/salesforce_streamer/version.rb

@@ -1,3 +1,3 @@
 module SalesforceStreamer
-  VERSION = '1.1.1'.freeze
+  VERSION = '2.0.0.rc1'.freeze
 end

data/salesforce_streamer.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'faye', '0.8.9'
-  spec.add_dependency 'restforce', '~> 4.2'
+  spec.add_dependency 'dry-initializer', '~> 3.0'
+  spec.add_dependency 'faye', '~> 1.4'
+  spec.add_dependency 'restforce', '>= 4.2', '< 6.0'
 
   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: 1.1.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Scott Serok
@@ -9,36 +9,56 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-initializer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: restforce
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -147,10 +167,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dependabot/config.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/ISSUE_TEMPLATE/story.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/auto-approve.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- CODE_OF_CONDUCT.md
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -164,14 +189,11 @@ files:
 - lib/salesforce_streamer/errors.rb
 - lib/salesforce_streamer/launcher.rb
 - lib/salesforce_streamer/log.rb
-- lib/salesforce_streamer/message_receiver.rb
 - lib/salesforce_streamer/push_topic.rb
-- lib/salesforce_streamer/redis_replay.rb
 - lib/salesforce_streamer/replay_id_error_extension.rb
-- lib/salesforce_streamer/replay_persistence.rb
 - lib/salesforce_streamer/salesforce_client.rb
+- lib/salesforce_streamer/salesforce_topic_manager.rb
 - lib/salesforce_streamer/server.rb
-- lib/salesforce_streamer/topic_manager.rb
 - lib/salesforce_streamer/version.rb
 - salesforce_streamer.gemspec
 homepage: https://github.com/renofi/salesforce_streamer
@@ -191,11 +213,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A wrapper around the Restforce Streaming API with a built-in PushTopic manager.

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at scott@renofi.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/lib/salesforce_streamer/message_receiver.rb

@@ -1,19 +0,0 @@
-module SalesforceStreamer
-  class MessageReceiver
-    class << self
-      # @param topic [String] The unique Salesforce Topic name
-      # @param handler [Object] An object that responds to .call(message)
-      # @param message [Hash] The event payload
-      def call(topic, handler, message)
-        if handler.respond_to? :perform_async
-          handler.perform_async message
-        else
-          handler.call message
-        end
-        ReplayPersistence.record topic, message.dig('event', 'replayId')
-      rescue StandardError => e
-        Configuration.instance.exception_adapter.call e
-      end
-    end
-  end
-end

data/lib/salesforce_streamer/redis_replay.rb

@@ -1,55 +0,0 @@
-module SalesforceStreamer
-  class RedisReplay
-    class << self
-      def redis_connection
-        @redis_connection ||= Configuration.instance.redis_connection || fail(RedisConnectionError)
-      end
-
-      attr_writer :redis_connection
-    end
-
-    def connection
-      if RedisReplay.redis_connection.respond_to?(:with)
-        RedisReplay.redis_connection.with do |conn|
-          yield(conn)
-        end
-      else
-        yield RedisReplay.redis_connection
-      end
-    end
-
-    # Saves the value to a key with expiration
-    def record(key, value)
-      return unless key && value
-
-      key = namespaced_key(key)
-      value = Integer(value)
-      connection { |c| c.setex key, SECONDS_TO_EXPIRE, value }
-    rescue StandardError => e
-      Configuration.instance.exception_adapter.call e
-      nil
-    end
-
-    def retrieve(key)
-      return unless key
-
-      key = namespaced_key(key)
-      value = connection { |c| c.get key }
-      Integer(value) if value
-    rescue StandardError => e
-      Configuration.instance.exception_adapter.call e
-      nil
-    end
-
-    private
-
-    def namespaced_key(key)
-      NAMESPACE + key.to_s
-    end
-
-    NAMESPACE = 'SalesforceStreamer:'.freeze
-    SECONDS_TO_EXPIRE = 24 * 60 * 60 # 24 hours
-    START = 0
-    STOP = 0
-  end
-end

data/lib/salesforce_streamer/replay_persistence.rb

@@ -1,18 +0,0 @@
-module SalesforceStreamer
-  # Store values for a given key in a sorted sequence
-  # Retrieves the highest value given a key
-  class ReplayPersistence
-    class << self
-      def record(key, value)
-        Log.debug { "Recording #{key}=#{value}" }
-        Configuration.instance.persistence_adapter&.record key, value
-      end
-
-      def retrieve(key)
-        Configuration.instance.persistence_adapter&.retrieve(key).tap do |v|
-          Log.debug { "Retrieved for #{key} #{v || 'nil'}" }
-        end
-      end
-    end
-  end
-end