deepstream 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8cafac8651bd0cb90746e47c290919eb51acb2058e24fd345759ffa0a459996
-  data.tar.gz: 29d4d74d4e417afd703e0ad190b138b7145cf8699cd5bb1c90ca0d006b95b83a
+  metadata.gz: 9fff30aea0355fa344202c8b0d7fc50eb68dc6dcc32d2f5da474f9bca70ef068
+  data.tar.gz: c0f4cef7341b68a0378444aa020f3483a6e68fc44dd7c0abb6e7777f94ac6395
 SHA512:
-  metadata.gz: f6f1f0bec2528e8fc4694b3febf05a036551fed454277bb3e9d655453805d4e938d51d6bc2a6765ee254739c36d7d6634c03f599659dad25c08ee3907085bafc
-  data.tar.gz: 968a2b71039dda4367e1152acb96f5ff164c5c14f4736774ee408cc7daa8c32f3d7661473f1eb63f9f745e5e7bd1cd024a2917a6f2281662a7e39251d5444e79
+  metadata.gz: c6248cae180ef82f9f1efaecea3366ec2d30c8fc24cf89a395a32e62ac1b75573c2b01a3486f8c30e8584b05dae4ac679318041348148174e8f7fc6367afc396
+  data.tar.gz: 82cf0ed01406e8c9e62e91bacf75e4a3005bef50ea9087d87dd73a4f21ba4f2b51b52949676c612a02e9140b6865e39000fcd2eee227b18935eafc04118a5673

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.3"
+  spec.version       = "1.0.8"
   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
@@ -44,14 +32,3 @@ module Async
     end
   end
 end
-
-module Protocol
-  module WebSocket
-    class TextFrame
-
-      def unpack
-        encoded_readed_string = super.encode(Encoding::UTF_8)
-      end
-    end
-  end
-end

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/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
@@ -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.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Currency-One S.A.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-24 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:
   - - ">="