rbkubemq 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037bd6fcea0ed99f88688ec9ac7c34f71425fba22655b1dfd283f3c30428c0f2
-  data.tar.gz: 2c63229009a6e41367d013568ea7de34b31fe2829109765758bc88d498009e2e
+  metadata.gz: fd2feb3d11caab95efa41a9c63a2e0fd0b2522ec5d2782589b954eeea6d0b548
+  data.tar.gz: 6b074e5fc0adbd3579df176ccb8b3d7a87c2aaac1881667af2d0ff2379141692
 SHA512:
-  metadata.gz: 35f0b187dbcac8eeaac2a533a45aacac2ff01baccd34844334a7cdeee3491c31f054c14f6b40b04746c75d3e7e1c0feac97a1d000b7bad0fec0163f9a7bab1a4
-  data.tar.gz: 92e823ed208562b20e59702341c37d23256123e221751ca83dacf0e88f110eb3983fdc9cba2bf1c8d14d2fd6fe39fa0fec406287cc0078c4f5af03751b4a3e64
+  metadata.gz: e0f011264cebac6aa0eb4f8ce96ff2d318a9e37a347e2d00b6628c3e1e154aa01564aeb31ecfe21fd93bd39f89d0fa799ed9ed12e093c9c39f612bbc16d70a01
+  data.tar.gz: 044db2136aacc0c1103799176a79172e9e2f89c144bb34464af30064c0e77e26885740037e13765e5e2378973da2afd31f5349246f6aca5ad146455464f986ec

data/RBKubeMQ.gemspec

@@ -4,13 +4,14 @@ require "rake"
 
 Gem::Specification.new do |s|
   s.name        = 'rbkubemq'
-  s.version	    = '0.0.2'
+  s.version	    = '0.1.0'
   s.authors     = ['Stefano Martin']
   s.email       = ['stefano@seluxit.com']
   s.homepage    = 'https://github.com/Seluxit/RBKubeMQ'
   s.license     = 'MIT'
   s.summary     = 'A simple gem for KubeMQ'
-  s.description = "Ruby driver for RBKubeMQ"
+  s.description = "Ruby driver for KubeMQ"
+  s.required_ruby_version = '>= 2.5.0'
   s.platform	   = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.files         = FileList['lib/**/*', 'RBKubeMQ.gemspec', 'Gemfile', 'LICENSE', 'README.md'].to_a

data/README.md

@@ -63,26 +63,25 @@ i = 0
 EM.run do
   streamer = client.streamer(client_id: "YOUR_CLIENT", channel: "YOUR_CHANNEL",
     meta: nil, store: false)
-  ws = streamer.start # Create a websocket by starting it
 
-  ws.on :open do |event|
+  streamer.on :open do |event|
     p [:open]
   end
 
-  ws.on :message do |event|
+  streamer.on :message do |event|
     p [:message, RBKubeMQ::Utility.load(event.data)]
   end
 
-  ws.on :close do |event|
+  streamer.on :close do |event|
     p [:close]
-    ws = nil; EM.stop
+    streamer = nil; EM.stop
   end
 
   # Send a message every second
   timer = EM::PeriodicTimer.new(1) do
     i += 1
     puts "SENDING #{i}"
-    streamer.send(i, meta: "Stream") # Note that we use streamer and not ws to send the stream
+    streamer.send(i, meta: "Stream")
   end
 end
 ```
@@ -97,25 +96,24 @@ It cannot be use to send data.
 EM.run do
   subscriber = client.subscriber(client_id: "YOUR_CLIENT", channel: "YOUR_CHANNEL",
     group: "YOUR_GROUP")
-  ws = subscriber.events
 
-  ws.on :open do |event|
+  subscriber.on :open do |event|
     p [:open]
   end
 
-  ws.on :message do |event|
+  subscriber.on :message do |event|
     p [:message, RBKubeMQ::Utility.load(event.data)]
   end
 
-  ws.on :close do |event|
+  subscriber.on :close do |event|
     p [:close]
-    ws = nil; EM.stop
+    subscriber = nil; EM.stop
   end
 end
 ```
 
 In the example the subscriber is for events.
-You can subscribe to "events_store", "requests", and "queries".
+You can subscribe to "events_store", "commands", and "queries" by specifying "type: events_store" during the initialization.
 
 <a name="RKMQUtility"></a>
 ## RBKubeMQ::Utility
@@ -129,3 +127,13 @@ RBKubeMQ::Utility.load(string) # Parse hash in human format from KubeMQ
 ## RBKubeMQ::Error
 
 RBKubeMQ::Error is used to manage generic errors inside of the gem.
+
+## Test
+
+To test, create a file "config.yml" in the "spec" folder with inside:
+
+```ruby
+host: YOUR_KYBEMQ_HOST
+```
+
+Then run the tests with `rspec spec/lib/sender.rb`.

data/lib/helpers/check.rb

@@ -4,5 +4,10 @@ module RBKubeMQ
       return if classes.include?(object.class)
       raise RBKubeMQ::Error.new("#{name} should be #{classes.map(&:to_s).join(", ")}")
     end
+
+    def is_in_list?(value, list, name)
+      return if list.include?(value)
+      raise RBKubeMQ::Error.new("#{name} should be #{list.join(", ")}")
+    end
   end
 end

data/lib/streamer.rb

@@ -1,5 +1,5 @@
 module RBKubeMQ
-  class Streamer
+  class Streamer < Faye::WebSocket::Client
     include Check
 
     def initialize(client:, client_id: nil, channel: nil, meta: nil, store: false)
@@ -9,14 +9,10 @@ module RBKubeMQ
       @channel = channel
       @meta    = meta.nil? ? meta.to_s : meta
       @store = store
+      super("#{@client.ws}/send/stream")
     end
 
-    attr_accessor :client_id, :channel, :meta, :store
-
-    def start
-      @ws = Faye::WebSocket::Client.new("#{@client.ws}/send/stream")
-      @ws
-    end
+    attr_reader :client_id, :channel, :meta, :store
 
     def send(message, meta: @meta, store: @store, client_id: @client_id,
         channel: @channel, id: nil)
@@ -28,7 +24,7 @@ module RBKubeMQ
         "Body" => message,
         "Store" => store
       }
-      @ws.send(RBKubeMQ::Utility.dump(body))
+      super(RBKubeMQ::Utility.dump(body))
     rescue StandardError => e
       raise RBKubeMQ::Error.new(e.message)
     end

data/lib/subscriber.rb

@@ -1,53 +1,33 @@
 module RBKubeMQ
-  class Subscriber
+  class Subscriber < Faye::WebSocket::Client
     include Check
 
     def initialize(client:, client_id: nil, channel: nil, group: nil,
-      events_store_type_data: 1, events_store_type_value: nil)
+      events_store_type_data: 1, events_store_type_value: nil, type: "events")
       is_class?(client, [RBKubeMQ::Client], "client")
+      type = type.to_s
+      is_in_list?(type, ["events", "events_store", "commands", "queries"], "type")
       @client = client
       @client_id  = client_id
       @channel = channel
       @group = group
       @events_store_type_data = events_store_type_data
       @events_store_type_value = events_store_type_value
-    end
-
-    attr_accessor :client_id, :channel, :meta, :store, :group,
-      :events_store_type_data, :events_store_type_value
-
-    def events
-      url = "#{@client.ws}/subscribe/events?client_id=#{@client_id}&channel=#{@channel}"
-      url += "&group=#{@group}" unless @group.nil?
-      url += "&subscribe_type=events"
-      @ws = Faye::WebSocket::Client.new(url)
-      @ws
-    end
-
-    def events_store
-      url = "#{@client.ws}/subscribe/events?client_id=#{@client_id}&channel=#{@channel}"
+      @type = type
+      url = "#{@client.ws}/subscribe/"
+      case type
+      when "events", "events_store"
+        url += "events"
+      when "commands", "queries"
+        url += "requests"
+      end
+      url += "?client_id=#{@client_id}&channel=#{@channel}"
       url += "&group=#{@group}" unless @group.nil?
-      url += "&events_store_type_data=#{@events_store_type_data}"
-      url += "&events_store_type_value=#{@events_store_type_value}" unless @events_store_type_value.nil?
-      url += "&subscribe_type=events_store"
-      @ws = Faye::WebSocket::Client.new(url)
-      @ws
+      url += "&subscribe_type=#{@type}"
+      super(url)
     end
 
-    def requests
-      url = "#{@client.ws}/subscribe/requests?client_id=#{@client_id}&channel=#{@channel}"
-      url += "&group=#{@group}" unless @group.nil?
-      url += "&subscribe_type=commands"
-      @ws = Faye::WebSocket::Client.new(url)
-      @ws
-    end
-
-    def queries
-      url = "#{@client.ws}/subscribe/requests?client_id=#{@client_id}&channel=#{@channel}"
-      url += "&group=#{@group}" unless @group.nil?
-      url += "&subscribe_type=queries"
-      @ws = Faye::WebSocket::Client.new(url)
-      @ws
-    end
+    attr_reader :client_id, :channel, :meta, :store, :group,
+      :events_store_type_data, :events_store_type_value, :type
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbkubemq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Stefano Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -70,7 +70,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.7
-description: Ruby driver for RBKubeMQ
+description: Ruby driver for KubeMQ
 email:
 - stefano@seluxit.com
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="