deepstream 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8169bda63ee658320c41ca0f1dd64de4a587d2b072786d1bc8ab936c96708c
-  data.tar.gz: 66648cc17ba621f33cbd9d7204f473201112adc309763331de39a723a665f342
+  metadata.gz: fb92438a6ee2d2ab7fe48104493f4007a1ca6b0f1716b8c6c362a2429099cb2d
+  data.tar.gz: 2b4a5dd03874f759869869869521c24d793a2b40216b6b1f010bcdcc1f45b4c9
 SHA512:
-  metadata.gz: 0f67317f952de1c621942d12b37aab4dbb321c6b3fb00c81ecd22e8b1288f47b6b14f64d1081a871359a721b89f5e29c44f135ec4e3523336c3da28030a08568
-  data.tar.gz: 629ec25bb730fc2392c12669a30a05ef0a19ea69c0567701a1db58eca8461ae36074bbfa13845f22ce5fb72cf8b09bfa657768777d48788e7b3e7007749936a9
+  metadata.gz: a87edb61bce878657d2f04bb4eb1d8e4634a968d27b530c61173c01f939656384e088a4a76197e1570afd01700d2b92a6eee14ae30d97175de194a95ce7c198b
+  data.tar.gz: 7f5eee48da30fa2160e0b9f1df1d1fdee08f4ec0427525bf6bcea310d8963e9fc30f0e3dd2d0f8d4af77689663c50b468f8cf81be6bc242cffcb6e4585249614

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.2"
+  spec.version       = "1.0.7"
   spec.authors       = ["Currency-One S.A."]
   spec.email         = ["ruby@currency-one.com"]
 

data/lib/deepstream/async_patch.rb

@@ -3,6 +3,18 @@ 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)
@@ -32,14 +44,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/helpers.rb

@@ -46,7 +46,7 @@ module Deepstream
       url.tap do |url|
         url.prepend(SCHEME) unless url.start_with?(/ws(s|)\:\/\//)
         url.concat(":#{DEFAULT_PORT}") unless url[/\:\d+/]
-        url.concat("/#{DEFAULT_PATH}") unless url[/\/\w+$/]
+        url.concat("/#{DEFAULT_PATH}") unless url[/:\d+\/\S+$/]
       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.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Currency-One S.A.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async