deepstream 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc30a0e0a97440b9c2cde61f862e835cad8f56fbe90c273f00c600b1ae9e947b
-  data.tar.gz: 4e0fb0d6fed3e2df75bb62711c3c0ac3498a4ffe2f1ce52a6c3b4b9d536f1186
+  metadata.gz: e0167226999cb5c1382b9d396aa2e8ce699fae587de39a970e9bdd64427a9e2a
+  data.tar.gz: 4b703477f808e422b964a0bbe0d23c7d0eef50d6bd815c109a334a59f98163e3
 SHA512:
-  metadata.gz: ff69e6bfd97ec1491c84c1b34e0635bad8c38547afa29c6276dfd164f1ba0c08866f01c1e81f90572c3b802dd7300b7910a73691c9e4c1c5719d237dde73cd73
-  data.tar.gz: 86c5c00074bc6581ffe5e6c9c396aee7180a4dae71473e7caab36f00f272c7b44adbef8783720e0899c0665df5e4ef0297ce25ba445ee315ba0008d1ab92dd0b
+  metadata.gz: 7b8c909ac4d4dc9117749a63e077d423f995ac340ca6bd843286c6dee0bc7eda4285ff69efb98a7285924ba83335832e45165ad265cecf356dbdf4f71ca44837
+  data.tar.gz: 642ded8ef97cc5429331accc0d86405e5938b8fe660a3dfc36bc1d2690799df882002d6bb4d4f3769cafac8bb1ca70ff6d341a7a64c31b90c31f3c5a1443dda3

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,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "deepstream"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.5"
   spec.authors       = ["Currency-One S.A."]
-  spec.email         = ["piotr.szczudlak@currency-one.com"]
+  spec.email         = ["ruby@currency-one.com"]
 
   spec.summary       = %q{deepstream.io ruby client}
   spec.description   = %q{Basic ruby client for the deepstream.io server}
@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
   spec.license       = "Apache-2.0"
   spec.add_runtime_dependency 'async', '~> 1.25.0'
-  spec.add_runtime_dependency 'async/io/stream', '~> 1.29.0'
-  spec.add_runtime_dependency 'async/http/endpoint', '~> 0.52.1'
-  spec.add_runtime_dependency 'async/websocket/client', '~> 0.14.0'
-  spec.add_runtime_dependency 'async/logger'
+  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_development_dependency 'cucumber'
   spec.add_development_dependency 'reel'
   spec.add_development_dependency 'pry'

data/lib/deepstream.rb

@@ -11,4 +11,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'deepstream/client'
+require_relative './deepstream/client'

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/client.rb

@@ -4,14 +4,14 @@ require 'async/io/stream'
 require 'async/http/endpoint'
 require 'async/websocket/client'
 require 'async/logger'
-require 'deepstream/constants'
-require 'deepstream/error_handler'
-require 'deepstream/event_handler'
-require 'deepstream/record_handler'
-require 'deepstream/helpers'
-require 'deepstream/message'
-require 'deepstream/exceptions'
-require 'deepstream/async_patch'
+require_relative './constants'
+require_relative './error_handler'
+require_relative './event_handler'
+require_relative './record_handler'
+require_relative './helpers'
+require_relative './message'
+require_relative './exceptions'
+require_relative './async_patch'
 
 module Deepstream
   class Client
@@ -227,7 +227,7 @@ module Deepstream
             break if ( connection.closed? || @deliberate_close )
             while !@message_buffer.empty? && (logged_in? || !@message_buffer[0].needs_authentication?)
               msg = @message_buffer.shift
-              next if message.expired?
+              next if msg.expired?
               encoded_msg = msg.to_s.encode(Encoding::UTF_8)
               @log.info "Sending msg = #{msg.inspect}" if @verbose
               connection.write(encoded_msg)

data/lib/deepstream/error_handler.rb

@@ -1,6 +1,6 @@
-require 'deepstream/constants'
-require 'deepstream/helpers'
-require 'deepstream/message'
+require_relative './constants'
+require_relative './helpers'
+require_relative './message'
 
 module Deepstream
   class ErrorHandler

data/lib/deepstream/event_handler.rb

@@ -1,7 +1,7 @@
-require 'deepstream/ack_timeout_registry'
-require 'deepstream/constants'
-require 'deepstream/exceptions'
-require 'deepstream/helpers'
+require_relative './ack_timeout_registry'
+require_relative './constants'
+require_relative './exceptions'
+require_relative './helpers'
 
 module Deepstream
   class EventHandler

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 'deepstream/record'
+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()
+        else
+          record.when_ready(&proc)
+        end
+      end
+    end
   end
 end

data/lib/deepstream/message.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'deepstream/constants'
+require_relative './constants'
 
 module Deepstream
   class Message

data/lib/deepstream/record.rb

@@ -1,9 +1,11 @@
 require 'json'
-require 'deepstream/constants'
-require 'deepstream/helpers'
+require_relative './constants'
+require_relative './helpers'
 
 module Deepstream
   class Record
+    attr_reader :data
+
     def initialize(client, name)
       @client = client
       @name = name
@@ -12,6 +14,7 @@ module Deepstream
       @is_reinitializing = false
       @data_cache = {}
       @client.send_message(TOPIC::RECORD, ACTION::CREATEORREAD, @name)
+      @ready_callback = nil
     end
 
     def reset_version
@@ -60,8 +63,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)

data/lib/deepstream/record_handler.rb

@@ -1,7 +1,7 @@
-require 'deepstream/constants'
-require 'deepstream/exceptions'
-require 'deepstream/list'
-require 'deepstream/record'
+require_relative './constants'
+require_relative './exceptions'
+require_relative './list'
+require_relative './record'
 
 module Deepstream
   class RecordHandler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepstream
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 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
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.25.0
 - !ruby/object:Gem::Dependency
-  name: async/io/stream
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.29.0
 - !ruby/object:Gem::Dependency
-  name: async/http/endpoint
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.52.1
 - !ruby/object:Gem::Dependency
-  name: async/websocket/client
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: async/logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +138,7 @@ dependencies:
         version: '0'
 description: Basic ruby client for the deepstream.io server
 email:
-- piotr.szczudlak@currency-one.com
+- ruby@currency-one.com
 executables: []
 extensions: []
 extra_rdoc_files: []