librevox 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741f63e510f82a40cfbb818d889405e46327bda536843c891767d21fafc7032d
-  data.tar.gz: be1b2346b673120f343d2cfea7c6eb71fcc085a3e1bdcdcaa86989dd97705b8a
+  metadata.gz: 95b27fda8c58322356ee1de25475e8a2d7a5f97de44bbed9b96e9a2bbf6b343f
+  data.tar.gz: ccc204e2ce431158e6522f00af68dc05ca1c830be38cfe72f062d351e70472a3
 SHA512:
-  metadata.gz: 77ed21f1951ea0061315850c0222ac422bedd25baa1e18b3e73bc983d9be1cfd94c6d3f9628ddc2e1461405d6623c248bd72e2a9a2bb1f898df035b0303962ed
-  data.tar.gz: 53fde0404e9b427820018c805d15f1bbb65fe9108384db699702130fb6c0aecefd89a3865e06193b75a5bc04fb06e7d47957e3e179f80f0f16a1edd414e479be
+  metadata.gz: bc30c9591747be4b1b86aa7c6107b8f367ef972c221271959a5c81f5b6bdead29cf6ebdc0d0162b00f899a41f0bbf6fcc1629b2000799179ca91495b54c3c796
+  data.tar.gz: 63e37d5c3792564c720340acd8c8c8f622f1e77a539d537cc5384f87753208efeb32ac6a8914fa4025113455012ae3f1f36517973bb4e3136cd64d79a21c9894

data/lib/librevox/applications.rb

@@ -150,9 +150,7 @@ module Librevox
       args = [min, max, tries, timeout, terminators, file, invalid_file,
         variable, regexp].join " "
 
-      params = {variable: variable}
-
-      application "play_and_get_digits", args, params
+      application "play_and_get_digits", args, variable: variable
     end
 
     # Plays a sound file on the current channel.
@@ -182,9 +180,7 @@ module Librevox
       arg_string = "%s %s %s %s %s %s" % [min, max, file, variable, timeout,
         terminators]
 
-      params = {variable: variable}
-
-      application "read", arg_string, params
+      application "read", arg_string, variable: variable
     end
 
     # Records a message, with an optional limit on the maximum duration of the

data/lib/librevox/command_socket.rb

@@ -37,11 +37,17 @@ module Librevox
       end
     end
 
-    def application(uuid, app, args = nil)
-      parts = ["sendmsg #{uuid}", "call-command: execute", "execute-app-name: #{app}"]
-      parts << "execute-app-arg: #{args}" if args && !args.empty?
-      parts << "event-lock: true"
-      send_message parts.join("\n")
+    def application(uuid, app, args = nil, **params)
+      headers = params
+        .merge(
+          event_lock:       true,
+          call_command:     "execute",
+          execute_app_name: app,
+          execute_app_arg:  args,
+        )
+        .map { |key, value| "#{key.to_s.tr('_', '-')}: #{value}" }
+
+      send_message "sendmsg #{uuid}\n#{headers.join("\n")}"
     end
 
     def close

data/lib/librevox/listener/inbound.rb

@@ -45,7 +45,6 @@ module Librevox
         end
 
         connection_completed
-        sleep # keep session alive for event hooks and child tasks
       end
 
       def connection_completed

data/lib/librevox/listener/outbound.rb

@@ -13,16 +13,24 @@ module Librevox
         barrier.async { server.run }
       end
 
-      def application(app, args = nil, params = {})
-        parts = ["sendmsg", "call-command: execute", "execute-app-name: #{app}"]
-        parts << "execute-app-arg: #{args}" if args && !args.empty?
-        parts << "event-lock: true"
+      def application(app, args = nil, **params)
+        variable_name = params.delete(:variable)
+
+        headers = params
+          .merge(
+            event_lock:        true,
+            call_command:      "execute",
+            execute_app_name:  app,
+            execute_app_arg:   args,
+          )
+          .map { |key, value| "#{key.to_s.tr('_', '-')}: #{value}" }
+
+        send_message "sendmsg\n#{headers.join("\n")}"
 
-        send_message parts.join("\n")
         response = @app_complete_queue.dequeue
         @session = response.content
 
-        params[:variable] ? variable(params[:variable]) : nil
+        variable(variable_name) if variable_name
       end
 
       attr_accessor :session
@@ -42,7 +50,6 @@ module Librevox
         send_message "myevents"
         send_message "linger"
         session_initiated
-        sleep # keep session alive for event hooks and child tasks
       end
 
       def handle_response

data/lib/librevox/server.rb

@@ -27,7 +27,10 @@ module Librevox
     end
 
     def run
-      @endpoint.accept(&method(:accept))
+      Async do |task|
+        @endpoint.accept(&method(:accept))
+        task.children.each(&:wait)
+      end
     end
   end
 end

data/lib/librevox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Librevox
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librevox
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Harry Vangberg