Merge pull request #6 from onyx-and-iris/dependabot/bundler/rexml-3.4.2

Bump rexml from 3.3.9 to 3.4.2

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    obsws (0.5.8)
+    obsws (0.6.2)
       waitutil (~> 0.2.1)
       websocket-driver (~> 0.7.5)
 
@@ -19,9 +19,9 @@ GEM
       racc
     racc (1.7.1)
     rainbow (3.1.1)
-    rake (11.3.0)
+    rake (13.0.6)
     regexp_parser (2.8.1)
-    rexml (3.2.5)
+    rexml (3.4.2)
     rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -58,11 +58,12 @@ GEM
 
 PLATFORMS
   x64-mingw-ucrt
+  x86_64-linux
 
 DEPENDENCIES
   minitest (~> 5.16, >= 5.16.3)
   obsws!
-  rake (~> 11.2, >= 11.2.2)
+  rake (~> 13.0, >= 11.2.2)
   standard (~> 1.30)
 
 BUNDLED WITH

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
+        # register blocks on event types.
-        @e_client.register(
+        @e_client.on :current_program_scene_changed do |data|
-          [
+          ...
-            method(:on_current_program_scene_changed),
+        end
-            method(:on_input_mute_state_changed)
+        @e_client.on :input_mute_state_changed do |data|
-          ]
+          ...
-        )
+        end
     end
-
-    # define "on_" event methods.
-    def on_current_program_scene_changed(data)
-        ...
-    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):
+@e_client.on :input_mute_state_changed do |data|
-    p data.attrs
+  p data.attrs
+end
 ```
 
 ### Errors

examples/events/main.rb

@@ -1,19 +1,28 @@
 require_relative "../../lib/obsws"
 require "yaml"
 
-
 class Main
   def initialize(**kwargs)
     @r_client = OBSWS::Requests::Client.new(**kwargs)
     @e_client = OBSWS::Events::Client.new(**kwargs)
-    @e_client.add_observer(self)
+
+    @e_client.on :current_program_scene_changed do |data|
+      puts "Switched to scene #{data.scene_name}"
+    end
+    @e_client.on :scene_created do |data|
+      puts "scene #{data.scene_name} has been created"
+    end
+    @e_client.on :input_mute_state_changed do |data|
+      puts "#{data.input_name} mute toggled"
+    end
+    @e_client.on :exit_started do
+      puts "OBS closing!"
+      @r_client.close
+      @e_client.close
+      @running = false
+    end
 
     puts infostring
-    @running = true
-  end
-
-  def run
-    sleep(0.1) while @running
   end
 
   def infostring
@@ -24,23 +33,9 @@ class Main
     ].join(" ")
   end
 
-  def on_current_program_scene_changed(data)
+  def run
-    puts "Switched to scene #{data.scene_name}"
+    @running = true
-  end
+    sleep(0.1) while @running
-
-  def on_scene_created(data)
-    puts "scene #{data.scene_name} has been created"
-  end
-
-  def on_input_mute_state_changed(data)
-    puts "#{data.input_name} mute toggled"
-  end
-
-  def on_exit_started
-    puts "OBS closing!"
-    @r_client.close
-    @e_client.close
-    @running = false
   end
 end
 

examples/levels/main.rb

@@ -13,36 +13,29 @@ class Main
   def initialize(**kwargs)
     subs = OBSWS::Events::SUBS::LOW_VOLUME | OBSWS::Events::SUBS::INPUTVOLUMEMETERS
     @e_client = OBSWS::Events::Client.new(subs:, **kwargs)
-    @e_client.register(
+
-      [
+    @e_client.on :input_mute_state_changed do |data|
-        method(:on_input_mute_state_changed),
+      if data.input_name == DEVICE
-        method(:on_input_volume_meters)
+        puts "#{DEVICE} mute toggled"
-      ]
+      end
-    )
+    end
+    @e_client.on :input_volume_meters do |data|
+      fget = ->(x) { (x > 0) ? (20 * Math.log(x, 10)).round(1) : -200.0 }
+
+      data.inputs.each do |d|
+        name = d[:inputName]
+        if name == DEVICE && !d[:inputLevelsMul].empty?
+          left, right = d[:inputLevelsMul]
+          puts "#{name} [L: #{fget.call(left[LevelTypes::POSTFADER])}, R: #{fget.call(right[LevelTypes::POSTFADER])}]"
+        end
+      end
+    end
   end
 
   def run
     puts "press <Enter> to quit"
     loop { break if gets.chomp.empty? }
   end
-
-  def on_input_mute_state_changed(data)
-    if data.input_name == DEVICE
-      puts "#{DEVICE} mute toggled"
-    end
-  end
-
-  def on_input_volume_meters(data)
-    fget = ->(x) { (x > 0) ? (20 * Math.log(x, 10)).round(1) : -200.0 }
-
-    data.inputs.each do |d|
-      name = d[:inputName]
-      if name == DEVICE && !d[:inputLevelsMul].empty?
-        left, right = d[:inputLevelsMul]
-        puts "#{name} [L: #{fget.call(left[LevelTypes::POSTFADER])}, R: #{fget.call(right[LevelTypes::POSTFADER])}]"
-      end
-    end
-  end
 end
 
 def conn_from_yaml

lib/obsws.rb

@@ -18,10 +18,13 @@ 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
 

lib/obsws/event.rb

@@ -28,43 +28,35 @@ module OBSWS
       ALL = LOW_VOLUME | HIGH_VOLUME
     end
 
-    module Callbacks
+    module Director
-      include Util::String
+      using Util::CoreExtensions
 
       def observers
-        @observers ||= []
+        @observers ||= {}
       end
 
-      def add_observer(observer)
+      def on(event, method = nil, &block)
-        observer = [observer] unless observer.respond_to? :each
+        (observers[event] ||= []) << (block || method)
-        observer.each { |o| observers << o unless observers.include? o }
       end
 
-      def remove_observer(observer)
+      def register(cbs)
-        observer = [observer] unless observer.respond_to? :each
+        cbs = Array(cbs) unless cbs.respond_to? :each
-        observers.reject! { |o| observer.include? o }
+        cbs.each { |cb| on(cb.name[3..].to_sym, cb) }
       end
 
-      private def notify_observers(event, data)
+      def deregister(cbs)
-        observers.each do |o|
+        cbs = Array(cbs) unless cbs.respond_to? :each
-          if o.is_a? Method
+        cbs.each { |cb| observers[cb.name[3..].to_sym]&.reject! { |o| cbs.include? o } }
-            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
       end
 
-      alias_method :callbacks, :observers
+      def fire(event, data)
-      alias_method :register, :add_observer
+        observers[event.snakecase.to_sym]&.each { |block| data.empty? ? block.call : block.call(data) }
-      alias_method :deregister, :remove_observer
+      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

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

lib/obsws/util.rb

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

lib/obsws/version.rb

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

obsws.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "waitutil", "~> 0.2.1"
   spec.add_development_dependency "standard", "~> 1.30"
   spec.add_development_dependency "minitest", "~> 5.16", ">= 5.16.3"
-  spec.add_development_dependency "rake", "~> 11.2", ">= 11.2.2"
+  spec.add_development_dependency "rake", ">= 11.2.2", "~> 13.0"
   spec.required_ruby_version = ">= 3.0"
   spec.metadata = {
     "source_code_uri" => "https://github.com/onyx-and-iris/obsws-ruby"