salesforce_streamer 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b4745cb1c8f38229ac4be01e746a7b865458c37e0d293f3505bfe9803cce20c
-  data.tar.gz: 290378a24b830fedd86290a06deaf5050fd1187c22467cadc6b1278aee19cebf
+  metadata.gz: 76475a30dc6515e8071504a9383c2811fa339f0885be703929008aaf2abbed8d
+  data.tar.gz: 927f5ff453fc8e51adaeae3915ee4ace4b0bcf11e355fc66c5aa32dbb5eec3aa
 SHA512:
-  metadata.gz: 228d3f363b0b0bb292e94c4776c74fd8930f616250664fb586cfafa2695fcdde07f754f850c430e87ec12b9473046d733975d4c5ac3f9d9e70fd6be0ef8baa73
-  data.tar.gz: '0850171e7c9762b7cf498a8c9066b21482cab7e69f30d7a72d9cc0ca7b12c90ab5ea167ae312614d6d25060558cfd7aa2a880f60e6d7eaacf8229e916e14c61b'
+  metadata.gz: cf695ae8cf24912b2ccb403b46b3151cc9ec988202ed9dd04857dab27cbef4d9afec3425898384649bc1c5bc84e5a68d515237b20f0b0a249ebe92251d51cebf
+  data.tar.gz: 0b36d256fdc82499c701aa619205c0dddf3d8837200c1e1575f144fd87caed132658e3137d3c3bc9d655157086a5e6fa2b805561729b7cef50e19a526265ef1d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    salesforce_streamer (2.2.0)
+    salesforce_streamer (2.3.0)
       dry-initializer (~> 3.0)
       faye (~> 1.4)
       restforce (>= 4.2, < 6.0)

data/README.md

@@ -183,8 +183,23 @@ out more about extensions from
 specs.
 
 Any configured extensions are added to the Faye client used by the Restforce
-client when starting up the server.
+client when starting up the server. If the extension responds to `.server=` then
+the instance of `SalesforceStreamer::Server` is assigned. This may be convenient
+to restart the server subscriptions if an error requires a reset.
 
+```ruby
+class MyRestartFayeExtension
+  attr_accessor :server
+
+  def incoming(message, callback)
+    callback.call(message).tap |message|
+      server.restart if message['error'] == 'tragic'
+    end
+  end
+end
+
+SalesforceStreamer.config.use_faye_extension MyRestartFayeExtension.new
+```
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/salesforce_streamer/server.rb

@@ -1,15 +1,23 @@
 module SalesforceStreamer
   class Server
     attr_writer :push_topics
+    attr_reader :client
 
     def initialize(push_topics: [])
       @push_topics = push_topics
     end
 
     def run
-      Log.info 'Starting Server'
+      Log.info 'Starting server'
       catch_signals
-      start_em
+      reset_client
+      EM.run { subscribe }
+    end
+
+    def restart
+      Log.info 'Restarting server'
+      reset_client
+      EM.next_tick { subscribe }
     end
 
     private
@@ -23,24 +31,21 @@ module SalesforceStreamer
       end
     end
 
-    def client
-      return @client if @client
+    def reset_client
       @client = Restforce.new
-      @client.authenticate!
+      client.authenticate!
       Configuration.instance.faye_extensions.each do |extension|
         Log.debug %(adding Faye extension #{extension})
-        @client.faye.add_extension extension
+        extension.server = self if extension.respond_to?(:server=)
+        client.faye.add_extension extension
       end
-      @client
     end
 
-    def start_em
-      EM.run do
-        @push_topics.map do |topic|
-          client.subscribe topic.name, replay: Configuration.instance.replay_adapter do |message|
-            Log.info "Message #{message.dig('event', 'replayId')} received from topic #{topic.name}"
-            topic.handle message
-          end
+    def subscribe
+      @push_topics.each do |topic|
+        client.subscribe topic.name, replay: Configuration.instance.replay_adapter do |message|
+          Log.info "Message #{message.dig('event', 'replayId')} received from topic #{topic.name}"
+          topic.handle message
         end
       end
     end

data/lib/salesforce_streamer/version.rb

@@ -1,3 +1,3 @@
 module SalesforceStreamer
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_streamer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Scott Serok
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer