asterisk-ari-client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ced2496e519a26e6291bb719686a52645aad490
-  data.tar.gz: 2b0c8f8f38e6394ec90499079dfeb6321b470ebb
+  metadata.gz: 7fc8fd04e5ce4dda1088d1ce10f1b0e277ccd658
+  data.tar.gz: fc2881cb4c2bd69bfc1887d96ed4c987237ed0a3
 SHA512:
-  metadata.gz: 2f8f6d269307b5d89289d9760352e975005ff7044cbc48befae9868b6875b48e7f82cef0dc97407358fccf4e2eafde7fd94f0a032514eec5c8712e4e4c561c1e
-  data.tar.gz: fdf3eb413dffb79596790731a993b4908ab4afa8105527e4fac9b601ee87844ac22ffacbfabae2ea03cf790d14ffd1c7a23ce9384b7a488ec409c2f8a5cfd423
+  metadata.gz: 6b50e0b96d66452077838c9c0fa4023f89d119da7f9ce728518c0a0aaa8d0dc0c8fe962fc2bd7a3b3fbdf452f73d030f6552291211c1c0aa3dc226fbfbd2029a
+  data.tar.gz: 0f9dd78084a4ec64e530c97003a0708c65d9fc490bff0ec368705b85c44c958e6ac1c1a98e74bedcf6acaf0d422a859993700fd5ea8210adbcc051c8ea6ee4c0

data/lib/ari/client.rb

@@ -63,34 +63,30 @@ module Ari
     end
 
     def handle_websocket_message(event)
-      Thread.new do
-        begin
-          handle_websocket_close(event) and next if event.type == :close
-          next unless event.type == :text
-
-          object = MultiJson.load event.data
-
-          handler_klass = Ari.const_get object['type'] rescue nil
-          next unless handler_klass
-          event_name = object['type'].gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
-
-          instances = self.class.instance_listeners[event_name.to_sym]
-          
-          event_properties = (handler_klass.instance_methods - Ari::Event.instance_methods)
-          event_properties.reject! { |p| p.to_s.end_with? '=' }
-          handler = handler_klass.new(object.merge(client: self))
-          event_model_ids = event_properties.map { |p| handler.send(p).id rescue nil }.compact
-          [*instances].each do |instance|
-            if event_model_ids.include? instance.id
-              emit "#{event_name}-#{instance.id}", handler
-            end
-          end
-
-          self.emit event_name, handler_klass.new(object.merge(client: self))
-        rescue => err
-          emit :websocket_error, err
+      handle_websocket_close(event) and return if event.type == :close
+      return unless event.type == :text
+
+      object = MultiJson.load event.data
+
+      handler_klass = Ari.const_get object['type'] rescue nil
+      return unless handler_klass
+      event_name = object['type'].gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
+
+      instances = self.class.instance_listeners[event_name.to_sym]
+
+      event_properties = (handler_klass.instance_methods - Ari::Event.instance_methods)
+      event_properties.reject! { |p| p.to_s.end_with? '=' }
+      handler = handler_klass.new(object.merge(client: self))
+      event_model_ids = event_properties.map { |p| handler.send(p).id rescue nil }.compact
+      [*instances].each do |instance|
+        if event_model_ids.include? instance.id
+          Thread.new { emit "#{event_name}-#{instance.id}", handler }
         end
       end
+
+      Thread.new { self.emit event_name, handler_klass.new(object.merge(client: self)) }
+    rescue => err
+      emit :websocket_error, err
     end
 
     def handle_websocket_error(err)

data/lib/asterisk/ari/client/version.rb

@@ -1,7 +1,7 @@
 module Asterisk
   module Ari
     module Client
-      VERSION = "0.0.6"
+      VERSION = "0.0.7"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asterisk-ari-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jan Svoboda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby client library for the Asterisk REST Interface (ARI).