obsws 0.5.8 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e289e262d4b31c03c7df28ba6d638c39d04e362fb0173f2535e0bf60f188bd41
-  data.tar.gz: '0925f7d4d8695401d27dfb0d01df2c4fe5751d82d04c9bec752c981c52e1be8e'
+  metadata.gz: 112d9ab40ebc9219946426e476beaf6c489803049382d16feca972e7e14428d1
+  data.tar.gz: 561994b90c57837f4f5a496b22ba017fcb0fd4e4dfd946b7e62cdb91441f7253
 SHA512:
-  metadata.gz: 79e9065b4190dd974195079e31dc191fb7412fa143297b1f6dacedb1aae2100ded74abac9c1553b7fc92dce2987f40615d1101dfe5eab987f982a3bd3a7d87dd
-  data.tar.gz: 5137c5ca260beaedcda8936532bd4d04b6154d2c4b7e4a005e5eb12ab070e5502c7231acf2539a90304170bb75ebdd2fdf96a5a7f9bf49a4eafbb6f3370a945f
+  metadata.gz: da20d79e6e27d739ad0df64505e5ca0ed5e770505589f9fe89f05f8b326fec6df3a7aaaf290cf2d841cd5145475f219feadeb79c8e0f633f76f66b2336361777
+  data.tar.gz: '09d3781a1e45dd3631a5e0b300fb998cd03798e53bc51e1888850603ab55e1d8f6d3850315452e20178eebe60e11fb0f7d4a2a250cd0cc6eff4709d22eed623e'

data/README.md

@@ -67,7 +67,9 @@ For a full list of requests refer to [Requests](https://github.com/obsproject/ob
 
 ### Events
 
-Register `on_` callback methods. Method names should match the api event but snake cased.
+Register blocks with the Event client using the `on` method. Event tokens should match the event name but snake cased.
+
+The event data will be passed to the block.
 
 example:
 
@@ -75,23 +77,14 @@ example:
 class Observer
     def initialize
         @e_client = OBSWS::Events::Client.new(host: "localhost", port: 4455, password: "strongpassword")
-        # register callback methods with the Event client
-        @e_client.register(
-          [
-            method(:on_current_program_scene_changed),
-            method(:on_input_mute_state_changed)
-          ]
-        )
-    end
-
-    # define "on_" event methods.
-    def on_current_program_scene_changed(data)
-        ...
+        # register blocks on event types.
+        @e_client.on :current_program_scene_changed do |data|
+          ...
+        end
+        @e_client.on :input_mute_state_changed do |data|
+          ...
+        end
     end
-    def on_input_mute_state_changed(data)
-        ...
-    end
-    ...
 end
 ```
 
@@ -104,11 +97,12 @@ For both request responses and event data you may inspect the available attribut
 example:
 
 ```ruby
-resp = cl.get_version
+resp = @r_client.get_version
 p resp.attrs
 
-def on_scene_created(data):
-    p data.attrs
+@e_client.on :input_mute_state_changed do |data|
+  p data.attrs
+end
 ```
 
 ### Errors

data/lib/obsws/base.rb

@@ -29,8 +29,8 @@ module OBSWS
       port = kwargs[:port] || 4455
       @password = kwargs[:password] || ""
       @subs = kwargs[:subs] || 0
-      setup_driver(host, port) and start_driver
       @identified = Identified.new
+      setup_driver(host, port) and start_driver
       WaitUtil.wait_for_condition(
         "successful identification",
         delay_sec: 0.01,

data/lib/obsws/event.rb

@@ -28,43 +28,35 @@ module OBSWS
       ALL = LOW_VOLUME | HIGH_VOLUME
     end
 
-    module Callbacks
-      include Util::String
+    module Director
+      using Util::CoreExtensions
 
       def observers
-        @observers ||= []
+        @observers ||= {}
       end
 
-      def add_observer(observer)
-        observer = [observer] unless observer.respond_to? :each
-        observer.each { |o| observers << o unless observers.include? o }
+      def on(event, method = nil, &block)
+        (observers[event] ||= []) << (block || method)
       end
 
-      def remove_observer(observer)
-        observer = [observer] unless observer.respond_to? :each
-        observers.reject! { |o| observer.include? o }
+      def register(cbs)
+        cbs = Array(cbs) unless cbs.respond_to? :each
+        cbs.each { |cb| on(cb.name[3..].to_sym, cb) }
       end
 
-      private def notify_observers(event, data)
-        observers.each do |o|
-          if o.is_a? Method
-            if o.name.to_s == "on_#{snakecase(event)}"
-              data.empty? ? o.call : o.call(data)
-            end
-          elsif o.respond_to? "on_#{snakecase(event)}"
-            data.empty? ? o.send("on_#{snakecase(event)}") : o.send("on_#{snakecase(event)}", data)
-          end
-        end
+      def deregister(cbs)
+        cbs = Array(cbs) unless cbs.respond_to? :each
+        cbs.each { |cb| observers[cb.name[3..].to_sym]&.reject! { |o| cbs.include? o } }
       end
 
-      alias_method :callbacks, :observers
-      alias_method :register, :add_observer
-      alias_method :deregister, :remove_observer
+      def fire(event, data)
+        observers[event.snakecase.to_sym]&.each { |block| data.empty? ? block.call : block.call(data) }
+      end
     end
 
     class Client
       include Logging
-      include Callbacks
+      include Events::Director
       include Mixin::TearDown
       include Mixin::OPCodes
 
@@ -87,7 +79,7 @@ module OBSWS
             logger.debug("received: #{data}")
             event = data[:eventType]
             data = data.fetch(:eventData, {})
-            notify_observers(event, Mixin::Data.new(data, data.keys))
+            fire(event, Mixin::Data.new(data, data.keys))
           end
         }
       end

data/lib/obsws/mixin.rb

@@ -1,16 +1,17 @@
 module OBSWS
   module Mixin
     module Meta
-      include Util::String
+      using Util::CoreExtensions
 
       def make_field_methods(*params)
         params.each do |param|
-          define_singleton_method(snakecase(param.to_s)) { @resp[param] }
+          define_singleton_method(param.to_s.snakecase) { @resp[param] }
         end
       end
     end
 
     class MetaObject
+      using Util::CoreExtensions
       include Mixin::Meta
 
       def initialize(resp, fields)
@@ -21,14 +22,14 @@ module OBSWS
 
       def empty? = @fields.empty?
 
-      def attrs = @fields.map { |f| snakecase(f.to_s) }
+      def attrs = @fields.map { |f| f.to_s.snakecase }
     end
 
-    class Response < MetaObject; end
     # Represents a request response object
+    class Response < MetaObject; end
 
-    class Data < MetaObject; end
     # Represents an event data object
+    class Data < MetaObject; end
 
     module TearDown
       def stop_driver

data/lib/obsws/util.rb

@@ -1,15 +1,16 @@
 module OBSWS
   module Util
-    module String
-      def camelcase(s)
-        s.split("_").map(&:capitalize).join
-      end
+    module CoreExtensions
+      refine String do
+        def camelcase
+          split("_").map(&:capitalize).join
+        end
 
-      def snakecase(s)
-        s
-          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-          .downcase
+        def snakecase
+          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+            .downcase
+        end
       end
     end
   end

data/lib/obsws/version.rb

@@ -7,11 +7,11 @@ module OBSWS
     end
 
     def minor
-      5
+      6
     end
 
     def patch
-      8
+      2
     end
 
     def to_a

data/lib/obsws.rb

@@ -18,26 +18,22 @@ require_relative "obsws/event"
 require_relative "obsws/version"
 
 module OBSWS
+  # Base OBSWS error class
   class OBSWSError < StandardError; end
 
+  # Raised when a connection fails or times out
   class OBSWSConnectionError < OBSWSError; end
 
+  # Raised when a request returns an error code
   class OBSWSRequestError < OBSWSError
     attr_reader :req_name, :code
 
-    def initialize(req_name, code, msg)
+    def initialize(req_name, code, comment)
       @req_name = req_name
       @code = code
-      @msg = msg
+      message = "Request #{@req_name} returned code #{@code}."
+      message << " With message: #{comment}" if comment
       super(message)
     end
-
-    def message
-      msg = [
-        "Request #{@req_name} returned code #{@code}."
-      ]
-      msg << "With message: #{@msg}" if @msg
-      msg.join(" ")
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obsws
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.2
 platform: ruby
 authors:
 - onyx_online
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver