deepstream 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be943700904c49bfe301ba108143b3b1bf483c62
-  data.tar.gz: 37c6bcc801a2d78bef07daa359c1ca498df0b57d
+  metadata.gz: 834372ce6b7a3821b4b8146fc902a0dbac4b5b69
+  data.tar.gz: 5a84d22a6970dee3c65909a01b83392e9562cacd
 SHA512:
-  metadata.gz: ff5403c28136a4d9b01be6e3201a9665a4102aa72f11c12db9f06fc50fbb5a9892709ca43da3da45839fd3ba9e6d196e9c2c8b28a21016166157b34fdf63d30f
-  data.tar.gz: acbe6674e94967e725a659fd9d70cd38055e50445b9fa6c804c4ac83d8169352d53c8acb0f68057492cc498af29ea0407c3dc452972f164248799b5c877882b2
+  metadata.gz: 4dd169130ec5b074383796628d25bc2161806d096aa67670cf749a884f66ac73726b8ceacfc8be989963435151d86310206488e8307c12cf815378b5affceca6
+  data.tar.gz: 45eafd3aadb23c743217ccbbdf9ee60c4d699543158b4667df6ba23ec6e15dcca308e5e03aca11fa42e1d4712b8f11a8781d4119e799a4f7271488fc1abf444f

data/README.md

@@ -35,9 +35,7 @@ ds.emit 'my_event'
 ds.emit 'my_event', foo: 'bar', bar: 'foo'
 
 # Subscribe to events
-ds.on('some_event') do |event_name, msg|
-  puts msg
-end
+ds.on('some_event') { |data| puts data }
 
 # Get a record
 foo = ds.get('foo')

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       = "0.2.4"
+  spec.version       = "0.2.5"
   spec.authors       = ["Currency-One S.A."]
   spec.email         = ["piotr.szczudlak@currency-one.com"]
 

data/lib/deepstream/event_handler.rb

@@ -50,8 +50,9 @@ module Deepstream
       end
     end
 
-    def emit(event, data = nil, opts = { timeout: @client.options[:emit_timeout] })
-      @client.send_message(TOPIC::EVENT, ACTION::EVENT, event, Helpers.to_deepstream_type(data), timeout: opts[:timeout])
+    def emit(event, *args, timeout: @client.options[:emit_timeout], **kwargs)
+      data = Helpers.message_data(*args, **kwargs)
+      @client.send_message(TOPIC::EVENT, ACTION::EVENT, event, Helpers.to_deepstream_type(data), timeout: timeout)
     rescue => e
       @client.on_exception(e)
     end
@@ -74,8 +75,7 @@ module Deepstream
 
     def fire_event_callback(message)
       event, data = message.data
-      data = Helpers.to_type(data)
-      Celluloid::Future.new { @callbacks[event].call(event, data) }
+      Celluloid::Future.new { @callbacks[event].call(Helpers.to_type(data)) }
     end
 
     def fire_listen_callback(message)

data/lib/deepstream/helpers.rb

@@ -8,6 +8,7 @@ module Deepstream
 
     def self.to_deepstream_type(value)
       case value
+      when Array then "O#{value.to_json}"
       when Hash then "O#{value.to_json}"
       when String then "S#{value}"
       when Numeric then "N#{value}"
@@ -52,5 +53,14 @@ module Deepstream
         url.concat("/#{DEFAULT_PATH}") unless url[/\/\w+$/]
       end
     end
+
+    def self.message_data(*args, **kwargs)
+      kwargs = kwargs.empty? ? nil : kwargs
+      if args.empty?
+        kwargs
+      else
+        (args << kwargs).compact.instance_eval { one? ? first : self }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepstream
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Currency-One S.A.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-websocket-client