deepstream 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb6836f0d6e68ba31e24af61935f988597318c5b6f253fcde568eab923bb2d8
-  data.tar.gz: 46af39f8a25cf0570dac24b244e258a35d6884f654cbb275c8ec82ae1906194f
+  metadata.gz: ce0d374d6501431341af6d92bc81dac4d69625ff7f1798589d219ac8fdd1a2b9
+  data.tar.gz: 155d1a92062f7fdb6e1743634e1faab24bfcf9ddc4b437989068e1d8fc75c285
 SHA512:
-  metadata.gz: 72d8ce15a93805aadb21985808d6788c9acc701106deb6e47c5fafb096b1fa2d09312cff3d64bc53208828c9c7b21632fc9a2cac8300fa236e88770048edbe39
-  data.tar.gz: 257bca56120ed94acb499b5f8acef3cd5dce9477a852b3e70956804aff7415ce85493a3668c10c4e8764bdcef8f4425f9860a9652e28ba3bdd9d9ffba288189a
+  metadata.gz: dd265a7de16feb50657b0d764a4105b8db11b200d558811d57a8acd0d83c619a007aa98a79246bae1bdda59e55a1bc5c65a9276901fa5751a4be22cb8de95a7f
+  data.tar.gz: 0a980e1dda5288e1b66655951ebd4ef02eb6dfae4496677f02ff2958a29b26b05e77ce09b4a78ac71e92933169088069fb1b601015b38fcc34f90aa588b0f168

data/README.md

@@ -79,6 +79,9 @@ foo.data
 foo.keys
 # get records from the list
 foo.all
+# callbacks
+foo.on(:added) { |record|  }
+foo.on(:removed) { |record|  }
 ```
 
 

data/deepstream.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "deepstream"
-  spec.version       = "1.0.4"
+  spec.version       = "1.0.9"
   spec.authors       = ["Currency-One S.A."]
   spec.email         = ["ruby@currency-one.com"]
 
@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.license       = "Apache-2.0"
-  spec.add_runtime_dependency 'async', '~> 1.25.0'
-  spec.add_runtime_dependency 'async-io', '~> 1.29.0'
-  spec.add_runtime_dependency 'async-http', '~> 0.52.1'
-  spec.add_runtime_dependency 'async-websocket', '~> 0.14.0'
+  spec.add_runtime_dependency 'async', '~> 1.28.9'
+  spec.add_runtime_dependency 'async-io', '~> 1.30.2'
+  spec.add_runtime_dependency 'async-http', '~> 0.54.1'
+  spec.add_runtime_dependency 'async-websocket', '~> 0.17.0'
   spec.add_development_dependency 'cucumber'
   spec.add_development_dependency 'reel'
   spec.add_development_dependency 'pry'

data/lib/deepstream/async_patch.rb

@@ -3,22 +3,10 @@ module Async
     class Client < ::Protocol::HTTP::Middleware
       include ::Protocol::WebSocket::Headers
 
-      def self.open(endpoint, *args, &block)
-        client = self.new(HTTP::Client.new(endpoint, *args), mask: true)
-
-        return client unless block_given?
-
-        begin
-          yield client
-        ensure
-          client.close
-        end
-      end
-
       def self.connect(endpoint, *args, **options, &block)
         self.open(endpoint, *args) do |client|
-          connection = client.connect(endpoint.path, **options)
-
+          connection = client.connect(endpoint.authority, endpoint.path, **options)
+       
           return connection unless block_given?
 
           begin

data/lib/deepstream/client.rb

@@ -34,8 +34,9 @@ module Deepstream
       @challenge_denied, @@deliberate_close = false
       @state = CONNECTION_STATE::CLOSED
       @verbose = @options[:verbose]
+      @reinitialize_master = @options[:reinitialize_master]
       @log = Async.logger
-      @never_connected_before = true
+      @connected_before = false
       connect
     end
 
@@ -156,7 +157,7 @@ module Deepstream
     def on_connection_ack
       @state = CONNECTION_STATE::AUTHENTICATING
       @message_buffer.delete_if { |msg| msg.action == ACTION::PATCH }
-      @record_handler.reinitialize unless @never_connected_before
+      @record_handler.reinitialize if @connected_before
       login
     end
 
@@ -166,7 +167,7 @@ module Deepstream
     end
 
     def on_login
-      @never_connected_before = false
+      @connected_before = true
       @state = CONNECTION_STATE::OPEN
       every(@options[:heartbeat_interval]) { check_heartbeat } if @options[:heartbeat_interval]
       resubscribe

data/lib/deepstream/exceptions.rb

@@ -1,4 +1,5 @@
 module Deepstream
   class UnknownTopic < StandardError; end
   class UnknownAction < StandardError; end
+  class UnknownListCallback < StandardError; end
 end

data/lib/deepstream/helpers.rb

@@ -38,7 +38,8 @@ module Deepstream
         heartbeat_interval: nil,
         in_thread: true,
         verbose: false,
-        debug: false
+        debug: false,
+        reinitialize_master: false
       }
     end
 

data/lib/deepstream/list.rb

@@ -1,16 +1,21 @@
 require_relative './record'
+require_relative './exceptions'
 
 module Deepstream
   class List < Record
+    LIST_CALLBACKS = %i{added removed}
+
     def initialize(*args)
       super
       @data = []
+      @handlers = {}
     end
 
     def add(record_name)
       unless @data.include?(record_name)
         @data << record_name
         set
+        notify_listeners(:removed, record_name)
       end
     rescue => e
       @client.on_exception(e)
@@ -20,13 +25,14 @@ module Deepstream
       @version = version.to_i
       data = JSON.parse(data)
       if data.is_a?(Array)
-        @data.concat(data).uniq!
+        set_new_data (@data + data).uniq
         set if @data.size > data.size
       end
     end
 
     def remove(record_name)
       set if @data.delete(record_name)
+      notify_listeners(:removed, record_name)
     end
 
     def keys
@@ -43,10 +49,53 @@ module Deepstream
       @is_reinitializing = false
     end
 
+    def update(version, data)
+      @version = version.to_i
+      set_new_data JSON.parse(data)
+    rescue => e
+      @client.on_exception(e)
+    end
+
+    def on(cb_name, &block)
+      unless LIST_CALLBACKS.include?(cb_name)
+        raise(UnknownListCallback, "Uknown callback name: #{cb_name}. Must be one of: #{LIST_CALLBACKS}")
+      end
+      (@handlers[cb_name] ||= []).push(block)
+      nil
+    end
+
+    def off(cb_name, &block)
+      if block_given?
+        @handlers[cb_name].delete block
+      elsif cb_name
+        @handlers[cb_name] = []
+      else
+        @handlers = {}
+      end
+      nil
+    end
+
     private
 
     def set
       @client.send_message(TOPIC::RECORD, ACTION::UPDATE, @name, (@version += 1), @data.to_json) if @version
     end
+
+    def set_new_data(new_data)
+      (@data - new_data).each { |uid| notify_listeners(:removed, uid) }
+      (new_data - @data).each { |uid| notify_listeners(:added, uid) }
+      @data = new_data
+    end
+
+    def notify_listeners(cb_name, uid)
+      (@handlers[cb_name] || []).each do |proc|
+        record = @client.get(uid)
+        if record.__version
+          proc.call(record)
+        else
+          record.when_ready(&proc)
+        end
+      end
+    end
   end
 end

data/lib/deepstream/record.rb

@@ -4,6 +4,8 @@ require_relative './helpers'
 
 module Deepstream
   class Record
+    attr_reader :data
+
     def initialize(client, name)
       @client = client
       @name = name
@@ -12,6 +14,15 @@ module Deepstream
       @is_reinitializing = false
       @data_cache = {}
       @client.send_message(TOPIC::RECORD, ACTION::CREATEORREAD, @name)
+      @ready_callback = nil
+    end
+
+    def __version
+      @version
+    end
+
+    def __name
+      @name
     end
 
     def reset_version
@@ -29,8 +40,8 @@ module Deepstream
     end
 
     def end_reinitializing
-      reset_version
-      set(@data_cache)
+      reset_version if @client.options[:reinitialize_master]
+      set(@data_cache) if @client.options[:reinitialize_master]
       @is_reinitializing = false
     end
 
@@ -60,8 +71,16 @@ module Deepstream
       @client.on_exception(e)
     end
 
+    def when_ready(&block)
+      @ready_callback = block
+    end
+
     def read(version, data)
       update(version, data)
+      if @ready_callback
+        @ready_callback.call(self)
+        @ready_callback = nil
+      end
     end
 
     def patch(version, path, value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepstream
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Currency-One S.A.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.28.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.28.9
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.30.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.30.2
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.54.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.54.1
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="