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.6.0)
+    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

lib/obsws/event.rb

@@ -28,8 +28,8 @@ module OBSWS
       ALL = LOW_VOLUME | HIGH_VOLUME
     end
 
-    module EventDirector
-      include Util::String
+    module Director
+      using Util::CoreExtensions
 
       def observers
         @observers ||= {}
@@ -50,13 +50,13 @@ module OBSWS
       end
 
       def fire(event, data)
-        observers[snakecase(event).to_sym]&.each { |block| data.empty? ? block.call : block.call(data) }
+        observers[event.snakecase.to_sym]&.each { |block| data.empty? ? block.call : block.call(data) }
       end
     end
 
     class Client
       include Logging
-      include EventDirector
+      include Events::Director
       include Mixin::TearDown
       include Mixin::OPCodes
 

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,7 +22,7 @@ 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
 
     # Represents a request response object

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

lib/obsws/version.rb

@@ -11,7 +11,7 @@ module OBSWS
     end
 
     def patch
-      1
+      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"